TreeFetcher improvements