Expanded class hierarchy of Type