Update to work with CBQE