EntityManagerAware interface and trait added