Added retry on client as well as client queue per resource