Webservice improvement