Improve load times by skipping serialization of entities when unecessary.

Improve load times by skipping serialization of entities when unecessary. #531