Updated spring extensions