updates for using dao