Fixing Dao classes