Add automatic_retries with handler to client