Expanded class hierarchy of _Substitution