Add option to retry an unlimited number of times