Add retry feature