Improved Spring support in client