Upgrade and switch to Sppring Data WebConfig