Refactored RestoreManager