updated dao queries