Add retry support