Added support for folder tree