Updated/New Composer support for Tree

See diff for full changes