Spring context refactor