Upgrade to Spring 4