Added support for retry options