Context Constraints vis. improvements