Fixed getPayload references