Reworking generic payload transmit