Added Entity&EntityManager. More to come