fixed dao implementations