More entities, no test or DAO yet