ref #6794 update some imports to model changes and add ITermTree