Refactored tree object