Optimizing EQUI_CLASS_POLICY