Added entities, some DAO class