Changed database and related DAO-s