Tidied up nested app support