Add MemberConstraint
Forcefully refactor Definition with friends again