Added fields to constraint