Add auto-retry to flags