First Refactoring. Adding BaseApplication.