Fix payload structure