added EntityManager and DAO TODOs