Abstract away payload, WIP for marshaling