[WIP] - API fixes for PR #385

Created by: marcus-oscarsson

Hi,

This is the PR that goes back to the per operation API based on PR #385.

Ive started to test this here, please let me know, if you like to continue with this one or use #385.

Marcus