Add late ping support