Constraints added for 3.5