Added tree builder for support