Refactored spring application context