Add retry field support