- removed source requirement from createPayload and wrap