Add support for retries