Entity Manager updated with implementation of identity map, deleted Unit of work as too much complexity at this stage