Updated webservices classes