support for hierarchy (submenus) in fs-based models, more templating options and better testing