Expanded class hierarchy of Extension