Add basic support for manual retries