* Webservices improvements. Seem to work