Improved Application class