Revise Data Structure for Tree Class