fixed dao classes