Added EntityManager storage and its test