Add operator id, make operator name human readable