Modified dao classes