Changing notion of constraints

refs #1