Improvements to marionette type definition

Improvements to the Application and AppRouter definitions