Upgrade to Spring Framework 4