More changes for CQL3