Add in auto-recovery for all operations