Rework default payload