Added entity data classes and EntityManager