Use custom CQL building