! Application class refactoring