Update for new CQL parser