Updated and refined constraints for Person, Organization, and User domains