Context constraints added