Updated to newer version of Spring