Added validation to CQL