Break unit.payload into two separate properties.