add ID to Message
move OperationType to Operation.Type