slight restructure, fix EntityManager producers