Enhance support for retransmissions