Better payload compat