Changes to Tree and AutoDictionary