Adds retry and blacklist logic