Convert preprocessing to strict cql