Update monitoring to "right" payload format