updates for doctrine layer and entities