Implemented new classes. Fixed a couple of issues around the road.
Fixes Strict error on EntityPersisterMock.