Add tags when saving and restoring