Add debug info and limited retransmission