Constraint feature expansion