Refactoring to implement custom identity checking
Change to using a singleton for EntityMappingStore