Complete retry initial implementation