Optimized restore procedure