Upgrade to spring 4