Added scaffolding for failure recovery (e.g. RetryPolicy)