Expanded class hierarchy of Tar