Add do-query-dao and do-select-dao working