Update to allow using original tree format.