Enhancing to JSON payload