Better names for rescue strategies
Refactor
Handle finalize phase as well