CAS-1271: Updated rules