Upgrading to the new spring libs