Changed Application class