Added retry capability to es driver