Add Save and Restore commands (TBD)