Improved cql