Added ability to specify custom operation id