Adding retry after mechanism