updated to support new dqs and updated dqs