Bug fix for referencing

Bug fix
Issue: entities that were hydrated were behaving strange because data
would be overwriten etc etc
Fix: hydrating now uses a clone of the entity given in the Mapper