Added retry handler interface