TreeDecorator now uses tree classes