fixing Dao classes