Updated to remove spring modules dependency and updated XStream version