Adapt to new webservices