Adjustments to support down stream consumer expect payload formats