Add expand and make Tree yieldable