restructured constraint set definition