Spring config improvement.