Separate restoring from initialization