Add AliasConstraint
Merged scope assertions into 2 methods
Refactor container out of Definition constraint