fixed dao classes implemenation