applicationContext refactoring