Prepare for future payload format change