Expanded class hierarchy of Language