Added retry and exponential backoff
2.1.2