Add retry handling