Added auto retry for lost data