Re-add Save/Restore functions.