Applying changes due to Eik's update of the webservice.