Added retry to client