Fix Update and Remove commands, add Restore.