Fixed more CQL support