Add normalizePayload