improved dao classes