Updated tree handling
Updated loading state