Implements #1254
Add webservice for #1254