Expanded class hierarchy of Substitution