Update json payload to be more generic.

#MBL-10145 Fixed

@CHenrie Please Review