Added retry to the request handler