Added category subdivisions to Constraint.