Improved compatibility; better handling of response from server