add Operator and OperatorServingStop

https://trello.com/c/bsKmWOwY