Changes for tree usage