implemented DAOs, improved entities