First improvements to Application class.