upgraded cql lib