fixed Dao classes