Add Application class and NavigationService