Add support for retried jobs