Setting the payload better