Web service adaptation #12 
 Commit after next stable test