Update to support CQ count