PR - Add Json Payload support