Added Entities and DAOs