Services were added, Entities and DAOs were fixed