Improved constraints in the new constructs