Adding EntityManager and cleaning up generated classes