Re-introduce restore functionality