Refactored tree structures.