refactored application-context-configuration