Upgraded to new Web API, fixes #6