Added support for simple trees