Added in support for selective retry support