Adds failsafe for Retry with Full Data mechanism