Changed ConstraintValue to ConstraintProperty