Added support for nested apps