aligning with latest updates from cq-tools