Update column code to work with CBQE