Improve attempt propagation