Improvements to Retry System