diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..644452c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,69 @@
+
+iWorkFileInspector/Externals/intermediate
+iWorkFileInspector/Externals/packages
+iWorkFileInspector/Externals/prebuilt
+iWorkFileInspector/Externals/build
+
+iWorkFileInspector/Externals/proto*
+iWorkFileInspector/Externals/snappy*
+
+# OSX Specific System Files
+.DS_Store
+*.swp
+.Spotlight-V100
+.Trashes
+
+# Win Specific System Files
+ehthumbs.db
+Thumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# Xcode Specific Files
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+*.xcworkspace
+!default.xcworkspace
+xcuserdata
+*.moved-aside
+*.xccheckout
+
+# CMake build-system
+CMakeCache.txt
+CMakeFiles
+Makefile
+install_manifest.txt
+cmake_install.cmake
+cmake_uninstall.cmake
+
+# Subversion files
+.svn
diff --git a/iWorkFileInspector/Externals/prebuilt/bin/protoc b/iWorkFileInspector/Externals/prebuilt/bin/protoc
index 454ca2e..d51e32a 100755
Binary files a/iWorkFileInspector/Externals/prebuilt/bin/protoc and b/iWorkFileInspector/Externals/prebuilt/bin/protoc differ
diff --git a/iWorkFileInspector/Externals/prebuilt/lib/libprotobuf.a b/iWorkFileInspector/Externals/prebuilt/lib/libprotobuf.a
index d55be1c..0217944 100644
Binary files a/iWorkFileInspector/Externals/prebuilt/lib/libprotobuf.a and b/iWorkFileInspector/Externals/prebuilt/lib/libprotobuf.a differ
diff --git a/iWorkFileInspector/Externals/prebuilt/lib/libsnappy.a b/iWorkFileInspector/Externals/prebuilt/lib/libsnappy.a
index 557303f..02ae23d 100644
Binary files a/iWorkFileInspector/Externals/prebuilt/lib/libsnappy.a and b/iWorkFileInspector/Externals/prebuilt/lib/libsnappy.a differ
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.cc
index 336fc2e..99a1dd1 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.cc
@@ -180,7 +180,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(AnimationAttributesArchive));
   TransitionAttributesArchive_descriptor_ = file->message_type(1);
-  static const int TransitionAttributesArchive_offsets_[15] = {
+  static const int TransitionAttributesArchive_offsets_[16] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, animationattributes_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, isautomatic_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, custom_twist_),
@@ -190,6 +190,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, custom_magic_move_fade_unmatched_objects_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, custom_timing_curve_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, custom_text_delivery_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, custom_motion_blur_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, database_animationtype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, database_effect_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TransitionAttributesArchive, database_duration_),
@@ -246,7 +247,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BuildChunkArchive));
   BuildAttributesArchive_descriptor_ = file->message_type(4);
-  static const int BuildAttributesArchive_offsets_[28] = {
+  static const int BuildAttributesArchive_offsets_[29] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, animationattributes_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, eventtrigger_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, delayautomaticafter_),
@@ -268,6 +269,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, custom_action_repeatcount_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, custom_action_scale_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, custom_action_jiggleintensity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, custom_motion_blur_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, database_animationtype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, database_effect_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BuildAttributesArchive, database_direction_),
@@ -377,7 +379,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ClassicThemeRecordArchive));
   SlideArchive_descriptor_ = file->message_type(10);
-  static const int SlideArchive_offsets_[36] = {
+  static const int SlideArchive_offsets_[38] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, style_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, builds_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, buildchunks_),
@@ -386,7 +388,8 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, bodyplaceholder_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, objectplaceholder_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, slidenumberplaceholder_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, drawables_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, owned_drawables_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, drawables_z_order_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, sage_tag_to_info_map_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, name_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, titleplaceholdergeometry_),
@@ -406,6 +409,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, bodyliststyles_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, thumbnailtextfortitleplaceholder_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, thumbnailtextforbodyplaceholder_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, slideobjectslayerwithmaster_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, master_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, staticguides_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideArchive, userdefinedguidestorage_),
@@ -443,7 +447,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SlideArchive_SageTagMapEntry));
   SlideNodeArchive_descriptor_ = file->message_type(11);
-  static const int SlideNodeArchive_offsets_[19] = {
+  static const int SlideNodeArchive_offsets_[20] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, children_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, slide_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, thumbnails_),
@@ -461,6 +465,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, copyfromslideidentifier_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, slidespecifichyperlinkcount_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, eventcount_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, has_explicit_builds_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, database_thumbnail_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideNodeArchive, database_thumbnails_),
   };
@@ -498,7 +503,7 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
   DesktopUILayoutArchive_SidebarViewMode_descriptor_ = DesktopUILayoutArchive_descriptor_->enum_type(0);
   DesktopUILayoutArchive_InspectorPaneViewMode_descriptor_ = DesktopUILayoutArchive_descriptor_->enum_type(1);
   UIStateArchive_descriptor_ = file->message_type(13);
-  static const int UIStateArchive_offsets_[24] = {
+  static const int UIStateArchive_offsets_[27] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, slidenodetoedit_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, deprecated_masterslidenodetoapply_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, deprecated_slidethumbnailsize_),
@@ -523,6 +528,9 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, desktop_navigator_view_width_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, desktop_outline_view_width_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, desktop_main_content_size_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, desktop_presenter_notes_view_height_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, desktop_main_window_origin_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UIStateArchive, light_table_hides_skipped_slides_),
   };
   UIStateArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -553,12 +561,14 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CanvasSelectionArchive));
   ThemeArchive_descriptor_ = file->message_type(15);
-  static const int ThemeArchive_offsets_[5] = {
+  static const int ThemeArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, masters_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, uuid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, classicthemerecords_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, defaultmasterslidenode_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, default_master_slide_node_reference_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ThemeArchive, default_master_slide_node_is_our_best_guess_),
   };
   ThemeArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -672,13 +682,16 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SlideStyleArchive));
   PasteboardNativeStorageArchive_descriptor_ = file->message_type(21);
-  static const int PasteboardNativeStorageArchive_offsets_[6] = {
+  static const int PasteboardNativeStorageArchive_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, drawables_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, builds_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, buildchunks_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, slidenodes_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, masterslidenodes_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, originalshowsize_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, titleranges_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, geometries_in_root_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardNativeStorageArchive, slide_node_unique_identifier_),
   };
   PasteboardNativeStorageArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -786,8 +799,9 @@ void protobuf_AssignDesc_KNArchives_2eproto() {
       sizeof(RecordingNavigationEventArchive));
   RecordingNavigationEventArchive_RecordingNavigationEventAnimationPhase_descriptor_ = RecordingNavigationEventArchive_descriptor_->enum_type(0);
   RecordingLaserEventArchive_descriptor_ = file->message_type(27);
-  static const int RecordingLaserEventArchive_offsets_[1] = {
+  static const int RecordingLaserEventArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordingLaserEventArchive, unscaled_location_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordingLaserEventArchive, unit_location_),
   };
   RecordingLaserEventArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -1122,7 +1136,7 @@ void protobuf_AddDesc_KNArchives_2eproto() {
     "nType\030\001 \001(\t\022\016\n\006effect\030\002 \001(\t\022\020\n\010duration\030"
     "\003 \001(\001\022\021\n\tdirection\030\004 \001(\r\022\r\n\005delay\030\005 \001(\001\022"
     "\023\n\013isAutomatic\030\006 \001(\010\022\031\n\005color\030\007 \001(\0132\n.TS"
-    "P.Color\"\241\t\n\033TransitionAttributesArchive\022"
+    "P.Color\"\325\t\n\033TransitionAttributesArchive\022"
     ";\n\023animationAttributes\030\010 \001(\0132\036.KN.Animat"
     "ionAttributesArchive\022\023\n\013isAutomatic\030\006 \001("
     "\010\022\024\n\014custom_twist\030\t \001(\002\022\032\n\022custom_mosaic"
@@ -1134,320 +1148,336 @@ void protobuf_AddDesc_KNArchives_2eproto() {
     "sTimingCurveType\022m\n\031custom_text_delivery"
     "_type\030\020 \001(\0162J.KN.TransitionAttributesArc"
     "hive.TransitionCustomAttributesTextDeliv"
-    "eryType\022\036\n\026database_animationType\030\001 \001(\t\022"
-    "\027\n\017database_effect\030\002 \001(\t\022\031\n\021database_dur"
-    "ation\030\003 \001(\001\022\032\n\022database_direction\030\004 \001(\r\022"
-    "\026\n\016database_delay\030\005 \001(\002\022\"\n\016database_colo"
-    "r\030\007 \001(\0132\n.TSP.Color\"\207\002\n)TransitionCustom"
-    "AttributesTimingCurveType\0223\n/TransitionC"
-    "ustomAttributesTimingCurveTypeLinear\020\001\0223"
-    "\n/TransitionCustomAttributesTimingCurveT"
-    "ypeEaseIn\020\002\0224\n0TransitionCustomAttribute"
-    "sTimingCurveTypeEaseOut\020\003\022:\n6TransitionC"
-    "ustomAttributesTimingCurveTypeEaseInEase"
-    "Out\020\004\"\213\002\n*TransitionCustomAttributesText"
-    "DeliveryType\0226\n2TransitionCustomAttribut"
-    "esTextDeliveryTypeByObject\020\001\0224\n0Transiti"
-    "onCustomAttributesTextDeliveryTypeByWord"
-    "\020\002\0229\n5TransitionCustomAttributesTextDeli"
-    "veryTypeByCharacter\020\003\0224\n0TransitionCusto"
-    "mAttributesTextDeliveryTypeByLine\020\004\"H\n\021T"
-    "ransitionArchive\0223\n\nattributes\030\002 \002(\0132\037.K"
-    "N.TransitionAttributesArchive\"\207\001\n\021BuildC"
-    "hunkArchive\022\035\n\005build\030\001 \002(\0132\016.TSP.Referen"
-    "ce\022\r\n\005index\030\002 \002(\r\022\r\n\005delay\030\003 \001(\001\022\020\n\010dura"
-    "tion\030\004 \001(\001\022\021\n\tautomatic\030\005 \001(\010\022\020\n\010referen"
-    "t\030\006 \001(\010\"\215\017\n\026BuildAttributesArchive\022;\n\023an"
-    "imationAttributes\030\022 \001(\0132\036.KN.AnimationAt"
-    "tributesArchive\022\024\n\014eventTrigger\030\004 \001(\r\022\033\n"
-    "\023delayAutomaticAfter\030\006 \001(\001\022\032\n\022delayAutom"
-    "aticWith\030\007 \001(\001\022H\n\ncurveStyle\030\016 \001(\01624.KN."
-    "BuildAttributesArchive.BuildAttributesCu"
-    "rveStyle\022\027\n\017ChartRotation3D\030\021 \001(\001\022\023\n\013sta"
-    "rtOffset\030\033 \001(\r\022\021\n\tendOffset\030\034 \001(\r\022\034\n\024act"
-    "ion_rotationAngle\030\t \001(\001\022]\n\030action_rotati"
-    "onDirection\030\n \001(\0162;.KN.BuildAttributesAr"
-    "chive.BuildAttributesRotationDirection\022\030"
-    "\n\020action_scaleSize\030\013 \001(\001\022\031\n\021action_color"
-    "Alpha\030\014 \001(\001\022S\n\023action_acceleration\030\r \001(\016"
-    "26.KN.BuildAttributesArchive.BuildAttrib"
-    "utesAcceleration\0227\n\027action_motionPathSou"
-    "rce\030\026 \001(\0132\026.TSD.PathSourceArchive\022\025\n\rcus"
-    "tom_bounce\030\023 \001(\010\022S\n\023custom_textDelivery\030"
-    "\024 \001(\01626.KN.BuildAttributesArchive.BuildA"
-    "ttributesTextDelivery\022W\n\025custom_delivery"
-    "Option\030\025 \001(\01628.KN.BuildAttributesArchive"
-    ".BuildAttributesDeliveryOption\022\033\n\023custom"
-    "_action_decay\030\027 \001(\010\022!\n\031custom_action_rep"
-    "eatCount\030\030 \001(\r\022\033\n\023custom_action_scale\030\031 "
-    "\001(\001\022f\n\035custom_action_jiggleIntensity\030\032 \001"
-    "(\0162\?.KN.BuildAttributesArchive.ActionBui"
-    "ldAttributesJiggleIntensity\022\036\n\026database_"
-    "animationType\030\001 \001(\t\022\027\n\017database_effect\030\002"
-    " \001(\t\022\032\n\022database_direction\030\003 \001(\r\022\026\n\016data"
-    "base_delay\030\005 \001(\001\022\031\n\021database_duration\030\010 "
-    "\001(\001\022\"\n\016database_color\030\020 \001(\0132\n.TSP.Color\022"
-    "\034\n\020motionPathString\030\017 \001(\tB\002\030\001\"R\n\033BuildAt"
-    "tributesAcceleration\022\t\n\005kNone\020\000\022\013\n\007kEase"
-    "In\020\001\022\014\n\010kEaseOut\020\002\022\r\n\tkEaseBoth\020\003\"I\n Bui"
-    "ldAttributesRotationDirection\022\016\n\nkClockw"
-    "ise\020\037\022\025\n\021kCounterclockwise\020 \"7\n\031BuildAtt"
-    "ributesCurveStyle\022\r\n\tkStraight\020\000\022\013\n\007kCur"
-    "ved\020\001\"\244\001\n\033BuildAttributesTextDelivery\022\032\n"
-    "\026kTextDeliveryUndefined\020\000\022\031\n\025kTextDelive"
-    "ryByObject\020\001\022\027\n\023kTextDeliveryByWord\020\002\022\034\n"
-    "\030kTextDeliveryByCharacter\020\003\022\027\n\023kTextDeli"
-    "veryByLine\020\004\"\316\001\n\035BuildAttributesDelivery"
-    "Option\022\034\n\030kDeliveryOptionUndefined\020\000\022\032\n\026"
-    "kDeliveryOptionForward\020\001\022\033\n\027kDeliveryOpt"
-    "ionBackward\020\002\022\035\n\031kDeliveryOptionFromCent"
-    "er\020\003\022\034\n\030kDeliveryOptionFromEdges\020\004\022\031\n\025kD"
-    "eliveryOptionRandom\020\005\"x\n$ActionBuildAttr"
-    "ibutesJiggleIntensity\022\031\n\025kJiggleIntensit"
-    "ySmall\020\000\022\032\n\026kJiggleIntensityMedium\020\001\022\031\n\025"
-    "kJiggleIntensityLarge\020\002\"\204\001\n\014BuildArchive"
-    "\022 \n\010drawable\030\001 \002(\0132\016.TSP.Reference\022\020\n\010de"
-    "livery\030\002 \002(\t\022\020\n\010duration\030\003 \002(\001\022.\n\nattrib"
-    "utes\030\004 \002(\0132\032.KN.BuildAttributesArchive\"\211"
-    "\002\n\022PlaceholderArchive\022%\n\005super\030\001 \002(\0132\026.T"
-    "SWP.ShapeInfoArchive\022;\n\004kind\030\002 \001(\0162\033.KN."
-    "PlaceholderArchive.Kind:\020kKindPlaceholde"
-    "r\"\216\001\n\004Kind\022\024\n\020kKindPlaceholder\020\000\022\037\n\033kKin"
-    "dSlideNumberPlaceholder\020\001\022\031\n\025kKindTitleP"
-    "laceholder\020\002\022\030\n\024kKindBodyPlaceholder\020\003\022\032"
-    "\n\026kKindObjectPlaceholder\020\004\"7\n\013NoteArchiv"
-    "e\022(\n\020containedStorage\030\001 \002(\0132\016.TSP.Refere"
-    "nce\"\215\001\n\036ClassicStylesheetRecordArchive\022L"
-    "\n\027identifier_to_style_map\030\001 \003(\0132+.TSS.St"
-    "ylesheetArchive.IdentifiedStyleEntry\022\035\n\005"
-    "theme\030\002 \001(\0132\016.TSP.Reference\"t\n\031ClassicTh"
-    "emeRecordArchive\022\014\n\004uuid\030\001 \001(\t\022(\n\020styles"
-    "heetRecord\030\002 \001(\0132\016.TSP.Reference\022\037\n\007mast"
-    "ers\030\003 \003(\0132\016.TSP.Reference\"\305\r\n\014SlideArchi"
-    "ve\022\035\n\005style\030\001 \002(\0132\016.TSP.Reference\022\036\n\006bui"
-    "lds\030\002 \003(\0132\016.TSP.Reference\022*\n\013buildChunks"
-    "\030\003 \003(\0132\025.KN.BuildChunkArchive\022)\n\ntransit"
-    "ion\030\004 \002(\0132\025.KN.TransitionArchive\022(\n\020titl"
-    "ePlaceholder\030\005 \001(\0132\016.TSP.Reference\022\'\n\017bo"
-    "dyPlaceholder\030\006 \001(\0132\016.TSP.Reference\022)\n\021o"
-    "bjectPlaceholder\030\036 \001(\0132\016.TSP.Reference\022."
-    "\n\026slideNumberPlaceholder\030\024 \001(\0132\016.TSP.Ref"
-    "erence\022!\n\tdrawables\030\007 \003(\0132\016.TSP.Referenc"
-    "e\022>\n\024sage_tag_to_info_map\030\034 \003(\0132 .KN.Sli"
-    "deArchive.SageTagMapEntry\022\014\n\004name\030\n \001(\t\022"
-    "6\n\030titlePlaceholderGeometry\030\013 \001(\0132\024.TSD."
-    "GeometryArchive\022\'\n\037titlePlaceholderShape"
-    "StyleIndex\030\014 \001(\r\022&\n\036titlePlaceholderText"
-    "StyleIndex\030\r \001(\r\022@\n\025titleLayoutPropertie"
-    "s\030\030 \001(\0132!.TSWP.ShapeStylePropertiesArchi"
-    "ve\0225\n\027bodyPlaceholderGeometry\030\016 \001(\0132\024.TS"
-    "D.GeometryArchive\022&\n\036bodyPlaceholderShap"
-    "eStyleIndex\030\017 \001(\r\022%\n\035bodyPlaceholderText"
-    "StyleIndex\030\020 \001(\r\022\?\n\024bodyLayoutProperties"
-    "\030\031 \001(\0132!.TSWP.ShapeStylePropertiesArchiv"
-    "e\022<\n\036slideNumberPlaceholderGeometry\030\025 \001("
-    "\0132\024.TSD.GeometryArchive\022-\n%slideNumberPl"
-    "aceholderShapeStyleIndex\030\026 \001(\r\022,\n$slideN"
-    "umberPlaceholderTextStyleIndex\030\027 \001(\r\022F\n\033"
-    "slideNumberLayoutProperties\030\032 \001(\0132!.TSWP"
-    ".ShapeStylePropertiesArchive\022/\n\027classicS"
-    "tylesheetRecord\030\035 \001(\0132\016.TSP.Reference\022+\n"
-    "\023bodyParagraphStyles\030\037 \003(\0132\016.TSP.Referen"
-    "ce\022&\n\016bodyListStyles\030# \003(\0132\016.TSP.Referen"
-    "ce\022(\n thumbnailTextForTitlePlaceholder\030%"
-    " \001(\t\022\'\n\037thumbnailTextForBodyPlaceholder\030"
-    "& \001(\t\022\036\n\006master\030\021 \001(\0132\016.TSP.Reference\022\'\n"
-    "\014staticGuides\030\022 \003(\0132\021.TSD.GuideArchive\022/"
-    "\n\027userDefinedGuideStorage\030$ \001(\0132\016.TSP.Re"
-    "ference\022\022\n\ninDocument\030\023 \002(\010\022\034\n\004note\030\033 \001("
-    "\0132\016.TSP.Reference\022>\n&info_using_object_p"
-    "laceholder_geometry\030\' \001(\0132\016.TSP.Referenc"
-    "e\022R\nJinfo_using_object_placeholder_geome"
-    "try_matches_object_placeholder_geometry\030"
-    "( \001(\010\0224\n,deprecated_objectPlaceholderVis"
-    "ibleForExport\030\" \001(\010\032<\n\017SageTagMapEntry\022\013"
-    "\n\003tag\030\001 \002(\t\022\034\n\004info\030\002 \002(\0132\016.TSP.Referenc"
-    "e\"\322\004\n\020SlideNodeArchive\022 \n\010children\030\001 \003(\013"
-    "2\016.TSP.Reference\022\035\n\005slide\030\002 \001(\0132\016.TSP.Re"
-    "ference\022&\n\nthumbnails\030\020 \003(\0132\022.TSP.DataRe"
-    "ference\022!\n\016thumbnailSizes\030\n \003(\0132\t.TSP.Si"
-    "ze\022\032\n\022thumbnailsAreDirty\030\016 \001(\010\022\020\n\010isHidd"
-    "en\030\004 \002(\010\022\027\n\013isCollapsed\030\005 \002(\010B\002\030\001\022 \n\030isC"
-    "ollapsedInOutlineView\030\021 \001(\010\022\034\n\024hasBodyIn"
-    "OutlineView\030\023 \001(\010\022\021\n\thasBuilds\030\006 \002(\010\022\025\n\r"
-    "hasTransition\030\007 \002(\010\022\017\n\007hasNote\030\010 \001(\010\022#\n\024"
-    "isSlideNumberVisible\030\022 \001(\010:\005false\022\030\n\020uni"
-    "queIdentifier\030\013 \001(\t\022\037\n\027copyFromSlideIden"
-    "tifier\030\014 \001(\t\022#\n\033slideSpecificHyperlinkCo"
-    "unt\030\r \001(\r\022\022\n\neventCount\030\017 \001(\r\022*\n\022databas"
-    "e_thumbnail\030\003 \001(\0132\016.TSP.Reference\022+\n\023dat"
-    "abase_thumbnails\030\t \003(\0132\016.TSP.Reference\"\222"
-    "\004\n\026DesktopUILayoutArchive\022\027\n\017sidebar_vis"
-    "ible\030\001 \001(\010\022E\n\021sidebar_view_mode\030\002 \001(\0162*."
-    "KN.DesktopUILayoutArchive.SidebarViewMod"
-    "e\022\025\n\rnotes_visible\030\003 \001(\010\022\033\n\023light_table_"
-    "visible\030\005 \001(\010\022$\n\026inspector_pane_visible\030"
-    "\006 \001(\010:\004true\022p\n\030inspector_pane_view_mode\030"
-    "\007 \001(\01620.KN.DesktopUILayoutArchive.Inspec"
-    "torPaneViewMode:\034kInspectorPaneViewModeF"
-    "ormat\"M\n\017SidebarViewMode\022\035\n\031kSidebarView"
-    "ModeNavigator\020\000\022\033\n\027kSidebarViewModeOutli"
-    "ne\020\001\"}\n\025InspectorPaneViewMode\022 \n\034kInspec"
-    "torPaneViewModeFormat\020\000\022!\n\035kInspectorPan"
-    "eViewModeAnimate\020\001\022\037\n\033kInspectorPaneView"
-    "ModeSetup\020\002\"\241\007\n\016UIStateArchive\022\'\n\017slideN"
-    "odeToEdit\030\001 \001(\0132\016.TSP.Reference\0229\n!depre"
-    "cated_masterSlideNodeToApply\030\002 \001(\0132\016.TSP"
-    ".Reference\0220\n\035deprecated_slideThumbnailS"
-    "ize\030\003 \001(\0132\t.TSP.Size\022\027\n\017canvasViewScale\030"
-    "\004 \001(\002\022 \n\014canvasOffset\030\005 \001(\0132\n.TSP.Point\022"
-    "*\n\022selectedSlideNodes\030\006 \003(\0132\016.TSP.Refere"
-    "nce\022\035\n\025iPhoneCanvasViewScale\030\007 \001(\002\022&\n\022iP"
-    "honeCanvasOffset\030\010 \001(\0132\n.TSP.Point\022 \n\030iP"
-    "hone568CanvasViewScale\030\t \001(\002\022)\n\025iPhone56"
-    "8CanvasOffset\030\n \001(\0132\n.TSP.Point\022)\n\021deskt"
-    "op_ui_layout\030\013 \001(\0132\016.TSP.Reference\022.\n&de"
-    "sktop_slide_view_content_fits_window\030\014 \001"
-    "(\010\022!\n\031desktop_canvas_view_scale\030\r \001(\002\022)\n"
-    "\025desktop_canvas_offset\030\025 \001(\0132\n.TSP.Point"
-    "\022\036\n\026light_table_zoom_scale\030\016 \001(\002\022*\n\016char"
-    "t_ui_state\030\017 \003(\0132\022.TSCH.ChartUIState\022\031\n\021"
-    "show_slide_guides\030\020 \001(\010\022\032\n\022show_master_g"
-    "uides\030\021 \001(\010\022\026\n\016shows_comments\030\022 \001(\010\022-\n\025c"
-    "ollapsed_slide_nodes\030\023 \003(\0132\016.TSP.Referen"
-    "ce\022\023\n\013shows_ruler\030\024 \001(\010\022$\n\034desktop_navig"
-    "ator_view_width\030\026 \001(\002\022\"\n\032desktop_outline"
-    "_view_width\030\027 \001(\002\022,\n\031desktop_main_conten"
-    "t_size\030\030 \001(\0132\t.TSP.Size\"\217\001\n\026CanvasSelect"
-    "ionArchive\022\035\n\005infos\030\001 \003(\0132\016.TSP.Referenc"
-    "e\022+\n\024action_ghost_indexes\030\003 \003(\0132\r.TSP.In"
-    "dexSet\022)\n\035database_action_ghost_indexes\030"
-    "\002 \003(\rB\002\030\001\"\274\001\n\014ThemeArchive\022 \n\005super\030\001 \002("
-    "\0132\021.TSS.ThemeArchive\022\037\n\007masters\030\002 \003(\0132\016."
-    "TSP.Reference\022\014\n\004uuid\030\003 \001(\t\022+\n\023classicTh"
-    "emeRecords\030\004 \003(\0132\016.TSP.Reference\022.\n\026defa"
-    "ultMasterSlideNode\030\005 \001(\0132\016.TSP.Reference"
-    "\"9\n\020SlideTreeArchive\022%\n\rrootSlideNode\030\001 "
-    "\001(\0132\016.TSP.Reference\"\364\004\n\013ShowArchive\022\037\n\007u"
-    "iState\030\001 \001(\0132\016.TSP.Reference\022\035\n\005theme\030\002 "
-    "\002(\0132\016.TSP.Reference\022\'\n\tslideTree\030\003 \002(\0132\024"
-    ".KN.SlideTreeArchive\022\027\n\004size\030\004 \002(\0132\t.TSP"
-    ".Size\022\"\n\nstylesheet\030\005 \002(\0132\016.TSP.Referenc"
-    "e\022\033\n\023slideNumbersVisible\030\006 \001(\010\022!\n\trecord"
-    "ing\030\007 \001(\0132\016.TSP.Reference\022\031\n\021loop_presen"
-    "tation\030\010 \001(\010\022;\n\004mode\030\t \001(\0162\032.KN.ShowArch"
-    "ive.KNShowMode:\021kKNShowModeNormal\022$\n\031aut"
-    "oplay_transition_delay\030\n \001(\001:\0015\022\037\n\024autop"
-    "lay_build_delay\030\013 \001(\001:\0012\022\031\n\021idle_timer_a"
-    "ctive\030\017 \001(\010\022\035\n\020idle_timer_delay\030\020 \001(\001:\0039"
-    "00\022\"\n\nsoundtrack\030\021 \001(\0132\016.TSP.Reference\022%"
-    "\n\035automatically_plays_upon_open\030\022 \001(\010\"[\n"
-    "\nKNShowMode\022\025\n\021kKNShowModeNormal\020\000\022\027\n\023kK"
-    "NShowModeAutoPlay\020\001\022\035\n\031kKNShowModeHyperl"
-    "inksOnly\020\002\"\207\001\n\017DocumentArchive\022#\n\005super\030"
-    "\003 \002(\0132\024.TSA.DocumentArchive\022\034\n\004show\030\002 \002("
-    "\0132\016.TSP.Reference\0221\n\031tables_custom_forma"
-    "t_list\030\004 \001(\0132\016.TSP.Reference\"\241\002\n\033SlideSt"
-    "ylePropertiesArchive\022\036\n\004fill\030\001 \001(\0132\020.TSD"
-    ".FillArchive\0223\n\ntransition\030\002 \001(\0132\037.KN.Tr"
-    "ansitionAttributesArchive\022\027\n\017transition_"
-    "null\030\003 \001(\010\022\"\n\032titlePlaceholderVisibility"
-    "\030\004 \001(\010\022!\n\031bodyPlaceholderVisibility\030\005 \001("
-    "\010\022#\n\033objectPlaceholderVisibility\030\007 \001(\010\022("
-    "\n slideNumberPlaceholderVisibility\030\006 \001(\010"
-    "\"\213\001\n\021SlideStyleArchive\022 \n\005super\030\001 \002(\0132\021."
-    "TSS.StyleArchive\022\031\n\016override_count\030\n \001(\r"
-    ":\0010\0229\n\020slide_properties\030\013 \001(\0132\037.KN.Slide"
-    "StylePropertiesArchive\"\371\001\n\036PasteboardNat"
-    "iveStorageArchive\022!\n\tdrawables\030\001 \003(\0132\016.T"
-    "SP.Reference\022\036\n\006builds\030\002 \003(\0132\016.TSP.Refer"
-    "ence\022*\n\013buildChunks\030\003 \003(\0132\025.KN.BuildChun"
-    "kArchive\022\"\n\nslideNodes\030\004 \003(\0132\016.TSP.Refer"
-    "ence\022#\n\020originalShowSize\030\005 \001(\0132\t.TSP.Siz"
-    "e\022\037\n\013titleRanges\030\006 \003(\0132\n.TSP.Range\"\241\002\n\027M"
-    "asterChangeBlobArchive\022\035\n\005slide\030\001 \001(\0132\016."
-    "TSP.Reference\022\036\n\006master\030\002 \001(\0132\016.TSP.Refe"
-    "rence\022#\n\013slide_style\030\003 \001(\0132\016.TSP.Referen"
-    "ce\022)\n\021title_placeholder\030\004 \001(\0132\016.TSP.Refe"
-    "rence\022(\n\020body_placeholder\030\005 \001(\0132\016.TSP.Re"
-    "ference\022*\n\022object_placeholder\030\007 \001(\0132\016.TS"
-    "P.Reference\022!\n\tdrawables\030\006 \003(\0132\016.TSP.Ref"
-    "erence\"\334\002\n\020RecordingArchive\022$\n\014event_tra"
-    "cks\030\001 \003(\0132\016.TSP.Reference\022#\n\013movie_track"
-    "\030\002 \001(\0132\016.TSP.Reference\022\020\n\010duration\030\003 \001(\001"
-    "\022^\n\nsync_state\030\004 \001(\0162\'.KN.RecordingArchi"
-    "ve.RecordingSyncState:!kRecordingSyncSta"
-    "teInSyncWithShow\022$\n\021modification_date\030\005 "
-    "\001(\0132\t.TSP.Date\"e\n\022RecordingSyncState\022%\n!"
-    "kRecordingSyncStateInSyncWithShow\020\000\022(\n$k"
-    "RecordingSyncStateOutOfSyncWithShow\020\001\"U\n"
-    "\032RecordingEventTrackArchive\022\014\n\004type\030\001 \001("
-    "\t\022)\n\006events\030\002 \003(\0132\031.KN.RecordingEventArc"
-    "hive\"\261\002\n\025RecordingEventArchive\022\026\n\nstart_"
-    "time\030\001 \001(\001:\002-1\022F\n\030navigation_event_archi"
-    "ve\030\350\007 \001(\0132#.KN.RecordingNavigationEventA"
-    "rchive\022<\n\023laser_event_archive\030\351\007 \001(\0132\036.K"
-    "N.RecordingLaserEventArchive\022<\n\023pause_ev"
-    "ent_archive\030\352\007 \001(\0132\036.KN.RecordingPauseEv"
-    "entArchive\022<\n\023movie_event_archive\030\353\007 \001(\013"
-    "2\036.KN.RecordingMovieEventArchive\"\257\003\n\037Rec"
-    "ordingNavigationEventArchive\0223\n\033target_s"
-    "lide_node_reference\030\001 \001(\0132\016.TSP.Referenc"
-    "e\022\032\n\022target_event_index\030\002 \001(\r\022\213\001\n\017animat"
-    "ion_phase\030\003 \001(\0162J.KN.RecordingNavigation"
-    "EventArchive.RecordingNavigationEventAni"
-    "mationPhase:&kRecordingNavigationEventAn"
-    "imationNone\"\254\001\n&RecordingNavigationEvent"
-    "AnimationPhase\022*\n&kRecordingNavigationEv"
-    "entAnimationNone\020\000\022+\n\'kRecordingNavigati"
-    "onEventAnimationStart\020\001\022)\n%kRecordingNav"
-    "igationEventAnimationEnd\020\002\"C\n\032RecordingL"
-    "aserEventArchive\022%\n\021unscaled_location\030\001 "
-    "\001(\0132\n.TSP.Point\"\315\002\n\032RecordingPauseEventA"
-    "rchive\022p\n\020pause_event_type\030\001 \001(\01626.KN.Re"
-    "cordingPauseEventArchive.RecordingPauseE"
-    "ventType:\036kRecordingPauseEventTypeResume"
-    "\"\274\001\n\027RecordingPauseEventType\022\"\n\036kRecordi"
-    "ngPauseEventTypeResume\020\000\022!\n\035kRecordingPa"
-    "useEventTypePause\020\001\022,\n(kRecordingPauseEv"
-    "entTypeConcealWithBlack\020\002\022,\n(kRecordingP"
-    "auseEventTypeConcealWithWhite\020\003\"\345\003\n\032Reco"
-    "rdingMovieEventArchive\022,\n\024movie_info_ref"
-    "erence\030\001 \001(\0132\016.TSP.Reference\022j\n\020movie_ev"
-    "ent_type\030\002 \001(\01626.KN.RecordingMovieEventA"
-    "rchive.RecordingMovieEventType:\030kRecordi"
-    "ngMovieEventSeek\022\031\n\021movie_event_value\030\003 "
-    "\001(\001\"\221\002\n\027RecordingMovieEventType\022\034\n\030kReco"
-    "rdingMovieEventNone\020\000\022\034\n\030kRecordingMovie"
-    "EventSeek\020\001\022\037\n\033kRecordingMovieEventSetRa"
-    "te\020\002\022%\n!kRecordingMovieEventStartPlaybac"
-    "k\020\003\022$\n kRecordingMovieEventStopPlayback\020"
-    "\004\022&\n\"kRecordingMovieEventBeginScrubbing\020"
-    "\005\022$\n kRecordingMovieEventEndScrubbing\020\006\""
-    "M\n\032RecordingMovieTrackArchive\022/\n\016movie_s"
-    "egments\030\001 \003(\0132\027.KN.MovieSegmentArchive\"\202"
-    "\001\n\023MovieSegmentArchive\022&\n\nmovie_data\030\003 \001"
-    "(\0132\022.TSP.DataReference\022\026\n\nstart_time\030\002 \001"
-    "(\001:\002-1\022+\n\023database_movie_data\030\001 \001(\0132\016.TS"
-    "P.Reference\"\371\001\n\nSoundtrack\022\016\n\006volume\030\001 \001"
-    "(\001\022F\n\004mode\030\002 \001(\0162\035.KN.Soundtrack.Soundtr"
-    "ackMode:\031kKNSoundtrackModePlayOnce\022\'\n\013mo"
-    "vie_media\030\003 \003(\0132\022.TSP.DataReference\"j\n\016S"
-    "oundtrackMode\022\035\n\031kKNSoundtrackModePlayOn"
-    "ce\020\000\022\031\n\025kKNSoundtrackModeLoop\020\001\022\036\n\032kKNSo"
-    "undtrackModeDoNotPlay\020\002\"M\n\034SlideNumberAt"
-    "tachmentArchive\022-\n\005super\030\001 \002(\0132\036.TSWP.Te"
-    "xtualAttachmentArchive\"\370\002\n\037SlideCollecti"
-    "onSelectionArchive\022#\n\013slide_nodes\030\001 \003(\0132"
-    "\016.TSP.Reference\022*\n\022slide_node_to_edit\030\002 "
-    "\001(\0132\016.TSP.Reference\022h\n*selected_paragrap"
-    "h_indexes_for_slide_nodes\030\003 \003(\01324.KN.Sli"
-    "deCollectionSelectionArchive.OutlineSele"
-    "ction\022/\n\033range_in_selected_paragraph\030\004 \001"
-    "(\0132\n.TSP.Range\032i\n\020OutlineSelection\022\"\n\nsl"
-    "ide_node\030\001 \002(\0132\016.TSP.Reference\0221\n\032select"
-    "ed_paragraph_indexes\030\002 \002(\0132\r.TSP.IndexSe"
-    "t", 13321);
+    "eryType\022\032\n\022custom_motion_blur\030\021 \001(\010\022\"\n\026d"
+    "atabase_animationType\030\001 \001(\tB\002\030\001\022\033\n\017datab"
+    "ase_effect\030\002 \001(\tB\002\030\001\022\035\n\021database_duratio"
+    "n\030\003 \001(\001B\002\030\001\022\036\n\022database_direction\030\004 \001(\rB"
+    "\002\030\001\022\032\n\016database_delay\030\005 \001(\002B\002\030\001\022&\n\016datab"
+    "ase_color\030\007 \001(\0132\n.TSP.ColorB\002\030\001\"\207\002\n)Tran"
+    "sitionCustomAttributesTimingCurveType\0223\n"
+    "/TransitionCustomAttributesTimingCurveTy"
+    "peLinear\020\001\0223\n/TransitionCustomAttributes"
+    "TimingCurveTypeEaseIn\020\002\0224\n0TransitionCus"
+    "tomAttributesTimingCurveTypeEaseOut\020\003\022:\n"
+    "6TransitionCustomAttributesTimingCurveTy"
+    "peEaseInEaseOut\020\004\"\213\002\n*TransitionCustomAt"
+    "tributesTextDeliveryType\0226\n2TransitionCu"
+    "stomAttributesTextDeliveryTypeByObject\020\001"
+    "\0224\n0TransitionCustomAttributesTextDelive"
+    "ryTypeByWord\020\002\0229\n5TransitionCustomAttrib"
+    "utesTextDeliveryTypeByCharacter\020\003\0224\n0Tra"
+    "nsitionCustomAttributesTextDeliveryTypeB"
+    "yLine\020\004\"H\n\021TransitionArchive\0223\n\nattribut"
+    "es\030\002 \002(\0132\037.KN.TransitionAttributesArchiv"
+    "e\"\207\001\n\021BuildChunkArchive\022\035\n\005build\030\001 \002(\0132\016"
+    ".TSP.Reference\022\r\n\005index\030\002 \002(\r\022\r\n\005delay\030\003"
+    " \001(\001\022\020\n\010duration\030\004 \001(\001\022\021\n\tautomatic\030\005 \001("
+    "\010\022\020\n\010referent\030\006 \001(\010\"\311\017\n\026BuildAttributesA"
+    "rchive\022;\n\023animationAttributes\030\022 \001(\0132\036.KN"
+    ".AnimationAttributesArchive\022\024\n\014eventTrig"
+    "ger\030\004 \001(\r\022\037\n\023delayAutomaticAfter\030\006 \001(\001B\002"
+    "\030\001\022\036\n\022delayAutomaticWith\030\007 \001(\001B\002\030\001\022H\n\ncu"
+    "rveStyle\030\016 \001(\01624.KN.BuildAttributesArchi"
+    "ve.BuildAttributesCurveStyle\022\027\n\017ChartRot"
+    "ation3D\030\021 \001(\001\022\023\n\013startOffset\030\033 \001(\r\022\021\n\ten"
+    "dOffset\030\034 \001(\r\022\034\n\024action_rotationAngle\030\t "
+    "\001(\001\022]\n\030action_rotationDirection\030\n \001(\0162;."
+    "KN.BuildAttributesArchive.BuildAttribute"
+    "sRotationDirection\022\030\n\020action_scaleSize\030\013"
+    " \001(\001\022\031\n\021action_colorAlpha\030\014 \001(\001\022S\n\023actio"
+    "n_acceleration\030\r \001(\01626.KN.BuildAttribute"
+    "sArchive.BuildAttributesAcceleration\0227\n\027"
+    "action_motionPathSource\030\026 \001(\0132\026.TSD.Path"
+    "SourceArchive\022\025\n\rcustom_bounce\030\023 \001(\010\022S\n\023"
+    "custom_textDelivery\030\024 \001(\01626.KN.BuildAttr"
+    "ibutesArchive.BuildAttributesTextDeliver"
+    "y\022W\n\025custom_deliveryOption\030\025 \001(\01628.KN.Bu"
+    "ildAttributesArchive.BuildAttributesDeli"
+    "veryOption\022\033\n\023custom_action_decay\030\027 \001(\010\022"
+    "!\n\031custom_action_repeatCount\030\030 \001(\r\022\033\n\023cu"
+    "stom_action_scale\030\031 \001(\001\022f\n\035custom_action"
+    "_jiggleIntensity\030\032 \001(\0162\?.KN.BuildAttribu"
+    "tesArchive.ActionBuildAttributesJiggleIn"
+    "tensity\022\032\n\022custom_motion_blur\030\035 \001(\010\022\"\n\026d"
+    "atabase_animationType\030\001 \001(\tB\002\030\001\022\033\n\017datab"
+    "ase_effect\030\002 \001(\tB\002\030\001\022\036\n\022database_directi"
+    "on\030\003 \001(\rB\002\030\001\022\032\n\016database_delay\030\005 \001(\001B\002\030\001"
+    "\022\035\n\021database_duration\030\010 \001(\001B\002\030\001\022&\n\016datab"
+    "ase_color\030\020 \001(\0132\n.TSP.ColorB\002\030\001\022\034\n\020motio"
+    "nPathString\030\017 \001(\tB\002\030\001\"R\n\033BuildAttributes"
+    "Acceleration\022\t\n\005kNone\020\000\022\013\n\007kEaseIn\020\001\022\014\n\010"
+    "kEaseOut\020\002\022\r\n\tkEaseBoth\020\003\"I\n BuildAttrib"
+    "utesRotationDirection\022\016\n\nkClockwise\020\037\022\025\n"
+    "\021kCounterclockwise\020 \"7\n\031BuildAttributesC"
+    "urveStyle\022\r\n\tkStraight\020\000\022\013\n\007kCurved\020\001\"\244\001"
+    "\n\033BuildAttributesTextDelivery\022\032\n\026kTextDe"
+    "liveryUndefined\020\000\022\031\n\025kTextDeliveryByObje"
+    "ct\020\001\022\027\n\023kTextDeliveryByWord\020\002\022\034\n\030kTextDe"
+    "liveryByCharacter\020\003\022\027\n\023kTextDeliveryByLi"
+    "ne\020\004\"\316\001\n\035BuildAttributesDeliveryOption\022\034"
+    "\n\030kDeliveryOptionUndefined\020\000\022\032\n\026kDeliver"
+    "yOptionForward\020\001\022\033\n\027kDeliveryOptionBackw"
+    "ard\020\002\022\035\n\031kDeliveryOptionFromCenter\020\003\022\034\n\030"
+    "kDeliveryOptionFromEdges\020\004\022\031\n\025kDeliveryO"
+    "ptionRandom\020\005\"x\n$ActionBuildAttributesJi"
+    "ggleIntensity\022\031\n\025kJiggleIntensitySmall\020\000"
+    "\022\032\n\026kJiggleIntensityMedium\020\001\022\031\n\025kJiggleI"
+    "ntensityLarge\020\002\"\204\001\n\014BuildArchive\022 \n\010draw"
+    "able\030\001 \002(\0132\016.TSP.Reference\022\020\n\010delivery\030\002"
+    " \002(\t\022\020\n\010duration\030\003 \002(\001\022.\n\nattributes\030\004 \002"
+    "(\0132\032.KN.BuildAttributesArchive\"\211\002\n\022Place"
+    "holderArchive\022%\n\005super\030\001 \002(\0132\026.TSWP.Shap"
+    "eInfoArchive\022;\n\004kind\030\002 \001(\0162\033.KN.Placehol"
+    "derArchive.Kind:\020kKindPlaceholder\"\216\001\n\004Ki"
+    "nd\022\024\n\020kKindPlaceholder\020\000\022\037\n\033kKindSlideNu"
+    "mberPlaceholder\020\001\022\031\n\025kKindTitlePlacehold"
+    "er\020\002\022\030\n\024kKindBodyPlaceholder\020\003\022\032\n\026kKindO"
+    "bjectPlaceholder\020\004\"7\n\013NoteArchive\022(\n\020con"
+    "tainedStorage\030\001 \002(\0132\016.TSP.Reference\"\215\001\n\036"
+    "ClassicStylesheetRecordArchive\022L\n\027identi"
+    "fier_to_style_map\030\001 \003(\0132+.TSS.Stylesheet"
+    "Archive.IdentifiedStyleEntry\022\035\n\005theme\030\002 "
+    "\001(\0132\016.TSP.Reference\"t\n\031ClassicThemeRecor"
+    "dArchive\022\014\n\004uuid\030\001 \001(\t\022(\n\020stylesheetReco"
+    "rd\030\002 \001(\0132\016.TSP.Reference\022\037\n\007masters\030\003 \003("
+    "\0132\016.TSP.Reference\"\242\016\n\014SlideArchive\022\035\n\005st"
+    "yle\030\001 \002(\0132\016.TSP.Reference\022\036\n\006builds\030\002 \003("
+    "\0132\016.TSP.Reference\022*\n\013buildChunks\030\003 \003(\0132\025"
+    ".KN.BuildChunkArchive\022)\n\ntransition\030\004 \002("
+    "\0132\025.KN.TransitionArchive\022(\n\020titlePlaceho"
+    "lder\030\005 \001(\0132\016.TSP.Reference\022\'\n\017bodyPlaceh"
+    "older\030\006 \001(\0132\016.TSP.Reference\022)\n\021objectPla"
+    "ceholder\030\036 \001(\0132\016.TSP.Reference\022.\n\026slideN"
+    "umberPlaceholder\030\024 \001(\0132\016.TSP.Reference\022\'"
+    "\n\017owned_drawables\030\007 \003(\0132\016.TSP.Reference\022"
+    ")\n\021drawables_z_order\030* \003(\0132\016.TSP.Referen"
+    "ce\022>\n\024sage_tag_to_info_map\030\034 \003(\0132 .KN.Sl"
+    "ideArchive.SageTagMapEntry\022\014\n\004name\030\n \001(\t"
+    "\0226\n\030titlePlaceholderGeometry\030\013 \001(\0132\024.TSD"
+    ".GeometryArchive\022\'\n\037titlePlaceholderShap"
+    "eStyleIndex\030\014 \001(\r\022&\n\036titlePlaceholderTex"
+    "tStyleIndex\030\r \001(\r\022@\n\025titleLayoutProperti"
+    "es\030\030 \001(\0132!.TSWP.ShapeStylePropertiesArch"
+    "ive\0225\n\027bodyPlaceholderGeometry\030\016 \001(\0132\024.T"
+    "SD.GeometryArchive\022&\n\036bodyPlaceholderSha"
+    "peStyleIndex\030\017 \001(\r\022%\n\035bodyPlaceholderTex"
+    "tStyleIndex\030\020 \001(\r\022\?\n\024bodyLayoutPropertie"
+    "s\030\031 \001(\0132!.TSWP.ShapeStylePropertiesArchi"
+    "ve\022<\n\036slideNumberPlaceholderGeometry\030\025 \001"
+    "(\0132\024.TSD.GeometryArchive\022-\n%slideNumberP"
+    "laceholderShapeStyleIndex\030\026 \001(\r\022,\n$slide"
+    "NumberPlaceholderTextStyleIndex\030\027 \001(\r\022F\n"
+    "\033slideNumberLayoutProperties\030\032 \001(\0132!.TSW"
+    "P.ShapeStylePropertiesArchive\022/\n\027classic"
+    "StylesheetRecord\030\035 \001(\0132\016.TSP.Reference\022+"
+    "\n\023bodyParagraphStyles\030\037 \003(\0132\016.TSP.Refere"
+    "nce\022&\n\016bodyListStyles\030# \003(\0132\016.TSP.Refere"
+    "nce\022(\n thumbnailTextForTitlePlaceholder\030"
+    "% \001(\t\022\'\n\037thumbnailTextForBodyPlaceholder"
+    "\030& \001(\t\022*\n\033slideObjectsLayerWithMaster\030) "
+    "\001(\010:\005false\022\036\n\006master\030\021 \001(\0132\016.TSP.Referen"
+    "ce\022\'\n\014staticGuides\030\022 \003(\0132\021.TSD.GuideArch"
+    "ive\022/\n\027userDefinedGuideStorage\030$ \001(\0132\016.T"
+    "SP.Reference\022\022\n\ninDocument\030\023 \002(\010\022\034\n\004note"
+    "\030\033 \001(\0132\016.TSP.Reference\022>\n&info_using_obj"
+    "ect_placeholder_geometry\030\' \001(\0132\016.TSP.Ref"
+    "erence\022R\nJinfo_using_object_placeholder_"
+    "geometry_matches_object_placeholder_geom"
+    "etry\030( \001(\010\0224\n,deprecated_objectPlacehold"
+    "erVisibleForExport\030\" \001(\010\032<\n\017SageTagMapEn"
+    "try\022\013\n\003tag\030\001 \002(\t\022\034\n\004info\030\002 \002(\0132\016.TSP.Ref"
+    "erence\"\363\004\n\020SlideNodeArchive\022 \n\010children\030"
+    "\001 \003(\0132\016.TSP.Reference\022\035\n\005slide\030\002 \001(\0132\016.T"
+    "SP.Reference\022&\n\nthumbnails\030\020 \003(\0132\022.TSP.D"
+    "ataReference\022!\n\016thumbnailSizes\030\n \003(\0132\t.T"
+    "SP.Size\022\032\n\022thumbnailsAreDirty\030\016 \001(\010\022\020\n\010i"
+    "sHidden\030\004 \002(\010\022\027\n\013isCollapsed\030\005 \002(\010B\002\030\001\022 "
+    "\n\030isCollapsedInOutlineView\030\021 \001(\010\022\034\n\024hasB"
+    "odyInOutlineView\030\023 \001(\010\022\025\n\thasBuilds\030\006 \002("
+    "\010B\002\030\001\022\025\n\rhasTransition\030\007 \002(\010\022\017\n\007hasNote\030"
+    "\010 \001(\010\022#\n\024isSlideNumberVisible\030\022 \001(\010:\005fal"
+    "se\022\030\n\020uniqueIdentifier\030\013 \001(\t\022\037\n\027copyFrom"
+    "SlideIdentifier\030\014 \001(\t\022#\n\033slideSpecificHy"
+    "perlinkCount\030\r \001(\r\022\022\n\neventCount\030\017 \001(\r\022\033"
+    "\n\023has_explicit_builds\030\024 \001(\010\022*\n\022database_"
+    "thumbnail\030\003 \001(\0132\016.TSP.Reference\022+\n\023datab"
+    "ase_thumbnails\030\t \003(\0132\016.TSP.Reference\"\222\004\n"
+    "\026DesktopUILayoutArchive\022\027\n\017sidebar_visib"
+    "le\030\001 \001(\010\022E\n\021sidebar_view_mode\030\002 \001(\0162*.KN"
+    ".DesktopUILayoutArchive.SidebarViewMode\022"
+    "\025\n\rnotes_visible\030\003 \001(\010\022\033\n\023light_table_vi"
+    "sible\030\005 \001(\010\022$\n\026inspector_pane_visible\030\006 "
+    "\001(\010:\004true\022p\n\030inspector_pane_view_mode\030\007 "
+    "\001(\01620.KN.DesktopUILayoutArchive.Inspecto"
+    "rPaneViewMode:\034kInspectorPaneViewModeFor"
+    "mat\"M\n\017SidebarViewMode\022\035\n\031kSidebarViewMo"
+    "deNavigator\020\000\022\033\n\027kSidebarViewModeOutline"
+    "\020\001\"}\n\025InspectorPaneViewMode\022 \n\034kInspecto"
+    "rPaneViewModeFormat\020\000\022!\n\035kInspectorPaneV"
+    "iewModeAnimate\020\001\022\037\n\033kInspectorPaneViewMo"
+    "deSetup\020\002\"\250\010\n\016UIStateArchive\022\'\n\017slideNod"
+    "eToEdit\030\001 \001(\0132\016.TSP.Reference\0229\n!depreca"
+    "ted_masterSlideNodeToApply\030\002 \001(\0132\016.TSP.R"
+    "eference\0220\n\035deprecated_slideThumbnailSiz"
+    "e\030\003 \001(\0132\t.TSP.Size\022\027\n\017canvasViewScale\030\004 "
+    "\001(\002\022 \n\014canvasOffset\030\005 \001(\0132\n.TSP.Point\022*\n"
+    "\022selectedSlideNodes\030\006 \003(\0132\016.TSP.Referenc"
+    "e\022\035\n\025iPhoneCanvasViewScale\030\007 \001(\002\022&\n\022iPho"
+    "neCanvasOffset\030\010 \001(\0132\n.TSP.Point\022 \n\030iPho"
+    "ne568CanvasViewScale\030\t \001(\002\022)\n\025iPhone568C"
+    "anvasOffset\030\n \001(\0132\n.TSP.Point\022)\n\021desktop"
+    "_ui_layout\030\013 \001(\0132\016.TSP.Reference\022.\n&desk"
+    "top_slide_view_content_fits_window\030\014 \001(\010"
+    "\022!\n\031desktop_canvas_view_scale\030\r \001(\002\022)\n\025d"
+    "esktop_canvas_offset\030\025 \001(\0132\n.TSP.Point\022\036"
+    "\n\026light_table_zoom_scale\030\016 \001(\002\022*\n\016chart_"
+    "ui_state\030\017 \003(\0132\022.TSCH.ChartUIState\022\031\n\021sh"
+    "ow_slide_guides\030\020 \001(\010\022\032\n\022show_master_gui"
+    "des\030\021 \001(\010\022\026\n\016shows_comments\030\022 \001(\010\022-\n\025col"
+    "lapsed_slide_nodes\030\023 \003(\0132\016.TSP.Reference"
+    "\022\023\n\013shows_ruler\030\024 \001(\010\022$\n\034desktop_navigat"
+    "or_view_width\030\026 \001(\002\022\"\n\032desktop_outline_v"
+    "iew_width\030\027 \001(\002\022,\n\031desktop_main_content_"
+    "size\030\030 \001(\0132\t.TSP.Size\022+\n#desktop_present"
+    "er_notes_view_height\030\031 \001(\002\022.\n\032desktop_ma"
+    "in_window_origin\030\032 \001(\0132\n.TSP.Point\022(\n li"
+    "ght_table_hides_skipped_slides\030\033 \001(\010\"\217\001\n"
+    "\026CanvasSelectionArchive\022\035\n\005infos\030\001 \003(\0132\016"
+    ".TSP.Reference\022+\n\024action_ghost_indexes\030\003"
+    " \003(\0132\r.TSP.IndexSet\022)\n\035database_action_g"
+    "host_indexes\030\002 \003(\rB\002\030\001\"\256\002\n\014ThemeArchive\022"
+    " \n\005super\030\001 \002(\0132\021.TSS.ThemeArchive\022\037\n\007mas"
+    "ters\030\002 \003(\0132\016.TSP.Reference\022\014\n\004uuid\030\003 \001(\t"
+    "\022+\n\023classicThemeRecords\030\004 \003(\0132\016.TSP.Refe"
+    "rence\022.\n\026defaultMasterSlideNode\030\005 \001(\0132\016."
+    "TSP.Reference\022;\n#default_master_slide_no"
+    "de_reference\030\006 \001(\0132\016.TSP.Reference\0223\n+de"
+    "fault_master_slide_node_is_our_best_gues"
+    "s\030\007 \001(\010\"9\n\020SlideTreeArchive\022%\n\rrootSlide"
+    "Node\030\001 \001(\0132\016.TSP.Reference\"\364\004\n\013ShowArchi"
+    "ve\022\037\n\007uiState\030\001 \001(\0132\016.TSP.Reference\022\035\n\005t"
+    "heme\030\002 \002(\0132\016.TSP.Reference\022\'\n\tslideTree\030"
+    "\003 \002(\0132\024.KN.SlideTreeArchive\022\027\n\004size\030\004 \002("
+    "\0132\t.TSP.Size\022\"\n\nstylesheet\030\005 \002(\0132\016.TSP.R"
+    "eference\022\033\n\023slideNumbersVisible\030\006 \001(\010\022!\n"
+    "\trecording\030\007 \001(\0132\016.TSP.Reference\022\031\n\021loop"
+    "_presentation\030\010 \001(\010\022;\n\004mode\030\t \001(\0162\032.KN.S"
+    "howArchive.KNShowMode:\021kKNShowModeNormal"
+    "\022$\n\031autoplay_transition_delay\030\n \001(\001:\0015\022\037"
+    "\n\024autoplay_build_delay\030\013 \001(\001:\0012\022\031\n\021idle_"
+    "timer_active\030\017 \001(\010\022\035\n\020idle_timer_delay\030\020"
+    " \001(\001:\003900\022\"\n\nsoundtrack\030\021 \001(\0132\016.TSP.Refe"
+    "rence\022%\n\035automatically_plays_upon_open\030\022"
+    " \001(\010\"[\n\nKNShowMode\022\025\n\021kKNShowModeNormal\020"
+    "\000\022\027\n\023kKNShowModeAutoPlay\020\001\022\035\n\031kKNShowMod"
+    "eHyperlinksOnly\020\002\"\207\001\n\017DocumentArchive\022#\n"
+    "\005super\030\003 \002(\0132\024.TSA.DocumentArchive\022\034\n\004sh"
+    "ow\030\002 \002(\0132\016.TSP.Reference\0221\n\031tables_custo"
+    "m_format_list\030\004 \001(\0132\016.TSP.Reference\"\241\002\n\033"
+    "SlideStylePropertiesArchive\022\036\n\004fill\030\001 \001("
+    "\0132\020.TSD.FillArchive\0223\n\ntransition\030\002 \001(\0132"
+    "\037.KN.TransitionAttributesArchive\022\027\n\017tran"
+    "sition_null\030\003 \001(\010\022\"\n\032titlePlaceholderVis"
+    "ibility\030\004 \001(\010\022!\n\031bodyPlaceholderVisibili"
+    "ty\030\005 \001(\010\022#\n\033objectPlaceholderVisibility\030"
+    "\007 \001(\010\022(\n slideNumberPlaceholderVisibilit"
+    "y\030\006 \001(\010\"\213\001\n\021SlideStyleArchive\022 \n\005super\030\001"
+    " \002(\0132\021.TSS.StyleArchive\022\031\n\016override_coun"
+    "t\030\n \001(\r:\0010\0229\n\020slide_properties\030\013 \001(\0132\037.K"
+    "N.SlideStylePropertiesArchive\"\373\002\n\036Pasteb"
+    "oardNativeStorageArchive\022!\n\tdrawables\030\001 "
+    "\003(\0132\016.TSP.Reference\022\036\n\006builds\030\002 \003(\0132\016.TS"
+    "P.Reference\022*\n\013buildChunks\030\003 \003(\0132\025.KN.Bu"
+    "ildChunkArchive\022\"\n\nslideNodes\030\004 \003(\0132\016.TS"
+    "P.Reference\022(\n\020masterSlideNodes\030\t \003(\0132\016."
+    "TSP.Reference\022#\n\020originalShowSize\030\005 \001(\0132"
+    "\t.TSP.Size\022\037\n\013titleRanges\030\006 \003(\0132\n.TSP.Ra"
+    "nge\0220\n\022geometries_in_root\030\007 \003(\0132\024.TSD.Ge"
+    "ometryArchive\022$\n\034slide_node_unique_ident"
+    "ifier\030\010 \001(\t\"\241\002\n\027MasterChangeBlobArchive\022"
+    "\035\n\005slide\030\001 \001(\0132\016.TSP.Reference\022\036\n\006master"
+    "\030\002 \001(\0132\016.TSP.Reference\022#\n\013slide_style\030\003 "
+    "\001(\0132\016.TSP.Reference\022)\n\021title_placeholder"
+    "\030\004 \001(\0132\016.TSP.Reference\022(\n\020body_placehold"
+    "er\030\005 \001(\0132\016.TSP.Reference\022*\n\022object_place"
+    "holder\030\007 \001(\0132\016.TSP.Reference\022!\n\tdrawable"
+    "s\030\006 \003(\0132\016.TSP.Reference\"\334\002\n\020RecordingArc"
+    "hive\022$\n\014event_tracks\030\001 \003(\0132\016.TSP.Referen"
+    "ce\022#\n\013movie_track\030\002 \001(\0132\016.TSP.Reference\022"
+    "\020\n\010duration\030\003 \001(\001\022^\n\nsync_state\030\004 \001(\0162\'."
+    "KN.RecordingArchive.RecordingSyncState:!"
+    "kRecordingSyncStateInSyncWithShow\022$\n\021mod"
+    "ification_date\030\005 \001(\0132\t.TSP.Date\"e\n\022Recor"
+    "dingSyncState\022%\n!kRecordingSyncStateInSy"
+    "ncWithShow\020\000\022(\n$kRecordingSyncStateOutOf"
+    "SyncWithShow\020\001\"U\n\032RecordingEventTrackArc"
+    "hive\022\014\n\004type\030\001 \001(\t\022)\n\006events\030\002 \003(\0132\031.KN."
+    "RecordingEventArchive\"\261\002\n\025RecordingEvent"
+    "Archive\022\026\n\nstart_time\030\001 \001(\001:\002-1\022F\n\030navig"
+    "ation_event_archive\030\350\007 \001(\0132#.KN.Recordin"
+    "gNavigationEventArchive\022<\n\023laser_event_a"
+    "rchive\030\351\007 \001(\0132\036.KN.RecordingLaserEventAr"
+    "chive\022<\n\023pause_event_archive\030\352\007 \001(\0132\036.KN"
+    ".RecordingPauseEventArchive\022<\n\023movie_eve"
+    "nt_archive\030\353\007 \001(\0132\036.KN.RecordingMovieEve"
+    "ntArchive\"\257\003\n\037RecordingNavigationEventAr"
+    "chive\0223\n\033target_slide_node_reference\030\001 \001"
+    "(\0132\016.TSP.Reference\022\032\n\022target_event_index"
+    "\030\002 \001(\r\022\213\001\n\017animation_phase\030\003 \001(\0162J.KN.Re"
+    "cordingNavigationEventArchive.RecordingN"
+    "avigationEventAnimationPhase:&kRecording"
+    "NavigationEventAnimationNone\"\254\001\n&Recordi"
+    "ngNavigationEventAnimationPhase\022*\n&kReco"
+    "rdingNavigationEventAnimationNone\020\000\022+\n\'k"
+    "RecordingNavigationEventAnimationStart\020\001"
+    "\022)\n%kRecordingNavigationEventAnimationEn"
+    "d\020\002\"j\n\032RecordingLaserEventArchive\022)\n\021uns"
+    "caled_location\030\001 \001(\0132\n.TSP.PointB\002\030\001\022!\n\r"
+    "unit_location\030\002 \001(\0132\n.TSP.Point\"\315\002\n\032Reco"
+    "rdingPauseEventArchive\022p\n\020pause_event_ty"
+    "pe\030\001 \001(\01626.KN.RecordingPauseEventArchive"
+    ".RecordingPauseEventType:\036kRecordingPaus"
+    "eEventTypeResume\"\274\001\n\027RecordingPauseEvent"
+    "Type\022\"\n\036kRecordingPauseEventTypeResume\020\000"
+    "\022!\n\035kRecordingPauseEventTypePause\020\001\022,\n(k"
+    "RecordingPauseEventTypeConcealWithBlack\020"
+    "\002\022,\n(kRecordingPauseEventTypeConcealWith"
+    "White\020\003\"\345\003\n\032RecordingMovieEventArchive\022,"
+    "\n\024movie_info_reference\030\001 \001(\0132\016.TSP.Refer"
+    "ence\022j\n\020movie_event_type\030\002 \001(\01626.KN.Reco"
+    "rdingMovieEventArchive.RecordingMovieEve"
+    "ntType:\030kRecordingMovieEventSeek\022\031\n\021movi"
+    "e_event_value\030\003 \001(\001\"\221\002\n\027RecordingMovieEv"
+    "entType\022\034\n\030kRecordingMovieEventNone\020\000\022\034\n"
+    "\030kRecordingMovieEventSeek\020\001\022\037\n\033kRecordin"
+    "gMovieEventSetRate\020\002\022%\n!kRecordingMovieE"
+    "ventStartPlayback\020\003\022$\n kRecordingMovieEv"
+    "entStopPlayback\020\004\022&\n\"kRecordingMovieEven"
+    "tBeginScrubbing\020\005\022$\n kRecordingMovieEven"
+    "tEndScrubbing\020\006\"M\n\032RecordingMovieTrackAr"
+    "chive\022/\n\016movie_segments\030\001 \003(\0132\027.KN.Movie"
+    "SegmentArchive\"\202\001\n\023MovieSegmentArchive\022&"
+    "\n\nmovie_data\030\003 \001(\0132\022.TSP.DataReference\022\026"
+    "\n\nstart_time\030\002 \001(\001:\002-1\022+\n\023database_movie"
+    "_data\030\001 \001(\0132\016.TSP.Reference\"\371\001\n\nSoundtra"
+    "ck\022\016\n\006volume\030\001 \001(\001\022F\n\004mode\030\002 \001(\0162\035.KN.So"
+    "undtrack.SoundtrackMode:\031kKNSoundtrackMo"
+    "dePlayOnce\022\'\n\013movie_media\030\003 \003(\0132\022.TSP.Da"
+    "taReference\"j\n\016SoundtrackMode\022\035\n\031kKNSoun"
+    "dtrackModePlayOnce\020\000\022\031\n\025kKNSoundtrackMod"
+    "eLoop\020\001\022\036\n\032kKNSoundtrackModeDoNotPlay\020\002\""
+    "M\n\034SlideNumberAttachmentArchive\022-\n\005super"
+    "\030\001 \002(\0132\036.TSWP.TextualAttachmentArchive\"\370"
+    "\002\n\037SlideCollectionSelectionArchive\022#\n\013sl"
+    "ide_nodes\030\001 \003(\0132\016.TSP.Reference\022*\n\022slide"
+    "_node_to_edit\030\002 \001(\0132\016.TSP.Reference\022h\n*s"
+    "elected_paragraph_indexes_for_slide_node"
+    "s\030\003 \003(\01324.KN.SlideCollectionSelectionArc"
+    "hive.OutlineSelection\022/\n\033range_in_select"
+    "ed_paragraph\030\004 \001(\0132\n.TSP.Range\032i\n\020Outlin"
+    "eSelection\022\"\n\nslide_node\030\001 \002(\0132\016.TSP.Ref"
+    "erence\0221\n\032selected_paragraph_indexes\030\002 \002"
+    "(\0132\r.TSP.IndexSet", 13977);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "KNArchives.proto", &protobuf_RegisterTypes);
   AnimationAttributesArchive::default_instance_ = new AnimationAttributesArchive();
@@ -2080,6 +2110,7 @@ const int TransitionAttributesArchive::kCustomBounceFieldNumber;
 const int TransitionAttributesArchive::kCustomMagicMoveFadeUnmatchedObjectsFieldNumber;
 const int TransitionAttributesArchive::kCustomTimingCurveFieldNumber;
 const int TransitionAttributesArchive::kCustomTextDeliveryTypeFieldNumber;
+const int TransitionAttributesArchive::kCustomMotionBlurFieldNumber;
 const int TransitionAttributesArchive::kDatabaseAnimationTypeFieldNumber;
 const int TransitionAttributesArchive::kDatabaseEffectFieldNumber;
 const int TransitionAttributesArchive::kDatabaseDurationFieldNumber;
@@ -2115,6 +2146,7 @@ void TransitionAttributesArchive::SharedCtor() {
   custom_magic_move_fade_unmatched_objects_ = false;
   custom_timing_curve_ = 1;
   custom_text_delivery_type_ = 1;
+  custom_motion_blur_ = false;
   database_animationtype_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   database_effect_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   database_duration_ = 0;
@@ -2177,6 +2209,7 @@ void TransitionAttributesArchive::Clear() {
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     custom_text_delivery_type_ = 1;
+    custom_motion_blur_ = false;
     if (has_database_animationtype()) {
       if (database_animationtype_ != &::google::protobuf::internal::kEmptyString) {
         database_animationtype_->clear();
@@ -2204,7 +2237,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string database_animationType = 1;
+      // optional string database_animationType = 1 [deprecated = true];
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -2220,7 +2253,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional string database_effect = 2;
+      // optional string database_effect = 2 [deprecated = true];
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -2237,7 +2270,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional double database_duration = 3;
+      // optional double database_duration = 3 [deprecated = true];
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -2253,7 +2286,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional uint32 database_direction = 4;
+      // optional uint32 database_direction = 4 [deprecated = true];
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -2269,7 +2302,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional float database_delay = 5;
+      // optional float database_delay = 5 [deprecated = true];
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
@@ -2301,7 +2334,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .TSP.Color database_color = 7;
+      // optional .TSP.Color database_color = 7 [deprecated = true];
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -2447,6 +2480,22 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(136)) goto parse_custom_motion_blur;
+        break;
+      }
+
+      // optional bool custom_motion_blur = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_custom_motion_blur:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &custom_motion_blur_)));
+          set_has_custom_motion_blur();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -2469,7 +2518,7 @@ bool TransitionAttributesArchive::MergePartialFromCodedStream(
 
 void TransitionAttributesArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional string database_animationType = 1;
+  // optional string database_animationType = 1 [deprecated = true];
   if (has_database_animationtype()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_animationtype().data(), this->database_animationtype().length(),
@@ -2478,7 +2527,7 @@ void TransitionAttributesArchive::SerializeWithCachedSizes(
       1, this->database_animationtype(), output);
   }
 
-  // optional string database_effect = 2;
+  // optional string database_effect = 2 [deprecated = true];
   if (has_database_effect()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_effect().data(), this->database_effect().length(),
@@ -2487,17 +2536,17 @@ void TransitionAttributesArchive::SerializeWithCachedSizes(
       2, this->database_effect(), output);
   }
 
-  // optional double database_duration = 3;
+  // optional double database_duration = 3 [deprecated = true];
   if (has_database_duration()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->database_duration(), output);
   }
 
-  // optional uint32 database_direction = 4;
+  // optional uint32 database_direction = 4 [deprecated = true];
   if (has_database_direction()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->database_direction(), output);
   }
 
-  // optional float database_delay = 5;
+  // optional float database_delay = 5 [deprecated = true];
   if (has_database_delay()) {
     ::google::protobuf::internal::WireFormatLite::WriteFloat(5, this->database_delay(), output);
   }
@@ -2507,7 +2556,7 @@ void TransitionAttributesArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->isautomatic(), output);
   }
 
-  // optional .TSP.Color database_color = 7;
+  // optional .TSP.Color database_color = 7 [deprecated = true];
   if (has_database_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       7, this->database_color(), output);
@@ -2556,6 +2605,11 @@ void TransitionAttributesArchive::SerializeWithCachedSizes(
       16, this->custom_text_delivery_type(), output);
   }
 
+  // optional bool custom_motion_blur = 17;
+  if (has_custom_motion_blur()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(17, this->custom_motion_blur(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2564,7 +2618,7 @@ void TransitionAttributesArchive::SerializeWithCachedSizes(
 
 ::google::protobuf::uint8* TransitionAttributesArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional string database_animationType = 1;
+  // optional string database_animationType = 1 [deprecated = true];
   if (has_database_animationtype()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_animationtype().data(), this->database_animationtype().length(),
@@ -2574,7 +2628,7 @@ ::google::protobuf::uint8* TransitionAttributesArchive::SerializeWithCachedSizes
         1, this->database_animationtype(), target);
   }
 
-  // optional string database_effect = 2;
+  // optional string database_effect = 2 [deprecated = true];
   if (has_database_effect()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_effect().data(), this->database_effect().length(),
@@ -2584,17 +2638,17 @@ ::google::protobuf::uint8* TransitionAttributesArchive::SerializeWithCachedSizes
         2, this->database_effect(), target);
   }
 
-  // optional double database_duration = 3;
+  // optional double database_duration = 3 [deprecated = true];
   if (has_database_duration()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(3, this->database_duration(), target);
   }
 
-  // optional uint32 database_direction = 4;
+  // optional uint32 database_direction = 4 [deprecated = true];
   if (has_database_direction()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->database_direction(), target);
   }
 
-  // optional float database_delay = 5;
+  // optional float database_delay = 5 [deprecated = true];
   if (has_database_delay()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(5, this->database_delay(), target);
   }
@@ -2604,7 +2658,7 @@ ::google::protobuf::uint8* TransitionAttributesArchive::SerializeWithCachedSizes
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->isautomatic(), target);
   }
 
-  // optional .TSP.Color database_color = 7;
+  // optional .TSP.Color database_color = 7 [deprecated = true];
   if (has_database_color()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -2655,6 +2709,11 @@ ::google::protobuf::uint8* TransitionAttributesArchive::SerializeWithCachedSizes
       16, this->custom_text_delivery_type(), target);
   }
 
+  // optional bool custom_motion_blur = 17;
+  if (has_custom_motion_blur()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(17, this->custom_motion_blur(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2721,38 +2780,43 @@ int TransitionAttributesArchive::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->custom_text_delivery_type());
     }
 
-    // optional string database_animationType = 1;
+    // optional bool custom_motion_blur = 17;
+    if (has_custom_motion_blur()) {
+      total_size += 2 + 1;
+    }
+
+    // optional string database_animationType = 1 [deprecated = true];
     if (has_database_animationtype()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->database_animationtype());
     }
 
-    // optional string database_effect = 2;
+    // optional string database_effect = 2 [deprecated = true];
     if (has_database_effect()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->database_effect());
     }
 
-    // optional double database_duration = 3;
+    // optional double database_duration = 3 [deprecated = true];
     if (has_database_duration()) {
       total_size += 1 + 8;
     }
 
-    // optional uint32 database_direction = 4;
+    // optional uint32 database_direction = 4 [deprecated = true];
     if (has_database_direction()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->database_direction());
     }
 
-    // optional float database_delay = 5;
+    // optional float database_delay = 5 [deprecated = true];
     if (has_database_delay()) {
       total_size += 1 + 4;
     }
 
-    // optional .TSP.Color database_color = 7;
+    // optional .TSP.Color database_color = 7 [deprecated = true];
     if (has_database_color()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -2815,6 +2879,9 @@ void TransitionAttributesArchive::MergeFrom(const TransitionAttributesArchive& f
     if (from.has_custom_text_delivery_type()) {
       set_custom_text_delivery_type(from.custom_text_delivery_type());
     }
+    if (from.has_custom_motion_blur()) {
+      set_custom_motion_blur(from.custom_motion_blur());
+    }
     if (from.has_database_animationtype()) {
       set_database_animationtype(from.database_animationtype());
     }
@@ -2871,6 +2938,7 @@ void TransitionAttributesArchive::Swap(TransitionAttributesArchive* other) {
     std::swap(custom_magic_move_fade_unmatched_objects_, other->custom_magic_move_fade_unmatched_objects_);
     std::swap(custom_timing_curve_, other->custom_timing_curve_);
     std::swap(custom_text_delivery_type_, other->custom_text_delivery_type_);
+    std::swap(custom_motion_blur_, other->custom_motion_blur_);
     std::swap(database_animationtype_, other->database_animationtype_);
     std::swap(database_effect_, other->database_effect_);
     std::swap(database_duration_, other->database_duration_);
@@ -3688,6 +3756,7 @@ const int BuildAttributesArchive::kCustomActionDecayFieldNumber;
 const int BuildAttributesArchive::kCustomActionRepeatCountFieldNumber;
 const int BuildAttributesArchive::kCustomActionScaleFieldNumber;
 const int BuildAttributesArchive::kCustomActionJiggleIntensityFieldNumber;
+const int BuildAttributesArchive::kCustomMotionBlurFieldNumber;
 const int BuildAttributesArchive::kDatabaseAnimationTypeFieldNumber;
 const int BuildAttributesArchive::kDatabaseEffectFieldNumber;
 const int BuildAttributesArchive::kDatabaseDirectionFieldNumber;
@@ -3737,6 +3806,7 @@ void BuildAttributesArchive::SharedCtor() {
   custom_action_repeatcount_ = 0u;
   custom_action_scale_ = 0;
   custom_action_jiggleintensity_ = 0;
+  custom_motion_blur_ = false;
   database_animationtype_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   database_effect_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   database_direction_ = 0u;
@@ -3820,6 +3890,7 @@ void BuildAttributesArchive::Clear() {
     custom_action_repeatcount_ = 0u;
     custom_action_scale_ = 0;
     custom_action_jiggleintensity_ = 0;
+    custom_motion_blur_ = false;
     if (has_database_animationtype()) {
       if (database_animationtype_ != &::google::protobuf::internal::kEmptyString) {
         database_animationtype_->clear();
@@ -3830,9 +3901,9 @@ void BuildAttributesArchive::Clear() {
         database_effect_->clear();
       }
     }
-    database_direction_ = 0u;
   }
   if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    database_direction_ = 0u;
     database_delay_ = 0;
     database_duration_ = 0;
     if (has_database_color()) {
@@ -3854,7 +3925,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string database_animationType = 1;
+      // optional string database_animationType = 1 [deprecated = true];
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -3870,7 +3941,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional string database_effect = 2;
+      // optional string database_effect = 2 [deprecated = true];
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -3887,7 +3958,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional uint32 database_direction = 3;
+      // optional uint32 database_direction = 3 [deprecated = true];
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -3919,7 +3990,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional double database_delay = 5;
+      // optional double database_delay = 5 [deprecated = true];
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -3935,7 +4006,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional double delayAutomaticAfter = 6;
+      // optional double delayAutomaticAfter = 6 [deprecated = true];
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -3951,7 +4022,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional double delayAutomaticWith = 7;
+      // optional double delayAutomaticWith = 7 [deprecated = true];
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -3967,7 +4038,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional double database_duration = 8;
+      // optional double database_duration = 8 [deprecated = true];
       case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -4111,7 +4182,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional .TSP.Color database_color = 16;
+      // optional .TSP.Color database_color = 16 [deprecated = true];
       case 16: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -4324,6 +4395,22 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(232)) goto parse_custom_motion_blur;
+        break;
+      }
+
+      // optional bool custom_motion_blur = 29;
+      case 29: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_custom_motion_blur:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &custom_motion_blur_)));
+          set_has_custom_motion_blur();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -4346,7 +4433,7 @@ bool BuildAttributesArchive::MergePartialFromCodedStream(
 
 void BuildAttributesArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional string database_animationType = 1;
+  // optional string database_animationType = 1 [deprecated = true];
   if (has_database_animationtype()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_animationtype().data(), this->database_animationtype().length(),
@@ -4355,7 +4442,7 @@ void BuildAttributesArchive::SerializeWithCachedSizes(
       1, this->database_animationtype(), output);
   }
 
-  // optional string database_effect = 2;
+  // optional string database_effect = 2 [deprecated = true];
   if (has_database_effect()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_effect().data(), this->database_effect().length(),
@@ -4364,7 +4451,7 @@ void BuildAttributesArchive::SerializeWithCachedSizes(
       2, this->database_effect(), output);
   }
 
-  // optional uint32 database_direction = 3;
+  // optional uint32 database_direction = 3 [deprecated = true];
   if (has_database_direction()) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->database_direction(), output);
   }
@@ -4374,22 +4461,22 @@ void BuildAttributesArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->eventtrigger(), output);
   }
 
-  // optional double database_delay = 5;
+  // optional double database_delay = 5 [deprecated = true];
   if (has_database_delay()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->database_delay(), output);
   }
 
-  // optional double delayAutomaticAfter = 6;
+  // optional double delayAutomaticAfter = 6 [deprecated = true];
   if (has_delayautomaticafter()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(6, this->delayautomaticafter(), output);
   }
 
-  // optional double delayAutomaticWith = 7;
+  // optional double delayAutomaticWith = 7 [deprecated = true];
   if (has_delayautomaticwith()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(7, this->delayautomaticwith(), output);
   }
 
-  // optional double database_duration = 8;
+  // optional double database_duration = 8 [deprecated = true];
   if (has_database_duration()) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(8, this->database_duration(), output);
   }
@@ -4436,7 +4523,7 @@ void BuildAttributesArchive::SerializeWithCachedSizes(
       15, this->motionpathstring(), output);
   }
 
-  // optional .TSP.Color database_color = 16;
+  // optional .TSP.Color database_color = 16 [deprecated = true];
   if (has_database_color()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       16, this->database_color(), output);
@@ -4507,6 +4594,11 @@ void BuildAttributesArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(28, this->endoffset(), output);
   }
 
+  // optional bool custom_motion_blur = 29;
+  if (has_custom_motion_blur()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(29, this->custom_motion_blur(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -4515,7 +4607,7 @@ void BuildAttributesArchive::SerializeWithCachedSizes(
 
 ::google::protobuf::uint8* BuildAttributesArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional string database_animationType = 1;
+  // optional string database_animationType = 1 [deprecated = true];
   if (has_database_animationtype()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_animationtype().data(), this->database_animationtype().length(),
@@ -4525,7 +4617,7 @@ ::google::protobuf::uint8* BuildAttributesArchive::SerializeWithCachedSizesToArr
         1, this->database_animationtype(), target);
   }
 
-  // optional string database_effect = 2;
+  // optional string database_effect = 2 [deprecated = true];
   if (has_database_effect()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->database_effect().data(), this->database_effect().length(),
@@ -4535,7 +4627,7 @@ ::google::protobuf::uint8* BuildAttributesArchive::SerializeWithCachedSizesToArr
         2, this->database_effect(), target);
   }
 
-  // optional uint32 database_direction = 3;
+  // optional uint32 database_direction = 3 [deprecated = true];
   if (has_database_direction()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->database_direction(), target);
   }
@@ -4545,22 +4637,22 @@ ::google::protobuf::uint8* BuildAttributesArchive::SerializeWithCachedSizesToArr
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->eventtrigger(), target);
   }
 
-  // optional double database_delay = 5;
+  // optional double database_delay = 5 [deprecated = true];
   if (has_database_delay()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->database_delay(), target);
   }
 
-  // optional double delayAutomaticAfter = 6;
+  // optional double delayAutomaticAfter = 6 [deprecated = true];
   if (has_delayautomaticafter()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(6, this->delayautomaticafter(), target);
   }
 
-  // optional double delayAutomaticWith = 7;
+  // optional double delayAutomaticWith = 7 [deprecated = true];
   if (has_delayautomaticwith()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(7, this->delayautomaticwith(), target);
   }
 
-  // optional double database_duration = 8;
+  // optional double database_duration = 8 [deprecated = true];
   if (has_database_duration()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(8, this->database_duration(), target);
   }
@@ -4608,7 +4700,7 @@ ::google::protobuf::uint8* BuildAttributesArchive::SerializeWithCachedSizesToArr
         15, this->motionpathstring(), target);
   }
 
-  // optional .TSP.Color database_color = 16;
+  // optional .TSP.Color database_color = 16 [deprecated = true];
   if (has_database_color()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -4682,6 +4774,11 @@ ::google::protobuf::uint8* BuildAttributesArchive::SerializeWithCachedSizesToArr
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(28, this->endoffset(), target);
   }
 
+  // optional bool custom_motion_blur = 29;
+  if (has_custom_motion_blur()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(29, this->custom_motion_blur(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -4707,12 +4804,12 @@ int BuildAttributesArchive::ByteSize() const {
           this->eventtrigger());
     }
 
-    // optional double delayAutomaticAfter = 6;
+    // optional double delayAutomaticAfter = 6 [deprecated = true];
     if (has_delayautomaticafter()) {
       total_size += 1 + 8;
     }
 
-    // optional double delayAutomaticWith = 7;
+    // optional double delayAutomaticWith = 7 [deprecated = true];
     if (has_delayautomaticwith()) {
       total_size += 1 + 8;
     }
@@ -4820,40 +4917,45 @@ int BuildAttributesArchive::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->custom_action_jiggleintensity());
     }
 
-    // optional string database_animationType = 1;
+    // optional bool custom_motion_blur = 29;
+    if (has_custom_motion_blur()) {
+      total_size += 2 + 1;
+    }
+
+    // optional string database_animationType = 1 [deprecated = true];
     if (has_database_animationtype()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->database_animationtype());
     }
 
-    // optional string database_effect = 2;
+    // optional string database_effect = 2 [deprecated = true];
     if (has_database_effect()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->database_effect());
     }
 
-    // optional uint32 database_direction = 3;
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional uint32 database_direction = 3 [deprecated = true];
     if (has_database_direction()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->database_direction());
     }
 
-  }
-  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
-    // optional double database_delay = 5;
+    // optional double database_delay = 5 [deprecated = true];
     if (has_database_delay()) {
       total_size += 1 + 8;
     }
 
-    // optional double database_duration = 8;
+    // optional double database_duration = 8 [deprecated = true];
     if (has_database_duration()) {
       total_size += 1 + 8;
     }
 
-    // optional .TSP.Color database_color = 16;
+    // optional .TSP.Color database_color = 16 [deprecated = true];
     if (has_database_color()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -4961,17 +5063,20 @@ void BuildAttributesArchive::MergeFrom(const BuildAttributesArchive& from) {
     if (from.has_custom_action_jiggleintensity()) {
       set_custom_action_jiggleintensity(from.custom_action_jiggleintensity());
     }
+    if (from.has_custom_motion_blur()) {
+      set_custom_motion_blur(from.custom_motion_blur());
+    }
     if (from.has_database_animationtype()) {
       set_database_animationtype(from.database_animationtype());
     }
     if (from.has_database_effect()) {
       set_database_effect(from.database_effect());
     }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (from.has_database_direction()) {
       set_database_direction(from.database_direction());
     }
-  }
-  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (from.has_database_delay()) {
       set_database_delay(from.database_delay());
     }
@@ -5037,6 +5142,7 @@ void BuildAttributesArchive::Swap(BuildAttributesArchive* other) {
     std::swap(custom_action_repeatcount_, other->custom_action_repeatcount_);
     std::swap(custom_action_scale_, other->custom_action_scale_);
     std::swap(custom_action_jiggleintensity_, other->custom_action_jiggleintensity_);
+    std::swap(custom_motion_blur_, other->custom_motion_blur_);
     std::swap(database_animationtype_, other->database_animationtype_);
     std::swap(database_effect_, other->database_effect_);
     std::swap(database_direction_, other->database_direction_);
@@ -6787,7 +6893,8 @@ const int SlideArchive::kTitlePlaceholderFieldNumber;
 const int SlideArchive::kBodyPlaceholderFieldNumber;
 const int SlideArchive::kObjectPlaceholderFieldNumber;
 const int SlideArchive::kSlideNumberPlaceholderFieldNumber;
-const int SlideArchive::kDrawablesFieldNumber;
+const int SlideArchive::kOwnedDrawablesFieldNumber;
+const int SlideArchive::kDrawablesZOrderFieldNumber;
 const int SlideArchive::kSageTagToInfoMapFieldNumber;
 const int SlideArchive::kNameFieldNumber;
 const int SlideArchive::kTitlePlaceholderGeometryFieldNumber;
@@ -6807,6 +6914,7 @@ const int SlideArchive::kBodyParagraphStylesFieldNumber;
 const int SlideArchive::kBodyListStylesFieldNumber;
 const int SlideArchive::kThumbnailTextForTitlePlaceholderFieldNumber;
 const int SlideArchive::kThumbnailTextForBodyPlaceholderFieldNumber;
+const int SlideArchive::kSlideObjectsLayerWithMasterFieldNumber;
 const int SlideArchive::kMasterFieldNumber;
 const int SlideArchive::kStaticGuidesFieldNumber;
 const int SlideArchive::kUserDefinedGuideStorageFieldNumber;
@@ -6872,6 +6980,7 @@ void SlideArchive::SharedCtor() {
   classicstylesheetrecord_ = NULL;
   thumbnailtextfortitleplaceholder_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   thumbnailtextforbodyplaceholder_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  slideobjectslayerwithmaster_ = false;
   master_ = NULL;
   userdefinedguidestorage_ = NULL;
   indocument_ = false;
@@ -6959,7 +7068,7 @@ void SlideArchive::Clear() {
       if (slidenumberplaceholder_ != NULL) slidenumberplaceholder_->::TSP::Reference::Clear();
     }
   }
-  if (_has_bits_[10 / 32] & (0xffu << (10 % 32))) {
+  if (_has_bits_[11 / 32] & (0xffu << (11 % 32))) {
     if (has_name()) {
       if (name_ != &::google::protobuf::internal::kEmptyString) {
         name_->clear();
@@ -6973,11 +7082,11 @@ void SlideArchive::Clear() {
     if (has_titlelayoutproperties()) {
       if (titlelayoutproperties_ != NULL) titlelayoutproperties_->::TSWP::ShapeStylePropertiesArchive::Clear();
     }
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (has_bodyplaceholdergeometry()) {
       if (bodyplaceholdergeometry_ != NULL) bodyplaceholdergeometry_->::TSD::GeometryArchive::Clear();
     }
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     bodyplaceholdershapestyleindex_ = 0u;
     bodyplaceholdertextstyleindex_ = 0u;
     if (has_bodylayoutproperties()) {
@@ -6991,11 +7100,11 @@ void SlideArchive::Clear() {
     if (has_slidenumberlayoutproperties()) {
       if (slidenumberlayoutproperties_ != NULL) slidenumberlayoutproperties_->::TSWP::ShapeStylePropertiesArchive::Clear();
     }
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (has_classicstylesheetrecord()) {
       if (classicstylesheetrecord_ != NULL) classicstylesheetrecord_->::TSP::Reference::Clear();
     }
-  }
-  if (_has_bits_[26 / 32] & (0xffu << (26 % 32))) {
     if (has_thumbnailtextfortitleplaceholder()) {
       if (thumbnailtextfortitleplaceholder_ != &::google::protobuf::internal::kEmptyString) {
         thumbnailtextfortitleplaceholder_->clear();
@@ -7006,15 +7115,16 @@ void SlideArchive::Clear() {
         thumbnailtextforbodyplaceholder_->clear();
       }
     }
+    slideobjectslayerwithmaster_ = false;
     if (has_master()) {
       if (master_ != NULL) master_->::TSP::Reference::Clear();
     }
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (has_userdefinedguidestorage()) {
       if (userdefinedguidestorage_ != NULL) userdefinedguidestorage_->::TSP::Reference::Clear();
     }
     indocument_ = false;
-  }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (has_note()) {
       if (note_ != NULL) note_->::TSP::Reference::Clear();
     }
@@ -7026,7 +7136,8 @@ void SlideArchive::Clear() {
   }
   builds_.Clear();
   buildchunks_.Clear();
-  drawables_.Clear();
+  owned_drawables_.Clear();
+  drawables_z_order_.Clear();
   sage_tag_to_info_map_.Clear();
   bodyparagraphstyles_.Clear();
   bodyliststyles_.Clear();
@@ -7122,21 +7233,21 @@ bool SlideArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_drawables;
+        if (input->ExpectTag(58)) goto parse_owned_drawables;
         break;
       }
 
-      // repeated .TSP.Reference drawables = 7;
+      // repeated .TSP.Reference owned_drawables = 7;
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_drawables:
+         parse_owned_drawables:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_drawables()));
+                input, add_owned_drawables()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_drawables;
+        if (input->ExpectTag(58)) goto parse_owned_drawables;
         if (input->ExpectTag(82)) goto parse_name;
         break;
       }
@@ -7574,6 +7685,37 @@ bool SlideArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(328)) goto parse_slideObjectsLayerWithMaster;
+        break;
+      }
+
+      // optional bool slideObjectsLayerWithMaster = 41 [default = false];
+      case 41: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_slideObjectsLayerWithMaster:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &slideobjectslayerwithmaster_)));
+          set_has_slideobjectslayerwithmaster();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(338)) goto parse_drawables_z_order;
+        break;
+      }
+
+      // repeated .TSP.Reference drawables_z_order = 42;
+      case 42: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_drawables_z_order:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_drawables_z_order()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(338)) goto parse_drawables_z_order;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -7632,10 +7774,10 @@ void SlideArchive::SerializeWithCachedSizes(
       6, this->bodyplaceholder(), output);
   }
 
-  // repeated .TSP.Reference drawables = 7;
-  for (int i = 0; i < this->drawables_size(); i++) {
+  // repeated .TSP.Reference owned_drawables = 7;
+  for (int i = 0; i < this->owned_drawables_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->drawables(i), output);
+      7, this->owned_drawables(i), output);
   }
 
   // optional string name = 10;
@@ -7812,6 +7954,17 @@ void SlideArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(40, this->info_using_object_placeholder_geometry_matches_object_placeholder_geometry(), output);
   }
 
+  // optional bool slideObjectsLayerWithMaster = 41 [default = false];
+  if (has_slideobjectslayerwithmaster()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(41, this->slideobjectslayerwithmaster(), output);
+  }
+
+  // repeated .TSP.Reference drawables_z_order = 42;
+  for (int i = 0; i < this->drawables_z_order_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      42, this->drawables_z_order(i), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -7862,11 +8015,11 @@ ::google::protobuf::uint8* SlideArchive::SerializeWithCachedSizesToArray(
         6, this->bodyplaceholder(), target);
   }
 
-  // repeated .TSP.Reference drawables = 7;
-  for (int i = 0; i < this->drawables_size(); i++) {
+  // repeated .TSP.Reference owned_drawables = 7;
+  for (int i = 0; i < this->owned_drawables_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->drawables(i), target);
+        7, this->owned_drawables(i), target);
   }
 
   // optional string name = 10;
@@ -8063,6 +8216,18 @@ ::google::protobuf::uint8* SlideArchive::SerializeWithCachedSizesToArray(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(40, this->info_using_object_placeholder_geometry_matches_object_placeholder_geometry(), target);
   }
 
+  // optional bool slideObjectsLayerWithMaster = 41 [default = false];
+  if (has_slideobjectslayerwithmaster()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(41, this->slideobjectslayerwithmaster(), target);
+  }
+
+  // repeated .TSP.Reference drawables_z_order = 42;
+  for (int i = 0; i < this->drawables_z_order_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        42, this->drawables_z_order(i), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -8117,7 +8282,7 @@ int SlideArchive::ByteSize() const {
     }
 
   }
-  if (_has_bits_[10 / 32] & (0xffu << (10 % 32))) {
+  if (_has_bits_[11 / 32] & (0xffu << (11 % 32))) {
     // optional string name = 10;
     if (has_name()) {
       total_size += 1 +
@@ -8153,6 +8318,8 @@ int SlideArchive::ByteSize() const {
           this->titlelayoutproperties());
     }
 
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional .TSD.GeometryArchive bodyPlaceholderGeometry = 14;
     if (has_bodyplaceholdergeometry()) {
       total_size += 1 +
@@ -8160,8 +8327,6 @@ int SlideArchive::ByteSize() const {
           this->bodyplaceholdergeometry());
     }
 
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional uint32 bodyPlaceholderShapeStyleIndex = 15;
     if (has_bodyplaceholdershapestyleindex()) {
       total_size += 1 +
@@ -8211,6 +8376,8 @@ int SlideArchive::ByteSize() const {
           this->slidenumberlayoutproperties());
     }
 
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     // optional .TSP.Reference classicStylesheetRecord = 29;
     if (has_classicstylesheetrecord()) {
       total_size += 2 +
@@ -8218,8 +8385,6 @@ int SlideArchive::ByteSize() const {
           this->classicstylesheetrecord());
     }
 
-  }
-  if (_has_bits_[26 / 32] & (0xffu << (26 % 32))) {
     // optional string thumbnailTextForTitlePlaceholder = 37;
     if (has_thumbnailtextfortitleplaceholder()) {
       total_size += 2 +
@@ -8234,6 +8399,11 @@ int SlideArchive::ByteSize() const {
           this->thumbnailtextforbodyplaceholder());
     }
 
+    // optional bool slideObjectsLayerWithMaster = 41 [default = false];
+    if (has_slideobjectslayerwithmaster()) {
+      total_size += 2 + 1;
+    }
+
     // optional .TSP.Reference master = 17;
     if (has_master()) {
       total_size += 2 +
@@ -8241,6 +8411,8 @@ int SlideArchive::ByteSize() const {
           this->master());
     }
 
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     // optional .TSP.Reference userDefinedGuideStorage = 36;
     if (has_userdefinedguidestorage()) {
       total_size += 2 +
@@ -8253,8 +8425,6 @@ int SlideArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     // optional .TSP.Reference note = 27;
     if (has_note()) {
       total_size += 2 +
@@ -8296,12 +8466,20 @@ int SlideArchive::ByteSize() const {
         this->buildchunks(i));
   }
 
-  // repeated .TSP.Reference drawables = 7;
-  total_size += 1 * this->drawables_size();
-  for (int i = 0; i < this->drawables_size(); i++) {
+  // repeated .TSP.Reference owned_drawables = 7;
+  total_size += 1 * this->owned_drawables_size();
+  for (int i = 0; i < this->owned_drawables_size(); i++) {
     total_size +=
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->drawables(i));
+        this->owned_drawables(i));
+  }
+
+  // repeated .TSP.Reference drawables_z_order = 42;
+  total_size += 2 * this->drawables_z_order_size();
+  for (int i = 0; i < this->drawables_z_order_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->drawables_z_order(i));
   }
 
   // repeated .KN.SlideArchive.SageTagMapEntry sage_tag_to_info_map = 28;
@@ -8363,7 +8541,8 @@ void SlideArchive::MergeFrom(const SlideArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   builds_.MergeFrom(from.builds_);
   buildchunks_.MergeFrom(from.buildchunks_);
-  drawables_.MergeFrom(from.drawables_);
+  owned_drawables_.MergeFrom(from.owned_drawables_);
+  drawables_z_order_.MergeFrom(from.drawables_z_order_);
   sage_tag_to_info_map_.MergeFrom(from.sage_tag_to_info_map_);
   bodyparagraphstyles_.MergeFrom(from.bodyparagraphstyles_);
   bodyliststyles_.MergeFrom(from.bodyliststyles_);
@@ -8388,7 +8567,7 @@ void SlideArchive::MergeFrom(const SlideArchive& from) {
       mutable_slidenumberplaceholder()->::TSP::Reference::MergeFrom(from.slidenumberplaceholder());
     }
   }
-  if (from._has_bits_[10 / 32] & (0xffu << (10 % 32))) {
+  if (from._has_bits_[11 / 32] & (0xffu << (11 % 32))) {
     if (from.has_name()) {
       set_name(from.name());
     }
@@ -8404,11 +8583,11 @@ void SlideArchive::MergeFrom(const SlideArchive& from) {
     if (from.has_titlelayoutproperties()) {
       mutable_titlelayoutproperties()->::TSWP::ShapeStylePropertiesArchive::MergeFrom(from.titlelayoutproperties());
     }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_bodyplaceholdergeometry()) {
       mutable_bodyplaceholdergeometry()->::TSD::GeometryArchive::MergeFrom(from.bodyplaceholdergeometry());
     }
-  }
-  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_bodyplaceholdershapestyleindex()) {
       set_bodyplaceholdershapestyleindex(from.bodyplaceholdershapestyleindex());
     }
@@ -8430,28 +8609,31 @@ void SlideArchive::MergeFrom(const SlideArchive& from) {
     if (from.has_slidenumberlayoutproperties()) {
       mutable_slidenumberlayoutproperties()->::TSWP::ShapeStylePropertiesArchive::MergeFrom(from.slidenumberlayoutproperties());
     }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (from.has_classicstylesheetrecord()) {
       mutable_classicstylesheetrecord()->::TSP::Reference::MergeFrom(from.classicstylesheetrecord());
     }
-  }
-  if (from._has_bits_[26 / 32] & (0xffu << (26 % 32))) {
     if (from.has_thumbnailtextfortitleplaceholder()) {
       set_thumbnailtextfortitleplaceholder(from.thumbnailtextfortitleplaceholder());
     }
     if (from.has_thumbnailtextforbodyplaceholder()) {
       set_thumbnailtextforbodyplaceholder(from.thumbnailtextforbodyplaceholder());
     }
+    if (from.has_slideobjectslayerwithmaster()) {
+      set_slideobjectslayerwithmaster(from.slideobjectslayerwithmaster());
+    }
     if (from.has_master()) {
       mutable_master()->::TSP::Reference::MergeFrom(from.master());
     }
+  }
+  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (from.has_userdefinedguidestorage()) {
       mutable_userdefinedguidestorage()->::TSP::Reference::MergeFrom(from.userdefinedguidestorage());
     }
     if (from.has_indocument()) {
       set_indocument(from.indocument());
     }
-  }
-  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (from.has_note()) {
       mutable_note()->::TSP::Reference::MergeFrom(from.note());
     }
@@ -8481,7 +8663,8 @@ void SlideArchive::CopyFrom(const SlideArchive& from) {
 }
 
 bool SlideArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x80000009) != 0x80000009) return false;
+  if ((_has_bits_[0] & 0x00000009) != 0x00000009) return false;
+  if ((_has_bits_[1] & 0x00000002) != 0x00000002) return false;
 
   if (has_style()) {
     if (!this->style().IsInitialized()) return false;
@@ -8507,8 +8690,11 @@ bool SlideArchive::IsInitialized() const {
   if (has_slidenumberplaceholder()) {
     if (!this->slidenumberplaceholder().IsInitialized()) return false;
   }
-  for (int i = 0; i < drawables_size(); i++) {
-    if (!this->drawables(i).IsInitialized()) return false;
+  for (int i = 0; i < owned_drawables_size(); i++) {
+    if (!this->owned_drawables(i).IsInitialized()) return false;
+  }
+  for (int i = 0; i < drawables_z_order_size(); i++) {
+    if (!this->drawables_z_order(i).IsInitialized()) return false;
   }
   for (int i = 0; i < sage_tag_to_info_map_size(); i++) {
     if (!this->sage_tag_to_info_map(i).IsInitialized()) return false;
@@ -8565,7 +8751,8 @@ void SlideArchive::Swap(SlideArchive* other) {
     std::swap(bodyplaceholder_, other->bodyplaceholder_);
     std::swap(objectplaceholder_, other->objectplaceholder_);
     std::swap(slidenumberplaceholder_, other->slidenumberplaceholder_);
-    drawables_.Swap(&other->drawables_);
+    owned_drawables_.Swap(&other->owned_drawables_);
+    drawables_z_order_.Swap(&other->drawables_z_order_);
     sage_tag_to_info_map_.Swap(&other->sage_tag_to_info_map_);
     std::swap(name_, other->name_);
     std::swap(titleplaceholdergeometry_, other->titleplaceholdergeometry_);
@@ -8585,6 +8772,7 @@ void SlideArchive::Swap(SlideArchive* other) {
     bodyliststyles_.Swap(&other->bodyliststyles_);
     std::swap(thumbnailtextfortitleplaceholder_, other->thumbnailtextfortitleplaceholder_);
     std::swap(thumbnailtextforbodyplaceholder_, other->thumbnailtextforbodyplaceholder_);
+    std::swap(slideobjectslayerwithmaster_, other->slideobjectslayerwithmaster_);
     std::swap(master_, other->master_);
     staticguides_.Swap(&other->staticguides_);
     std::swap(userdefinedguidestorage_, other->userdefinedguidestorage_);
@@ -8629,6 +8817,7 @@ const int SlideNodeArchive::kUniqueIdentifierFieldNumber;
 const int SlideNodeArchive::kCopyFromSlideIdentifierFieldNumber;
 const int SlideNodeArchive::kSlideSpecificHyperlinkCountFieldNumber;
 const int SlideNodeArchive::kEventCountFieldNumber;
+const int SlideNodeArchive::kHasExplicitBuildsFieldNumber;
 const int SlideNodeArchive::kDatabaseThumbnailFieldNumber;
 const int SlideNodeArchive::kDatabaseThumbnailsFieldNumber;
 #endif  // !_MSC_VER
@@ -8665,6 +8854,7 @@ void SlideNodeArchive::SharedCtor() {
   copyfromslideidentifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   slidespecifichyperlinkcount_ = 0u;
   eventcount_ = 0u;
+  has_explicit_builds_ = false;
   database_thumbnail_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -8737,6 +8927,7 @@ void SlideNodeArchive::Clear() {
   }
   if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     eventcount_ = 0u;
+    has_explicit_builds_ = false;
     if (has_database_thumbnail()) {
       if (database_thumbnail_ != NULL) database_thumbnail_->::TSP::Reference::Clear();
     }
@@ -8830,7 +9021,7 @@ bool SlideNodeArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // required bool hasBuilds = 6;
+      // required bool hasBuilds = 6 [deprecated = true];
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -9049,6 +9240,22 @@ bool SlideNodeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(160)) goto parse_has_explicit_builds;
+        break;
+      }
+
+      // optional bool has_explicit_builds = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_has_explicit_builds:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &has_explicit_builds_)));
+          set_has_has_explicit_builds();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -9099,7 +9306,7 @@ void SlideNodeArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->iscollapsed(), output);
   }
 
-  // required bool hasBuilds = 6;
+  // required bool hasBuilds = 6 [deprecated = true];
   if (has_hasbuilds()) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->hasbuilds(), output);
   }
@@ -9180,6 +9387,11 @@ void SlideNodeArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(19, this->hasbodyinoutlineview(), output);
   }
 
+  // optional bool has_explicit_builds = 20;
+  if (has_has_explicit_builds()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(20, this->has_explicit_builds(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -9219,7 +9431,7 @@ ::google::protobuf::uint8* SlideNodeArchive::SerializeWithCachedSizesToArray(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->iscollapsed(), target);
   }
 
-  // required bool hasBuilds = 6;
+  // required bool hasBuilds = 6 [deprecated = true];
   if (has_hasbuilds()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->hasbuilds(), target);
   }
@@ -9305,6 +9517,11 @@ ::google::protobuf::uint8* SlideNodeArchive::SerializeWithCachedSizesToArray(
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(19, this->hasbodyinoutlineview(), target);
   }
 
+  // optional bool has_explicit_builds = 20;
+  if (has_has_explicit_builds()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->has_explicit_builds(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -9350,7 +9567,7 @@ int SlideNodeArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
-    // required bool hasBuilds = 6;
+    // required bool hasBuilds = 6 [deprecated = true];
     if (has_hasbuilds()) {
       total_size += 1 + 1;
     }
@@ -9400,6 +9617,11 @@ int SlideNodeArchive::ByteSize() const {
           this->eventcount());
     }
 
+    // optional bool has_explicit_builds = 20;
+    if (has_has_explicit_builds()) {
+      total_size += 2 + 1;
+    }
+
     // optional .TSP.Reference database_thumbnail = 3;
     if (has_database_thumbnail()) {
       total_size += 1 +
@@ -9516,6 +9738,9 @@ void SlideNodeArchive::MergeFrom(const SlideNodeArchive& from) {
     if (from.has_eventcount()) {
       set_eventcount(from.eventcount());
     }
+    if (from.has_has_explicit_builds()) {
+      set_has_explicit_builds(from.has_explicit_builds());
+    }
     if (from.has_database_thumbnail()) {
       mutable_database_thumbnail()->::TSP::Reference::MergeFrom(from.database_thumbnail());
     }
@@ -9578,6 +9803,7 @@ void SlideNodeArchive::Swap(SlideNodeArchive* other) {
     std::swap(copyfromslideidentifier_, other->copyfromslideidentifier_);
     std::swap(slidespecifichyperlinkcount_, other->slidespecifichyperlinkcount_);
     std::swap(eventcount_, other->eventcount_);
+    std::swap(has_explicit_builds_, other->has_explicit_builds_);
     std::swap(database_thumbnail_, other->database_thumbnail_);
     database_thumbnails_.Swap(&other->database_thumbnails_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
@@ -10078,6 +10304,9 @@ const int UIStateArchive::kShowsRulerFieldNumber;
 const int UIStateArchive::kDesktopNavigatorViewWidthFieldNumber;
 const int UIStateArchive::kDesktopOutlineViewWidthFieldNumber;
 const int UIStateArchive::kDesktopMainContentSizeFieldNumber;
+const int UIStateArchive::kDesktopPresenterNotesViewHeightFieldNumber;
+const int UIStateArchive::kDesktopMainWindowOriginFieldNumber;
+const int UIStateArchive::kLightTableHidesSkippedSlidesFieldNumber;
 #endif  // !_MSC_VER
 
 UIStateArchive::UIStateArchive()
@@ -10095,6 +10324,7 @@ void UIStateArchive::InitAsDefaultInstance() {
   desktop_ui_layout_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   desktop_canvas_offset_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
   desktop_main_content_size_ = const_cast< ::TSP::Size*>(&::TSP::Size::default_instance());
+  desktop_main_window_origin_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
 }
 
 UIStateArchive::UIStateArchive(const UIStateArchive& from)
@@ -10126,6 +10356,9 @@ void UIStateArchive::SharedCtor() {
   desktop_navigator_view_width_ = 0;
   desktop_outline_view_width_ = 0;
   desktop_main_content_size_ = NULL;
+  desktop_presenter_notes_view_height_ = 0;
+  desktop_main_window_origin_ = NULL;
+  light_table_hides_skipped_slides_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -10144,6 +10377,7 @@ void UIStateArchive::SharedDtor() {
     delete desktop_ui_layout_;
     delete desktop_canvas_offset_;
     delete desktop_main_content_size_;
+    delete desktop_main_window_origin_;
   }
 }
 
@@ -10214,6 +10448,13 @@ void UIStateArchive::Clear() {
       if (desktop_main_content_size_ != NULL) desktop_main_content_size_->::TSP::Size::Clear();
     }
   }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    desktop_presenter_notes_view_height_ = 0;
+    if (has_desktop_main_window_origin()) {
+      if (desktop_main_window_origin_ != NULL) desktop_main_window_origin_->::TSP::Point::Clear();
+    }
+    light_table_hides_skipped_slides_ = false;
+  }
   selectedslidenodes_.Clear();
   chart_ui_state_.Clear();
   collapsed_slide_nodes_.Clear();
@@ -10585,6 +10826,52 @@ bool UIStateArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(205)) goto parse_desktop_presenter_notes_view_height;
+        break;
+      }
+
+      // optional float desktop_presenter_notes_view_height = 25;
+      case 25: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_desktop_presenter_notes_view_height:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &desktop_presenter_notes_view_height_)));
+          set_has_desktop_presenter_notes_view_height();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(210)) goto parse_desktop_main_window_origin;
+        break;
+      }
+
+      // optional .TSP.Point desktop_main_window_origin = 26;
+      case 26: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_desktop_main_window_origin:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_desktop_main_window_origin()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(216)) goto parse_light_table_hides_skipped_slides;
+        break;
+      }
+
+      // optional bool light_table_hides_skipped_slides = 27;
+      case 27: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_light_table_hides_skipped_slides:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &light_table_hides_skipped_slides_)));
+          set_has_light_table_hides_skipped_slides();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -10739,6 +11026,22 @@ void UIStateArchive::SerializeWithCachedSizes(
       24, this->desktop_main_content_size(), output);
   }
 
+  // optional float desktop_presenter_notes_view_height = 25;
+  if (has_desktop_presenter_notes_view_height()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(25, this->desktop_presenter_notes_view_height(), output);
+  }
+
+  // optional .TSP.Point desktop_main_window_origin = 26;
+  if (has_desktop_main_window_origin()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      26, this->desktop_main_window_origin(), output);
+  }
+
+  // optional bool light_table_hides_skipped_slides = 27;
+  if (has_light_table_hides_skipped_slides()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(27, this->light_table_hides_skipped_slides(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -10891,6 +11194,23 @@ ::google::protobuf::uint8* UIStateArchive::SerializeWithCachedSizesToArray(
         24, this->desktop_main_content_size(), target);
   }
 
+  // optional float desktop_presenter_notes_view_height = 25;
+  if (has_desktop_presenter_notes_view_height()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(25, this->desktop_presenter_notes_view_height(), target);
+  }
+
+  // optional .TSP.Point desktop_main_window_origin = 26;
+  if (has_desktop_main_window_origin()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        26, this->desktop_main_window_origin(), target);
+  }
+
+  // optional bool light_table_hides_skipped_slides = 27;
+  if (has_light_table_hides_skipped_slides()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(27, this->light_table_hides_skipped_slides(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -11029,6 +11349,25 @@ int UIStateArchive::ByteSize() const {
           this->desktop_main_content_size());
     }
 
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional float desktop_presenter_notes_view_height = 25;
+    if (has_desktop_presenter_notes_view_height()) {
+      total_size += 2 + 4;
+    }
+
+    // optional .TSP.Point desktop_main_window_origin = 26;
+    if (has_desktop_main_window_origin()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->desktop_main_window_origin());
+    }
+
+    // optional bool light_table_hides_skipped_slides = 27;
+    if (has_light_table_hides_skipped_slides()) {
+      total_size += 2 + 1;
+    }
+
   }
   // repeated .TSP.Reference selectedSlideNodes = 6;
   total_size += 1 * this->selectedslidenodes_size();
@@ -11151,6 +11490,17 @@ void UIStateArchive::MergeFrom(const UIStateArchive& from) {
       mutable_desktop_main_content_size()->::TSP::Size::MergeFrom(from.desktop_main_content_size());
     }
   }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (from.has_desktop_presenter_notes_view_height()) {
+      set_desktop_presenter_notes_view_height(from.desktop_presenter_notes_view_height());
+    }
+    if (from.has_desktop_main_window_origin()) {
+      mutable_desktop_main_window_origin()->::TSP::Point::MergeFrom(from.desktop_main_window_origin());
+    }
+    if (from.has_light_table_hides_skipped_slides()) {
+      set_light_table_hides_skipped_slides(from.light_table_hides_skipped_slides());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -11204,6 +11554,9 @@ bool UIStateArchive::IsInitialized() const {
   if (has_desktop_main_content_size()) {
     if (!this->desktop_main_content_size().IsInitialized()) return false;
   }
+  if (has_desktop_main_window_origin()) {
+    if (!this->desktop_main_window_origin().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -11233,6 +11586,9 @@ void UIStateArchive::Swap(UIStateArchive* other) {
     std::swap(desktop_navigator_view_width_, other->desktop_navigator_view_width_);
     std::swap(desktop_outline_view_width_, other->desktop_outline_view_width_);
     std::swap(desktop_main_content_size_, other->desktop_main_content_size_);
+    std::swap(desktop_presenter_notes_view_height_, other->desktop_presenter_notes_view_height_);
+    std::swap(desktop_main_window_origin_, other->desktop_main_window_origin_);
+    std::swap(light_table_hides_skipped_slides_, other->light_table_hides_skipped_slides_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -11553,6 +11909,8 @@ const int ThemeArchive::kMastersFieldNumber;
 const int ThemeArchive::kUuidFieldNumber;
 const int ThemeArchive::kClassicThemeRecordsFieldNumber;
 const int ThemeArchive::kDefaultMasterSlideNodeFieldNumber;
+const int ThemeArchive::kDefaultMasterSlideNodeReferenceFieldNumber;
+const int ThemeArchive::kDefaultMasterSlideNodeIsOurBestGuessFieldNumber;
 #endif  // !_MSC_VER
 
 ThemeArchive::ThemeArchive()
@@ -11563,6 +11921,7 @@ ThemeArchive::ThemeArchive()
 void ThemeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSS::ThemeArchive*>(&::TSS::ThemeArchive::default_instance());
   defaultmasterslidenode_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  default_master_slide_node_reference_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
 ThemeArchive::ThemeArchive(const ThemeArchive& from)
@@ -11576,6 +11935,8 @@ void ThemeArchive::SharedCtor() {
   super_ = NULL;
   uuid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   defaultmasterslidenode_ = NULL;
+  default_master_slide_node_reference_ = NULL;
+  default_master_slide_node_is_our_best_guess_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -11590,6 +11951,7 @@ void ThemeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
     delete defaultmasterslidenode_;
+    delete default_master_slide_node_reference_;
   }
 }
 
@@ -11627,6 +11989,10 @@ void ThemeArchive::Clear() {
     if (has_defaultmasterslidenode()) {
       if (defaultmasterslidenode_ != NULL) defaultmasterslidenode_->::TSP::Reference::Clear();
     }
+    if (has_default_master_slide_node_reference()) {
+      if (default_master_slide_node_reference_ != NULL) default_master_slide_node_reference_->::TSP::Reference::Clear();
+    }
+    default_master_slide_node_is_our_best_guess_ = false;
   }
   masters_.Clear();
   classicthemerecords_.Clear();
@@ -11710,6 +12076,36 @@ bool ThemeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(50)) goto parse_default_master_slide_node_reference;
+        break;
+      }
+
+      // optional .TSP.Reference default_master_slide_node_reference = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_default_master_slide_node_reference:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_default_master_slide_node_reference()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_default_master_slide_node_is_our_best_guess;
+        break;
+      }
+
+      // optional bool default_master_slide_node_is_our_best_guess = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_default_master_slide_node_is_our_best_guess:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &default_master_slide_node_is_our_best_guess_)));
+          set_has_default_master_slide_node_is_our_best_guess();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -11765,6 +12161,17 @@ void ThemeArchive::SerializeWithCachedSizes(
       5, this->defaultmasterslidenode(), output);
   }
 
+  // optional .TSP.Reference default_master_slide_node_reference = 6;
+  if (has_default_master_slide_node_reference()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->default_master_slide_node_reference(), output);
+  }
+
+  // optional bool default_master_slide_node_is_our_best_guess = 7;
+  if (has_default_master_slide_node_is_our_best_guess()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->default_master_slide_node_is_our_best_guess(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -11811,6 +12218,18 @@ ::google::protobuf::uint8* ThemeArchive::SerializeWithCachedSizesToArray(
         5, this->defaultmasterslidenode(), target);
   }
 
+  // optional .TSP.Reference default_master_slide_node_reference = 6;
+  if (has_default_master_slide_node_reference()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->default_master_slide_node_reference(), target);
+  }
+
+  // optional bool default_master_slide_node_is_our_best_guess = 7;
+  if (has_default_master_slide_node_is_our_best_guess()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->default_master_slide_node_is_our_best_guess(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -11843,6 +12262,18 @@ int ThemeArchive::ByteSize() const {
           this->defaultmasterslidenode());
     }
 
+    // optional .TSP.Reference default_master_slide_node_reference = 6;
+    if (has_default_master_slide_node_reference()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->default_master_slide_node_reference());
+    }
+
+    // optional bool default_master_slide_node_is_our_best_guess = 7;
+    if (has_default_master_slide_node_is_our_best_guess()) {
+      total_size += 1 + 1;
+    }
+
   }
   // repeated .TSP.Reference masters = 2;
   total_size += 1 * this->masters_size();
@@ -11897,6 +12328,12 @@ void ThemeArchive::MergeFrom(const ThemeArchive& from) {
     if (from.has_defaultmasterslidenode()) {
       mutable_defaultmasterslidenode()->::TSP::Reference::MergeFrom(from.defaultmasterslidenode());
     }
+    if (from.has_default_master_slide_node_reference()) {
+      mutable_default_master_slide_node_reference()->::TSP::Reference::MergeFrom(from.default_master_slide_node_reference());
+    }
+    if (from.has_default_master_slide_node_is_our_best_guess()) {
+      set_default_master_slide_node_is_our_best_guess(from.default_master_slide_node_is_our_best_guess());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -11928,6 +12365,9 @@ bool ThemeArchive::IsInitialized() const {
   if (has_defaultmasterslidenode()) {
     if (!this->defaultmasterslidenode().IsInitialized()) return false;
   }
+  if (has_default_master_slide_node_reference()) {
+    if (!this->default_master_slide_node_reference().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -11938,6 +12378,8 @@ void ThemeArchive::Swap(ThemeArchive* other) {
     std::swap(uuid_, other->uuid_);
     classicthemerecords_.Swap(&other->classicthemerecords_);
     std::swap(defaultmasterslidenode_, other->defaultmasterslidenode_);
+    std::swap(default_master_slide_node_reference_, other->default_master_slide_node_reference_);
+    std::swap(default_master_slide_node_is_our_best_guess_, other->default_master_slide_node_is_our_best_guess_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -14094,8 +14536,11 @@ const int PasteboardNativeStorageArchive::kDrawablesFieldNumber;
 const int PasteboardNativeStorageArchive::kBuildsFieldNumber;
 const int PasteboardNativeStorageArchive::kBuildChunksFieldNumber;
 const int PasteboardNativeStorageArchive::kSlideNodesFieldNumber;
+const int PasteboardNativeStorageArchive::kMasterSlideNodesFieldNumber;
 const int PasteboardNativeStorageArchive::kOriginalShowSizeFieldNumber;
 const int PasteboardNativeStorageArchive::kTitleRangesFieldNumber;
+const int PasteboardNativeStorageArchive::kGeometriesInRootFieldNumber;
+const int PasteboardNativeStorageArchive::kSlideNodeUniqueIdentifierFieldNumber;
 #endif  // !_MSC_VER
 
 PasteboardNativeStorageArchive::PasteboardNativeStorageArchive()
@@ -14116,6 +14561,7 @@ PasteboardNativeStorageArchive::PasteboardNativeStorageArchive(const PasteboardN
 void PasteboardNativeStorageArchive::SharedCtor() {
   _cached_size_ = 0;
   originalshowsize_ = NULL;
+  slide_node_unique_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -14124,6 +14570,9 @@ PasteboardNativeStorageArchive::~PasteboardNativeStorageArchive() {
 }
 
 void PasteboardNativeStorageArchive::SharedDtor() {
+  if (slide_node_unique_identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete slide_node_unique_identifier_;
+  }
   if (this != default_instance_) {
     delete originalshowsize_;
   }
@@ -14151,16 +14600,25 @@ PasteboardNativeStorageArchive* PasteboardNativeStorageArchive::New() const {
 }
 
 void PasteboardNativeStorageArchive::Clear() {
-  if (_has_bits_[4 / 32] & (0xffu << (4 % 32))) {
+  if (_has_bits_[5 / 32] & (0xffu << (5 % 32))) {
     if (has_originalshowsize()) {
       if (originalshowsize_ != NULL) originalshowsize_->::TSP::Size::Clear();
     }
   }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_slide_node_unique_identifier()) {
+      if (slide_node_unique_identifier_ != &::google::protobuf::internal::kEmptyString) {
+        slide_node_unique_identifier_->clear();
+      }
+    }
+  }
   drawables_.Clear();
   builds_.Clear();
   buildchunks_.Clear();
   slidenodes_.Clear();
+  masterslidenodes_.Clear();
   titleranges_.Clear();
+  geometries_in_root_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -14256,6 +14714,53 @@ bool PasteboardNativeStorageArchive::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(50)) goto parse_titleRanges;
+        if (input->ExpectTag(58)) goto parse_geometries_in_root;
+        break;
+      }
+
+      // repeated .TSD.GeometryArchive geometries_in_root = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_geometries_in_root:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_geometries_in_root()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_geometries_in_root;
+        if (input->ExpectTag(66)) goto parse_slide_node_unique_identifier;
+        break;
+      }
+
+      // optional string slide_node_unique_identifier = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_slide_node_unique_identifier:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_slide_node_unique_identifier()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->slide_node_unique_identifier().data(), this->slide_node_unique_identifier().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_masterSlideNodes;
+        break;
+      }
+
+      // repeated .TSP.Reference masterSlideNodes = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_masterSlideNodes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_masterslidenodes()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_masterSlideNodes;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -14314,6 +14819,27 @@ void PasteboardNativeStorageArchive::SerializeWithCachedSizes(
       6, this->titleranges(i), output);
   }
 
+  // repeated .TSD.GeometryArchive geometries_in_root = 7;
+  for (int i = 0; i < this->geometries_in_root_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->geometries_in_root(i), output);
+  }
+
+  // optional string slide_node_unique_identifier = 8;
+  if (has_slide_node_unique_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->slide_node_unique_identifier().data(), this->slide_node_unique_identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      8, this->slide_node_unique_identifier(), output);
+  }
+
+  // repeated .TSP.Reference masterSlideNodes = 9;
+  for (int i = 0; i < this->masterslidenodes_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->masterslidenodes(i), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -14364,6 +14890,30 @@ ::google::protobuf::uint8* PasteboardNativeStorageArchive::SerializeWithCachedSi
         6, this->titleranges(i), target);
   }
 
+  // repeated .TSD.GeometryArchive geometries_in_root = 7;
+  for (int i = 0; i < this->geometries_in_root_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->geometries_in_root(i), target);
+  }
+
+  // optional string slide_node_unique_identifier = 8;
+  if (has_slide_node_unique_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->slide_node_unique_identifier().data(), this->slide_node_unique_identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        8, this->slide_node_unique_identifier(), target);
+  }
+
+  // repeated .TSP.Reference masterSlideNodes = 9;
+  for (int i = 0; i < this->masterslidenodes_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->masterslidenodes(i), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -14374,7 +14924,7 @@ ::google::protobuf::uint8* PasteboardNativeStorageArchive::SerializeWithCachedSi
 int PasteboardNativeStorageArchive::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[4 / 32] & (0xffu << (4 % 32))) {
+  if (_has_bits_[5 / 32] & (0xffu << (5 % 32))) {
     // optional .TSP.Size originalShowSize = 5;
     if (has_originalshowsize()) {
       total_size += 1 +
@@ -14382,6 +14932,15 @@ int PasteboardNativeStorageArchive::ByteSize() const {
           this->originalshowsize());
     }
 
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional string slide_node_unique_identifier = 8;
+    if (has_slide_node_unique_identifier()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->slide_node_unique_identifier());
+    }
+
   }
   // repeated .TSP.Reference drawables = 1;
   total_size += 1 * this->drawables_size();
@@ -14415,6 +14974,14 @@ int PasteboardNativeStorageArchive::ByteSize() const {
         this->slidenodes(i));
   }
 
+  // repeated .TSP.Reference masterSlideNodes = 9;
+  total_size += 1 * this->masterslidenodes_size();
+  for (int i = 0; i < this->masterslidenodes_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->masterslidenodes(i));
+  }
+
   // repeated .TSP.Range titleRanges = 6;
   total_size += 1 * this->titleranges_size();
   for (int i = 0; i < this->titleranges_size(); i++) {
@@ -14423,6 +14990,14 @@ int PasteboardNativeStorageArchive::ByteSize() const {
         this->titleranges(i));
   }
 
+  // repeated .TSD.GeometryArchive geometries_in_root = 7;
+  total_size += 1 * this->geometries_in_root_size();
+  for (int i = 0; i < this->geometries_in_root_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->geometries_in_root(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -14452,12 +15027,19 @@ void PasteboardNativeStorageArchive::MergeFrom(const PasteboardNativeStorageArch
   builds_.MergeFrom(from.builds_);
   buildchunks_.MergeFrom(from.buildchunks_);
   slidenodes_.MergeFrom(from.slidenodes_);
+  masterslidenodes_.MergeFrom(from.masterslidenodes_);
   titleranges_.MergeFrom(from.titleranges_);
-  if (from._has_bits_[4 / 32] & (0xffu << (4 % 32))) {
+  geometries_in_root_.MergeFrom(from.geometries_in_root_);
+  if (from._has_bits_[5 / 32] & (0xffu << (5 % 32))) {
     if (from.has_originalshowsize()) {
       mutable_originalshowsize()->::TSP::Size::MergeFrom(from.originalshowsize());
     }
   }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_slide_node_unique_identifier()) {
+      set_slide_node_unique_identifier(from.slide_node_unique_identifier());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -14487,12 +15069,18 @@ bool PasteboardNativeStorageArchive::IsInitialized() const {
   for (int i = 0; i < slidenodes_size(); i++) {
     if (!this->slidenodes(i).IsInitialized()) return false;
   }
+  for (int i = 0; i < masterslidenodes_size(); i++) {
+    if (!this->masterslidenodes(i).IsInitialized()) return false;
+  }
   if (has_originalshowsize()) {
     if (!this->originalshowsize().IsInitialized()) return false;
   }
   for (int i = 0; i < titleranges_size(); i++) {
     if (!this->titleranges(i).IsInitialized()) return false;
   }
+  for (int i = 0; i < geometries_in_root_size(); i++) {
+    if (!this->geometries_in_root(i).IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -14502,8 +15090,11 @@ void PasteboardNativeStorageArchive::Swap(PasteboardNativeStorageArchive* other)
     builds_.Swap(&other->builds_);
     buildchunks_.Swap(&other->buildchunks_);
     slidenodes_.Swap(&other->slidenodes_);
+    masterslidenodes_.Swap(&other->masterslidenodes_);
     std::swap(originalshowsize_, other->originalshowsize_);
     titleranges_.Swap(&other->titleranges_);
+    geometries_in_root_.Swap(&other->geometries_in_root_);
+    std::swap(slide_node_unique_identifier_, other->slide_node_unique_identifier_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -16423,6 +17014,7 @@ ::google::protobuf::Metadata RecordingNavigationEventArchive::GetMetadata() cons
 
 #ifndef _MSC_VER
 const int RecordingLaserEventArchive::kUnscaledLocationFieldNumber;
+const int RecordingLaserEventArchive::kUnitLocationFieldNumber;
 #endif  // !_MSC_VER
 
 RecordingLaserEventArchive::RecordingLaserEventArchive()
@@ -16432,6 +17024,7 @@ RecordingLaserEventArchive::RecordingLaserEventArchive()
 
 void RecordingLaserEventArchive::InitAsDefaultInstance() {
   unscaled_location_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
+  unit_location_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
 }
 
 RecordingLaserEventArchive::RecordingLaserEventArchive(const RecordingLaserEventArchive& from)
@@ -16443,6 +17036,7 @@ RecordingLaserEventArchive::RecordingLaserEventArchive(const RecordingLaserEvent
 void RecordingLaserEventArchive::SharedCtor() {
   _cached_size_ = 0;
   unscaled_location_ = NULL;
+  unit_location_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -16453,6 +17047,7 @@ RecordingLaserEventArchive::~RecordingLaserEventArchive() {
 void RecordingLaserEventArchive::SharedDtor() {
   if (this != default_instance_) {
     delete unscaled_location_;
+    delete unit_location_;
   }
 }
 
@@ -16482,6 +17077,9 @@ void RecordingLaserEventArchive::Clear() {
     if (has_unscaled_location()) {
       if (unscaled_location_ != NULL) unscaled_location_->::TSP::Point::Clear();
     }
+    if (has_unit_location()) {
+      if (unit_location_ != NULL) unit_location_->::TSP::Point::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -16493,7 +17091,7 @@ bool RecordingLaserEventArchive::MergePartialFromCodedStream(
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .TSP.Point unscaled_location = 1;
+      // optional .TSP.Point unscaled_location = 1 [deprecated = true];
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -16502,6 +17100,20 @@ bool RecordingLaserEventArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_unit_location;
+        break;
+      }
+
+      // optional .TSP.Point unit_location = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_unit_location:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_unit_location()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -16524,12 +17136,18 @@ bool RecordingLaserEventArchive::MergePartialFromCodedStream(
 
 void RecordingLaserEventArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .TSP.Point unscaled_location = 1;
+  // optional .TSP.Point unscaled_location = 1 [deprecated = true];
   if (has_unscaled_location()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->unscaled_location(), output);
   }
 
+  // optional .TSP.Point unit_location = 2;
+  if (has_unit_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->unit_location(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -16538,13 +17156,20 @@ void RecordingLaserEventArchive::SerializeWithCachedSizes(
 
 ::google::protobuf::uint8* RecordingLaserEventArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional .TSP.Point unscaled_location = 1;
+  // optional .TSP.Point unscaled_location = 1 [deprecated = true];
   if (has_unscaled_location()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->unscaled_location(), target);
   }
 
+  // optional .TSP.Point unit_location = 2;
+  if (has_unit_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->unit_location(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -16556,13 +17181,20 @@ int RecordingLaserEventArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .TSP.Point unscaled_location = 1;
+    // optional .TSP.Point unscaled_location = 1 [deprecated = true];
     if (has_unscaled_location()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->unscaled_location());
     }
 
+    // optional .TSP.Point unit_location = 2;
+    if (has_unit_location()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->unit_location());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -16593,6 +17225,9 @@ void RecordingLaserEventArchive::MergeFrom(const RecordingLaserEventArchive& fro
     if (from.has_unscaled_location()) {
       mutable_unscaled_location()->::TSP::Point::MergeFrom(from.unscaled_location());
     }
+    if (from.has_unit_location()) {
+      mutable_unit_location()->::TSP::Point::MergeFrom(from.unit_location());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -16614,12 +17249,16 @@ bool RecordingLaserEventArchive::IsInitialized() const {
   if (has_unscaled_location()) {
     if (!this->unscaled_location().IsInitialized()) return false;
   }
+  if (has_unit_location()) {
+    if (!this->unit_location().IsInitialized()) return false;
+  }
   return true;
 }
 
 void RecordingLaserEventArchive::Swap(RecordingLaserEventArchive* other) {
   if (other != this) {
     std::swap(unscaled_location_, other->unscaled_location_);
+    std::swap(unit_location_, other->unit_location_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.h
index 0648121..2ed2cf2 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/KNArchives.pb.h
@@ -757,59 +757,66 @@ class TransitionAttributesArchive : public ::google::protobuf::Message {
   inline ::KN::TransitionAttributesArchive_TransitionCustomAttributesTextDeliveryType custom_text_delivery_type() const;
   inline void set_custom_text_delivery_type(::KN::TransitionAttributesArchive_TransitionCustomAttributesTextDeliveryType value);
 
-  // optional string database_animationType = 1;
-  inline bool has_database_animationtype() const;
-  inline void clear_database_animationtype();
+  // optional bool custom_motion_blur = 17;
+  inline bool has_custom_motion_blur() const;
+  inline void clear_custom_motion_blur();
+  static const int kCustomMotionBlurFieldNumber = 17;
+  inline bool custom_motion_blur() const;
+  inline void set_custom_motion_blur(bool value);
+
+  // optional string database_animationType = 1 [deprecated = true];
+  inline bool has_database_animationtype() const PROTOBUF_DEPRECATED;
+  inline void clear_database_animationtype() PROTOBUF_DEPRECATED;
   static const int kDatabaseAnimationTypeFieldNumber = 1;
-  inline const ::std::string& database_animationtype() const;
-  inline void set_database_animationtype(const ::std::string& value);
-  inline void set_database_animationtype(const char* value);
-  inline void set_database_animationtype(const char* value, size_t size);
-  inline ::std::string* mutable_database_animationtype();
-  inline ::std::string* release_database_animationtype();
-  inline void set_allocated_database_animationtype(::std::string* database_animationtype);
-
-  // optional string database_effect = 2;
-  inline bool has_database_effect() const;
-  inline void clear_database_effect();
+  inline const ::std::string& database_animationtype() const PROTOBUF_DEPRECATED;
+  inline void set_database_animationtype(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_database_animationtype(const char* value) PROTOBUF_DEPRECATED;
+  inline void set_database_animationtype(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_database_animationtype() PROTOBUF_DEPRECATED;
+  inline ::std::string* release_database_animationtype() PROTOBUF_DEPRECATED;
+  inline void set_allocated_database_animationtype(::std::string* database_animationtype) PROTOBUF_DEPRECATED;
+
+  // optional string database_effect = 2 [deprecated = true];
+  inline bool has_database_effect() const PROTOBUF_DEPRECATED;
+  inline void clear_database_effect() PROTOBUF_DEPRECATED;
   static const int kDatabaseEffectFieldNumber = 2;
-  inline const ::std::string& database_effect() const;
-  inline void set_database_effect(const ::std::string& value);
-  inline void set_database_effect(const char* value);
-  inline void set_database_effect(const char* value, size_t size);
-  inline ::std::string* mutable_database_effect();
-  inline ::std::string* release_database_effect();
-  inline void set_allocated_database_effect(::std::string* database_effect);
-
-  // optional double database_duration = 3;
-  inline bool has_database_duration() const;
-  inline void clear_database_duration();
+  inline const ::std::string& database_effect() const PROTOBUF_DEPRECATED;
+  inline void set_database_effect(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_database_effect(const char* value) PROTOBUF_DEPRECATED;
+  inline void set_database_effect(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_database_effect() PROTOBUF_DEPRECATED;
+  inline ::std::string* release_database_effect() PROTOBUF_DEPRECATED;
+  inline void set_allocated_database_effect(::std::string* database_effect) PROTOBUF_DEPRECATED;
+
+  // optional double database_duration = 3 [deprecated = true];
+  inline bool has_database_duration() const PROTOBUF_DEPRECATED;
+  inline void clear_database_duration() PROTOBUF_DEPRECATED;
   static const int kDatabaseDurationFieldNumber = 3;
-  inline double database_duration() const;
-  inline void set_database_duration(double value);
+  inline double database_duration() const PROTOBUF_DEPRECATED;
+  inline void set_database_duration(double value) PROTOBUF_DEPRECATED;
 
-  // optional uint32 database_direction = 4;
-  inline bool has_database_direction() const;
-  inline void clear_database_direction();
+  // optional uint32 database_direction = 4 [deprecated = true];
+  inline bool has_database_direction() const PROTOBUF_DEPRECATED;
+  inline void clear_database_direction() PROTOBUF_DEPRECATED;
   static const int kDatabaseDirectionFieldNumber = 4;
-  inline ::google::protobuf::uint32 database_direction() const;
-  inline void set_database_direction(::google::protobuf::uint32 value);
+  inline ::google::protobuf::uint32 database_direction() const PROTOBUF_DEPRECATED;
+  inline void set_database_direction(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
 
-  // optional float database_delay = 5;
-  inline bool has_database_delay() const;
-  inline void clear_database_delay();
+  // optional float database_delay = 5 [deprecated = true];
+  inline bool has_database_delay() const PROTOBUF_DEPRECATED;
+  inline void clear_database_delay() PROTOBUF_DEPRECATED;
   static const int kDatabaseDelayFieldNumber = 5;
-  inline float database_delay() const;
-  inline void set_database_delay(float value);
+  inline float database_delay() const PROTOBUF_DEPRECATED;
+  inline void set_database_delay(float value) PROTOBUF_DEPRECATED;
 
-  // optional .TSP.Color database_color = 7;
-  inline bool has_database_color() const;
-  inline void clear_database_color();
+  // optional .TSP.Color database_color = 7 [deprecated = true];
+  inline bool has_database_color() const PROTOBUF_DEPRECATED;
+  inline void clear_database_color() PROTOBUF_DEPRECATED;
   static const int kDatabaseColorFieldNumber = 7;
-  inline const ::TSP::Color& database_color() const;
-  inline ::TSP::Color* mutable_database_color();
-  inline ::TSP::Color* release_database_color();
-  inline void set_allocated_database_color(::TSP::Color* database_color);
+  inline const ::TSP::Color& database_color() const PROTOBUF_DEPRECATED;
+  inline ::TSP::Color* mutable_database_color() PROTOBUF_DEPRECATED;
+  inline ::TSP::Color* release_database_color() PROTOBUF_DEPRECATED;
+  inline void set_allocated_database_color(::TSP::Color* database_color) PROTOBUF_DEPRECATED;
 
   // @@protoc_insertion_point(class_scope:KN.TransitionAttributesArchive)
  private:
@@ -831,6 +838,8 @@ class TransitionAttributesArchive : public ::google::protobuf::Message {
   inline void clear_has_custom_timing_curve();
   inline void set_has_custom_text_delivery_type();
   inline void clear_has_custom_text_delivery_type();
+  inline void set_has_custom_motion_blur();
+  inline void clear_has_custom_motion_blur();
   inline void set_has_database_animationtype();
   inline void clear_has_database_animationtype();
   inline void set_has_database_effect();
@@ -853,6 +862,7 @@ class TransitionAttributesArchive : public ::google::protobuf::Message {
   bool isautomatic_;
   bool custom_bounce_;
   bool custom_magic_move_fade_unmatched_objects_;
+  bool custom_motion_blur_;
   int custom_timing_curve_;
   int custom_text_delivery_type_;
   ::std::string* database_animationtype_;
@@ -863,7 +873,7 @@ class TransitionAttributesArchive : public ::google::protobuf::Message {
   ::TSP::Color* database_color_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(15 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(16 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -1316,19 +1326,19 @@ class BuildAttributesArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 eventtrigger() const;
   inline void set_eventtrigger(::google::protobuf::uint32 value);
 
-  // optional double delayAutomaticAfter = 6;
-  inline bool has_delayautomaticafter() const;
-  inline void clear_delayautomaticafter();
+  // optional double delayAutomaticAfter = 6 [deprecated = true];
+  inline bool has_delayautomaticafter() const PROTOBUF_DEPRECATED;
+  inline void clear_delayautomaticafter() PROTOBUF_DEPRECATED;
   static const int kDelayAutomaticAfterFieldNumber = 6;
-  inline double delayautomaticafter() const;
-  inline void set_delayautomaticafter(double value);
+  inline double delayautomaticafter() const PROTOBUF_DEPRECATED;
+  inline void set_delayautomaticafter(double value) PROTOBUF_DEPRECATED;
 
-  // optional double delayAutomaticWith = 7;
-  inline bool has_delayautomaticwith() const;
-  inline void clear_delayautomaticwith();
+  // optional double delayAutomaticWith = 7 [deprecated = true];
+  inline bool has_delayautomaticwith() const PROTOBUF_DEPRECATED;
+  inline void clear_delayautomaticwith() PROTOBUF_DEPRECATED;
   static const int kDelayAutomaticWithFieldNumber = 7;
-  inline double delayautomaticwith() const;
-  inline void set_delayautomaticwith(double value);
+  inline double delayautomaticwith() const PROTOBUF_DEPRECATED;
+  inline void set_delayautomaticwith(double value) PROTOBUF_DEPRECATED;
 
   // optional .KN.BuildAttributesArchive.BuildAttributesCurveStyle curveStyle = 14;
   inline bool has_curvestyle() const;
@@ -1451,59 +1461,66 @@ class BuildAttributesArchive : public ::google::protobuf::Message {
   inline ::KN::BuildAttributesArchive_ActionBuildAttributesJiggleIntensity custom_action_jiggleintensity() const;
   inline void set_custom_action_jiggleintensity(::KN::BuildAttributesArchive_ActionBuildAttributesJiggleIntensity value);
 
-  // optional string database_animationType = 1;
-  inline bool has_database_animationtype() const;
-  inline void clear_database_animationtype();
+  // optional bool custom_motion_blur = 29;
+  inline bool has_custom_motion_blur() const;
+  inline void clear_custom_motion_blur();
+  static const int kCustomMotionBlurFieldNumber = 29;
+  inline bool custom_motion_blur() const;
+  inline void set_custom_motion_blur(bool value);
+
+  // optional string database_animationType = 1 [deprecated = true];
+  inline bool has_database_animationtype() const PROTOBUF_DEPRECATED;
+  inline void clear_database_animationtype() PROTOBUF_DEPRECATED;
   static const int kDatabaseAnimationTypeFieldNumber = 1;
-  inline const ::std::string& database_animationtype() const;
-  inline void set_database_animationtype(const ::std::string& value);
-  inline void set_database_animationtype(const char* value);
-  inline void set_database_animationtype(const char* value, size_t size);
-  inline ::std::string* mutable_database_animationtype();
-  inline ::std::string* release_database_animationtype();
-  inline void set_allocated_database_animationtype(::std::string* database_animationtype);
-
-  // optional string database_effect = 2;
-  inline bool has_database_effect() const;
-  inline void clear_database_effect();
+  inline const ::std::string& database_animationtype() const PROTOBUF_DEPRECATED;
+  inline void set_database_animationtype(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_database_animationtype(const char* value) PROTOBUF_DEPRECATED;
+  inline void set_database_animationtype(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_database_animationtype() PROTOBUF_DEPRECATED;
+  inline ::std::string* release_database_animationtype() PROTOBUF_DEPRECATED;
+  inline void set_allocated_database_animationtype(::std::string* database_animationtype) PROTOBUF_DEPRECATED;
+
+  // optional string database_effect = 2 [deprecated = true];
+  inline bool has_database_effect() const PROTOBUF_DEPRECATED;
+  inline void clear_database_effect() PROTOBUF_DEPRECATED;
   static const int kDatabaseEffectFieldNumber = 2;
-  inline const ::std::string& database_effect() const;
-  inline void set_database_effect(const ::std::string& value);
-  inline void set_database_effect(const char* value);
-  inline void set_database_effect(const char* value, size_t size);
-  inline ::std::string* mutable_database_effect();
-  inline ::std::string* release_database_effect();
-  inline void set_allocated_database_effect(::std::string* database_effect);
-
-  // optional uint32 database_direction = 3;
-  inline bool has_database_direction() const;
-  inline void clear_database_direction();
+  inline const ::std::string& database_effect() const PROTOBUF_DEPRECATED;
+  inline void set_database_effect(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_database_effect(const char* value) PROTOBUF_DEPRECATED;
+  inline void set_database_effect(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_database_effect() PROTOBUF_DEPRECATED;
+  inline ::std::string* release_database_effect() PROTOBUF_DEPRECATED;
+  inline void set_allocated_database_effect(::std::string* database_effect) PROTOBUF_DEPRECATED;
+
+  // optional uint32 database_direction = 3 [deprecated = true];
+  inline bool has_database_direction() const PROTOBUF_DEPRECATED;
+  inline void clear_database_direction() PROTOBUF_DEPRECATED;
   static const int kDatabaseDirectionFieldNumber = 3;
-  inline ::google::protobuf::uint32 database_direction() const;
-  inline void set_database_direction(::google::protobuf::uint32 value);
+  inline ::google::protobuf::uint32 database_direction() const PROTOBUF_DEPRECATED;
+  inline void set_database_direction(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
 
-  // optional double database_delay = 5;
-  inline bool has_database_delay() const;
-  inline void clear_database_delay();
+  // optional double database_delay = 5 [deprecated = true];
+  inline bool has_database_delay() const PROTOBUF_DEPRECATED;
+  inline void clear_database_delay() PROTOBUF_DEPRECATED;
   static const int kDatabaseDelayFieldNumber = 5;
-  inline double database_delay() const;
-  inline void set_database_delay(double value);
+  inline double database_delay() const PROTOBUF_DEPRECATED;
+  inline void set_database_delay(double value) PROTOBUF_DEPRECATED;
 
-  // optional double database_duration = 8;
-  inline bool has_database_duration() const;
-  inline void clear_database_duration();
+  // optional double database_duration = 8 [deprecated = true];
+  inline bool has_database_duration() const PROTOBUF_DEPRECATED;
+  inline void clear_database_duration() PROTOBUF_DEPRECATED;
   static const int kDatabaseDurationFieldNumber = 8;
-  inline double database_duration() const;
-  inline void set_database_duration(double value);
+  inline double database_duration() const PROTOBUF_DEPRECATED;
+  inline void set_database_duration(double value) PROTOBUF_DEPRECATED;
 
-  // optional .TSP.Color database_color = 16;
-  inline bool has_database_color() const;
-  inline void clear_database_color();
+  // optional .TSP.Color database_color = 16 [deprecated = true];
+  inline bool has_database_color() const PROTOBUF_DEPRECATED;
+  inline void clear_database_color() PROTOBUF_DEPRECATED;
   static const int kDatabaseColorFieldNumber = 16;
-  inline const ::TSP::Color& database_color() const;
-  inline ::TSP::Color* mutable_database_color();
-  inline ::TSP::Color* release_database_color();
-  inline void set_allocated_database_color(::TSP::Color* database_color);
+  inline const ::TSP::Color& database_color() const PROTOBUF_DEPRECATED;
+  inline ::TSP::Color* mutable_database_color() PROTOBUF_DEPRECATED;
+  inline ::TSP::Color* release_database_color() PROTOBUF_DEPRECATED;
+  inline void set_allocated_database_color(::TSP::Color* database_color) PROTOBUF_DEPRECATED;
 
   // optional string motionPathString = 15 [deprecated = true];
   inline bool has_motionpathstring() const PROTOBUF_DEPRECATED;
@@ -1561,6 +1578,8 @@ class BuildAttributesArchive : public ::google::protobuf::Message {
   inline void clear_has_custom_action_scale();
   inline void set_has_custom_action_jiggleintensity();
   inline void clear_has_custom_action_jiggleintensity();
+  inline void set_has_custom_motion_blur();
+  inline void clear_has_custom_motion_blur();
   inline void set_has_database_animationtype();
   inline void clear_has_database_animationtype();
   inline void set_has_database_effect();
@@ -1593,14 +1612,15 @@ class BuildAttributesArchive : public ::google::protobuf::Message {
   double action_coloralpha_;
   ::TSD::PathSourceArchive* action_motionpathsource_;
   int custom_textdelivery_;
+  int custom_deliveryoption_;
   bool custom_bounce_;
   bool custom_action_decay_;
-  int custom_deliveryoption_;
+  bool custom_motion_blur_;
   ::google::protobuf::uint32 custom_action_repeatcount_;
   double custom_action_scale_;
-  ::std::string* database_animationtype_;
   int custom_action_jiggleintensity_;
   ::google::protobuf::uint32 database_direction_;
+  ::std::string* database_animationtype_;
   ::std::string* database_effect_;
   double database_delay_;
   double database_duration_;
@@ -1608,7 +1628,7 @@ class BuildAttributesArchive : public ::google::protobuf::Message {
   ::std::string* motionpathstring_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(28 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(29 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -2387,17 +2407,29 @@ class SlideArchive : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_slidenumberplaceholder();
   inline void set_allocated_slidenumberplaceholder(::TSP::Reference* slidenumberplaceholder);
 
-  // repeated .TSP.Reference drawables = 7;
-  inline int drawables_size() const;
-  inline void clear_drawables();
-  static const int kDrawablesFieldNumber = 7;
-  inline const ::TSP::Reference& drawables(int index) const;
-  inline ::TSP::Reference* mutable_drawables(int index);
-  inline ::TSP::Reference* add_drawables();
+  // repeated .TSP.Reference owned_drawables = 7;
+  inline int owned_drawables_size() const;
+  inline void clear_owned_drawables();
+  static const int kOwnedDrawablesFieldNumber = 7;
+  inline const ::TSP::Reference& owned_drawables(int index) const;
+  inline ::TSP::Reference* mutable_owned_drawables(int index);
+  inline ::TSP::Reference* add_owned_drawables();
   inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
-      drawables() const;
+      owned_drawables() const;
   inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
-      mutable_drawables();
+      mutable_owned_drawables();
+
+  // repeated .TSP.Reference drawables_z_order = 42;
+  inline int drawables_z_order_size() const;
+  inline void clear_drawables_z_order();
+  static const int kDrawablesZOrderFieldNumber = 42;
+  inline const ::TSP::Reference& drawables_z_order(int index) const;
+  inline ::TSP::Reference* mutable_drawables_z_order(int index);
+  inline ::TSP::Reference* add_drawables_z_order();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      drawables_z_order() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_drawables_z_order();
 
   // repeated .KN.SlideArchive.SageTagMapEntry sage_tag_to_info_map = 28;
   inline int sage_tag_to_info_map_size() const;
@@ -2576,6 +2608,13 @@ class SlideArchive : public ::google::protobuf::Message {
   inline ::std::string* release_thumbnailtextforbodyplaceholder();
   inline void set_allocated_thumbnailtextforbodyplaceholder(::std::string* thumbnailtextforbodyplaceholder);
 
+  // optional bool slideObjectsLayerWithMaster = 41 [default = false];
+  inline bool has_slideobjectslayerwithmaster() const;
+  inline void clear_slideobjectslayerwithmaster();
+  static const int kSlideObjectsLayerWithMasterFieldNumber = 41;
+  inline bool slideobjectslayerwithmaster() const;
+  inline void set_slideobjectslayerwithmaster(bool value);
+
   // optional .TSP.Reference master = 17;
   inline bool has_master() const;
   inline void clear_master();
@@ -2691,6 +2730,8 @@ class SlideArchive : public ::google::protobuf::Message {
   inline void clear_has_thumbnailtextfortitleplaceholder();
   inline void set_has_thumbnailtextforbodyplaceholder();
   inline void clear_has_thumbnailtextforbodyplaceholder();
+  inline void set_has_slideobjectslayerwithmaster();
+  inline void clear_has_slideobjectslayerwithmaster();
   inline void set_has_master();
   inline void clear_has_master();
   inline void set_has_userdefinedguidestorage();
@@ -2716,7 +2757,8 @@ class SlideArchive : public ::google::protobuf::Message {
   ::TSP::Reference* bodyplaceholder_;
   ::TSP::Reference* objectplaceholder_;
   ::TSP::Reference* slidenumberplaceholder_;
-  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > drawables_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > owned_drawables_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > drawables_z_order_;
   ::google::protobuf::RepeatedPtrField< ::KN::SlideArchive_SageTagMapEntry > sage_tag_to_info_map_;
   ::std::string* name_;
   ::TSD::GeometryArchive* titleplaceholdergeometry_;
@@ -2741,12 +2783,13 @@ class SlideArchive : public ::google::protobuf::Message {
   ::TSP::Reference* userdefinedguidestorage_;
   ::TSP::Reference* note_;
   ::TSP::Reference* info_using_object_placeholder_geometry_;
+  bool slideobjectslayerwithmaster_;
   bool indocument_;
   bool info_using_object_placeholder_geometry_matches_object_placeholder_geometry_;
   bool deprecated_objectplaceholdervisibleforexport_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(36 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(38 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -2891,12 +2934,12 @@ class SlideNodeArchive : public ::google::protobuf::Message {
   inline bool hasbodyinoutlineview() const;
   inline void set_hasbodyinoutlineview(bool value);
 
-  // required bool hasBuilds = 6;
-  inline bool has_hasbuilds() const;
-  inline void clear_hasbuilds();
+  // required bool hasBuilds = 6 [deprecated = true];
+  inline bool has_hasbuilds() const PROTOBUF_DEPRECATED;
+  inline void clear_hasbuilds() PROTOBUF_DEPRECATED;
   static const int kHasBuildsFieldNumber = 6;
-  inline bool hasbuilds() const;
-  inline void set_hasbuilds(bool value);
+  inline bool hasbuilds() const PROTOBUF_DEPRECATED;
+  inline void set_hasbuilds(bool value) PROTOBUF_DEPRECATED;
 
   // required bool hasTransition = 7;
   inline bool has_hastransition() const;
@@ -2957,6 +3000,13 @@ class SlideNodeArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::uint32 eventcount() const;
   inline void set_eventcount(::google::protobuf::uint32 value);
 
+  // optional bool has_explicit_builds = 20;
+  inline bool has_has_explicit_builds() const;
+  inline void clear_has_explicit_builds();
+  static const int kHasExplicitBuildsFieldNumber = 20;
+  inline bool has_explicit_builds() const;
+  inline void set_has_explicit_builds(bool value);
+
   // optional .TSP.Reference database_thumbnail = 3;
   inline bool has_database_thumbnail() const;
   inline void clear_database_thumbnail();
@@ -3008,6 +3058,8 @@ class SlideNodeArchive : public ::google::protobuf::Message {
   inline void clear_has_slidespecifichyperlinkcount();
   inline void set_has_eventcount();
   inline void clear_has_eventcount();
+  inline void set_has_has_explicit_builds();
+  inline void clear_has_has_explicit_builds();
   inline void set_has_database_thumbnail();
   inline void clear_has_database_thumbnail();
 
@@ -3026,15 +3078,16 @@ class SlideNodeArchive : public ::google::protobuf::Message {
   bool hastransition_;
   bool hasnote_;
   ::std::string* uniqueidentifier_;
+  ::std::string* copyfromslideidentifier_;
   bool isslidenumbervisible_;
+  bool has_explicit_builds_;
   ::google::protobuf::uint32 slidespecifichyperlinkcount_;
-  ::std::string* copyfromslideidentifier_;
   ::TSP::Reference* database_thumbnail_;
   ::google::protobuf::RepeatedPtrField< ::TSP::Reference > database_thumbnails_;
   ::google::protobuf::uint32 eventcount_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(19 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(20 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -3481,6 +3534,29 @@ class UIStateArchive : public ::google::protobuf::Message {
   inline ::TSP::Size* release_desktop_main_content_size();
   inline void set_allocated_desktop_main_content_size(::TSP::Size* desktop_main_content_size);
 
+  // optional float desktop_presenter_notes_view_height = 25;
+  inline bool has_desktop_presenter_notes_view_height() const;
+  inline void clear_desktop_presenter_notes_view_height();
+  static const int kDesktopPresenterNotesViewHeightFieldNumber = 25;
+  inline float desktop_presenter_notes_view_height() const;
+  inline void set_desktop_presenter_notes_view_height(float value);
+
+  // optional .TSP.Point desktop_main_window_origin = 26;
+  inline bool has_desktop_main_window_origin() const;
+  inline void clear_desktop_main_window_origin();
+  static const int kDesktopMainWindowOriginFieldNumber = 26;
+  inline const ::TSP::Point& desktop_main_window_origin() const;
+  inline ::TSP::Point* mutable_desktop_main_window_origin();
+  inline ::TSP::Point* release_desktop_main_window_origin();
+  inline void set_allocated_desktop_main_window_origin(::TSP::Point* desktop_main_window_origin);
+
+  // optional bool light_table_hides_skipped_slides = 27;
+  inline bool has_light_table_hides_skipped_slides() const;
+  inline void clear_light_table_hides_skipped_slides();
+  static const int kLightTableHidesSkippedSlidesFieldNumber = 27;
+  inline bool light_table_hides_skipped_slides() const;
+  inline void set_light_table_hides_skipped_slides(bool value);
+
   // @@protoc_insertion_point(class_scope:KN.UIStateArchive)
  private:
   inline void set_has_slidenodetoedit();
@@ -3525,6 +3601,12 @@ class UIStateArchive : public ::google::protobuf::Message {
   inline void clear_has_desktop_outline_view_width();
   inline void set_has_desktop_main_content_size();
   inline void clear_has_desktop_main_content_size();
+  inline void set_has_desktop_presenter_notes_view_height();
+  inline void clear_has_desktop_presenter_notes_view_height();
+  inline void set_has_desktop_main_window_origin();
+  inline void clear_has_desktop_main_window_origin();
+  inline void set_has_light_table_hides_skipped_slides();
+  inline void clear_has_light_table_hides_skipped_slides();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -3548,13 +3630,16 @@ class UIStateArchive : public ::google::protobuf::Message {
   bool show_master_guides_;
   bool shows_comments_;
   ::google::protobuf::RepeatedPtrField< ::TSP::Reference > collapsed_slide_nodes_;
-  bool shows_ruler_;
   float desktop_navigator_view_width_;
-  ::TSP::Size* desktop_main_content_size_;
   float desktop_outline_view_width_;
+  ::TSP::Size* desktop_main_content_size_;
+  bool shows_ruler_;
+  bool light_table_hides_skipped_slides_;
+  float desktop_presenter_notes_view_height_;
+  ::TSP::Point* desktop_main_window_origin_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(24 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(27 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -3784,6 +3869,22 @@ class ThemeArchive : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_defaultmasterslidenode();
   inline void set_allocated_defaultmasterslidenode(::TSP::Reference* defaultmasterslidenode);
 
+  // optional .TSP.Reference default_master_slide_node_reference = 6;
+  inline bool has_default_master_slide_node_reference() const;
+  inline void clear_default_master_slide_node_reference();
+  static const int kDefaultMasterSlideNodeReferenceFieldNumber = 6;
+  inline const ::TSP::Reference& default_master_slide_node_reference() const;
+  inline ::TSP::Reference* mutable_default_master_slide_node_reference();
+  inline ::TSP::Reference* release_default_master_slide_node_reference();
+  inline void set_allocated_default_master_slide_node_reference(::TSP::Reference* default_master_slide_node_reference);
+
+  // optional bool default_master_slide_node_is_our_best_guess = 7;
+  inline bool has_default_master_slide_node_is_our_best_guess() const;
+  inline void clear_default_master_slide_node_is_our_best_guess();
+  static const int kDefaultMasterSlideNodeIsOurBestGuessFieldNumber = 7;
+  inline bool default_master_slide_node_is_our_best_guess() const;
+  inline void set_default_master_slide_node_is_our_best_guess(bool value);
+
   // @@protoc_insertion_point(class_scope:KN.ThemeArchive)
  private:
   inline void set_has_super();
@@ -3792,6 +3893,10 @@ class ThemeArchive : public ::google::protobuf::Message {
   inline void clear_has_uuid();
   inline void set_has_defaultmasterslidenode();
   inline void clear_has_defaultmasterslidenode();
+  inline void set_has_default_master_slide_node_reference();
+  inline void clear_has_default_master_slide_node_reference();
+  inline void set_has_default_master_slide_node_is_our_best_guess();
+  inline void clear_has_default_master_slide_node_is_our_best_guess();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -3800,9 +3905,11 @@ class ThemeArchive : public ::google::protobuf::Message {
   ::std::string* uuid_;
   ::google::protobuf::RepeatedPtrField< ::TSP::Reference > classicthemerecords_;
   ::TSP::Reference* defaultmasterslidenode_;
+  ::TSP::Reference* default_master_slide_node_reference_;
+  bool default_master_slide_node_is_our_best_guess_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -4620,6 +4727,18 @@ class PasteboardNativeStorageArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
       mutable_slidenodes();
 
+  // repeated .TSP.Reference masterSlideNodes = 9;
+  inline int masterslidenodes_size() const;
+  inline void clear_masterslidenodes();
+  static const int kMasterSlideNodesFieldNumber = 9;
+  inline const ::TSP::Reference& masterslidenodes(int index) const;
+  inline ::TSP::Reference* mutable_masterslidenodes(int index);
+  inline ::TSP::Reference* add_masterslidenodes();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      masterslidenodes() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_masterslidenodes();
+
   // optional .TSP.Size originalShowSize = 5;
   inline bool has_originalshowsize() const;
   inline void clear_originalshowsize();
@@ -4641,10 +4760,36 @@ class PasteboardNativeStorageArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::TSP::Range >*
       mutable_titleranges();
 
+  // repeated .TSD.GeometryArchive geometries_in_root = 7;
+  inline int geometries_in_root_size() const;
+  inline void clear_geometries_in_root();
+  static const int kGeometriesInRootFieldNumber = 7;
+  inline const ::TSD::GeometryArchive& geometries_in_root(int index) const;
+  inline ::TSD::GeometryArchive* mutable_geometries_in_root(int index);
+  inline ::TSD::GeometryArchive* add_geometries_in_root();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSD::GeometryArchive >&
+      geometries_in_root() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSD::GeometryArchive >*
+      mutable_geometries_in_root();
+
+  // optional string slide_node_unique_identifier = 8;
+  inline bool has_slide_node_unique_identifier() const;
+  inline void clear_slide_node_unique_identifier();
+  static const int kSlideNodeUniqueIdentifierFieldNumber = 8;
+  inline const ::std::string& slide_node_unique_identifier() const;
+  inline void set_slide_node_unique_identifier(const ::std::string& value);
+  inline void set_slide_node_unique_identifier(const char* value);
+  inline void set_slide_node_unique_identifier(const char* value, size_t size);
+  inline ::std::string* mutable_slide_node_unique_identifier();
+  inline ::std::string* release_slide_node_unique_identifier();
+  inline void set_allocated_slide_node_unique_identifier(::std::string* slide_node_unique_identifier);
+
   // @@protoc_insertion_point(class_scope:KN.PasteboardNativeStorageArchive)
  private:
   inline void set_has_originalshowsize();
   inline void clear_has_originalshowsize();
+  inline void set_has_slide_node_unique_identifier();
+  inline void clear_has_slide_node_unique_identifier();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -4652,11 +4797,14 @@ class PasteboardNativeStorageArchive : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedPtrField< ::TSP::Reference > builds_;
   ::google::protobuf::RepeatedPtrField< ::KN::BuildChunkArchive > buildchunks_;
   ::google::protobuf::RepeatedPtrField< ::TSP::Reference > slidenodes_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > masterslidenodes_;
   ::TSP::Size* originalshowsize_;
   ::google::protobuf::RepeatedPtrField< ::TSP::Range > titleranges_;
+  ::google::protobuf::RepeatedPtrField< ::TSD::GeometryArchive > geometries_in_root_;
+  ::std::string* slide_node_unique_identifier_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(9 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -5390,26 +5538,38 @@ class RecordingLaserEventArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // optional .TSP.Point unscaled_location = 1;
-  inline bool has_unscaled_location() const;
-  inline void clear_unscaled_location();
+  // optional .TSP.Point unscaled_location = 1 [deprecated = true];
+  inline bool has_unscaled_location() const PROTOBUF_DEPRECATED;
+  inline void clear_unscaled_location() PROTOBUF_DEPRECATED;
   static const int kUnscaledLocationFieldNumber = 1;
-  inline const ::TSP::Point& unscaled_location() const;
-  inline ::TSP::Point* mutable_unscaled_location();
-  inline ::TSP::Point* release_unscaled_location();
-  inline void set_allocated_unscaled_location(::TSP::Point* unscaled_location);
+  inline const ::TSP::Point& unscaled_location() const PROTOBUF_DEPRECATED;
+  inline ::TSP::Point* mutable_unscaled_location() PROTOBUF_DEPRECATED;
+  inline ::TSP::Point* release_unscaled_location() PROTOBUF_DEPRECATED;
+  inline void set_allocated_unscaled_location(::TSP::Point* unscaled_location) PROTOBUF_DEPRECATED;
+
+  // optional .TSP.Point unit_location = 2;
+  inline bool has_unit_location() const;
+  inline void clear_unit_location();
+  static const int kUnitLocationFieldNumber = 2;
+  inline const ::TSP::Point& unit_location() const;
+  inline ::TSP::Point* mutable_unit_location();
+  inline ::TSP::Point* release_unit_location();
+  inline void set_allocated_unit_location(::TSP::Point* unit_location);
 
   // @@protoc_insertion_point(class_scope:KN.RecordingLaserEventArchive)
  private:
   inline void set_has_unscaled_location();
   inline void clear_has_unscaled_location();
+  inline void set_has_unit_location();
+  inline void clear_has_unit_location();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSP::Point* unscaled_location_;
+  ::TSP::Point* unit_location_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNArchives_2eproto();
   friend void protobuf_AssignDesc_KNArchives_2eproto();
@@ -6777,16 +6937,38 @@ inline void TransitionAttributesArchive::set_custom_text_delivery_type(::KN::Tra
   custom_text_delivery_type_ = value;
 }
 
-// optional string database_animationType = 1;
-inline bool TransitionAttributesArchive::has_database_animationtype() const {
+// optional bool custom_motion_blur = 17;
+inline bool TransitionAttributesArchive::has_custom_motion_blur() const {
   return (_has_bits_[0] & 0x00000200u) != 0;
 }
-inline void TransitionAttributesArchive::set_has_database_animationtype() {
+inline void TransitionAttributesArchive::set_has_custom_motion_blur() {
   _has_bits_[0] |= 0x00000200u;
 }
-inline void TransitionAttributesArchive::clear_has_database_animationtype() {
+inline void TransitionAttributesArchive::clear_has_custom_motion_blur() {
   _has_bits_[0] &= ~0x00000200u;
 }
+inline void TransitionAttributesArchive::clear_custom_motion_blur() {
+  custom_motion_blur_ = false;
+  clear_has_custom_motion_blur();
+}
+inline bool TransitionAttributesArchive::custom_motion_blur() const {
+  return custom_motion_blur_;
+}
+inline void TransitionAttributesArchive::set_custom_motion_blur(bool value) {
+  set_has_custom_motion_blur();
+  custom_motion_blur_ = value;
+}
+
+// optional string database_animationType = 1 [deprecated = true];
+inline bool TransitionAttributesArchive::has_database_animationtype() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void TransitionAttributesArchive::set_has_database_animationtype() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void TransitionAttributesArchive::clear_has_database_animationtype() {
+  _has_bits_[0] &= ~0x00000400u;
+}
 inline void TransitionAttributesArchive::clear_database_animationtype() {
   if (database_animationtype_ != &::google::protobuf::internal::kEmptyString) {
     database_animationtype_->clear();
@@ -6847,15 +7029,15 @@ inline void TransitionAttributesArchive::set_allocated_database_animationtype(::
   }
 }
 
-// optional string database_effect = 2;
+// optional string database_effect = 2 [deprecated = true];
 inline bool TransitionAttributesArchive::has_database_effect() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
 inline void TransitionAttributesArchive::set_has_database_effect() {
-  _has_bits_[0] |= 0x00000400u;
+  _has_bits_[0] |= 0x00000800u;
 }
 inline void TransitionAttributesArchive::clear_has_database_effect() {
-  _has_bits_[0] &= ~0x00000400u;
+  _has_bits_[0] &= ~0x00000800u;
 }
 inline void TransitionAttributesArchive::clear_database_effect() {
   if (database_effect_ != &::google::protobuf::internal::kEmptyString) {
@@ -6917,15 +7099,15 @@ inline void TransitionAttributesArchive::set_allocated_database_effect(::std::st
   }
 }
 
-// optional double database_duration = 3;
+// optional double database_duration = 3 [deprecated = true];
 inline bool TransitionAttributesArchive::has_database_duration() const {
-  return (_has_bits_[0] & 0x00000800u) != 0;
+  return (_has_bits_[0] & 0x00001000u) != 0;
 }
 inline void TransitionAttributesArchive::set_has_database_duration() {
-  _has_bits_[0] |= 0x00000800u;
+  _has_bits_[0] |= 0x00001000u;
 }
 inline void TransitionAttributesArchive::clear_has_database_duration() {
-  _has_bits_[0] &= ~0x00000800u;
+  _has_bits_[0] &= ~0x00001000u;
 }
 inline void TransitionAttributesArchive::clear_database_duration() {
   database_duration_ = 0;
@@ -6939,15 +7121,15 @@ inline void TransitionAttributesArchive::set_database_duration(double value) {
   database_duration_ = value;
 }
 
-// optional uint32 database_direction = 4;
+// optional uint32 database_direction = 4 [deprecated = true];
 inline bool TransitionAttributesArchive::has_database_direction() const {
-  return (_has_bits_[0] & 0x00001000u) != 0;
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
 inline void TransitionAttributesArchive::set_has_database_direction() {
-  _has_bits_[0] |= 0x00001000u;
+  _has_bits_[0] |= 0x00002000u;
 }
 inline void TransitionAttributesArchive::clear_has_database_direction() {
-  _has_bits_[0] &= ~0x00001000u;
+  _has_bits_[0] &= ~0x00002000u;
 }
 inline void TransitionAttributesArchive::clear_database_direction() {
   database_direction_ = 0u;
@@ -6961,15 +7143,15 @@ inline void TransitionAttributesArchive::set_database_direction(::google::protob
   database_direction_ = value;
 }
 
-// optional float database_delay = 5;
+// optional float database_delay = 5 [deprecated = true];
 inline bool TransitionAttributesArchive::has_database_delay() const {
-  return (_has_bits_[0] & 0x00002000u) != 0;
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
 inline void TransitionAttributesArchive::set_has_database_delay() {
-  _has_bits_[0] |= 0x00002000u;
+  _has_bits_[0] |= 0x00004000u;
 }
 inline void TransitionAttributesArchive::clear_has_database_delay() {
-  _has_bits_[0] &= ~0x00002000u;
+  _has_bits_[0] &= ~0x00004000u;
 }
 inline void TransitionAttributesArchive::clear_database_delay() {
   database_delay_ = 0;
@@ -6983,15 +7165,15 @@ inline void TransitionAttributesArchive::set_database_delay(float value) {
   database_delay_ = value;
 }
 
-// optional .TSP.Color database_color = 7;
+// optional .TSP.Color database_color = 7 [deprecated = true];
 inline bool TransitionAttributesArchive::has_database_color() const {
-  return (_has_bits_[0] & 0x00004000u) != 0;
+  return (_has_bits_[0] & 0x00008000u) != 0;
 }
 inline void TransitionAttributesArchive::set_has_database_color() {
-  _has_bits_[0] |= 0x00004000u;
+  _has_bits_[0] |= 0x00008000u;
 }
 inline void TransitionAttributesArchive::clear_has_database_color() {
-  _has_bits_[0] &= ~0x00004000u;
+  _has_bits_[0] &= ~0x00008000u;
 }
 inline void TransitionAttributesArchive::clear_database_color() {
   if (database_color_ != NULL) database_color_->::TSP::Color::Clear();
@@ -7279,7 +7461,7 @@ inline void BuildAttributesArchive::set_eventtrigger(::google::protobuf::uint32
   eventtrigger_ = value;
 }
 
-// optional double delayAutomaticAfter = 6;
+// optional double delayAutomaticAfter = 6 [deprecated = true];
 inline bool BuildAttributesArchive::has_delayautomaticafter() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -7301,7 +7483,7 @@ inline void BuildAttributesArchive::set_delayautomaticafter(double value) {
   delayautomaticafter_ = value;
 }
 
-// optional double delayAutomaticWith = 7;
+// optional double delayAutomaticWith = 7 [deprecated = true];
 inline bool BuildAttributesArchive::has_delayautomaticwith() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -7719,16 +7901,38 @@ inline void BuildAttributesArchive::set_custom_action_jiggleintensity(::KN::Buil
   custom_action_jiggleintensity_ = value;
 }
 
-// optional string database_animationType = 1;
-inline bool BuildAttributesArchive::has_database_animationtype() const {
+// optional bool custom_motion_blur = 29;
+inline bool BuildAttributesArchive::has_custom_motion_blur() const {
   return (_has_bits_[0] & 0x00200000u) != 0;
 }
-inline void BuildAttributesArchive::set_has_database_animationtype() {
+inline void BuildAttributesArchive::set_has_custom_motion_blur() {
   _has_bits_[0] |= 0x00200000u;
 }
-inline void BuildAttributesArchive::clear_has_database_animationtype() {
+inline void BuildAttributesArchive::clear_has_custom_motion_blur() {
   _has_bits_[0] &= ~0x00200000u;
 }
+inline void BuildAttributesArchive::clear_custom_motion_blur() {
+  custom_motion_blur_ = false;
+  clear_has_custom_motion_blur();
+}
+inline bool BuildAttributesArchive::custom_motion_blur() const {
+  return custom_motion_blur_;
+}
+inline void BuildAttributesArchive::set_custom_motion_blur(bool value) {
+  set_has_custom_motion_blur();
+  custom_motion_blur_ = value;
+}
+
+// optional string database_animationType = 1 [deprecated = true];
+inline bool BuildAttributesArchive::has_database_animationtype() const {
+  return (_has_bits_[0] & 0x00400000u) != 0;
+}
+inline void BuildAttributesArchive::set_has_database_animationtype() {
+  _has_bits_[0] |= 0x00400000u;
+}
+inline void BuildAttributesArchive::clear_has_database_animationtype() {
+  _has_bits_[0] &= ~0x00400000u;
+}
 inline void BuildAttributesArchive::clear_database_animationtype() {
   if (database_animationtype_ != &::google::protobuf::internal::kEmptyString) {
     database_animationtype_->clear();
@@ -7789,15 +7993,15 @@ inline void BuildAttributesArchive::set_allocated_database_animationtype(::std::
   }
 }
 
-// optional string database_effect = 2;
+// optional string database_effect = 2 [deprecated = true];
 inline bool BuildAttributesArchive::has_database_effect() const {
-  return (_has_bits_[0] & 0x00400000u) != 0;
+  return (_has_bits_[0] & 0x00800000u) != 0;
 }
 inline void BuildAttributesArchive::set_has_database_effect() {
-  _has_bits_[0] |= 0x00400000u;
+  _has_bits_[0] |= 0x00800000u;
 }
 inline void BuildAttributesArchive::clear_has_database_effect() {
-  _has_bits_[0] &= ~0x00400000u;
+  _has_bits_[0] &= ~0x00800000u;
 }
 inline void BuildAttributesArchive::clear_database_effect() {
   if (database_effect_ != &::google::protobuf::internal::kEmptyString) {
@@ -7859,15 +8063,15 @@ inline void BuildAttributesArchive::set_allocated_database_effect(::std::string*
   }
 }
 
-// optional uint32 database_direction = 3;
+// optional uint32 database_direction = 3 [deprecated = true];
 inline bool BuildAttributesArchive::has_database_direction() const {
-  return (_has_bits_[0] & 0x00800000u) != 0;
+  return (_has_bits_[0] & 0x01000000u) != 0;
 }
 inline void BuildAttributesArchive::set_has_database_direction() {
-  _has_bits_[0] |= 0x00800000u;
+  _has_bits_[0] |= 0x01000000u;
 }
 inline void BuildAttributesArchive::clear_has_database_direction() {
-  _has_bits_[0] &= ~0x00800000u;
+  _has_bits_[0] &= ~0x01000000u;
 }
 inline void BuildAttributesArchive::clear_database_direction() {
   database_direction_ = 0u;
@@ -7881,15 +8085,15 @@ inline void BuildAttributesArchive::set_database_direction(::google::protobuf::u
   database_direction_ = value;
 }
 
-// optional double database_delay = 5;
+// optional double database_delay = 5 [deprecated = true];
 inline bool BuildAttributesArchive::has_database_delay() const {
-  return (_has_bits_[0] & 0x01000000u) != 0;
+  return (_has_bits_[0] & 0x02000000u) != 0;
 }
 inline void BuildAttributesArchive::set_has_database_delay() {
-  _has_bits_[0] |= 0x01000000u;
+  _has_bits_[0] |= 0x02000000u;
 }
 inline void BuildAttributesArchive::clear_has_database_delay() {
-  _has_bits_[0] &= ~0x01000000u;
+  _has_bits_[0] &= ~0x02000000u;
 }
 inline void BuildAttributesArchive::clear_database_delay() {
   database_delay_ = 0;
@@ -7903,15 +8107,15 @@ inline void BuildAttributesArchive::set_database_delay(double value) {
   database_delay_ = value;
 }
 
-// optional double database_duration = 8;
+// optional double database_duration = 8 [deprecated = true];
 inline bool BuildAttributesArchive::has_database_duration() const {
-  return (_has_bits_[0] & 0x02000000u) != 0;
+  return (_has_bits_[0] & 0x04000000u) != 0;
 }
 inline void BuildAttributesArchive::set_has_database_duration() {
-  _has_bits_[0] |= 0x02000000u;
+  _has_bits_[0] |= 0x04000000u;
 }
 inline void BuildAttributesArchive::clear_has_database_duration() {
-  _has_bits_[0] &= ~0x02000000u;
+  _has_bits_[0] &= ~0x04000000u;
 }
 inline void BuildAttributesArchive::clear_database_duration() {
   database_duration_ = 0;
@@ -7925,15 +8129,15 @@ inline void BuildAttributesArchive::set_database_duration(double value) {
   database_duration_ = value;
 }
 
-// optional .TSP.Color database_color = 16;
+// optional .TSP.Color database_color = 16 [deprecated = true];
 inline bool BuildAttributesArchive::has_database_color() const {
-  return (_has_bits_[0] & 0x04000000u) != 0;
+  return (_has_bits_[0] & 0x08000000u) != 0;
 }
 inline void BuildAttributesArchive::set_has_database_color() {
-  _has_bits_[0] |= 0x04000000u;
+  _has_bits_[0] |= 0x08000000u;
 }
 inline void BuildAttributesArchive::clear_has_database_color() {
-  _has_bits_[0] &= ~0x04000000u;
+  _has_bits_[0] &= ~0x08000000u;
 }
 inline void BuildAttributesArchive::clear_database_color() {
   if (database_color_ != NULL) database_color_->::TSP::Color::Clear();
@@ -7965,13 +8169,13 @@ inline void BuildAttributesArchive::set_allocated_database_color(::TSP::Color* d
 
 // optional string motionPathString = 15 [deprecated = true];
 inline bool BuildAttributesArchive::has_motionpathstring() const {
-  return (_has_bits_[0] & 0x08000000u) != 0;
+  return (_has_bits_[0] & 0x10000000u) != 0;
 }
 inline void BuildAttributesArchive::set_has_motionpathstring() {
-  _has_bits_[0] |= 0x08000000u;
+  _has_bits_[0] |= 0x10000000u;
 }
 inline void BuildAttributesArchive::clear_has_motionpathstring() {
-  _has_bits_[0] &= ~0x08000000u;
+  _has_bits_[0] &= ~0x10000000u;
 }
 inline void BuildAttributesArchive::clear_motionpathstring() {
   if (motionpathstring_ != &::google::protobuf::internal::kEmptyString) {
@@ -8910,29 +9114,54 @@ inline void SlideArchive::set_allocated_slidenumberplaceholder(::TSP::Reference*
   }
 }
 
-// repeated .TSP.Reference drawables = 7;
-inline int SlideArchive::drawables_size() const {
-  return drawables_.size();
+// repeated .TSP.Reference owned_drawables = 7;
+inline int SlideArchive::owned_drawables_size() const {
+  return owned_drawables_.size();
 }
-inline void SlideArchive::clear_drawables() {
-  drawables_.Clear();
+inline void SlideArchive::clear_owned_drawables() {
+  owned_drawables_.Clear();
 }
-inline const ::TSP::Reference& SlideArchive::drawables(int index) const {
-  return drawables_.Get(index);
+inline const ::TSP::Reference& SlideArchive::owned_drawables(int index) const {
+  return owned_drawables_.Get(index);
 }
-inline ::TSP::Reference* SlideArchive::mutable_drawables(int index) {
-  return drawables_.Mutable(index);
+inline ::TSP::Reference* SlideArchive::mutable_owned_drawables(int index) {
+  return owned_drawables_.Mutable(index);
 }
-inline ::TSP::Reference* SlideArchive::add_drawables() {
-  return drawables_.Add();
+inline ::TSP::Reference* SlideArchive::add_owned_drawables() {
+  return owned_drawables_.Add();
 }
 inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
-SlideArchive::drawables() const {
-  return drawables_;
+SlideArchive::owned_drawables() const {
+  return owned_drawables_;
 }
 inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
-SlideArchive::mutable_drawables() {
-  return &drawables_;
+SlideArchive::mutable_owned_drawables() {
+  return &owned_drawables_;
+}
+
+// repeated .TSP.Reference drawables_z_order = 42;
+inline int SlideArchive::drawables_z_order_size() const {
+  return drawables_z_order_.size();
+}
+inline void SlideArchive::clear_drawables_z_order() {
+  drawables_z_order_.Clear();
+}
+inline const ::TSP::Reference& SlideArchive::drawables_z_order(int index) const {
+  return drawables_z_order_.Get(index);
+}
+inline ::TSP::Reference* SlideArchive::mutable_drawables_z_order(int index) {
+  return drawables_z_order_.Mutable(index);
+}
+inline ::TSP::Reference* SlideArchive::add_drawables_z_order() {
+  return drawables_z_order_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+SlideArchive::drawables_z_order() const {
+  return drawables_z_order_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+SlideArchive::mutable_drawables_z_order() {
+  return &drawables_z_order_;
 }
 
 // repeated .KN.SlideArchive.SageTagMapEntry sage_tag_to_info_map = 28;
@@ -8962,13 +9191,13 @@ SlideArchive::mutable_sage_tag_to_info_map() {
 
 // optional string name = 10;
 inline bool SlideArchive::has_name() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
 inline void SlideArchive::set_has_name() {
-  _has_bits_[0] |= 0x00000400u;
+  _has_bits_[0] |= 0x00000800u;
 }
 inline void SlideArchive::clear_has_name() {
-  _has_bits_[0] &= ~0x00000400u;
+  _has_bits_[0] &= ~0x00000800u;
 }
 inline void SlideArchive::clear_name() {
   if (name_ != &::google::protobuf::internal::kEmptyString) {
@@ -9032,13 +9261,13 @@ inline void SlideArchive::set_allocated_name(::std::string* name) {
 
 // optional .TSD.GeometryArchive titlePlaceholderGeometry = 11;
 inline bool SlideArchive::has_titleplaceholdergeometry() const {
-  return (_has_bits_[0] & 0x00000800u) != 0;
+  return (_has_bits_[0] & 0x00001000u) != 0;
 }
 inline void SlideArchive::set_has_titleplaceholdergeometry() {
-  _has_bits_[0] |= 0x00000800u;
+  _has_bits_[0] |= 0x00001000u;
 }
 inline void SlideArchive::clear_has_titleplaceholdergeometry() {
-  _has_bits_[0] &= ~0x00000800u;
+  _has_bits_[0] &= ~0x00001000u;
 }
 inline void SlideArchive::clear_titleplaceholdergeometry() {
   if (titleplaceholdergeometry_ != NULL) titleplaceholdergeometry_->::TSD::GeometryArchive::Clear();
@@ -9070,13 +9299,13 @@ inline void SlideArchive::set_allocated_titleplaceholdergeometry(::TSD::Geometry
 
 // optional uint32 titlePlaceholderShapeStyleIndex = 12;
 inline bool SlideArchive::has_titleplaceholdershapestyleindex() const {
-  return (_has_bits_[0] & 0x00001000u) != 0;
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
 inline void SlideArchive::set_has_titleplaceholdershapestyleindex() {
-  _has_bits_[0] |= 0x00001000u;
+  _has_bits_[0] |= 0x00002000u;
 }
 inline void SlideArchive::clear_has_titleplaceholdershapestyleindex() {
-  _has_bits_[0] &= ~0x00001000u;
+  _has_bits_[0] &= ~0x00002000u;
 }
 inline void SlideArchive::clear_titleplaceholdershapestyleindex() {
   titleplaceholdershapestyleindex_ = 0u;
@@ -9092,13 +9321,13 @@ inline void SlideArchive::set_titleplaceholdershapestyleindex(::google::protobuf
 
 // optional uint32 titlePlaceholderTextStyleIndex = 13;
 inline bool SlideArchive::has_titleplaceholdertextstyleindex() const {
-  return (_has_bits_[0] & 0x00002000u) != 0;
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
 inline void SlideArchive::set_has_titleplaceholdertextstyleindex() {
-  _has_bits_[0] |= 0x00002000u;
+  _has_bits_[0] |= 0x00004000u;
 }
 inline void SlideArchive::clear_has_titleplaceholdertextstyleindex() {
-  _has_bits_[0] &= ~0x00002000u;
+  _has_bits_[0] &= ~0x00004000u;
 }
 inline void SlideArchive::clear_titleplaceholdertextstyleindex() {
   titleplaceholdertextstyleindex_ = 0u;
@@ -9114,13 +9343,13 @@ inline void SlideArchive::set_titleplaceholdertextstyleindex(::google::protobuf:
 
 // optional .TSWP.ShapeStylePropertiesArchive titleLayoutProperties = 24;
 inline bool SlideArchive::has_titlelayoutproperties() const {
-  return (_has_bits_[0] & 0x00004000u) != 0;
+  return (_has_bits_[0] & 0x00008000u) != 0;
 }
 inline void SlideArchive::set_has_titlelayoutproperties() {
-  _has_bits_[0] |= 0x00004000u;
+  _has_bits_[0] |= 0x00008000u;
 }
 inline void SlideArchive::clear_has_titlelayoutproperties() {
-  _has_bits_[0] &= ~0x00004000u;
+  _has_bits_[0] &= ~0x00008000u;
 }
 inline void SlideArchive::clear_titlelayoutproperties() {
   if (titlelayoutproperties_ != NULL) titlelayoutproperties_->::TSWP::ShapeStylePropertiesArchive::Clear();
@@ -9152,13 +9381,13 @@ inline void SlideArchive::set_allocated_titlelayoutproperties(::TSWP::ShapeStyle
 
 // optional .TSD.GeometryArchive bodyPlaceholderGeometry = 14;
 inline bool SlideArchive::has_bodyplaceholdergeometry() const {
-  return (_has_bits_[0] & 0x00008000u) != 0;
+  return (_has_bits_[0] & 0x00010000u) != 0;
 }
 inline void SlideArchive::set_has_bodyplaceholdergeometry() {
-  _has_bits_[0] |= 0x00008000u;
+  _has_bits_[0] |= 0x00010000u;
 }
 inline void SlideArchive::clear_has_bodyplaceholdergeometry() {
-  _has_bits_[0] &= ~0x00008000u;
+  _has_bits_[0] &= ~0x00010000u;
 }
 inline void SlideArchive::clear_bodyplaceholdergeometry() {
   if (bodyplaceholdergeometry_ != NULL) bodyplaceholdergeometry_->::TSD::GeometryArchive::Clear();
@@ -9190,13 +9419,13 @@ inline void SlideArchive::set_allocated_bodyplaceholdergeometry(::TSD::GeometryA
 
 // optional uint32 bodyPlaceholderShapeStyleIndex = 15;
 inline bool SlideArchive::has_bodyplaceholdershapestyleindex() const {
-  return (_has_bits_[0] & 0x00010000u) != 0;
+  return (_has_bits_[0] & 0x00020000u) != 0;
 }
 inline void SlideArchive::set_has_bodyplaceholdershapestyleindex() {
-  _has_bits_[0] |= 0x00010000u;
+  _has_bits_[0] |= 0x00020000u;
 }
 inline void SlideArchive::clear_has_bodyplaceholdershapestyleindex() {
-  _has_bits_[0] &= ~0x00010000u;
+  _has_bits_[0] &= ~0x00020000u;
 }
 inline void SlideArchive::clear_bodyplaceholdershapestyleindex() {
   bodyplaceholdershapestyleindex_ = 0u;
@@ -9212,13 +9441,13 @@ inline void SlideArchive::set_bodyplaceholdershapestyleindex(::google::protobuf:
 
 // optional uint32 bodyPlaceholderTextStyleIndex = 16;
 inline bool SlideArchive::has_bodyplaceholdertextstyleindex() const {
-  return (_has_bits_[0] & 0x00020000u) != 0;
+  return (_has_bits_[0] & 0x00040000u) != 0;
 }
 inline void SlideArchive::set_has_bodyplaceholdertextstyleindex() {
-  _has_bits_[0] |= 0x00020000u;
+  _has_bits_[0] |= 0x00040000u;
 }
 inline void SlideArchive::clear_has_bodyplaceholdertextstyleindex() {
-  _has_bits_[0] &= ~0x00020000u;
+  _has_bits_[0] &= ~0x00040000u;
 }
 inline void SlideArchive::clear_bodyplaceholdertextstyleindex() {
   bodyplaceholdertextstyleindex_ = 0u;
@@ -9234,13 +9463,13 @@ inline void SlideArchive::set_bodyplaceholdertextstyleindex(::google::protobuf::
 
 // optional .TSWP.ShapeStylePropertiesArchive bodyLayoutProperties = 25;
 inline bool SlideArchive::has_bodylayoutproperties() const {
-  return (_has_bits_[0] & 0x00040000u) != 0;
+  return (_has_bits_[0] & 0x00080000u) != 0;
 }
 inline void SlideArchive::set_has_bodylayoutproperties() {
-  _has_bits_[0] |= 0x00040000u;
+  _has_bits_[0] |= 0x00080000u;
 }
 inline void SlideArchive::clear_has_bodylayoutproperties() {
-  _has_bits_[0] &= ~0x00040000u;
+  _has_bits_[0] &= ~0x00080000u;
 }
 inline void SlideArchive::clear_bodylayoutproperties() {
   if (bodylayoutproperties_ != NULL) bodylayoutproperties_->::TSWP::ShapeStylePropertiesArchive::Clear();
@@ -9272,13 +9501,13 @@ inline void SlideArchive::set_allocated_bodylayoutproperties(::TSWP::ShapeStyleP
 
 // optional .TSD.GeometryArchive slideNumberPlaceholderGeometry = 21;
 inline bool SlideArchive::has_slidenumberplaceholdergeometry() const {
-  return (_has_bits_[0] & 0x00080000u) != 0;
+  return (_has_bits_[0] & 0x00100000u) != 0;
 }
 inline void SlideArchive::set_has_slidenumberplaceholdergeometry() {
-  _has_bits_[0] |= 0x00080000u;
+  _has_bits_[0] |= 0x00100000u;
 }
 inline void SlideArchive::clear_has_slidenumberplaceholdergeometry() {
-  _has_bits_[0] &= ~0x00080000u;
+  _has_bits_[0] &= ~0x00100000u;
 }
 inline void SlideArchive::clear_slidenumberplaceholdergeometry() {
   if (slidenumberplaceholdergeometry_ != NULL) slidenumberplaceholdergeometry_->::TSD::GeometryArchive::Clear();
@@ -9310,13 +9539,13 @@ inline void SlideArchive::set_allocated_slidenumberplaceholdergeometry(::TSD::Ge
 
 // optional uint32 slideNumberPlaceholderShapeStyleIndex = 22;
 inline bool SlideArchive::has_slidenumberplaceholdershapestyleindex() const {
-  return (_has_bits_[0] & 0x00100000u) != 0;
+  return (_has_bits_[0] & 0x00200000u) != 0;
 }
 inline void SlideArchive::set_has_slidenumberplaceholdershapestyleindex() {
-  _has_bits_[0] |= 0x00100000u;
+  _has_bits_[0] |= 0x00200000u;
 }
 inline void SlideArchive::clear_has_slidenumberplaceholdershapestyleindex() {
-  _has_bits_[0] &= ~0x00100000u;
+  _has_bits_[0] &= ~0x00200000u;
 }
 inline void SlideArchive::clear_slidenumberplaceholdershapestyleindex() {
   slidenumberplaceholdershapestyleindex_ = 0u;
@@ -9332,13 +9561,13 @@ inline void SlideArchive::set_slidenumberplaceholdershapestyleindex(::google::pr
 
 // optional uint32 slideNumberPlaceholderTextStyleIndex = 23;
 inline bool SlideArchive::has_slidenumberplaceholdertextstyleindex() const {
-  return (_has_bits_[0] & 0x00200000u) != 0;
+  return (_has_bits_[0] & 0x00400000u) != 0;
 }
 inline void SlideArchive::set_has_slidenumberplaceholdertextstyleindex() {
-  _has_bits_[0] |= 0x00200000u;
+  _has_bits_[0] |= 0x00400000u;
 }
 inline void SlideArchive::clear_has_slidenumberplaceholdertextstyleindex() {
-  _has_bits_[0] &= ~0x00200000u;
+  _has_bits_[0] &= ~0x00400000u;
 }
 inline void SlideArchive::clear_slidenumberplaceholdertextstyleindex() {
   slidenumberplaceholdertextstyleindex_ = 0u;
@@ -9354,13 +9583,13 @@ inline void SlideArchive::set_slidenumberplaceholdertextstyleindex(::google::pro
 
 // optional .TSWP.ShapeStylePropertiesArchive slideNumberLayoutProperties = 26;
 inline bool SlideArchive::has_slidenumberlayoutproperties() const {
-  return (_has_bits_[0] & 0x00400000u) != 0;
+  return (_has_bits_[0] & 0x00800000u) != 0;
 }
 inline void SlideArchive::set_has_slidenumberlayoutproperties() {
-  _has_bits_[0] |= 0x00400000u;
+  _has_bits_[0] |= 0x00800000u;
 }
 inline void SlideArchive::clear_has_slidenumberlayoutproperties() {
-  _has_bits_[0] &= ~0x00400000u;
+  _has_bits_[0] &= ~0x00800000u;
 }
 inline void SlideArchive::clear_slidenumberlayoutproperties() {
   if (slidenumberlayoutproperties_ != NULL) slidenumberlayoutproperties_->::TSWP::ShapeStylePropertiesArchive::Clear();
@@ -9392,13 +9621,13 @@ inline void SlideArchive::set_allocated_slidenumberlayoutproperties(::TSWP::Shap
 
 // optional .TSP.Reference classicStylesheetRecord = 29;
 inline bool SlideArchive::has_classicstylesheetrecord() const {
-  return (_has_bits_[0] & 0x00800000u) != 0;
+  return (_has_bits_[0] & 0x01000000u) != 0;
 }
 inline void SlideArchive::set_has_classicstylesheetrecord() {
-  _has_bits_[0] |= 0x00800000u;
+  _has_bits_[0] |= 0x01000000u;
 }
 inline void SlideArchive::clear_has_classicstylesheetrecord() {
-  _has_bits_[0] &= ~0x00800000u;
+  _has_bits_[0] &= ~0x01000000u;
 }
 inline void SlideArchive::clear_classicstylesheetrecord() {
   if (classicstylesheetrecord_ != NULL) classicstylesheetrecord_->::TSP::Reference::Clear();
@@ -9480,13 +9709,13 @@ SlideArchive::mutable_bodyliststyles() {
 
 // optional string thumbnailTextForTitlePlaceholder = 37;
 inline bool SlideArchive::has_thumbnailtextfortitleplaceholder() const {
-  return (_has_bits_[0] & 0x04000000u) != 0;
+  return (_has_bits_[0] & 0x08000000u) != 0;
 }
 inline void SlideArchive::set_has_thumbnailtextfortitleplaceholder() {
-  _has_bits_[0] |= 0x04000000u;
+  _has_bits_[0] |= 0x08000000u;
 }
 inline void SlideArchive::clear_has_thumbnailtextfortitleplaceholder() {
-  _has_bits_[0] &= ~0x04000000u;
+  _has_bits_[0] &= ~0x08000000u;
 }
 inline void SlideArchive::clear_thumbnailtextfortitleplaceholder() {
   if (thumbnailtextfortitleplaceholder_ != &::google::protobuf::internal::kEmptyString) {
@@ -9550,13 +9779,13 @@ inline void SlideArchive::set_allocated_thumbnailtextfortitleplaceholder(::std::
 
 // optional string thumbnailTextForBodyPlaceholder = 38;
 inline bool SlideArchive::has_thumbnailtextforbodyplaceholder() const {
-  return (_has_bits_[0] & 0x08000000u) != 0;
+  return (_has_bits_[0] & 0x10000000u) != 0;
 }
 inline void SlideArchive::set_has_thumbnailtextforbodyplaceholder() {
-  _has_bits_[0] |= 0x08000000u;
+  _has_bits_[0] |= 0x10000000u;
 }
 inline void SlideArchive::clear_has_thumbnailtextforbodyplaceholder() {
-  _has_bits_[0] &= ~0x08000000u;
+  _has_bits_[0] &= ~0x10000000u;
 }
 inline void SlideArchive::clear_thumbnailtextforbodyplaceholder() {
   if (thumbnailtextforbodyplaceholder_ != &::google::protobuf::internal::kEmptyString) {
@@ -9618,15 +9847,37 @@ inline void SlideArchive::set_allocated_thumbnailtextforbodyplaceholder(::std::s
   }
 }
 
+// optional bool slideObjectsLayerWithMaster = 41 [default = false];
+inline bool SlideArchive::has_slideobjectslayerwithmaster() const {
+  return (_has_bits_[0] & 0x20000000u) != 0;
+}
+inline void SlideArchive::set_has_slideobjectslayerwithmaster() {
+  _has_bits_[0] |= 0x20000000u;
+}
+inline void SlideArchive::clear_has_slideobjectslayerwithmaster() {
+  _has_bits_[0] &= ~0x20000000u;
+}
+inline void SlideArchive::clear_slideobjectslayerwithmaster() {
+  slideobjectslayerwithmaster_ = false;
+  clear_has_slideobjectslayerwithmaster();
+}
+inline bool SlideArchive::slideobjectslayerwithmaster() const {
+  return slideobjectslayerwithmaster_;
+}
+inline void SlideArchive::set_slideobjectslayerwithmaster(bool value) {
+  set_has_slideobjectslayerwithmaster();
+  slideobjectslayerwithmaster_ = value;
+}
+
 // optional .TSP.Reference master = 17;
 inline bool SlideArchive::has_master() const {
-  return (_has_bits_[0] & 0x10000000u) != 0;
+  return (_has_bits_[0] & 0x40000000u) != 0;
 }
 inline void SlideArchive::set_has_master() {
-  _has_bits_[0] |= 0x10000000u;
+  _has_bits_[0] |= 0x40000000u;
 }
 inline void SlideArchive::clear_has_master() {
-  _has_bits_[0] &= ~0x10000000u;
+  _has_bits_[0] &= ~0x40000000u;
 }
 inline void SlideArchive::clear_master() {
   if (master_ != NULL) master_->::TSP::Reference::Clear();
@@ -9683,13 +9934,13 @@ SlideArchive::mutable_staticguides() {
 
 // optional .TSP.Reference userDefinedGuideStorage = 36;
 inline bool SlideArchive::has_userdefinedguidestorage() const {
-  return (_has_bits_[0] & 0x40000000u) != 0;
+  return (_has_bits_[1] & 0x00000001u) != 0;
 }
 inline void SlideArchive::set_has_userdefinedguidestorage() {
-  _has_bits_[0] |= 0x40000000u;
+  _has_bits_[1] |= 0x00000001u;
 }
 inline void SlideArchive::clear_has_userdefinedguidestorage() {
-  _has_bits_[0] &= ~0x40000000u;
+  _has_bits_[1] &= ~0x00000001u;
 }
 inline void SlideArchive::clear_userdefinedguidestorage() {
   if (userdefinedguidestorage_ != NULL) userdefinedguidestorage_->::TSP::Reference::Clear();
@@ -9721,13 +9972,13 @@ inline void SlideArchive::set_allocated_userdefinedguidestorage(::TSP::Reference
 
 // required bool inDocument = 19;
 inline bool SlideArchive::has_indocument() const {
-  return (_has_bits_[0] & 0x80000000u) != 0;
+  return (_has_bits_[1] & 0x00000002u) != 0;
 }
 inline void SlideArchive::set_has_indocument() {
-  _has_bits_[0] |= 0x80000000u;
+  _has_bits_[1] |= 0x00000002u;
 }
 inline void SlideArchive::clear_has_indocument() {
-  _has_bits_[0] &= ~0x80000000u;
+  _has_bits_[1] &= ~0x00000002u;
 }
 inline void SlideArchive::clear_indocument() {
   indocument_ = false;
@@ -9743,13 +9994,13 @@ inline void SlideArchive::set_indocument(bool value) {
 
 // optional .TSP.Reference note = 27;
 inline bool SlideArchive::has_note() const {
-  return (_has_bits_[1] & 0x00000001u) != 0;
+  return (_has_bits_[1] & 0x00000004u) != 0;
 }
 inline void SlideArchive::set_has_note() {
-  _has_bits_[1] |= 0x00000001u;
+  _has_bits_[1] |= 0x00000004u;
 }
 inline void SlideArchive::clear_has_note() {
-  _has_bits_[1] &= ~0x00000001u;
+  _has_bits_[1] &= ~0x00000004u;
 }
 inline void SlideArchive::clear_note() {
   if (note_ != NULL) note_->::TSP::Reference::Clear();
@@ -9781,13 +10032,13 @@ inline void SlideArchive::set_allocated_note(::TSP::Reference* note) {
 
 // optional .TSP.Reference info_using_object_placeholder_geometry = 39;
 inline bool SlideArchive::has_info_using_object_placeholder_geometry() const {
-  return (_has_bits_[1] & 0x00000002u) != 0;
+  return (_has_bits_[1] & 0x00000008u) != 0;
 }
 inline void SlideArchive::set_has_info_using_object_placeholder_geometry() {
-  _has_bits_[1] |= 0x00000002u;
+  _has_bits_[1] |= 0x00000008u;
 }
 inline void SlideArchive::clear_has_info_using_object_placeholder_geometry() {
-  _has_bits_[1] &= ~0x00000002u;
+  _has_bits_[1] &= ~0x00000008u;
 }
 inline void SlideArchive::clear_info_using_object_placeholder_geometry() {
   if (info_using_object_placeholder_geometry_ != NULL) info_using_object_placeholder_geometry_->::TSP::Reference::Clear();
@@ -9819,13 +10070,13 @@ inline void SlideArchive::set_allocated_info_using_object_placeholder_geometry(:
 
 // optional bool info_using_object_placeholder_geometry_matches_object_placeholder_geometry = 40;
 inline bool SlideArchive::has_info_using_object_placeholder_geometry_matches_object_placeholder_geometry() const {
-  return (_has_bits_[1] & 0x00000004u) != 0;
+  return (_has_bits_[1] & 0x00000010u) != 0;
 }
 inline void SlideArchive::set_has_info_using_object_placeholder_geometry_matches_object_placeholder_geometry() {
-  _has_bits_[1] |= 0x00000004u;
+  _has_bits_[1] |= 0x00000010u;
 }
 inline void SlideArchive::clear_has_info_using_object_placeholder_geometry_matches_object_placeholder_geometry() {
-  _has_bits_[1] &= ~0x00000004u;
+  _has_bits_[1] &= ~0x00000010u;
 }
 inline void SlideArchive::clear_info_using_object_placeholder_geometry_matches_object_placeholder_geometry() {
   info_using_object_placeholder_geometry_matches_object_placeholder_geometry_ = false;
@@ -9841,13 +10092,13 @@ inline void SlideArchive::set_info_using_object_placeholder_geometry_matches_obj
 
 // optional bool deprecated_objectPlaceholderVisibleForExport = 34;
 inline bool SlideArchive::has_deprecated_objectplaceholdervisibleforexport() const {
-  return (_has_bits_[1] & 0x00000008u) != 0;
+  return (_has_bits_[1] & 0x00000020u) != 0;
 }
 inline void SlideArchive::set_has_deprecated_objectplaceholdervisibleforexport() {
-  _has_bits_[1] |= 0x00000008u;
+  _has_bits_[1] |= 0x00000020u;
 }
 inline void SlideArchive::clear_has_deprecated_objectplaceholdervisibleforexport() {
-  _has_bits_[1] &= ~0x00000008u;
+  _has_bits_[1] &= ~0x00000020u;
 }
 inline void SlideArchive::clear_deprecated_objectplaceholdervisibleforexport() {
   deprecated_objectplaceholdervisibleforexport_ = false;
@@ -10088,7 +10339,7 @@ inline void SlideNodeArchive::set_hasbodyinoutlineview(bool value) {
   hasbodyinoutlineview_ = value;
 }
 
-// required bool hasBuilds = 6;
+// required bool hasBuilds = 6 [deprecated = true];
 inline bool SlideNodeArchive::has_hasbuilds() const {
   return (_has_bits_[0] & 0x00000200u) != 0;
 }
@@ -10360,15 +10611,37 @@ inline void SlideNodeArchive::set_eventcount(::google::protobuf::uint32 value) {
   eventcount_ = value;
 }
 
+// optional bool has_explicit_builds = 20;
+inline bool SlideNodeArchive::has_has_explicit_builds() const {
+  return (_has_bits_[0] & 0x00020000u) != 0;
+}
+inline void SlideNodeArchive::set_has_has_explicit_builds() {
+  _has_bits_[0] |= 0x00020000u;
+}
+inline void SlideNodeArchive::clear_has_has_explicit_builds() {
+  _has_bits_[0] &= ~0x00020000u;
+}
+inline void SlideNodeArchive::clear_has_explicit_builds() {
+  has_explicit_builds_ = false;
+  clear_has_has_explicit_builds();
+}
+inline bool SlideNodeArchive::has_explicit_builds() const {
+  return has_explicit_builds_;
+}
+inline void SlideNodeArchive::set_has_explicit_builds(bool value) {
+  set_has_has_explicit_builds();
+  has_explicit_builds_ = value;
+}
+
 // optional .TSP.Reference database_thumbnail = 3;
 inline bool SlideNodeArchive::has_database_thumbnail() const {
-  return (_has_bits_[0] & 0x00020000u) != 0;
+  return (_has_bits_[0] & 0x00040000u) != 0;
 }
 inline void SlideNodeArchive::set_has_database_thumbnail() {
-  _has_bits_[0] |= 0x00020000u;
+  _has_bits_[0] |= 0x00040000u;
 }
 inline void SlideNodeArchive::clear_has_database_thumbnail() {
-  _has_bits_[0] &= ~0x00020000u;
+  _has_bits_[0] &= ~0x00040000u;
 }
 inline void SlideNodeArchive::clear_database_thumbnail() {
   if (database_thumbnail_ != NULL) database_thumbnail_->::TSP::Reference::Clear();
@@ -11246,6 +11519,88 @@ inline void UIStateArchive::set_allocated_desktop_main_content_size(::TSP::Size*
   }
 }
 
+// optional float desktop_presenter_notes_view_height = 25;
+inline bool UIStateArchive::has_desktop_presenter_notes_view_height() const {
+  return (_has_bits_[0] & 0x01000000u) != 0;
+}
+inline void UIStateArchive::set_has_desktop_presenter_notes_view_height() {
+  _has_bits_[0] |= 0x01000000u;
+}
+inline void UIStateArchive::clear_has_desktop_presenter_notes_view_height() {
+  _has_bits_[0] &= ~0x01000000u;
+}
+inline void UIStateArchive::clear_desktop_presenter_notes_view_height() {
+  desktop_presenter_notes_view_height_ = 0;
+  clear_has_desktop_presenter_notes_view_height();
+}
+inline float UIStateArchive::desktop_presenter_notes_view_height() const {
+  return desktop_presenter_notes_view_height_;
+}
+inline void UIStateArchive::set_desktop_presenter_notes_view_height(float value) {
+  set_has_desktop_presenter_notes_view_height();
+  desktop_presenter_notes_view_height_ = value;
+}
+
+// optional .TSP.Point desktop_main_window_origin = 26;
+inline bool UIStateArchive::has_desktop_main_window_origin() const {
+  return (_has_bits_[0] & 0x02000000u) != 0;
+}
+inline void UIStateArchive::set_has_desktop_main_window_origin() {
+  _has_bits_[0] |= 0x02000000u;
+}
+inline void UIStateArchive::clear_has_desktop_main_window_origin() {
+  _has_bits_[0] &= ~0x02000000u;
+}
+inline void UIStateArchive::clear_desktop_main_window_origin() {
+  if (desktop_main_window_origin_ != NULL) desktop_main_window_origin_->::TSP::Point::Clear();
+  clear_has_desktop_main_window_origin();
+}
+inline const ::TSP::Point& UIStateArchive::desktop_main_window_origin() const {
+  return desktop_main_window_origin_ != NULL ? *desktop_main_window_origin_ : *default_instance_->desktop_main_window_origin_;
+}
+inline ::TSP::Point* UIStateArchive::mutable_desktop_main_window_origin() {
+  set_has_desktop_main_window_origin();
+  if (desktop_main_window_origin_ == NULL) desktop_main_window_origin_ = new ::TSP::Point;
+  return desktop_main_window_origin_;
+}
+inline ::TSP::Point* UIStateArchive::release_desktop_main_window_origin() {
+  clear_has_desktop_main_window_origin();
+  ::TSP::Point* temp = desktop_main_window_origin_;
+  desktop_main_window_origin_ = NULL;
+  return temp;
+}
+inline void UIStateArchive::set_allocated_desktop_main_window_origin(::TSP::Point* desktop_main_window_origin) {
+  delete desktop_main_window_origin_;
+  desktop_main_window_origin_ = desktop_main_window_origin;
+  if (desktop_main_window_origin) {
+    set_has_desktop_main_window_origin();
+  } else {
+    clear_has_desktop_main_window_origin();
+  }
+}
+
+// optional bool light_table_hides_skipped_slides = 27;
+inline bool UIStateArchive::has_light_table_hides_skipped_slides() const {
+  return (_has_bits_[0] & 0x04000000u) != 0;
+}
+inline void UIStateArchive::set_has_light_table_hides_skipped_slides() {
+  _has_bits_[0] |= 0x04000000u;
+}
+inline void UIStateArchive::clear_has_light_table_hides_skipped_slides() {
+  _has_bits_[0] &= ~0x04000000u;
+}
+inline void UIStateArchive::clear_light_table_hides_skipped_slides() {
+  light_table_hides_skipped_slides_ = false;
+  clear_has_light_table_hides_skipped_slides();
+}
+inline bool UIStateArchive::light_table_hides_skipped_slides() const {
+  return light_table_hides_skipped_slides_;
+}
+inline void UIStateArchive::set_light_table_hides_skipped_slides(bool value) {
+  set_has_light_table_hides_skipped_slides();
+  light_table_hides_skipped_slides_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // CanvasSelectionArchive
@@ -11525,6 +11880,66 @@ inline void ThemeArchive::set_allocated_defaultmasterslidenode(::TSP::Reference*
   }
 }
 
+// optional .TSP.Reference default_master_slide_node_reference = 6;
+inline bool ThemeArchive::has_default_master_slide_node_reference() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void ThemeArchive::set_has_default_master_slide_node_reference() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void ThemeArchive::clear_has_default_master_slide_node_reference() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void ThemeArchive::clear_default_master_slide_node_reference() {
+  if (default_master_slide_node_reference_ != NULL) default_master_slide_node_reference_->::TSP::Reference::Clear();
+  clear_has_default_master_slide_node_reference();
+}
+inline const ::TSP::Reference& ThemeArchive::default_master_slide_node_reference() const {
+  return default_master_slide_node_reference_ != NULL ? *default_master_slide_node_reference_ : *default_instance_->default_master_slide_node_reference_;
+}
+inline ::TSP::Reference* ThemeArchive::mutable_default_master_slide_node_reference() {
+  set_has_default_master_slide_node_reference();
+  if (default_master_slide_node_reference_ == NULL) default_master_slide_node_reference_ = new ::TSP::Reference;
+  return default_master_slide_node_reference_;
+}
+inline ::TSP::Reference* ThemeArchive::release_default_master_slide_node_reference() {
+  clear_has_default_master_slide_node_reference();
+  ::TSP::Reference* temp = default_master_slide_node_reference_;
+  default_master_slide_node_reference_ = NULL;
+  return temp;
+}
+inline void ThemeArchive::set_allocated_default_master_slide_node_reference(::TSP::Reference* default_master_slide_node_reference) {
+  delete default_master_slide_node_reference_;
+  default_master_slide_node_reference_ = default_master_slide_node_reference;
+  if (default_master_slide_node_reference) {
+    set_has_default_master_slide_node_reference();
+  } else {
+    clear_has_default_master_slide_node_reference();
+  }
+}
+
+// optional bool default_master_slide_node_is_our_best_guess = 7;
+inline bool ThemeArchive::has_default_master_slide_node_is_our_best_guess() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void ThemeArchive::set_has_default_master_slide_node_is_our_best_guess() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void ThemeArchive::clear_has_default_master_slide_node_is_our_best_guess() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void ThemeArchive::clear_default_master_slide_node_is_our_best_guess() {
+  default_master_slide_node_is_our_best_guess_ = false;
+  clear_has_default_master_slide_node_is_our_best_guess();
+}
+inline bool ThemeArchive::default_master_slide_node_is_our_best_guess() const {
+  return default_master_slide_node_is_our_best_guess_;
+}
+inline void ThemeArchive::set_default_master_slide_node_is_our_best_guess(bool value) {
+  set_has_default_master_slide_node_is_our_best_guess();
+  default_master_slide_node_is_our_best_guess_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // SlideTreeArchive
@@ -12528,15 +12943,40 @@ PasteboardNativeStorageArchive::mutable_slidenodes() {
   return &slidenodes_;
 }
 
+// repeated .TSP.Reference masterSlideNodes = 9;
+inline int PasteboardNativeStorageArchive::masterslidenodes_size() const {
+  return masterslidenodes_.size();
+}
+inline void PasteboardNativeStorageArchive::clear_masterslidenodes() {
+  masterslidenodes_.Clear();
+}
+inline const ::TSP::Reference& PasteboardNativeStorageArchive::masterslidenodes(int index) const {
+  return masterslidenodes_.Get(index);
+}
+inline ::TSP::Reference* PasteboardNativeStorageArchive::mutable_masterslidenodes(int index) {
+  return masterslidenodes_.Mutable(index);
+}
+inline ::TSP::Reference* PasteboardNativeStorageArchive::add_masterslidenodes() {
+  return masterslidenodes_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+PasteboardNativeStorageArchive::masterslidenodes() const {
+  return masterslidenodes_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+PasteboardNativeStorageArchive::mutable_masterslidenodes() {
+  return &masterslidenodes_;
+}
+
 // optional .TSP.Size originalShowSize = 5;
 inline bool PasteboardNativeStorageArchive::has_originalshowsize() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
 inline void PasteboardNativeStorageArchive::set_has_originalshowsize() {
-  _has_bits_[0] |= 0x00000010u;
+  _has_bits_[0] |= 0x00000020u;
 }
 inline void PasteboardNativeStorageArchive::clear_has_originalshowsize() {
-  _has_bits_[0] &= ~0x00000010u;
+  _has_bits_[0] &= ~0x00000020u;
 }
 inline void PasteboardNativeStorageArchive::clear_originalshowsize() {
   if (originalshowsize_ != NULL) originalshowsize_->::TSP::Size::Clear();
@@ -12591,6 +13031,101 @@ PasteboardNativeStorageArchive::mutable_titleranges() {
   return &titleranges_;
 }
 
+// repeated .TSD.GeometryArchive geometries_in_root = 7;
+inline int PasteboardNativeStorageArchive::geometries_in_root_size() const {
+  return geometries_in_root_.size();
+}
+inline void PasteboardNativeStorageArchive::clear_geometries_in_root() {
+  geometries_in_root_.Clear();
+}
+inline const ::TSD::GeometryArchive& PasteboardNativeStorageArchive::geometries_in_root(int index) const {
+  return geometries_in_root_.Get(index);
+}
+inline ::TSD::GeometryArchive* PasteboardNativeStorageArchive::mutable_geometries_in_root(int index) {
+  return geometries_in_root_.Mutable(index);
+}
+inline ::TSD::GeometryArchive* PasteboardNativeStorageArchive::add_geometries_in_root() {
+  return geometries_in_root_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSD::GeometryArchive >&
+PasteboardNativeStorageArchive::geometries_in_root() const {
+  return geometries_in_root_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSD::GeometryArchive >*
+PasteboardNativeStorageArchive::mutable_geometries_in_root() {
+  return &geometries_in_root_;
+}
+
+// optional string slide_node_unique_identifier = 8;
+inline bool PasteboardNativeStorageArchive::has_slide_node_unique_identifier() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void PasteboardNativeStorageArchive::set_has_slide_node_unique_identifier() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void PasteboardNativeStorageArchive::clear_has_slide_node_unique_identifier() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void PasteboardNativeStorageArchive::clear_slide_node_unique_identifier() {
+  if (slide_node_unique_identifier_ != &::google::protobuf::internal::kEmptyString) {
+    slide_node_unique_identifier_->clear();
+  }
+  clear_has_slide_node_unique_identifier();
+}
+inline const ::std::string& PasteboardNativeStorageArchive::slide_node_unique_identifier() const {
+  return *slide_node_unique_identifier_;
+}
+inline void PasteboardNativeStorageArchive::set_slide_node_unique_identifier(const ::std::string& value) {
+  set_has_slide_node_unique_identifier();
+  if (slide_node_unique_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    slide_node_unique_identifier_ = new ::std::string;
+  }
+  slide_node_unique_identifier_->assign(value);
+}
+inline void PasteboardNativeStorageArchive::set_slide_node_unique_identifier(const char* value) {
+  set_has_slide_node_unique_identifier();
+  if (slide_node_unique_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    slide_node_unique_identifier_ = new ::std::string;
+  }
+  slide_node_unique_identifier_->assign(value);
+}
+inline void PasteboardNativeStorageArchive::set_slide_node_unique_identifier(const char* value, size_t size) {
+  set_has_slide_node_unique_identifier();
+  if (slide_node_unique_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    slide_node_unique_identifier_ = new ::std::string;
+  }
+  slide_node_unique_identifier_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* PasteboardNativeStorageArchive::mutable_slide_node_unique_identifier() {
+  set_has_slide_node_unique_identifier();
+  if (slide_node_unique_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    slide_node_unique_identifier_ = new ::std::string;
+  }
+  return slide_node_unique_identifier_;
+}
+inline ::std::string* PasteboardNativeStorageArchive::release_slide_node_unique_identifier() {
+  clear_has_slide_node_unique_identifier();
+  if (slide_node_unique_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = slide_node_unique_identifier_;
+    slide_node_unique_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void PasteboardNativeStorageArchive::set_allocated_slide_node_unique_identifier(::std::string* slide_node_unique_identifier) {
+  if (slide_node_unique_identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete slide_node_unique_identifier_;
+  }
+  if (slide_node_unique_identifier) {
+    set_has_slide_node_unique_identifier();
+    slide_node_unique_identifier_ = slide_node_unique_identifier;
+  } else {
+    clear_has_slide_node_unique_identifier();
+    slide_node_unique_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
 // -------------------------------------------------------------------
 
 // MasterChangeBlobArchive
@@ -13366,7 +13901,7 @@ inline void RecordingNavigationEventArchive::set_animation_phase(::KN::Recording
 
 // RecordingLaserEventArchive
 
-// optional .TSP.Point unscaled_location = 1;
+// optional .TSP.Point unscaled_location = 1 [deprecated = true];
 inline bool RecordingLaserEventArchive::has_unscaled_location() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
@@ -13404,6 +13939,44 @@ inline void RecordingLaserEventArchive::set_allocated_unscaled_location(::TSP::P
   }
 }
 
+// optional .TSP.Point unit_location = 2;
+inline bool RecordingLaserEventArchive::has_unit_location() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void RecordingLaserEventArchive::set_has_unit_location() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void RecordingLaserEventArchive::clear_has_unit_location() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void RecordingLaserEventArchive::clear_unit_location() {
+  if (unit_location_ != NULL) unit_location_->::TSP::Point::Clear();
+  clear_has_unit_location();
+}
+inline const ::TSP::Point& RecordingLaserEventArchive::unit_location() const {
+  return unit_location_ != NULL ? *unit_location_ : *default_instance_->unit_location_;
+}
+inline ::TSP::Point* RecordingLaserEventArchive::mutable_unit_location() {
+  set_has_unit_location();
+  if (unit_location_ == NULL) unit_location_ = new ::TSP::Point;
+  return unit_location_;
+}
+inline ::TSP::Point* RecordingLaserEventArchive::release_unit_location() {
+  clear_has_unit_location();
+  ::TSP::Point* temp = unit_location_;
+  unit_location_ = NULL;
+  return temp;
+}
+inline void RecordingLaserEventArchive::set_allocated_unit_location(::TSP::Point* unit_location) {
+  delete unit_location_;
+  unit_location_ = unit_location;
+  if (unit_location) {
+    set_has_unit_location();
+  } else {
+    clear_has_unit_location();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // RecordingPauseEventArchive
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.cc
index 1b017fb..bde6693 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.cc
@@ -138,6 +138,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandMasterSetBodyStylesArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandMasterSetBodyStylesArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandMasterSetSlideObjectsLayerWithMasterArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandMasterSetSlideObjectsLayerWithMasterArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandSlideApplyThemeArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandSlideApplyThemeArchive_reflection_ = NULL;
@@ -159,6 +162,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandSoundtrackSetValue_PropertyValue_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandSoundtrackSetValue_PropertyValue_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandSlideUpdateMasterDrawables_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandSlideUpdateMasterDrawables_reflection_ = NULL;
 const ::google::protobuf::Descriptor* SlideCollectionCommandSelectionBehaviorArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   SlideCollectionCommandSelectionBehaviorArchive_reflection_ = NULL;
@@ -597,12 +603,13 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandInsertMasterArchive));
   CommandRemoveMasterArchive_descriptor_ = file->message_type(19);
-  static const int CommandRemoveMasterArchive_offsets_[5] = {
+  static const int CommandRemoveMasterArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveMasterArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveMasterArchive, theme_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveMasterArchive, master_slide_node_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveMasterArchive, previous_index_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveMasterArchive, master_change_commands_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveMasterArchive, default_master_slide_node_was_replaced_),
   };
   CommandRemoveMasterArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -777,7 +784,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSlideMoveBuildChunksArchive));
   CommandBuildSetValueArchive_descriptor_ = file->message_type(29);
-  static const int CommandBuildSetValueArchive_offsets_[12] = {
+  static const int CommandBuildSetValueArchive_offsets_[14] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, build_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, property_),
@@ -790,6 +797,8 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, delayautomaticafters_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, delayautomaticwiths_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, eventtriggers_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, oldattributes_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandBuildSetValueArchive, currentattributes_),
   };
   CommandBuildSetValueArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -825,7 +834,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandBuildChunkSetValueArchive));
   CommandTransitionSetValueArchive_descriptor_ = file->message_type(31);
-  static const int CommandTransitionSetValueArchive_offsets_[11] = {
+  static const int CommandTransitionSetValueArchive_offsets_[13] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, slidenode_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, property_),
@@ -837,6 +846,8 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, directions_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, isautomatics_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, delays_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, oldattributes_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTransitionSetValueArchive, currentattributes_),
   };
   CommandTransitionSetValueArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -922,7 +933,25 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMasterSetBodyStylesArchive));
-  CommandSlideApplyThemeArchive_descriptor_ = file->message_type(36);
+  CommandMasterSetSlideObjectsLayerWithMasterArchive_descriptor_ = file->message_type(36);
+  static const int CommandMasterSetSlideObjectsLayerWithMasterArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMasterSetSlideObjectsLayerWithMasterArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMasterSetSlideObjectsLayerWithMasterArchive, master_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMasterSetSlideObjectsLayerWithMasterArchive, new_value_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMasterSetSlideObjectsLayerWithMasterArchive, old_value_),
+  };
+  CommandMasterSetSlideObjectsLayerWithMasterArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandMasterSetSlideObjectsLayerWithMasterArchive_descriptor_,
+      CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance_,
+      CommandMasterSetSlideObjectsLayerWithMasterArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMasterSetSlideObjectsLayerWithMasterArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMasterSetSlideObjectsLayerWithMasterArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandMasterSetSlideObjectsLayerWithMasterArchive));
+  CommandSlideApplyThemeArchive_descriptor_ = file->message_type(37);
   static const int CommandSlideApplyThemeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideApplyThemeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideApplyThemeArchive, blob_),
@@ -938,7 +967,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSlideApplyThemeArchive));
-  CommandChangeMasterSlideArchive_descriptor_ = file->message_type(37);
+  CommandChangeMasterSlideArchive_descriptor_ = file->message_type(38);
   static const int CommandChangeMasterSlideArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChangeMasterSlideArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChangeMasterSlideArchive, slide_),
@@ -956,7 +985,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandChangeMasterSlideArchive));
-  CommandSlidePrimitiveSetMasterArchive_descriptor_ = file->message_type(38);
+  CommandSlidePrimitiveSetMasterArchive_descriptor_ = file->message_type(39);
   static const int CommandSlidePrimitiveSetMasterArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlidePrimitiveSetMasterArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlidePrimitiveSetMasterArchive, slide_),
@@ -974,7 +1003,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSlidePrimitiveSetMasterArchive));
-  CommandSlideReapplyMasterArchive_descriptor_ = file->message_type(39);
+  CommandSlideReapplyMasterArchive_descriptor_ = file->message_type(40);
   static const int CommandSlideReapplyMasterArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideReapplyMasterArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideReapplyMasterArchive, reapply_accumulated_command_),
@@ -990,7 +1019,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSlideReapplyMasterArchive));
-  CommandShowSetSoundtrack_descriptor_ = file->message_type(40);
+  CommandShowSetSoundtrack_descriptor_ = file->message_type(41);
   static const int CommandShowSetSoundtrack_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandShowSetSoundtrack, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandShowSetSoundtrack, show_),
@@ -1008,7 +1037,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandShowSetSoundtrack));
-  CommandSoundtrackSetValue_descriptor_ = file->message_type(41);
+  CommandSoundtrackSetValue_descriptor_ = file->message_type(42);
   static const int CommandSoundtrackSetValue_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSoundtrackSetValue, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSoundtrackSetValue, soundtrack_),
@@ -1044,7 +1073,26 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSoundtrackSetValue_PropertyValue));
-  SlideCollectionCommandSelectionBehaviorArchive_descriptor_ = file->message_type(42);
+  CommandSlideUpdateMasterDrawables_descriptor_ = file->message_type(43);
+  static const int CommandSlideUpdateMasterDrawables_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, slide_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, drawables_to_insert_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, sorted_drawables_to_remove_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, indexes_of_removed_drawables_),
+  };
+  CommandSlideUpdateMasterDrawables_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandSlideUpdateMasterDrawables_descriptor_,
+      CommandSlideUpdateMasterDrawables::default_instance_,
+      CommandSlideUpdateMasterDrawables_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSlideUpdateMasterDrawables, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandSlideUpdateMasterDrawables));
+  SlideCollectionCommandSelectionBehaviorArchive_descriptor_ = file->message_type(44);
   static const int SlideCollectionCommandSelectionBehaviorArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideCollectionCommandSelectionBehaviorArchive, archived_new_selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SlideCollectionCommandSelectionBehaviorArchive, archived_old_selection_),
@@ -1062,7 +1110,7 @@ void protobuf_AssignDesc_KNCommandArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SlideCollectionCommandSelectionBehaviorArchive));
   SlideCollectionCommandSelectionBehaviorArchive_Type_descriptor_ = SlideCollectionCommandSelectionBehaviorArchive_descriptor_->enum_type(0);
-  ChartInfoGeometryCommandArchive_descriptor_ = file->message_type(43);
+  ChartInfoGeometryCommandArchive_descriptor_ = file->message_type(45);
   static const int ChartInfoGeometryCommandArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartInfoGeometryCommandArchive, super_),
   };
@@ -1167,6 +1215,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandMasterSetThumbnailTextArchive_descriptor_, &CommandMasterSetThumbnailTextArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandMasterSetBodyStylesArchive_descriptor_, &CommandMasterSetBodyStylesArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandMasterSetSlideObjectsLayerWithMasterArchive_descriptor_, &CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandSlideApplyThemeArchive_descriptor_, &CommandSlideApplyThemeArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -1181,6 +1231,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandSoundtrackSetValue_descriptor_, &CommandSoundtrackSetValue::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandSoundtrackSetValue_PropertyValue_descriptor_, &CommandSoundtrackSetValue_PropertyValue::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandSlideUpdateMasterDrawables_descriptor_, &CommandSlideUpdateMasterDrawables::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     SlideCollectionCommandSelectionBehaviorArchive_descriptor_, &SlideCollectionCommandSelectionBehaviorArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -1268,6 +1320,8 @@ void protobuf_ShutdownFile_KNCommandArchives_2eproto() {
   delete CommandMasterSetThumbnailTextArchive_reflection_;
   delete CommandMasterSetBodyStylesArchive::default_instance_;
   delete CommandMasterSetBodyStylesArchive_reflection_;
+  delete CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance_;
+  delete CommandMasterSetSlideObjectsLayerWithMasterArchive_reflection_;
   delete CommandSlideApplyThemeArchive::default_instance_;
   delete CommandSlideApplyThemeArchive_reflection_;
   delete CommandChangeMasterSlideArchive::default_instance_;
@@ -1282,6 +1336,8 @@ void protobuf_ShutdownFile_KNCommandArchives_2eproto() {
   delete CommandSoundtrackSetValue_reflection_;
   delete CommandSoundtrackSetValue_PropertyValue::default_instance_;
   delete CommandSoundtrackSetValue_PropertyValue_reflection_;
+  delete CommandSlideUpdateMasterDrawables::default_instance_;
+  delete CommandSlideUpdateMasterDrawables_reflection_;
   delete SlideCollectionCommandSelectionBehaviorArchive::default_instance_;
   delete SlideCollectionCommandSelectionBehaviorArchive_reflection_;
   delete ChartInfoGeometryCommandArchive::default_instance_;
@@ -1426,127 +1482,146 @@ void protobuf_AddDesc_KNCommandArchives_2eproto() {
     ".CommandArchive\022\035\n\005theme\030\002 \002(\0132\016.TSP.Ref"
     "erence\022)\n\021master_slide_node\030\003 \002(\0132\016.TSP."
     "Reference\022\027\n\017insertion_index\030\004 \002(\r\022\036\n\026wa"
-    "s_inserted_with_drop\030\005 \002(\010\"\322\001\n\032CommandRe"
+    "s_inserted_with_drop\030\005 \002(\010\"\202\002\n\032CommandRe"
     "moveMasterArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.C"
     "ommandArchive\022\035\n\005theme\030\002 \002(\0132\016.TSP.Refer"
     "ence\022)\n\021master_slide_node\030\003 \002(\0132\016.TSP.Re"
     "ference\022\026\n\016previous_index\030\004 \002(\r\022.\n\026maste"
-    "r_change_commands\030\005 \001(\0132\016.TSP.Reference\""
-    "\224\001\n\032CommandRenameMasterArchive\022\"\n\005super\030"
-    "\001 \002(\0132\023.TSK.CommandArchive\022$\n\014master_sli"
-    "de\030\002 \002(\0132\016.TSP.Reference\022\023\n\013master_name\030"
-    "\003 \002(\t\022\027\n\017old_master_name\030\004 \002(\t\"\261\001\n\036Comma"
-    "ndSlideInsertBuildArchive\022\"\n\005super\030\001 \002(\013"
-    "2\023.TSK.CommandArchive\022!\n\tslideNode\030\002 \002(\013"
-    "2\016.TSP.Reference\022\035\n\005build\030\003 \002(\0132\016.TSP.Re"
-    "ference\022\r\n\005index\030\004 \002(\r\022\032\n\022shouldCreateCh"
-    "unks\030\005 \001(\010\"\225\001\n\036CommandSlideRemoveBuildAr"
-    "chive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchiv"
-    "e\022!\n\tslideNode\030\002 \002(\0132\016.TSP.Reference\022\035\n\005"
-    "build\030\003 \002(\0132\016.TSP.Reference\022\r\n\005index\030\004 \002"
-    "(\r\"\231\001\n/CommandSlideMoveBuildWithoutMovin"
-    "gChunksArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Comm"
-    "andArchive\022!\n\tslideNode\030\002 \002(\0132\016.TSP.Refe"
-    "rence\022\r\n\005index\030\003 \002(\r\022\020\n\010oldIndex\030\004 \002(\r\"t"
-    "\n\035CommandSlideMoveBuildsArchive\022\"\n\005super"
-    "\030\001 \002(\0132\023.TSK.CommandArchive\022\036\n\006builds\030\002 "
-    "\003(\0132\016.TSP.Reference\022\017\n\007toIndex\030\003 \001(\r\"\242\001\n"
-    "#CommandSlideInsertBuildChunkArchive\022\"\n\005"
-    "super\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n\005slid"
-    "e\030\002 \002(\0132\016.TSP.Reference\022)\n\nbuildChunk\030\003 "
-    "\002(\0132\025.KN.BuildChunkArchive\022\r\n\005index\030\004 \002("
-    "\r\"\242\001\n#CommandSlideRemoveBuildChunkArchiv"
-    "e\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n"
-    "\005slide\030\002 \002(\0132\016.TSP.Reference\022)\n\nbuildChu"
-    "nk\030\003 \002(\0132\025.KN.BuildChunkArchive\022\r\n\005index"
-    "\030\004 \002(\r\"\207\001\n!CommandSlideMoveBuildChunkArc"
-    "hive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive"
-    "\022\035\n\005slide\030\002 \002(\0132\016.TSP.Reference\022\r\n\005index"
-    "\030\003 \002(\r\022\020\n\010oldIndex\030\004 \002(\r\"\205\001\n\"CommandSlid"
-    "eMoveBuildChunksArchive\022\"\n\005super\030\001 \002(\0132\023"
-    ".TSK.CommandArchive\022*\n\013buildChunks\030\002 \003(\013"
-    "2\025.KN.BuildChunkArchive\022\017\n\007toIndex\030\003 \001(\r"
-    "\"\257\002\n\033CommandBuildSetValueArchive\022\"\n\005supe"
-    "r\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n\005build\030\002 "
-    "\002(\0132\016.TSP.Reference\022\020\n\010property\030\003 \002(\t\022\017\n"
-    "\007effects\030\004 \003(\t\022\r\n\005types\030\005 \003(\t\022\022\n\ndeliver"
-    "ies\030\006 \003(\t\022\022\n\ndirections\030\007 \003(\r\022\021\n\tduratio"
-    "ns\030\010 \003(\001\022\016\n\006delays\030\t \003(\001\022\034\n\024delayAutomat"
-    "icAfters\030\n \003(\001\022\033\n\023delayAutomaticWiths\030\013 "
-    "\003(\001\022\025\n\reventTriggers\030\014 \003(\010\"\343\001\n CommandBu"
-    "ildChunkSetValueArchive\022\"\n\005super\030\001 \002(\0132\023"
-    ".TSK.CommandArchive\022)\n\nbuildChunk\030\002 \002(\0132"
-    "\025.KN.BuildChunkArchive\022\020\n\010property\030\003 \002(\t"
-    "\022\021\n\treferents\030\004 \003(\r\022\022\n\nautomatics\030\005 \003(\010\022"
-    "\021\n\tdurations\030\006 \003(\001\022\016\n\006delays\030\007 \003(\001\022\024\n\014ol"
-    "dOwnsValue\030\010 \001(\010\"\213\002\n CommandTransitionSe"
-    "tValueArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Comma"
+    "r_change_commands\030\005 \001(\0132\016.TSP.Reference\022"
+    ".\n&default_master_slide_node_was_replace"
+    "d\030\006 \001(\010\"\224\001\n\032CommandRenameMasterArchive\022\""
+    "\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022$\n\014ma"
+    "ster_slide\030\002 \002(\0132\016.TSP.Reference\022\023\n\013mast"
+    "er_name\030\003 \002(\t\022\027\n\017old_master_name\030\004 \002(\t\"\261"
+    "\001\n\036CommandSlideInsertBuildArchive\022\"\n\005sup"
+    "er\030\001 \002(\0132\023.TSK.CommandArchive\022!\n\tslideNo"
+    "de\030\002 \002(\0132\016.TSP.Reference\022\035\n\005build\030\003 \002(\0132"
+    "\016.TSP.Reference\022\r\n\005index\030\004 \002(\r\022\032\n\022should"
+    "CreateChunks\030\005 \001(\010\"\225\001\n\036CommandSlideRemov"
+    "eBuildArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Comma"
     "ndArchive\022!\n\tslideNode\030\002 \002(\0132\016.TSP.Refer"
-    "ence\022\020\n\010property\030\003 \002(\t\022\017\n\007effects\030\004 \003(\t\022"
-    "\016\n\006unused\030\005 \003(\t\022\017\n\007unused2\030\006 \003(\t\022\017\n\007unus"
-    "ed3\030\007 \003(\t\022\021\n\tdurations\030\010 \003(\001\022\022\n\ndirectio"
-    "ns\030\t \003(\r\022\024\n\014isAutomatics\030\n \003(\010\022\016\n\006delays"
-    "\030\013 \003(\001\"\261\001\n*CommandShowSetSlideNumberVisi"
-    "bilityArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Comma"
-    "ndArchive\022\034\n\004show\030\002 \002(\0132\016.TSP.Reference\022"
-    "\033\n\023slideNumbersVisible\030\003 \002(\010\022$\n\014provider"
-    "Undo\030\004 \001(\0132\016.TSP.Reference\"a\n\033CommandMas"
-    "terRescaleArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.C"
-    "ommandArchive\022\036\n\006master\030\002 \002(\0132\016.TSP.Refe"
-    "rence\"\237\001\n$CommandMasterSetThumbnailTextA"
-    "rchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchi"
-    "ve\022\036\n\006master\030\002 \002(\0132\016.TSP.Reference\022\017\n\007is"
-    "_body\030\003 \002(\010\022\020\n\010new_text\030\004 \001(\t\022\020\n\010old_tex"
-    "t\030\005 \001(\t\"\225\002\n!CommandMasterSetBodyStylesAr"
-    "chive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchiv"
-    "e\022\036\n\006master\030\002 \002(\0132\016.TSP.Reference\022,\n\024new"
-    "_paragraph_styles\030\003 \003(\0132\016.TSP.Reference\022"
-    "\'\n\017new_list_styles\030\004 \003(\0132\016.TSP.Reference"
-    "\022,\n\024old_paragraph_styles\030\005 \003(\0132\016.TSP.Ref"
-    "erence\022\'\n\017old_list_styles\030\006 \003(\0132\016.TSP.Re"
-    "ference\"}\n\035CommandSlideApplyThemeArchive"
-    "\0221\n\005super\030\001 \002(\0132\".TSS.ApplyThemeChildCom"
-    "mandArchive\022)\n\004blob\030\002 \002(\0132\033.KN.MasterCha"
-    "ngeBlobArchive\"\262\001\n\037CommandChangeMasterSl"
-    "ideArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandA"
-    "rchive\022\035\n\005slide\030\002 \002(\0132\016.TSP.Reference\022\036\n"
-    "\006master\030\003 \002(\0132\016.TSP.Reference\022,\n\024placeho"
-    "lder_commands\030\004 \002(\0132\016.TSP.Reference\"\256\001\n%"
-    "CommandSlidePrimitiveSetMasterArchive\022\"\n"
-    "\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n\005sli"
-    "de\030\002 \002(\0132\016.TSP.Reference\022\036\n\006master\030\003 \002(\013"
-    "2\016.TSP.Reference\022\"\n\nold_master\030\004 \002(\0132\016.T"
-    "SP.Reference\"{\n CommandSlideReapplyMaste"
-    "rArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArc"
-    "hive\0223\n\033reapply_accumulated_command\030\002 \002("
-    "\0132\016.TSP.Reference\"\250\001\n\030CommandShowSetSoun"
-    "dtrack\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchi"
-    "ve\022\034\n\004show\030\002 \001(\0132\016.TSP.Reference\022\"\n\nsoun"
-    "dtrack\030\003 \001(\0132\016.TSP.Reference\022&\n\016old_soun"
-    "dtrack\030\004 \001(\0132\016.TSP.Reference\"\204\003\n\031Command"
-    "SoundtrackSetValue\022\"\n\005super\030\001 \002(\0132\023.TSK."
-    "CommandArchive\022\"\n\nsoundtrack\030\002 \001(\0132\016.TSP"
-    ".Reference\022\020\n\010property\030\003 \001(\t\022>\n\told_valu"
-    "e\030\004 \001(\0132+.KN.CommandSoundtrackSetValue.P"
-    "ropertyValue\022>\n\tnew_value\030\005 \001(\0132+.KN.Com"
-    "mandSoundtrackSetValue.PropertyValue\032\214\001\n"
-    "\rPropertyValue\022\024\n\014double_value\030\001 \001(\001\0221\n\n"
-    "mode_value\030\002 \001(\0162\035.KN.Soundtrack.Soundtr"
-    "ackMode\0222\n\026media_reference_values\030\003 \003(\0132"
-    "\022.TSP.DataReference\"\270\003\n.SlideCollectionC"
-    "ommandSelectionBehaviorArchive\022.\n\026archiv"
-    "ed_new_selection\030\001 \001(\0132\016.TSP.Reference\022."
-    "\n\026archived_old_selection\030\002 \001(\0132\016.TSP.Ref"
-    "erence\022m\n\004type\030\003 \001(\01627.KN.SlideCollectio"
-    "nCommandSelectionBehaviorArchive.Type:&k"
-    "KindSlideSelectionBehaviorTypeGeneral\"\266\001"
-    "\n\004Type\022*\n&kKindSlideSelectionBehaviorTyp"
-    "eGeneral\020\000\022,\n(kKindSlideSelectionBehavio"
-    "rTypeInsertion\020\001\022+\n\'kKindSlideSelectionB"
-    "ehaviorTypeDeletion\020\002\022\'\n#kKindSlideSelec"
-    "tionBehaviorTypeMove\020\003\"E\n\037ChartInfoGeome"
-    "tryCommandArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.C"
-    "ommandArchive", 9773);
+    "ence\022\035\n\005build\030\003 \002(\0132\016.TSP.Reference\022\r\n\005i"
+    "ndex\030\004 \002(\r\"\231\001\n/CommandSlideMoveBuildWith"
+    "outMovingChunksArchive\022\"\n\005super\030\001 \002(\0132\023."
+    "TSK.CommandArchive\022!\n\tslideNode\030\002 \002(\0132\016."
+    "TSP.Reference\022\r\n\005index\030\003 \002(\r\022\020\n\010oldIndex"
+    "\030\004 \002(\r\"t\n\035CommandSlideMoveBuildsArchive\022"
+    "\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\036\n\006b"
+    "uilds\030\002 \003(\0132\016.TSP.Reference\022\017\n\007toIndex\030\003"
+    " \001(\r\"\242\001\n#CommandSlideInsertBuildChunkArc"
+    "hive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive"
+    "\022\035\n\005slide\030\002 \002(\0132\016.TSP.Reference\022)\n\nbuild"
+    "Chunk\030\003 \002(\0132\025.KN.BuildChunkArchive\022\r\n\005in"
+    "dex\030\004 \002(\r\"\242\001\n#CommandSlideRemoveBuildChu"
+    "nkArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandAr"
+    "chive\022\035\n\005slide\030\002 \002(\0132\016.TSP.Reference\022)\n\n"
+    "buildChunk\030\003 \002(\0132\025.KN.BuildChunkArchive\022"
+    "\r\n\005index\030\004 \002(\r\"\207\001\n!CommandSlideMoveBuild"
+    "ChunkArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Comman"
+    "dArchive\022\035\n\005slide\030\002 \002(\0132\016.TSP.Reference\022"
+    "\r\n\005index\030\003 \002(\r\022\020\n\010oldIndex\030\004 \002(\r\"\205\001\n\"Com"
+    "mandSlideMoveBuildChunksArchive\022\"\n\005super"
+    "\030\001 \002(\0132\023.TSK.CommandArchive\022*\n\013buildChun"
+    "ks\030\002 \003(\0132\025.KN.BuildChunkArchive\022\017\n\007toInd"
+    "ex\030\003 \001(\r\"\271\003\n\033CommandBuildSetValueArchive"
+    "\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n\005"
+    "build\030\002 \002(\0132\016.TSP.Reference\022\020\n\010property\030"
+    "\003 \002(\t\022\023\n\007effects\030\004 \003(\tB\002\030\001\022\021\n\005types\030\005 \003("
+    "\tB\002\030\001\022\022\n\ndeliveries\030\006 \003(\t\022\026\n\ndirections\030"
+    "\007 \003(\rB\002\030\001\022\025\n\tdurations\030\010 \003(\001B\002\030\001\022\022\n\006dela"
+    "ys\030\t \003(\001B\002\030\001\022 \n\024delayAutomaticAfters\030\n \003"
+    "(\001B\002\030\001\022\037\n\023delayAutomaticWiths\030\013 \003(\001B\002\030\001\022"
+    "\031\n\reventTriggers\030\014 \003(\010B\002\030\001\0221\n\roldAttribu"
+    "tes\030\r \001(\0132\032.KN.BuildAttributesArchive\0225\n"
+    "\021currentAttributes\030\016 \001(\0132\032.KN.BuildAttri"
+    "butesArchive\"\347\001\n CommandBuildChunkSetVal"
+    "ueArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandAr"
+    "chive\022)\n\nbuildChunk\030\002 \002(\0132\025.KN.BuildChun"
+    "kArchive\022\020\n\010property\030\003 \002(\t\022\021\n\treferents\030"
+    "\004 \003(\r\022\022\n\nautomatics\030\005 \003(\010\022\021\n\tdurations\030\006"
+    " \003(\001\022\016\n\006delays\030\007 \003(\001\022\030\n\014oldOwnsValue\030\010 \001"
+    "(\010B\002\030\001\"\237\003\n CommandTransitionSetValueArch"
+    "ive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022"
+    "!\n\tslideNode\030\002 \002(\0132\016.TSP.Reference\022\020\n\010pr"
+    "operty\030\003 \002(\t\022\023\n\007effects\030\004 \003(\tB\002\030\001\022\022\n\006unu"
+    "sed\030\005 \003(\tB\002\030\001\022\023\n\007unused2\030\006 \003(\tB\002\030\001\022\023\n\007un"
+    "used3\030\007 \003(\tB\002\030\001\022\025\n\tdurations\030\010 \003(\001B\002\030\001\022\026"
+    "\n\ndirections\030\t \003(\rB\002\030\001\022\030\n\014isAutomatics\030\n"
+    " \003(\010B\002\030\001\022\022\n\006delays\030\013 \003(\001B\002\030\001\0226\n\roldAttri"
+    "butes\030\014 \001(\0132\037.KN.TransitionAttributesArc"
+    "hive\022:\n\021currentAttributes\030\r \001(\0132\037.KN.Tra"
+    "nsitionAttributesArchive\"\261\001\n*CommandShow"
+    "SetSlideNumberVisibilityArchive\022\"\n\005super"
+    "\030\001 \002(\0132\023.TSK.CommandArchive\022\034\n\004show\030\002 \002("
+    "\0132\016.TSP.Reference\022\033\n\023slideNumbersVisible"
+    "\030\003 \002(\010\022$\n\014providerUndo\030\004 \001(\0132\016.TSP.Refer"
+    "ence\"a\n\033CommandMasterRescaleArchive\022\"\n\005s"
+    "uper\030\001 \002(\0132\023.TSK.CommandArchive\022\036\n\006maste"
+    "r\030\002 \002(\0132\016.TSP.Reference\"\237\001\n$CommandMaste"
+    "rSetThumbnailTextArchive\022\"\n\005super\030\001 \002(\0132"
+    "\023.TSK.CommandArchive\022\036\n\006master\030\002 \002(\0132\016.T"
+    "SP.Reference\022\017\n\007is_body\030\003 \002(\010\022\020\n\010new_tex"
+    "t\030\004 \001(\t\022\020\n\010old_text\030\005 \001(\t\"\225\002\n!CommandMas"
+    "terSetBodyStylesArchive\022\"\n\005super\030\001 \002(\0132\023"
+    ".TSK.CommandArchive\022\036\n\006master\030\002 \002(\0132\016.TS"
+    "P.Reference\022,\n\024new_paragraph_styles\030\003 \003("
+    "\0132\016.TSP.Reference\022\'\n\017new_list_styles\030\004 \003"
+    "(\0132\016.TSP.Reference\022,\n\024old_paragraph_styl"
+    "es\030\005 \003(\0132\016.TSP.Reference\022\'\n\017old_list_sty"
+    "les\030\006 \003(\0132\016.TSP.Reference\"\236\001\n2CommandMas"
+    "terSetSlideObjectsLayerWithMasterArchive"
+    "\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\036\n\006"
+    "master\030\002 \002(\0132\016.TSP.Reference\022\021\n\tnew_valu"
+    "e\030\003 \002(\010\022\021\n\told_value\030\004 \002(\010\"}\n\035CommandSli"
+    "deApplyThemeArchive\0221\n\005super\030\001 \002(\0132\".TSS"
+    ".ApplyThemeChildCommandArchive\022)\n\004blob\030\002"
+    " \002(\0132\033.KN.MasterChangeBlobArchive\"\262\001\n\037Co"
+    "mmandChangeMasterSlideArchive\022\"\n\005super\030\001"
+    " \002(\0132\023.TSK.CommandArchive\022\035\n\005slide\030\002 \002(\013"
+    "2\016.TSP.Reference\022\036\n\006master\030\003 \002(\0132\016.TSP.R"
+    "eference\022,\n\024placeholder_commands\030\004 \002(\0132\016"
+    ".TSP.Reference\"\256\001\n%CommandSlidePrimitive"
+    "SetMasterArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Co"
+    "mmandArchive\022\035\n\005slide\030\002 \002(\0132\016.TSP.Refere"
+    "nce\022\036\n\006master\030\003 \002(\0132\016.TSP.Reference\022\"\n\no"
+    "ld_master\030\004 \002(\0132\016.TSP.Reference\"{\n Comma"
+    "ndSlideReapplyMasterArchive\022\"\n\005super\030\001 \002"
+    "(\0132\023.TSK.CommandArchive\0223\n\033reapply_accum"
+    "ulated_command\030\002 \002(\0132\016.TSP.Reference\"\250\001\n"
+    "\030CommandShowSetSoundtrack\022\"\n\005super\030\001 \002(\013"
+    "2\023.TSK.CommandArchive\022\034\n\004show\030\002 \001(\0132\016.TS"
+    "P.Reference\022\"\n\nsoundtrack\030\003 \001(\0132\016.TSP.Re"
+    "ference\022&\n\016old_soundtrack\030\004 \001(\0132\016.TSP.Re"
+    "ference\"\204\003\n\031CommandSoundtrackSetValue\022\"\n"
+    "\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\"\n\nsou"
+    "ndtrack\030\002 \001(\0132\016.TSP.Reference\022\020\n\010propert"
+    "y\030\003 \001(\t\022>\n\told_value\030\004 \001(\0132+.KN.CommandS"
+    "oundtrackSetValue.PropertyValue\022>\n\tnew_v"
+    "alue\030\005 \001(\0132+.KN.CommandSoundtrackSetValu"
+    "e.PropertyValue\032\214\001\n\rPropertyValue\022\024\n\014dou"
+    "ble_value\030\001 \001(\001\0221\n\nmode_value\030\002 \001(\0162\035.KN"
+    ".Soundtrack.SoundtrackMode\0222\n\026media_refe"
+    "rence_values\030\003 \003(\0132\022.TSP.DataReference\"\374"
+    "\001\n!CommandSlideUpdateMasterDrawables\022\"\n\005"
+    "super\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n\005slid"
+    "e\030\002 \002(\0132\016.TSP.Reference\022+\n\023drawables_to_"
+    "insert\030\003 \003(\0132\016.TSP.Reference\0222\n\032sorted_d"
+    "rawables_to_remove\030\004 \003(\0132\016.TSP.Reference"
+    "\0223\n\034indexes_of_removed_drawables\030\005 \002(\0132\r"
+    ".TSP.IndexSet\"\270\003\n.SlideCollectionCommand"
+    "SelectionBehaviorArchive\022.\n\026archived_new"
+    "_selection\030\001 \001(\0132\016.TSP.Reference\022.\n\026arch"
+    "ived_old_selection\030\002 \001(\0132\016.TSP.Reference"
+    "\022m\n\004type\030\003 \001(\01627.KN.SlideCollectionComma"
+    "ndSelectionBehaviorArchive.Type:&kKindSl"
+    "ideSelectionBehaviorTypeGeneral\"\266\001\n\004Type"
+    "\022*\n&kKindSlideSelectionBehaviorTypeGener"
+    "al\020\000\022,\n(kKindSlideSelectionBehaviorTypeI"
+    "nsertion\020\001\022+\n\'kKindSlideSelectionBehavio"
+    "rTypeDeletion\020\002\022\'\n#kKindSlideSelectionBe"
+    "haviorTypeMove\020\003\"E\n\037ChartInfoGeometryCom"
+    "mandArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Command"
+    "Archive", 10527);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "KNCommandArchives.proto", &protobuf_RegisterTypes);
   UIStateCommandGroupArchive::default_instance_ = new UIStateCommandGroupArchive();
@@ -1588,6 +1663,7 @@ void protobuf_AddDesc_KNCommandArchives_2eproto() {
   CommandMasterRescaleArchive::default_instance_ = new CommandMasterRescaleArchive();
   CommandMasterSetThumbnailTextArchive::default_instance_ = new CommandMasterSetThumbnailTextArchive();
   CommandMasterSetBodyStylesArchive::default_instance_ = new CommandMasterSetBodyStylesArchive();
+  CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance_ = new CommandMasterSetSlideObjectsLayerWithMasterArchive();
   CommandSlideApplyThemeArchive::default_instance_ = new CommandSlideApplyThemeArchive();
   CommandChangeMasterSlideArchive::default_instance_ = new CommandChangeMasterSlideArchive();
   CommandSlidePrimitiveSetMasterArchive::default_instance_ = new CommandSlidePrimitiveSetMasterArchive();
@@ -1595,6 +1671,7 @@ void protobuf_AddDesc_KNCommandArchives_2eproto() {
   CommandShowSetSoundtrack::default_instance_ = new CommandShowSetSoundtrack();
   CommandSoundtrackSetValue::default_instance_ = new CommandSoundtrackSetValue();
   CommandSoundtrackSetValue_PropertyValue::default_instance_ = new CommandSoundtrackSetValue_PropertyValue();
+  CommandSlideUpdateMasterDrawables::default_instance_ = new CommandSlideUpdateMasterDrawables();
   SlideCollectionCommandSelectionBehaviorArchive::default_instance_ = new SlideCollectionCommandSelectionBehaviorArchive();
   ChartInfoGeometryCommandArchive::default_instance_ = new ChartInfoGeometryCommandArchive();
   UIStateCommandGroupArchive::default_instance_->InitAsDefaultInstance();
@@ -1636,6 +1713,7 @@ void protobuf_AddDesc_KNCommandArchives_2eproto() {
   CommandMasterRescaleArchive::default_instance_->InitAsDefaultInstance();
   CommandMasterSetThumbnailTextArchive::default_instance_->InitAsDefaultInstance();
   CommandMasterSetBodyStylesArchive::default_instance_->InitAsDefaultInstance();
+  CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance_->InitAsDefaultInstance();
   CommandSlideApplyThemeArchive::default_instance_->InitAsDefaultInstance();
   CommandChangeMasterSlideArchive::default_instance_->InitAsDefaultInstance();
   CommandSlidePrimitiveSetMasterArchive::default_instance_->InitAsDefaultInstance();
@@ -1643,6 +1721,7 @@ void protobuf_AddDesc_KNCommandArchives_2eproto() {
   CommandShowSetSoundtrack::default_instance_->InitAsDefaultInstance();
   CommandSoundtrackSetValue::default_instance_->InitAsDefaultInstance();
   CommandSoundtrackSetValue_PropertyValue::default_instance_->InitAsDefaultInstance();
+  CommandSlideUpdateMasterDrawables::default_instance_->InitAsDefaultInstance();
   SlideCollectionCommandSelectionBehaviorArchive::default_instance_->InitAsDefaultInstance();
   ChartInfoGeometryCommandArchive::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_KNCommandArchives_2eproto);
@@ -10562,6 +10641,7 @@ const int CommandRemoveMasterArchive::kThemeFieldNumber;
 const int CommandRemoveMasterArchive::kMasterSlideNodeFieldNumber;
 const int CommandRemoveMasterArchive::kPreviousIndexFieldNumber;
 const int CommandRemoveMasterArchive::kMasterChangeCommandsFieldNumber;
+const int CommandRemoveMasterArchive::kDefaultMasterSlideNodeWasReplacedFieldNumber;
 #endif  // !_MSC_VER
 
 CommandRemoveMasterArchive::CommandRemoveMasterArchive()
@@ -10589,6 +10669,7 @@ void CommandRemoveMasterArchive::SharedCtor() {
   master_slide_node_ = NULL;
   previous_index_ = 0u;
   master_change_commands_ = NULL;
+  default_master_slide_node_was_replaced_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -10641,6 +10722,7 @@ void CommandRemoveMasterArchive::Clear() {
     if (has_master_change_commands()) {
       if (master_change_commands_ != NULL) master_change_commands_->::TSP::Reference::Clear();
     }
+    default_master_slide_node_was_replaced_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -10719,6 +10801,22 @@ bool CommandRemoveMasterArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(48)) goto parse_default_master_slide_node_was_replaced;
+        break;
+      }
+
+      // optional bool default_master_slide_node_was_replaced = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_default_master_slide_node_was_replaced:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &default_master_slide_node_was_replaced_)));
+          set_has_default_master_slide_node_was_replaced();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -10770,6 +10868,11 @@ void CommandRemoveMasterArchive::SerializeWithCachedSizes(
       5, this->master_change_commands(), output);
   }
 
+  // optional bool default_master_slide_node_was_replaced = 6;
+  if (has_default_master_slide_node_was_replaced()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->default_master_slide_node_was_replaced(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -10811,6 +10914,11 @@ ::google::protobuf::uint8* CommandRemoveMasterArchive::SerializeWithCachedSizesT
         5, this->master_change_commands(), target);
   }
 
+  // optional bool default_master_slide_node_was_replaced = 6;
+  if (has_default_master_slide_node_was_replaced()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->default_master_slide_node_was_replaced(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -10857,6 +10965,11 @@ int CommandRemoveMasterArchive::ByteSize() const {
           this->master_change_commands());
     }
 
+    // optional bool default_master_slide_node_was_replaced = 6;
+    if (has_default_master_slide_node_was_replaced()) {
+      total_size += 1 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -10899,6 +11012,9 @@ void CommandRemoveMasterArchive::MergeFrom(const CommandRemoveMasterArchive& fro
     if (from.has_master_change_commands()) {
       mutable_master_change_commands()->::TSP::Reference::MergeFrom(from.master_change_commands());
     }
+    if (from.has_default_master_slide_node_was_replaced()) {
+      set_default_master_slide_node_was_replaced(from.default_master_slide_node_was_replaced());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -10940,6 +11056,7 @@ void CommandRemoveMasterArchive::Swap(CommandRemoveMasterArchive* other) {
     std::swap(master_slide_node_, other->master_slide_node_);
     std::swap(previous_index_, other->previous_index_);
     std::swap(master_change_commands_, other->master_change_commands_);
+    std::swap(default_master_slide_node_was_replaced_, other->default_master_slide_node_was_replaced_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -14089,6 +14206,8 @@ const int CommandBuildSetValueArchive::kDelaysFieldNumber;
 const int CommandBuildSetValueArchive::kDelayAutomaticAftersFieldNumber;
 const int CommandBuildSetValueArchive::kDelayAutomaticWithsFieldNumber;
 const int CommandBuildSetValueArchive::kEventTriggersFieldNumber;
+const int CommandBuildSetValueArchive::kOldAttributesFieldNumber;
+const int CommandBuildSetValueArchive::kCurrentAttributesFieldNumber;
 #endif  // !_MSC_VER
 
 CommandBuildSetValueArchive::CommandBuildSetValueArchive()
@@ -14099,6 +14218,8 @@ CommandBuildSetValueArchive::CommandBuildSetValueArchive()
 void CommandBuildSetValueArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
   build_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  oldattributes_ = const_cast< ::KN::BuildAttributesArchive*>(&::KN::BuildAttributesArchive::default_instance());
+  currentattributes_ = const_cast< ::KN::BuildAttributesArchive*>(&::KN::BuildAttributesArchive::default_instance());
 }
 
 CommandBuildSetValueArchive::CommandBuildSetValueArchive(const CommandBuildSetValueArchive& from)
@@ -14112,6 +14233,8 @@ void CommandBuildSetValueArchive::SharedCtor() {
   super_ = NULL;
   build_ = NULL;
   property_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  oldattributes_ = NULL;
+  currentattributes_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -14126,6 +14249,8 @@ void CommandBuildSetValueArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
     delete build_;
+    delete oldattributes_;
+    delete currentattributes_;
   }
 }
 
@@ -14164,6 +14289,14 @@ void CommandBuildSetValueArchive::Clear() {
       }
     }
   }
+  if (_has_bits_[12 / 32] & (0xffu << (12 % 32))) {
+    if (has_oldattributes()) {
+      if (oldattributes_ != NULL) oldattributes_->::KN::BuildAttributesArchive::Clear();
+    }
+    if (has_currentattributes()) {
+      if (currentattributes_ != NULL) currentattributes_->::KN::BuildAttributesArchive::Clear();
+    }
+  }
   effects_.Clear();
   types_.Clear();
   deliveries_.Clear();
@@ -14227,7 +14360,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated string effects = 4;
+      // repeated string effects = 4 [deprecated = true];
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -14246,7 +14379,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated string types = 5;
+      // repeated string types = 5 [deprecated = true];
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -14284,7 +14417,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated uint32 directions = 7;
+      // repeated uint32 directions = 7 [deprecated = true];
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -14306,7 +14439,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated double durations = 8;
+      // repeated double durations = 8 [deprecated = true];
       case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -14328,7 +14461,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated double delays = 9;
+      // repeated double delays = 9 [deprecated = true];
       case 9: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -14350,7 +14483,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated double delayAutomaticAfters = 10;
+      // repeated double delayAutomaticAfters = 10 [deprecated = true];
       case 10: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -14372,7 +14505,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated double delayAutomaticWiths = 11;
+      // repeated double delayAutomaticWiths = 11 [deprecated = true];
       case 11: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -14394,7 +14527,7 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated bool eventTriggers = 12;
+      // repeated bool eventTriggers = 12 [deprecated = true];
       case 12: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -14412,6 +14545,34 @@ bool CommandBuildSetValueArchive::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(96)) goto parse_eventTriggers;
+        if (input->ExpectTag(106)) goto parse_oldAttributes;
+        break;
+      }
+
+      // optional .KN.BuildAttributesArchive oldAttributes = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_oldAttributes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_oldattributes()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(114)) goto parse_currentAttributes;
+        break;
+      }
+
+      // optional .KN.BuildAttributesArchive currentAttributes = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_currentAttributes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_currentattributes()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -14455,7 +14616,7 @@ void CommandBuildSetValueArchive::SerializeWithCachedSizes(
       3, this->property(), output);
   }
 
-  // repeated string effects = 4;
+  // repeated string effects = 4 [deprecated = true];
   for (int i = 0; i < this->effects_size(); i++) {
   ::google::protobuf::internal::WireFormat::VerifyUTF8String(
     this->effects(i).data(), this->effects(i).length(),
@@ -14464,7 +14625,7 @@ void CommandBuildSetValueArchive::SerializeWithCachedSizes(
       4, this->effects(i), output);
   }
 
-  // repeated string types = 5;
+  // repeated string types = 5 [deprecated = true];
   for (int i = 0; i < this->types_size(); i++) {
   ::google::protobuf::internal::WireFormat::VerifyUTF8String(
     this->types(i).data(), this->types(i).length(),
@@ -14482,42 +14643,54 @@ void CommandBuildSetValueArchive::SerializeWithCachedSizes(
       6, this->deliveries(i), output);
   }
 
-  // repeated uint32 directions = 7;
+  // repeated uint32 directions = 7 [deprecated = true];
   for (int i = 0; i < this->directions_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(
       7, this->directions(i), output);
   }
 
-  // repeated double durations = 8;
+  // repeated double durations = 8 [deprecated = true];
   for (int i = 0; i < this->durations_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       8, this->durations(i), output);
   }
 
-  // repeated double delays = 9;
+  // repeated double delays = 9 [deprecated = true];
   for (int i = 0; i < this->delays_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       9, this->delays(i), output);
   }
 
-  // repeated double delayAutomaticAfters = 10;
+  // repeated double delayAutomaticAfters = 10 [deprecated = true];
   for (int i = 0; i < this->delayautomaticafters_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       10, this->delayautomaticafters(i), output);
   }
 
-  // repeated double delayAutomaticWiths = 11;
+  // repeated double delayAutomaticWiths = 11 [deprecated = true];
   for (int i = 0; i < this->delayautomaticwiths_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       11, this->delayautomaticwiths(i), output);
   }
 
-  // repeated bool eventTriggers = 12;
+  // repeated bool eventTriggers = 12 [deprecated = true];
   for (int i = 0; i < this->eventtriggers_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(
       12, this->eventtriggers(i), output);
   }
 
+  // optional .KN.BuildAttributesArchive oldAttributes = 13;
+  if (has_oldattributes()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      13, this->oldattributes(), output);
+  }
+
+  // optional .KN.BuildAttributesArchive currentAttributes = 14;
+  if (has_currentattributes()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      14, this->currentattributes(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -14550,7 +14723,7 @@ ::google::protobuf::uint8* CommandBuildSetValueArchive::SerializeWithCachedSizes
         3, this->property(), target);
   }
 
-  // repeated string effects = 4;
+  // repeated string effects = 4 [deprecated = true];
   for (int i = 0; i < this->effects_size(); i++) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->effects(i).data(), this->effects(i).length(),
@@ -14559,7 +14732,7 @@ ::google::protobuf::uint8* CommandBuildSetValueArchive::SerializeWithCachedSizes
       WriteStringToArray(4, this->effects(i), target);
   }
 
-  // repeated string types = 5;
+  // repeated string types = 5 [deprecated = true];
   for (int i = 0; i < this->types_size(); i++) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->types(i).data(), this->types(i).length(),
@@ -14577,42 +14750,56 @@ ::google::protobuf::uint8* CommandBuildSetValueArchive::SerializeWithCachedSizes
       WriteStringToArray(6, this->deliveries(i), target);
   }
 
-  // repeated uint32 directions = 7;
+  // repeated uint32 directions = 7 [deprecated = true];
   for (int i = 0; i < this->directions_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteUInt32ToArray(7, this->directions(i), target);
   }
 
-  // repeated double durations = 8;
+  // repeated double durations = 8 [deprecated = true];
   for (int i = 0; i < this->durations_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteDoubleToArray(8, this->durations(i), target);
   }
 
-  // repeated double delays = 9;
+  // repeated double delays = 9 [deprecated = true];
   for (int i = 0; i < this->delays_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteDoubleToArray(9, this->delays(i), target);
   }
 
-  // repeated double delayAutomaticAfters = 10;
+  // repeated double delayAutomaticAfters = 10 [deprecated = true];
   for (int i = 0; i < this->delayautomaticafters_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteDoubleToArray(10, this->delayautomaticafters(i), target);
   }
 
-  // repeated double delayAutomaticWiths = 11;
+  // repeated double delayAutomaticWiths = 11 [deprecated = true];
   for (int i = 0; i < this->delayautomaticwiths_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteDoubleToArray(11, this->delayautomaticwiths(i), target);
   }
 
-  // repeated bool eventTriggers = 12;
+  // repeated bool eventTriggers = 12 [deprecated = true];
   for (int i = 0; i < this->eventtriggers_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteBoolToArray(12, this->eventtriggers(i), target);
   }
 
+  // optional .KN.BuildAttributesArchive oldAttributes = 13;
+  if (has_oldattributes()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        13, this->oldattributes(), target);
+  }
+
+  // optional .KN.BuildAttributesArchive currentAttributes = 14;
+  if (has_currentattributes()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        14, this->currentattributes(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -14646,14 +14833,30 @@ int CommandBuildSetValueArchive::ByteSize() const {
     }
 
   }
-  // repeated string effects = 4;
+  if (_has_bits_[12 / 32] & (0xffu << (12 % 32))) {
+    // optional .KN.BuildAttributesArchive oldAttributes = 13;
+    if (has_oldattributes()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->oldattributes());
+    }
+
+    // optional .KN.BuildAttributesArchive currentAttributes = 14;
+    if (has_currentattributes()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->currentattributes());
+    }
+
+  }
+  // repeated string effects = 4 [deprecated = true];
   total_size += 1 * this->effects_size();
   for (int i = 0; i < this->effects_size(); i++) {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
       this->effects(i));
   }
 
-  // repeated string types = 5;
+  // repeated string types = 5 [deprecated = true];
   total_size += 1 * this->types_size();
   for (int i = 0; i < this->types_size(); i++) {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
@@ -14667,7 +14870,7 @@ int CommandBuildSetValueArchive::ByteSize() const {
       this->deliveries(i));
   }
 
-  // repeated uint32 directions = 7;
+  // repeated uint32 directions = 7 [deprecated = true];
   {
     int data_size = 0;
     for (int i = 0; i < this->directions_size(); i++) {
@@ -14677,35 +14880,35 @@ int CommandBuildSetValueArchive::ByteSize() const {
     total_size += 1 * this->directions_size() + data_size;
   }
 
-  // repeated double durations = 8;
+  // repeated double durations = 8 [deprecated = true];
   {
     int data_size = 0;
     data_size = 8 * this->durations_size();
     total_size += 1 * this->durations_size() + data_size;
   }
 
-  // repeated double delays = 9;
+  // repeated double delays = 9 [deprecated = true];
   {
     int data_size = 0;
     data_size = 8 * this->delays_size();
     total_size += 1 * this->delays_size() + data_size;
   }
 
-  // repeated double delayAutomaticAfters = 10;
+  // repeated double delayAutomaticAfters = 10 [deprecated = true];
   {
     int data_size = 0;
     data_size = 8 * this->delayautomaticafters_size();
     total_size += 1 * this->delayautomaticafters_size() + data_size;
   }
 
-  // repeated double delayAutomaticWiths = 11;
+  // repeated double delayAutomaticWiths = 11 [deprecated = true];
   {
     int data_size = 0;
     data_size = 8 * this->delayautomaticwiths_size();
     total_size += 1 * this->delayautomaticwiths_size() + data_size;
   }
 
-  // repeated bool eventTriggers = 12;
+  // repeated bool eventTriggers = 12 [deprecated = true];
   {
     int data_size = 0;
     data_size = 1 * this->eventtriggers_size();
@@ -14757,6 +14960,14 @@ void CommandBuildSetValueArchive::MergeFrom(const CommandBuildSetValueArchive& f
       set_property(from.property());
     }
   }
+  if (from._has_bits_[12 / 32] & (0xffu << (12 % 32))) {
+    if (from.has_oldattributes()) {
+      mutable_oldattributes()->::KN::BuildAttributesArchive::MergeFrom(from.oldattributes());
+    }
+    if (from.has_currentattributes()) {
+      mutable_currentattributes()->::KN::BuildAttributesArchive::MergeFrom(from.currentattributes());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -14781,6 +14992,12 @@ bool CommandBuildSetValueArchive::IsInitialized() const {
   if (has_build()) {
     if (!this->build().IsInitialized()) return false;
   }
+  if (has_oldattributes()) {
+    if (!this->oldattributes().IsInitialized()) return false;
+  }
+  if (has_currentattributes()) {
+    if (!this->currentattributes().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -14798,6 +15015,8 @@ void CommandBuildSetValueArchive::Swap(CommandBuildSetValueArchive* other) {
     delayautomaticafters_.Swap(&other->delayautomaticafters_);
     delayautomaticwiths_.Swap(&other->delayautomaticwiths_);
     eventtriggers_.Swap(&other->eventtriggers_);
+    std::swap(oldattributes_, other->oldattributes_);
+    std::swap(currentattributes_, other->currentattributes_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -15047,7 +15266,7 @@ bool CommandBuildChunkSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // optional bool oldOwnsValue = 8;
+      // optional bool oldOwnsValue = 8 [deprecated = true];
       case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -15126,7 +15345,7 @@ void CommandBuildChunkSetValueArchive::SerializeWithCachedSizes(
       7, this->delays(i), output);
   }
 
-  // optional bool oldOwnsValue = 8;
+  // optional bool oldOwnsValue = 8 [deprecated = true];
   if (has_oldownsvalue()) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->oldownsvalue(), output);
   }
@@ -15187,7 +15406,7 @@ ::google::protobuf::uint8* CommandBuildChunkSetValueArchive::SerializeWithCached
       WriteDoubleToArray(7, this->delays(i), target);
   }
 
-  // optional bool oldOwnsValue = 8;
+  // optional bool oldOwnsValue = 8 [deprecated = true];
   if (has_oldownsvalue()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->oldownsvalue(), target);
   }
@@ -15224,7 +15443,7 @@ int CommandBuildChunkSetValueArchive::ByteSize() const {
           this->property());
     }
 
-    // optional bool oldOwnsValue = 8;
+    // optional bool oldOwnsValue = 8 [deprecated = true];
     if (has_oldownsvalue()) {
       total_size += 1 + 1;
     }
@@ -15370,6 +15589,8 @@ const int CommandTransitionSetValueArchive::kDurationsFieldNumber;
 const int CommandTransitionSetValueArchive::kDirectionsFieldNumber;
 const int CommandTransitionSetValueArchive::kIsAutomaticsFieldNumber;
 const int CommandTransitionSetValueArchive::kDelaysFieldNumber;
+const int CommandTransitionSetValueArchive::kOldAttributesFieldNumber;
+const int CommandTransitionSetValueArchive::kCurrentAttributesFieldNumber;
 #endif  // !_MSC_VER
 
 CommandTransitionSetValueArchive::CommandTransitionSetValueArchive()
@@ -15380,6 +15601,8 @@ CommandTransitionSetValueArchive::CommandTransitionSetValueArchive()
 void CommandTransitionSetValueArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
   slidenode_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  oldattributes_ = const_cast< ::KN::TransitionAttributesArchive*>(&::KN::TransitionAttributesArchive::default_instance());
+  currentattributes_ = const_cast< ::KN::TransitionAttributesArchive*>(&::KN::TransitionAttributesArchive::default_instance());
 }
 
 CommandTransitionSetValueArchive::CommandTransitionSetValueArchive(const CommandTransitionSetValueArchive& from)
@@ -15393,6 +15616,8 @@ void CommandTransitionSetValueArchive::SharedCtor() {
   super_ = NULL;
   slidenode_ = NULL;
   property_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  oldattributes_ = NULL;
+  currentattributes_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -15407,6 +15632,8 @@ void CommandTransitionSetValueArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
     delete slidenode_;
+    delete oldattributes_;
+    delete currentattributes_;
   }
 }
 
@@ -15445,6 +15672,14 @@ void CommandTransitionSetValueArchive::Clear() {
       }
     }
   }
+  if (_has_bits_[11 / 32] & (0xffu << (11 % 32))) {
+    if (has_oldattributes()) {
+      if (oldattributes_ != NULL) oldattributes_->::KN::TransitionAttributesArchive::Clear();
+    }
+    if (has_currentattributes()) {
+      if (currentattributes_ != NULL) currentattributes_->::KN::TransitionAttributesArchive::Clear();
+    }
+  }
   effects_.Clear();
   unused_.Clear();
   unused2_.Clear();
@@ -15507,7 +15742,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated string effects = 4;
+      // repeated string effects = 4 [deprecated = true];
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -15526,7 +15761,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated string unused = 5;
+      // repeated string unused = 5 [deprecated = true];
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -15545,7 +15780,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated string unused2 = 6;
+      // repeated string unused2 = 6 [deprecated = true];
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -15564,7 +15799,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated string unused3 = 7;
+      // repeated string unused3 = 7 [deprecated = true];
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -15583,7 +15818,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated double durations = 8;
+      // repeated double durations = 8 [deprecated = true];
       case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -15605,7 +15840,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated uint32 directions = 9;
+      // repeated uint32 directions = 9 [deprecated = true];
       case 9: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -15627,7 +15862,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated bool isAutomatics = 10;
+      // repeated bool isAutomatics = 10 [deprecated = true];
       case 10: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -15649,7 +15884,7 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated double delays = 11;
+      // repeated double delays = 11 [deprecated = true];
       case 11: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
@@ -15667,6 +15902,34 @@ bool CommandTransitionSetValueArchive::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(89)) goto parse_delays;
+        if (input->ExpectTag(98)) goto parse_oldAttributes;
+        break;
+      }
+
+      // optional .KN.TransitionAttributesArchive oldAttributes = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_oldAttributes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_oldattributes()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(106)) goto parse_currentAttributes;
+        break;
+      }
+
+      // optional .KN.TransitionAttributesArchive currentAttributes = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_currentAttributes:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_currentattributes()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -15710,7 +15973,7 @@ void CommandTransitionSetValueArchive::SerializeWithCachedSizes(
       3, this->property(), output);
   }
 
-  // repeated string effects = 4;
+  // repeated string effects = 4 [deprecated = true];
   for (int i = 0; i < this->effects_size(); i++) {
   ::google::protobuf::internal::WireFormat::VerifyUTF8String(
     this->effects(i).data(), this->effects(i).length(),
@@ -15719,7 +15982,7 @@ void CommandTransitionSetValueArchive::SerializeWithCachedSizes(
       4, this->effects(i), output);
   }
 
-  // repeated string unused = 5;
+  // repeated string unused = 5 [deprecated = true];
   for (int i = 0; i < this->unused_size(); i++) {
   ::google::protobuf::internal::WireFormat::VerifyUTF8String(
     this->unused(i).data(), this->unused(i).length(),
@@ -15728,7 +15991,7 @@ void CommandTransitionSetValueArchive::SerializeWithCachedSizes(
       5, this->unused(i), output);
   }
 
-  // repeated string unused2 = 6;
+  // repeated string unused2 = 6 [deprecated = true];
   for (int i = 0; i < this->unused2_size(); i++) {
   ::google::protobuf::internal::WireFormat::VerifyUTF8String(
     this->unused2(i).data(), this->unused2(i).length(),
@@ -15737,7 +16000,7 @@ void CommandTransitionSetValueArchive::SerializeWithCachedSizes(
       6, this->unused2(i), output);
   }
 
-  // repeated string unused3 = 7;
+  // repeated string unused3 = 7 [deprecated = true];
   for (int i = 0; i < this->unused3_size(); i++) {
   ::google::protobuf::internal::WireFormat::VerifyUTF8String(
     this->unused3(i).data(), this->unused3(i).length(),
@@ -15746,30 +16009,42 @@ void CommandTransitionSetValueArchive::SerializeWithCachedSizes(
       7, this->unused3(i), output);
   }
 
-  // repeated double durations = 8;
+  // repeated double durations = 8 [deprecated = true];
   for (int i = 0; i < this->durations_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       8, this->durations(i), output);
   }
 
-  // repeated uint32 directions = 9;
+  // repeated uint32 directions = 9 [deprecated = true];
   for (int i = 0; i < this->directions_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(
       9, this->directions(i), output);
   }
 
-  // repeated bool isAutomatics = 10;
+  // repeated bool isAutomatics = 10 [deprecated = true];
   for (int i = 0; i < this->isautomatics_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteBool(
       10, this->isautomatics(i), output);
   }
 
-  // repeated double delays = 11;
+  // repeated double delays = 11 [deprecated = true];
   for (int i = 0; i < this->delays_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteDouble(
       11, this->delays(i), output);
   }
 
+  // optional .KN.TransitionAttributesArchive oldAttributes = 12;
+  if (has_oldattributes()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      12, this->oldattributes(), output);
+  }
+
+  // optional .KN.TransitionAttributesArchive currentAttributes = 13;
+  if (has_currentattributes()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      13, this->currentattributes(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -15802,7 +16077,7 @@ ::google::protobuf::uint8* CommandTransitionSetValueArchive::SerializeWithCached
         3, this->property(), target);
   }
 
-  // repeated string effects = 4;
+  // repeated string effects = 4 [deprecated = true];
   for (int i = 0; i < this->effects_size(); i++) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->effects(i).data(), this->effects(i).length(),
@@ -15811,7 +16086,7 @@ ::google::protobuf::uint8* CommandTransitionSetValueArchive::SerializeWithCached
       WriteStringToArray(4, this->effects(i), target);
   }
 
-  // repeated string unused = 5;
+  // repeated string unused = 5 [deprecated = true];
   for (int i = 0; i < this->unused_size(); i++) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->unused(i).data(), this->unused(i).length(),
@@ -15820,7 +16095,7 @@ ::google::protobuf::uint8* CommandTransitionSetValueArchive::SerializeWithCached
       WriteStringToArray(5, this->unused(i), target);
   }
 
-  // repeated string unused2 = 6;
+  // repeated string unused2 = 6 [deprecated = true];
   for (int i = 0; i < this->unused2_size(); i++) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->unused2(i).data(), this->unused2(i).length(),
@@ -15829,7 +16104,7 @@ ::google::protobuf::uint8* CommandTransitionSetValueArchive::SerializeWithCached
       WriteStringToArray(6, this->unused2(i), target);
   }
 
-  // repeated string unused3 = 7;
+  // repeated string unused3 = 7 [deprecated = true];
   for (int i = 0; i < this->unused3_size(); i++) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
       this->unused3(i).data(), this->unused3(i).length(),
@@ -15838,30 +16113,44 @@ ::google::protobuf::uint8* CommandTransitionSetValueArchive::SerializeWithCached
       WriteStringToArray(7, this->unused3(i), target);
   }
 
-  // repeated double durations = 8;
+  // repeated double durations = 8 [deprecated = true];
   for (int i = 0; i < this->durations_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteDoubleToArray(8, this->durations(i), target);
   }
 
-  // repeated uint32 directions = 9;
+  // repeated uint32 directions = 9 [deprecated = true];
   for (int i = 0; i < this->directions_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteUInt32ToArray(9, this->directions(i), target);
   }
 
-  // repeated bool isAutomatics = 10;
+  // repeated bool isAutomatics = 10 [deprecated = true];
   for (int i = 0; i < this->isautomatics_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteBoolToArray(10, this->isautomatics(i), target);
   }
 
-  // repeated double delays = 11;
+  // repeated double delays = 11 [deprecated = true];
   for (int i = 0; i < this->delays_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteDoubleToArray(11, this->delays(i), target);
   }
 
+  // optional .KN.TransitionAttributesArchive oldAttributes = 12;
+  if (has_oldattributes()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        12, this->oldattributes(), target);
+  }
+
+  // optional .KN.TransitionAttributesArchive currentAttributes = 13;
+  if (has_currentattributes()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        13, this->currentattributes(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -15895,42 +16184,58 @@ int CommandTransitionSetValueArchive::ByteSize() const {
     }
 
   }
-  // repeated string effects = 4;
+  if (_has_bits_[11 / 32] & (0xffu << (11 % 32))) {
+    // optional .KN.TransitionAttributesArchive oldAttributes = 12;
+    if (has_oldattributes()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->oldattributes());
+    }
+
+    // optional .KN.TransitionAttributesArchive currentAttributes = 13;
+    if (has_currentattributes()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->currentattributes());
+    }
+
+  }
+  // repeated string effects = 4 [deprecated = true];
   total_size += 1 * this->effects_size();
   for (int i = 0; i < this->effects_size(); i++) {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
       this->effects(i));
   }
 
-  // repeated string unused = 5;
+  // repeated string unused = 5 [deprecated = true];
   total_size += 1 * this->unused_size();
   for (int i = 0; i < this->unused_size(); i++) {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
       this->unused(i));
   }
 
-  // repeated string unused2 = 6;
+  // repeated string unused2 = 6 [deprecated = true];
   total_size += 1 * this->unused2_size();
   for (int i = 0; i < this->unused2_size(); i++) {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
       this->unused2(i));
   }
 
-  // repeated string unused3 = 7;
+  // repeated string unused3 = 7 [deprecated = true];
   total_size += 1 * this->unused3_size();
   for (int i = 0; i < this->unused3_size(); i++) {
     total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
       this->unused3(i));
   }
 
-  // repeated double durations = 8;
+  // repeated double durations = 8 [deprecated = true];
   {
     int data_size = 0;
     data_size = 8 * this->durations_size();
     total_size += 1 * this->durations_size() + data_size;
   }
 
-  // repeated uint32 directions = 9;
+  // repeated uint32 directions = 9 [deprecated = true];
   {
     int data_size = 0;
     for (int i = 0; i < this->directions_size(); i++) {
@@ -15940,14 +16245,14 @@ int CommandTransitionSetValueArchive::ByteSize() const {
     total_size += 1 * this->directions_size() + data_size;
   }
 
-  // repeated bool isAutomatics = 10;
+  // repeated bool isAutomatics = 10 [deprecated = true];
   {
     int data_size = 0;
     data_size = 1 * this->isautomatics_size();
     total_size += 1 * this->isautomatics_size() + data_size;
   }
 
-  // repeated double delays = 11;
+  // repeated double delays = 11 [deprecated = true];
   {
     int data_size = 0;
     data_size = 8 * this->delays_size();
@@ -15998,6 +16303,14 @@ void CommandTransitionSetValueArchive::MergeFrom(const CommandTransitionSetValue
       set_property(from.property());
     }
   }
+  if (from._has_bits_[11 / 32] & (0xffu << (11 % 32))) {
+    if (from.has_oldattributes()) {
+      mutable_oldattributes()->::KN::TransitionAttributesArchive::MergeFrom(from.oldattributes());
+    }
+    if (from.has_currentattributes()) {
+      mutable_currentattributes()->::KN::TransitionAttributesArchive::MergeFrom(from.currentattributes());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -16022,6 +16335,12 @@ bool CommandTransitionSetValueArchive::IsInitialized() const {
   if (has_slidenode()) {
     if (!this->slidenode().IsInitialized()) return false;
   }
+  if (has_oldattributes()) {
+    if (!this->oldattributes().IsInitialized()) return false;
+  }
+  if (has_currentattributes()) {
+    if (!this->currentattributes().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -16038,6 +16357,8 @@ void CommandTransitionSetValueArchive::Swap(CommandTransitionSetValueArchive* ot
     directions_.Swap(&other->directions_);
     isautomatics_.Swap(&other->isautomatics_);
     delays_.Swap(&other->delays_);
+    std::swap(oldattributes_, other->oldattributes_);
+    std::swap(currentattributes_, other->currentattributes_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -17526,85 +17847,91 @@ ::google::protobuf::Metadata CommandMasterSetBodyStylesArchive::GetMetadata() co
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSlideApplyThemeArchive::kSuperFieldNumber;
-const int CommandSlideApplyThemeArchive::kBlobFieldNumber;
+const int CommandMasterSetSlideObjectsLayerWithMasterArchive::kSuperFieldNumber;
+const int CommandMasterSetSlideObjectsLayerWithMasterArchive::kMasterFieldNumber;
+const int CommandMasterSetSlideObjectsLayerWithMasterArchive::kNewValueFieldNumber;
+const int CommandMasterSetSlideObjectsLayerWithMasterArchive::kOldValueFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSlideApplyThemeArchive::CommandSlideApplyThemeArchive()
+CommandMasterSetSlideObjectsLayerWithMasterArchive::CommandMasterSetSlideObjectsLayerWithMasterArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSlideApplyThemeArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSS::ApplyThemeChildCommandArchive*>(&::TSS::ApplyThemeChildCommandArchive::default_instance());
-  blob_ = const_cast< ::KN::MasterChangeBlobArchive*>(&::KN::MasterChangeBlobArchive::default_instance());
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  master_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSlideApplyThemeArchive::CommandSlideApplyThemeArchive(const CommandSlideApplyThemeArchive& from)
+CommandMasterSetSlideObjectsLayerWithMasterArchive::CommandMasterSetSlideObjectsLayerWithMasterArchive(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSlideApplyThemeArchive::SharedCtor() {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  blob_ = NULL;
+  master_ = NULL;
+  new_value_ = false;
+  old_value_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSlideApplyThemeArchive::~CommandSlideApplyThemeArchive() {
+CommandMasterSetSlideObjectsLayerWithMasterArchive::~CommandMasterSetSlideObjectsLayerWithMasterArchive() {
   SharedDtor();
 }
 
-void CommandSlideApplyThemeArchive::SharedDtor() {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete blob_;
+    delete master_;
   }
 }
 
-void CommandSlideApplyThemeArchive::SetCachedSize(int size) const {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSlideApplyThemeArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMasterSetSlideObjectsLayerWithMasterArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSlideApplyThemeArchive_descriptor_;
+  return CommandMasterSetSlideObjectsLayerWithMasterArchive_descriptor_;
 }
 
-const CommandSlideApplyThemeArchive& CommandSlideApplyThemeArchive::default_instance() {
+const CommandMasterSetSlideObjectsLayerWithMasterArchive& CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSlideApplyThemeArchive* CommandSlideApplyThemeArchive::default_instance_ = NULL;
+CommandMasterSetSlideObjectsLayerWithMasterArchive* CommandMasterSetSlideObjectsLayerWithMasterArchive::default_instance_ = NULL;
 
-CommandSlideApplyThemeArchive* CommandSlideApplyThemeArchive::New() const {
-  return new CommandSlideApplyThemeArchive;
+CommandMasterSetSlideObjectsLayerWithMasterArchive* CommandMasterSetSlideObjectsLayerWithMasterArchive::New() const {
+  return new CommandMasterSetSlideObjectsLayerWithMasterArchive;
 }
 
-void CommandSlideApplyThemeArchive::Clear() {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_blob()) {
-      if (blob_ != NULL) blob_->::KN::MasterChangeBlobArchive::Clear();
+    if (has_master()) {
+      if (master_ != NULL) master_->::TSP::Reference::Clear();
     }
+    new_value_ = false;
+    old_value_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSlideApplyThemeArchive::MergePartialFromCodedStream(
+bool CommandMasterSetSlideObjectsLayerWithMasterArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSS.ApplyThemeChildCommandArchive super = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -17613,17 +17940,49 @@ bool CommandSlideApplyThemeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_blob;
+        if (input->ExpectTag(18)) goto parse_master;
         break;
       }
 
-      // required .KN.MasterChangeBlobArchive blob = 2;
+      // required .TSP.Reference master = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_blob:
+         parse_master:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_blob()));
+               input, mutable_master()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_new_value;
+        break;
+      }
+
+      // required bool new_value = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_new_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &new_value_)));
+          set_has_new_value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_old_value;
+        break;
+      }
+
+      // required bool old_value = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_old_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &old_value_)));
+          set_has_old_value();
         } else {
           goto handle_uninterpreted;
         }
@@ -17647,18 +18006,28 @@ bool CommandSlideApplyThemeArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSlideApplyThemeArchive::SerializeWithCachedSizes(
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .KN.MasterChangeBlobArchive blob = 2;
-  if (has_blob()) {
+  // required .TSP.Reference master = 2;
+  if (has_master()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->blob(), output);
+      2, this->master(), output);
+  }
+
+  // required bool new_value = 3;
+  if (has_new_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->new_value(), output);
+  }
+
+  // required bool old_value = 4;
+  if (has_old_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->old_value(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -17667,20 +18036,30 @@ void CommandSlideApplyThemeArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSlideApplyThemeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMasterSetSlideObjectsLayerWithMasterArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .KN.MasterChangeBlobArchive blob = 2;
-  if (has_blob()) {
+  // required .TSP.Reference master = 2;
+  if (has_master()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->blob(), target);
+        2, this->master(), target);
+  }
+
+  // required bool new_value = 3;
+  if (has_new_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->new_value(), target);
+  }
+
+  // required bool old_value = 4;
+  if (has_old_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->old_value(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -17690,22 +18069,32 @@ ::google::protobuf::uint8* CommandSlideApplyThemeArchive::SerializeWithCachedSiz
   return target;
 }
 
-int CommandSlideApplyThemeArchive::ByteSize() const {
+int CommandMasterSetSlideObjectsLayerWithMasterArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSS.ApplyThemeChildCommandArchive super = 1;
+    // required .TSK.CommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .KN.MasterChangeBlobArchive blob = 2;
-    if (has_blob()) {
+    // required .TSP.Reference master = 2;
+    if (has_master()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->blob());
+          this->master());
+    }
+
+    // required bool new_value = 3;
+    if (has_new_value()) {
+      total_size += 1 + 1;
+    }
+
+    // required bool old_value = 4;
+    if (has_old_value()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -17720,10 +18109,10 @@ int CommandSlideApplyThemeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSlideApplyThemeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSlideApplyThemeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlideApplyThemeArchive*>(
+  const CommandMasterSetSlideObjectsLayerWithMasterArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMasterSetSlideObjectsLayerWithMasterArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -17732,58 +18121,66 @@ void CommandSlideApplyThemeArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandSlideApplyThemeArchive::MergeFrom(const CommandSlideApplyThemeArchive& from) {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::MergeFrom(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSS::ApplyThemeChildCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_blob()) {
-      mutable_blob()->::KN::MasterChangeBlobArchive::MergeFrom(from.blob());
+    if (from.has_master()) {
+      mutable_master()->::TSP::Reference::MergeFrom(from.master());
+    }
+    if (from.has_new_value()) {
+      set_new_value(from.new_value());
+    }
+    if (from.has_old_value()) {
+      set_old_value(from.old_value());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSlideApplyThemeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSlideApplyThemeArchive::CopyFrom(const CommandSlideApplyThemeArchive& from) {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::CopyFrom(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSlideApplyThemeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandMasterSetSlideObjectsLayerWithMasterArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_blob()) {
-    if (!this->blob().IsInitialized()) return false;
+  if (has_master()) {
+    if (!this->master().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSlideApplyThemeArchive::Swap(CommandSlideApplyThemeArchive* other) {
+void CommandMasterSetSlideObjectsLayerWithMasterArchive::Swap(CommandMasterSetSlideObjectsLayerWithMasterArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(blob_, other->blob_);
+    std::swap(master_, other->master_);
+    std::swap(new_value_, other->new_value_);
+    std::swap(old_value_, other->old_value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSlideApplyThemeArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMasterSetSlideObjectsLayerWithMasterArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSlideApplyThemeArchive_descriptor_;
-  metadata.reflection = CommandSlideApplyThemeArchive_reflection_;
+  metadata.descriptor = CommandMasterSetSlideObjectsLayerWithMasterArchive_descriptor_;
+  metadata.reflection = CommandMasterSetSlideObjectsLayerWithMasterArchive_reflection_;
   return metadata;
 }
 
@@ -17791,99 +18188,85 @@ ::google::protobuf::Metadata CommandSlideApplyThemeArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandChangeMasterSlideArchive::kSuperFieldNumber;
-const int CommandChangeMasterSlideArchive::kSlideFieldNumber;
-const int CommandChangeMasterSlideArchive::kMasterFieldNumber;
-const int CommandChangeMasterSlideArchive::kPlaceholderCommandsFieldNumber;
+const int CommandSlideApplyThemeArchive::kSuperFieldNumber;
+const int CommandSlideApplyThemeArchive::kBlobFieldNumber;
 #endif  // !_MSC_VER
 
-CommandChangeMasterSlideArchive::CommandChangeMasterSlideArchive()
+CommandSlideApplyThemeArchive::CommandSlideApplyThemeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandChangeMasterSlideArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  slide_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  master_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  placeholder_commands_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSlideApplyThemeArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSS::ApplyThemeChildCommandArchive*>(&::TSS::ApplyThemeChildCommandArchive::default_instance());
+  blob_ = const_cast< ::KN::MasterChangeBlobArchive*>(&::KN::MasterChangeBlobArchive::default_instance());
 }
 
-CommandChangeMasterSlideArchive::CommandChangeMasterSlideArchive(const CommandChangeMasterSlideArchive& from)
+CommandSlideApplyThemeArchive::CommandSlideApplyThemeArchive(const CommandSlideApplyThemeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandChangeMasterSlideArchive::SharedCtor() {
+void CommandSlideApplyThemeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  slide_ = NULL;
-  master_ = NULL;
-  placeholder_commands_ = NULL;
+  blob_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandChangeMasterSlideArchive::~CommandChangeMasterSlideArchive() {
+CommandSlideApplyThemeArchive::~CommandSlideApplyThemeArchive() {
   SharedDtor();
 }
 
-void CommandChangeMasterSlideArchive::SharedDtor() {
+void CommandSlideApplyThemeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete slide_;
-    delete master_;
-    delete placeholder_commands_;
+    delete blob_;
   }
 }
 
-void CommandChangeMasterSlideArchive::SetCachedSize(int size) const {
+void CommandSlideApplyThemeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandChangeMasterSlideArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSlideApplyThemeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandChangeMasterSlideArchive_descriptor_;
+  return CommandSlideApplyThemeArchive_descriptor_;
 }
 
-const CommandChangeMasterSlideArchive& CommandChangeMasterSlideArchive::default_instance() {
+const CommandSlideApplyThemeArchive& CommandSlideApplyThemeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandChangeMasterSlideArchive* CommandChangeMasterSlideArchive::default_instance_ = NULL;
+CommandSlideApplyThemeArchive* CommandSlideApplyThemeArchive::default_instance_ = NULL;
 
-CommandChangeMasterSlideArchive* CommandChangeMasterSlideArchive::New() const {
-  return new CommandChangeMasterSlideArchive;
+CommandSlideApplyThemeArchive* CommandSlideApplyThemeArchive::New() const {
+  return new CommandSlideApplyThemeArchive;
 }
 
-void CommandChangeMasterSlideArchive::Clear() {
+void CommandSlideApplyThemeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
-    }
-    if (has_slide()) {
-      if (slide_ != NULL) slide_->::TSP::Reference::Clear();
-    }
-    if (has_master()) {
-      if (master_ != NULL) master_->::TSP::Reference::Clear();
+      if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
     }
-    if (has_placeholder_commands()) {
-      if (placeholder_commands_ != NULL) placeholder_commands_->::TSP::Reference::Clear();
+    if (has_blob()) {
+      if (blob_ != NULL) blob_->::KN::MasterChangeBlobArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandChangeMasterSlideArchive::MergePartialFromCodedStream(
+bool CommandSlideApplyThemeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // required .TSS.ApplyThemeChildCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -17892,45 +18275,17 @@ bool CommandChangeMasterSlideArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_slide;
+        if (input->ExpectTag(18)) goto parse_blob;
         break;
       }
 
-      // required .TSP.Reference slide = 2;
+      // required .KN.MasterChangeBlobArchive blob = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_slide:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_slide()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_master;
-        break;
-      }
-
-      // required .TSP.Reference master = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_master:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_master()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_placeholder_commands;
-        break;
-      }
-
-      // required .TSP.Reference placeholder_commands = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_placeholder_commands:
+         parse_blob:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_placeholder_commands()));
+               input, mutable_blob()));
         } else {
           goto handle_uninterpreted;
         }
@@ -17954,30 +18309,18 @@ bool CommandChangeMasterSlideArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandChangeMasterSlideArchive::SerializeWithCachedSizes(
+void CommandSlideApplyThemeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference slide = 2;
-  if (has_slide()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->slide(), output);
-  }
-
-  // required .TSP.Reference master = 3;
-  if (has_master()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->master(), output);
-  }
-
-  // required .TSP.Reference placeholder_commands = 4;
-  if (has_placeholder_commands()) {
+  // required .KN.MasterChangeBlobArchive blob = 2;
+  if (has_blob()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->placeholder_commands(), output);
+      2, this->blob(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -17986,34 +18329,20 @@ void CommandChangeMasterSlideArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandChangeMasterSlideArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSlideApplyThemeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference slide = 2;
-  if (has_slide()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->slide(), target);
-  }
-
-  // required .TSP.Reference master = 3;
-  if (has_master()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->master(), target);
-  }
-
-  // required .TSP.Reference placeholder_commands = 4;
-  if (has_placeholder_commands()) {
+  // required .KN.MasterChangeBlobArchive blob = 2;
+  if (has_blob()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->placeholder_commands(), target);
+        2, this->blob(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -18023,36 +18352,22 @@ ::google::protobuf::uint8* CommandChangeMasterSlideArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandChangeMasterSlideArchive::ByteSize() const {
+int CommandSlideApplyThemeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
+    // required .TSS.ApplyThemeChildCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSP.Reference slide = 2;
-    if (has_slide()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->slide());
-    }
-
-    // required .TSP.Reference master = 3;
-    if (has_master()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->master());
-    }
-
-    // required .TSP.Reference placeholder_commands = 4;
-    if (has_placeholder_commands()) {
+    // required .KN.MasterChangeBlobArchive blob = 2;
+    if (has_blob()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->placeholder_commands());
+          this->blob());
     }
 
   }
@@ -18067,10 +18382,10 @@ int CommandChangeMasterSlideArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandChangeMasterSlideArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSlideApplyThemeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandChangeMasterSlideArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandChangeMasterSlideArchive*>(
+  const CommandSlideApplyThemeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlideApplyThemeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -18079,72 +18394,58 @@ void CommandChangeMasterSlideArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandChangeMasterSlideArchive::MergeFrom(const CommandChangeMasterSlideArchive& from) {
+void CommandSlideApplyThemeArchive::MergeFrom(const CommandSlideApplyThemeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_slide()) {
-      mutable_slide()->::TSP::Reference::MergeFrom(from.slide());
-    }
-    if (from.has_master()) {
-      mutable_master()->::TSP::Reference::MergeFrom(from.master());
+      mutable_super()->::TSS::ApplyThemeChildCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_placeholder_commands()) {
-      mutable_placeholder_commands()->::TSP::Reference::MergeFrom(from.placeholder_commands());
+    if (from.has_blob()) {
+      mutable_blob()->::KN::MasterChangeBlobArchive::MergeFrom(from.blob());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandChangeMasterSlideArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSlideApplyThemeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandChangeMasterSlideArchive::CopyFrom(const CommandChangeMasterSlideArchive& from) {
+void CommandSlideApplyThemeArchive::CopyFrom(const CommandSlideApplyThemeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandChangeMasterSlideArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandSlideApplyThemeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_slide()) {
-    if (!this->slide().IsInitialized()) return false;
-  }
-  if (has_master()) {
-    if (!this->master().IsInitialized()) return false;
-  }
-  if (has_placeholder_commands()) {
-    if (!this->placeholder_commands().IsInitialized()) return false;
+  if (has_blob()) {
+    if (!this->blob().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandChangeMasterSlideArchive::Swap(CommandChangeMasterSlideArchive* other) {
+void CommandSlideApplyThemeArchive::Swap(CommandSlideApplyThemeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(slide_, other->slide_);
-    std::swap(master_, other->master_);
-    std::swap(placeholder_commands_, other->placeholder_commands_);
+    std::swap(blob_, other->blob_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandChangeMasterSlideArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSlideApplyThemeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandChangeMasterSlideArchive_descriptor_;
-  metadata.reflection = CommandChangeMasterSlideArchive_reflection_;
+  metadata.descriptor = CommandSlideApplyThemeArchive_descriptor_;
+  metadata.reflection = CommandSlideApplyThemeArchive_reflection_;
   return metadata;
 }
 
@@ -18152,74 +18453,74 @@ ::google::protobuf::Metadata CommandChangeMasterSlideArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSlidePrimitiveSetMasterArchive::kSuperFieldNumber;
-const int CommandSlidePrimitiveSetMasterArchive::kSlideFieldNumber;
-const int CommandSlidePrimitiveSetMasterArchive::kMasterFieldNumber;
-const int CommandSlidePrimitiveSetMasterArchive::kOldMasterFieldNumber;
+const int CommandChangeMasterSlideArchive::kSuperFieldNumber;
+const int CommandChangeMasterSlideArchive::kSlideFieldNumber;
+const int CommandChangeMasterSlideArchive::kMasterFieldNumber;
+const int CommandChangeMasterSlideArchive::kPlaceholderCommandsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSlidePrimitiveSetMasterArchive::CommandSlidePrimitiveSetMasterArchive()
+CommandChangeMasterSlideArchive::CommandChangeMasterSlideArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSlidePrimitiveSetMasterArchive::InitAsDefaultInstance() {
+void CommandChangeMasterSlideArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
   slide_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   master_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_master_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  placeholder_commands_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSlidePrimitiveSetMasterArchive::CommandSlidePrimitiveSetMasterArchive(const CommandSlidePrimitiveSetMasterArchive& from)
+CommandChangeMasterSlideArchive::CommandChangeMasterSlideArchive(const CommandChangeMasterSlideArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSlidePrimitiveSetMasterArchive::SharedCtor() {
+void CommandChangeMasterSlideArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
   slide_ = NULL;
   master_ = NULL;
-  old_master_ = NULL;
+  placeholder_commands_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSlidePrimitiveSetMasterArchive::~CommandSlidePrimitiveSetMasterArchive() {
+CommandChangeMasterSlideArchive::~CommandChangeMasterSlideArchive() {
   SharedDtor();
 }
 
-void CommandSlidePrimitiveSetMasterArchive::SharedDtor() {
+void CommandChangeMasterSlideArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
     delete slide_;
     delete master_;
-    delete old_master_;
+    delete placeholder_commands_;
   }
 }
 
-void CommandSlidePrimitiveSetMasterArchive::SetCachedSize(int size) const {
+void CommandChangeMasterSlideArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSlidePrimitiveSetMasterArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandChangeMasterSlideArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSlidePrimitiveSetMasterArchive_descriptor_;
+  return CommandChangeMasterSlideArchive_descriptor_;
 }
 
-const CommandSlidePrimitiveSetMasterArchive& CommandSlidePrimitiveSetMasterArchive::default_instance() {
+const CommandChangeMasterSlideArchive& CommandChangeMasterSlideArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSlidePrimitiveSetMasterArchive* CommandSlidePrimitiveSetMasterArchive::default_instance_ = NULL;
+CommandChangeMasterSlideArchive* CommandChangeMasterSlideArchive::default_instance_ = NULL;
 
-CommandSlidePrimitiveSetMasterArchive* CommandSlidePrimitiveSetMasterArchive::New() const {
-  return new CommandSlidePrimitiveSetMasterArchive;
+CommandChangeMasterSlideArchive* CommandChangeMasterSlideArchive::New() const {
+  return new CommandChangeMasterSlideArchive;
 }
 
-void CommandSlidePrimitiveSetMasterArchive::Clear() {
+void CommandChangeMasterSlideArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
@@ -18230,15 +18531,15 @@ void CommandSlidePrimitiveSetMasterArchive::Clear() {
     if (has_master()) {
       if (master_ != NULL) master_->::TSP::Reference::Clear();
     }
-    if (has_old_master()) {
-      if (old_master_ != NULL) old_master_->::TSP::Reference::Clear();
+    if (has_placeholder_commands()) {
+      if (placeholder_commands_ != NULL) placeholder_commands_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSlidePrimitiveSetMasterArchive::MergePartialFromCodedStream(
+bool CommandChangeMasterSlideArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -18281,17 +18582,17 @@ bool CommandSlidePrimitiveSetMasterArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_old_master;
+        if (input->ExpectTag(34)) goto parse_placeholder_commands;
         break;
       }
 
-      // required .TSP.Reference old_master = 4;
+      // required .TSP.Reference placeholder_commands = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_master:
+         parse_placeholder_commands:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_master()));
+               input, mutable_placeholder_commands()));
         } else {
           goto handle_uninterpreted;
         }
@@ -18315,7 +18616,7 @@ bool CommandSlidePrimitiveSetMasterArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSlidePrimitiveSetMasterArchive::SerializeWithCachedSizes(
+void CommandChangeMasterSlideArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -18335,10 +18636,10 @@ void CommandSlidePrimitiveSetMasterArchive::SerializeWithCachedSizes(
       3, this->master(), output);
   }
 
-  // required .TSP.Reference old_master = 4;
-  if (has_old_master()) {
+  // required .TSP.Reference placeholder_commands = 4;
+  if (has_placeholder_commands()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->old_master(), output);
+      4, this->placeholder_commands(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -18347,7 +18648,7 @@ void CommandSlidePrimitiveSetMasterArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSlidePrimitiveSetMasterArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandChangeMasterSlideArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -18370,11 +18671,11 @@ ::google::protobuf::uint8* CommandSlidePrimitiveSetMasterArchive::SerializeWithC
         3, this->master(), target);
   }
 
-  // required .TSP.Reference old_master = 4;
-  if (has_old_master()) {
+  // required .TSP.Reference placeholder_commands = 4;
+  if (has_placeholder_commands()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->old_master(), target);
+        4, this->placeholder_commands(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -18384,7 +18685,7 @@ ::google::protobuf::uint8* CommandSlidePrimitiveSetMasterArchive::SerializeWithC
   return target;
 }
 
-int CommandSlidePrimitiveSetMasterArchive::ByteSize() const {
+int CommandChangeMasterSlideArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -18409,11 +18710,11 @@ int CommandSlidePrimitiveSetMasterArchive::ByteSize() const {
           this->master());
     }
 
-    // required .TSP.Reference old_master = 4;
-    if (has_old_master()) {
+    // required .TSP.Reference placeholder_commands = 4;
+    if (has_placeholder_commands()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_master());
+          this->placeholder_commands());
     }
 
   }
@@ -18428,10 +18729,10 @@ int CommandSlidePrimitiveSetMasterArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSlidePrimitiveSetMasterArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandChangeMasterSlideArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSlidePrimitiveSetMasterArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlidePrimitiveSetMasterArchive*>(
+  const CommandChangeMasterSlideArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandChangeMasterSlideArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -18440,7 +18741,7 @@ void CommandSlidePrimitiveSetMasterArchive::MergeFrom(const ::google::protobuf::
   }
 }
 
-void CommandSlidePrimitiveSetMasterArchive::MergeFrom(const CommandSlidePrimitiveSetMasterArchive& from) {
+void CommandChangeMasterSlideArchive::MergeFrom(const CommandChangeMasterSlideArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
@@ -18452,26 +18753,26 @@ void CommandSlidePrimitiveSetMasterArchive::MergeFrom(const CommandSlidePrimitiv
     if (from.has_master()) {
       mutable_master()->::TSP::Reference::MergeFrom(from.master());
     }
-    if (from.has_old_master()) {
-      mutable_old_master()->::TSP::Reference::MergeFrom(from.old_master());
+    if (from.has_placeholder_commands()) {
+      mutable_placeholder_commands()->::TSP::Reference::MergeFrom(from.placeholder_commands());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSlidePrimitiveSetMasterArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandChangeMasterSlideArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSlidePrimitiveSetMasterArchive::CopyFrom(const CommandSlidePrimitiveSetMasterArchive& from) {
+void CommandChangeMasterSlideArchive::CopyFrom(const CommandChangeMasterSlideArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSlidePrimitiveSetMasterArchive::IsInitialized() const {
+bool CommandChangeMasterSlideArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
@@ -18483,29 +18784,29 @@ bool CommandSlidePrimitiveSetMasterArchive::IsInitialized() const {
   if (has_master()) {
     if (!this->master().IsInitialized()) return false;
   }
-  if (has_old_master()) {
-    if (!this->old_master().IsInitialized()) return false;
+  if (has_placeholder_commands()) {
+    if (!this->placeholder_commands().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSlidePrimitiveSetMasterArchive::Swap(CommandSlidePrimitiveSetMasterArchive* other) {
+void CommandChangeMasterSlideArchive::Swap(CommandChangeMasterSlideArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
     std::swap(slide_, other->slide_);
     std::swap(master_, other->master_);
-    std::swap(old_master_, other->old_master_);
+    std::swap(placeholder_commands_, other->placeholder_commands_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSlidePrimitiveSetMasterArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandChangeMasterSlideArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSlidePrimitiveSetMasterArchive_descriptor_;
-  metadata.reflection = CommandSlidePrimitiveSetMasterArchive_reflection_;
+  metadata.descriptor = CommandChangeMasterSlideArchive_descriptor_;
+  metadata.reflection = CommandChangeMasterSlideArchive_reflection_;
   return metadata;
 }
 
@@ -18513,79 +18814,93 @@ ::google::protobuf::Metadata CommandSlidePrimitiveSetMasterArchive::GetMetadata(
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSlideReapplyMasterArchive::kSuperFieldNumber;
-const int CommandSlideReapplyMasterArchive::kReapplyAccumulatedCommandFieldNumber;
+const int CommandSlidePrimitiveSetMasterArchive::kSuperFieldNumber;
+const int CommandSlidePrimitiveSetMasterArchive::kSlideFieldNumber;
+const int CommandSlidePrimitiveSetMasterArchive::kMasterFieldNumber;
+const int CommandSlidePrimitiveSetMasterArchive::kOldMasterFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSlideReapplyMasterArchive::CommandSlideReapplyMasterArchive()
+CommandSlidePrimitiveSetMasterArchive::CommandSlidePrimitiveSetMasterArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSlideReapplyMasterArchive::InitAsDefaultInstance() {
+void CommandSlidePrimitiveSetMasterArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  reapply_accumulated_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  slide_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  master_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_master_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSlideReapplyMasterArchive::CommandSlideReapplyMasterArchive(const CommandSlideReapplyMasterArchive& from)
+CommandSlidePrimitiveSetMasterArchive::CommandSlidePrimitiveSetMasterArchive(const CommandSlidePrimitiveSetMasterArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSlideReapplyMasterArchive::SharedCtor() {
+void CommandSlidePrimitiveSetMasterArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  reapply_accumulated_command_ = NULL;
+  slide_ = NULL;
+  master_ = NULL;
+  old_master_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSlideReapplyMasterArchive::~CommandSlideReapplyMasterArchive() {
+CommandSlidePrimitiveSetMasterArchive::~CommandSlidePrimitiveSetMasterArchive() {
   SharedDtor();
 }
 
-void CommandSlideReapplyMasterArchive::SharedDtor() {
+void CommandSlidePrimitiveSetMasterArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete reapply_accumulated_command_;
+    delete slide_;
+    delete master_;
+    delete old_master_;
   }
 }
 
-void CommandSlideReapplyMasterArchive::SetCachedSize(int size) const {
+void CommandSlidePrimitiveSetMasterArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSlideReapplyMasterArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSlidePrimitiveSetMasterArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSlideReapplyMasterArchive_descriptor_;
+  return CommandSlidePrimitiveSetMasterArchive_descriptor_;
 }
 
-const CommandSlideReapplyMasterArchive& CommandSlideReapplyMasterArchive::default_instance() {
+const CommandSlidePrimitiveSetMasterArchive& CommandSlidePrimitiveSetMasterArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSlideReapplyMasterArchive* CommandSlideReapplyMasterArchive::default_instance_ = NULL;
+CommandSlidePrimitiveSetMasterArchive* CommandSlidePrimitiveSetMasterArchive::default_instance_ = NULL;
 
-CommandSlideReapplyMasterArchive* CommandSlideReapplyMasterArchive::New() const {
-  return new CommandSlideReapplyMasterArchive;
+CommandSlidePrimitiveSetMasterArchive* CommandSlidePrimitiveSetMasterArchive::New() const {
+  return new CommandSlidePrimitiveSetMasterArchive;
 }
 
-void CommandSlideReapplyMasterArchive::Clear() {
+void CommandSlidePrimitiveSetMasterArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_reapply_accumulated_command()) {
-      if (reapply_accumulated_command_ != NULL) reapply_accumulated_command_->::TSP::Reference::Clear();
+    if (has_slide()) {
+      if (slide_ != NULL) slide_->::TSP::Reference::Clear();
+    }
+    if (has_master()) {
+      if (master_ != NULL) master_->::TSP::Reference::Clear();
+    }
+    if (has_old_master()) {
+      if (old_master_ != NULL) old_master_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSlideReapplyMasterArchive::MergePartialFromCodedStream(
+bool CommandSlidePrimitiveSetMasterArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -18600,17 +18915,45 @@ bool CommandSlideReapplyMasterArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_reapply_accumulated_command;
+        if (input->ExpectTag(18)) goto parse_slide;
         break;
       }
 
-      // required .TSP.Reference reapply_accumulated_command = 2;
+      // required .TSP.Reference slide = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_reapply_accumulated_command:
+         parse_slide:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_reapply_accumulated_command()));
+               input, mutable_slide()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_master;
+        break;
+      }
+
+      // required .TSP.Reference master = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_master:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_master()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_old_master;
+        break;
+      }
+
+      // required .TSP.Reference old_master = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_master:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_master()));
         } else {
           goto handle_uninterpreted;
         }
@@ -18634,7 +18977,7 @@ bool CommandSlideReapplyMasterArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSlideReapplyMasterArchive::SerializeWithCachedSizes(
+void CommandSlidePrimitiveSetMasterArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -18642,10 +18985,22 @@ void CommandSlideReapplyMasterArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference reapply_accumulated_command = 2;
-  if (has_reapply_accumulated_command()) {
+  // required .TSP.Reference slide = 2;
+  if (has_slide()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->reapply_accumulated_command(), output);
+      2, this->slide(), output);
+  }
+
+  // required .TSP.Reference master = 3;
+  if (has_master()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->master(), output);
+  }
+
+  // required .TSP.Reference old_master = 4;
+  if (has_old_master()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->old_master(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -18654,7 +19009,7 @@ void CommandSlideReapplyMasterArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSlideReapplyMasterArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSlidePrimitiveSetMasterArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -18663,11 +19018,25 @@ ::google::protobuf::uint8* CommandSlideReapplyMasterArchive::SerializeWithCached
         1, this->super(), target);
   }
 
-  // required .TSP.Reference reapply_accumulated_command = 2;
-  if (has_reapply_accumulated_command()) {
+  // required .TSP.Reference slide = 2;
+  if (has_slide()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->reapply_accumulated_command(), target);
+        2, this->slide(), target);
+  }
+
+  // required .TSP.Reference master = 3;
+  if (has_master()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->master(), target);
+  }
+
+  // required .TSP.Reference old_master = 4;
+  if (has_old_master()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->old_master(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -18677,7 +19046,7 @@ ::google::protobuf::uint8* CommandSlideReapplyMasterArchive::SerializeWithCached
   return target;
 }
 
-int CommandSlideReapplyMasterArchive::ByteSize() const {
+int CommandSlidePrimitiveSetMasterArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -18688,29 +19057,43 @@ int CommandSlideReapplyMasterArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSP.Reference reapply_accumulated_command = 2;
-    if (has_reapply_accumulated_command()) {
+    // required .TSP.Reference slide = 2;
+    if (has_slide()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->reapply_accumulated_command());
+          this->slide());
     }
 
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+    // required .TSP.Reference master = 3;
+    if (has_master()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->master());
+    }
+
+    // required .TSP.Reference old_master = 4;
+    if (has_old_master()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_master());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
   return total_size;
 }
 
-void CommandSlideReapplyMasterArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSlidePrimitiveSetMasterArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSlideReapplyMasterArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlideReapplyMasterArchive*>(
+  const CommandSlidePrimitiveSetMasterArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlidePrimitiveSetMasterArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -18719,58 +19102,72 @@ void CommandSlideReapplyMasterArchive::MergeFrom(const ::google::protobuf::Messa
   }
 }
 
-void CommandSlideReapplyMasterArchive::MergeFrom(const CommandSlideReapplyMasterArchive& from) {
+void CommandSlidePrimitiveSetMasterArchive::MergeFrom(const CommandSlidePrimitiveSetMasterArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_reapply_accumulated_command()) {
-      mutable_reapply_accumulated_command()->::TSP::Reference::MergeFrom(from.reapply_accumulated_command());
+    if (from.has_slide()) {
+      mutable_slide()->::TSP::Reference::MergeFrom(from.slide());
+    }
+    if (from.has_master()) {
+      mutable_master()->::TSP::Reference::MergeFrom(from.master());
+    }
+    if (from.has_old_master()) {
+      mutable_old_master()->::TSP::Reference::MergeFrom(from.old_master());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSlideReapplyMasterArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSlidePrimitiveSetMasterArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSlideReapplyMasterArchive::CopyFrom(const CommandSlideReapplyMasterArchive& from) {
+void CommandSlidePrimitiveSetMasterArchive::CopyFrom(const CommandSlidePrimitiveSetMasterArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSlideReapplyMasterArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSlidePrimitiveSetMasterArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_reapply_accumulated_command()) {
-    if (!this->reapply_accumulated_command().IsInitialized()) return false;
+  if (has_slide()) {
+    if (!this->slide().IsInitialized()) return false;
+  }
+  if (has_master()) {
+    if (!this->master().IsInitialized()) return false;
+  }
+  if (has_old_master()) {
+    if (!this->old_master().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSlideReapplyMasterArchive::Swap(CommandSlideReapplyMasterArchive* other) {
+void CommandSlidePrimitiveSetMasterArchive::Swap(CommandSlidePrimitiveSetMasterArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(reapply_accumulated_command_, other->reapply_accumulated_command_);
+    std::swap(slide_, other->slide_);
+    std::swap(master_, other->master_);
+    std::swap(old_master_, other->old_master_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSlideReapplyMasterArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSlidePrimitiveSetMasterArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSlideReapplyMasterArchive_descriptor_;
-  metadata.reflection = CommandSlideReapplyMasterArchive_reflection_;
+  metadata.descriptor = CommandSlidePrimitiveSetMasterArchive_descriptor_;
+  metadata.reflection = CommandSlidePrimitiveSetMasterArchive_reflection_;
   return metadata;
 }
 
@@ -18778,93 +19175,79 @@ ::google::protobuf::Metadata CommandSlideReapplyMasterArchive::GetMetadata() con
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandShowSetSoundtrack::kSuperFieldNumber;
-const int CommandShowSetSoundtrack::kShowFieldNumber;
-const int CommandShowSetSoundtrack::kSoundtrackFieldNumber;
-const int CommandShowSetSoundtrack::kOldSoundtrackFieldNumber;
+const int CommandSlideReapplyMasterArchive::kSuperFieldNumber;
+const int CommandSlideReapplyMasterArchive::kReapplyAccumulatedCommandFieldNumber;
 #endif  // !_MSC_VER
 
-CommandShowSetSoundtrack::CommandShowSetSoundtrack()
+CommandSlideReapplyMasterArchive::CommandSlideReapplyMasterArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandShowSetSoundtrack::InitAsDefaultInstance() {
+void CommandSlideReapplyMasterArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  show_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  soundtrack_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_soundtrack_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  reapply_accumulated_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandShowSetSoundtrack::CommandShowSetSoundtrack(const CommandShowSetSoundtrack& from)
+CommandSlideReapplyMasterArchive::CommandSlideReapplyMasterArchive(const CommandSlideReapplyMasterArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandShowSetSoundtrack::SharedCtor() {
+void CommandSlideReapplyMasterArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  show_ = NULL;
-  soundtrack_ = NULL;
-  old_soundtrack_ = NULL;
+  reapply_accumulated_command_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandShowSetSoundtrack::~CommandShowSetSoundtrack() {
+CommandSlideReapplyMasterArchive::~CommandSlideReapplyMasterArchive() {
   SharedDtor();
 }
 
-void CommandShowSetSoundtrack::SharedDtor() {
+void CommandSlideReapplyMasterArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete show_;
-    delete soundtrack_;
-    delete old_soundtrack_;
+    delete reapply_accumulated_command_;
   }
 }
 
-void CommandShowSetSoundtrack::SetCachedSize(int size) const {
+void CommandSlideReapplyMasterArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandShowSetSoundtrack::descriptor() {
+const ::google::protobuf::Descriptor* CommandSlideReapplyMasterArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandShowSetSoundtrack_descriptor_;
+  return CommandSlideReapplyMasterArchive_descriptor_;
 }
 
-const CommandShowSetSoundtrack& CommandShowSetSoundtrack::default_instance() {
+const CommandSlideReapplyMasterArchive& CommandSlideReapplyMasterArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandShowSetSoundtrack* CommandShowSetSoundtrack::default_instance_ = NULL;
+CommandSlideReapplyMasterArchive* CommandSlideReapplyMasterArchive::default_instance_ = NULL;
 
-CommandShowSetSoundtrack* CommandShowSetSoundtrack::New() const {
-  return new CommandShowSetSoundtrack;
+CommandSlideReapplyMasterArchive* CommandSlideReapplyMasterArchive::New() const {
+  return new CommandSlideReapplyMasterArchive;
 }
 
-void CommandShowSetSoundtrack::Clear() {
+void CommandSlideReapplyMasterArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_show()) {
-      if (show_ != NULL) show_->::TSP::Reference::Clear();
-    }
-    if (has_soundtrack()) {
-      if (soundtrack_ != NULL) soundtrack_->::TSP::Reference::Clear();
-    }
-    if (has_old_soundtrack()) {
-      if (old_soundtrack_ != NULL) old_soundtrack_->::TSP::Reference::Clear();
+    if (has_reapply_accumulated_command()) {
+      if (reapply_accumulated_command_ != NULL) reapply_accumulated_command_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandShowSetSoundtrack::MergePartialFromCodedStream(
+bool CommandSlideReapplyMasterArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -18879,45 +19262,17 @@ bool CommandShowSetSoundtrack::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_show;
+        if (input->ExpectTag(18)) goto parse_reapply_accumulated_command;
         break;
       }
 
-      // optional .TSP.Reference show = 2;
+      // required .TSP.Reference reapply_accumulated_command = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_show:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_show()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_soundtrack;
-        break;
-      }
-
-      // optional .TSP.Reference soundtrack = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_soundtrack:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_soundtrack()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_old_soundtrack;
-        break;
-      }
-
-      // optional .TSP.Reference old_soundtrack = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_soundtrack:
+         parse_reapply_accumulated_command:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_soundtrack()));
+               input, mutable_reapply_accumulated_command()));
         } else {
           goto handle_uninterpreted;
         }
@@ -18941,7 +19296,7 @@ bool CommandShowSetSoundtrack::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandShowSetSoundtrack::SerializeWithCachedSizes(
+void CommandSlideReapplyMasterArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -18949,22 +19304,10 @@ void CommandShowSetSoundtrack::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // optional .TSP.Reference show = 2;
-  if (has_show()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->show(), output);
-  }
-
-  // optional .TSP.Reference soundtrack = 3;
-  if (has_soundtrack()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->soundtrack(), output);
-  }
-
-  // optional .TSP.Reference old_soundtrack = 4;
-  if (has_old_soundtrack()) {
+  // required .TSP.Reference reapply_accumulated_command = 2;
+  if (has_reapply_accumulated_command()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->old_soundtrack(), output);
+      2, this->reapply_accumulated_command(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -18973,7 +19316,7 @@ void CommandShowSetSoundtrack::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandShowSetSoundtrack::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSlideReapplyMasterArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -18982,25 +19325,11 @@ ::google::protobuf::uint8* CommandShowSetSoundtrack::SerializeWithCachedSizesToA
         1, this->super(), target);
   }
 
-  // optional .TSP.Reference show = 2;
-  if (has_show()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->show(), target);
-  }
-
-  // optional .TSP.Reference soundtrack = 3;
-  if (has_soundtrack()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->soundtrack(), target);
-  }
-
-  // optional .TSP.Reference old_soundtrack = 4;
-  if (has_old_soundtrack()) {
+  // required .TSP.Reference reapply_accumulated_command = 2;
+  if (has_reapply_accumulated_command()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->old_soundtrack(), target);
+        2, this->reapply_accumulated_command(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -19010,7 +19339,7 @@ ::google::protobuf::uint8* CommandShowSetSoundtrack::SerializeWithCachedSizesToA
   return target;
 }
 
-int CommandShowSetSoundtrack::ByteSize() const {
+int CommandSlideReapplyMasterArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -19021,25 +19350,11 @@ int CommandShowSetSoundtrack::ByteSize() const {
           this->super());
     }
 
-    // optional .TSP.Reference show = 2;
-    if (has_show()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->show());
-    }
-
-    // optional .TSP.Reference soundtrack = 3;
-    if (has_soundtrack()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->soundtrack());
-    }
-
-    // optional .TSP.Reference old_soundtrack = 4;
-    if (has_old_soundtrack()) {
+    // required .TSP.Reference reapply_accumulated_command = 2;
+    if (has_reapply_accumulated_command()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_soundtrack());
+          this->reapply_accumulated_command());
     }
 
   }
@@ -19054,10 +19369,10 @@ int CommandShowSetSoundtrack::ByteSize() const {
   return total_size;
 }
 
-void CommandShowSetSoundtrack::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSlideReapplyMasterArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandShowSetSoundtrack* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandShowSetSoundtrack*>(
+  const CommandSlideReapplyMasterArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlideReapplyMasterArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -19066,72 +19381,58 @@ void CommandShowSetSoundtrack::MergeFrom(const ::google::protobuf::Message& from
   }
 }
 
-void CommandShowSetSoundtrack::MergeFrom(const CommandShowSetSoundtrack& from) {
+void CommandSlideReapplyMasterArchive::MergeFrom(const CommandSlideReapplyMasterArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_show()) {
-      mutable_show()->::TSP::Reference::MergeFrom(from.show());
-    }
-    if (from.has_soundtrack()) {
-      mutable_soundtrack()->::TSP::Reference::MergeFrom(from.soundtrack());
-    }
-    if (from.has_old_soundtrack()) {
-      mutable_old_soundtrack()->::TSP::Reference::MergeFrom(from.old_soundtrack());
+    if (from.has_reapply_accumulated_command()) {
+      mutable_reapply_accumulated_command()->::TSP::Reference::MergeFrom(from.reapply_accumulated_command());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandShowSetSoundtrack::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSlideReapplyMasterArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandShowSetSoundtrack::CopyFrom(const CommandShowSetSoundtrack& from) {
+void CommandSlideReapplyMasterArchive::CopyFrom(const CommandSlideReapplyMasterArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandShowSetSoundtrack::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandSlideReapplyMasterArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_show()) {
-    if (!this->show().IsInitialized()) return false;
-  }
-  if (has_soundtrack()) {
-    if (!this->soundtrack().IsInitialized()) return false;
-  }
-  if (has_old_soundtrack()) {
-    if (!this->old_soundtrack().IsInitialized()) return false;
+  if (has_reapply_accumulated_command()) {
+    if (!this->reapply_accumulated_command().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandShowSetSoundtrack::Swap(CommandShowSetSoundtrack* other) {
+void CommandSlideReapplyMasterArchive::Swap(CommandSlideReapplyMasterArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(show_, other->show_);
-    std::swap(soundtrack_, other->soundtrack_);
-    std::swap(old_soundtrack_, other->old_soundtrack_);
+    std::swap(reapply_accumulated_command_, other->reapply_accumulated_command_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandShowSetSoundtrack::GetMetadata() const {
+::google::protobuf::Metadata CommandSlideReapplyMasterArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandShowSetSoundtrack_descriptor_;
-  metadata.reflection = CommandShowSetSoundtrack_reflection_;
+  metadata.descriptor = CommandSlideReapplyMasterArchive_descriptor_;
+  metadata.reflection = CommandSlideReapplyMasterArchive_reflection_;
   return metadata;
 }
 
@@ -19139,125 +19440,149 @@ ::google::protobuf::Metadata CommandShowSetSoundtrack::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSoundtrackSetValue_PropertyValue::kDoubleValueFieldNumber;
-const int CommandSoundtrackSetValue_PropertyValue::kModeValueFieldNumber;
-const int CommandSoundtrackSetValue_PropertyValue::kMediaReferenceValuesFieldNumber;
+const int CommandShowSetSoundtrack::kSuperFieldNumber;
+const int CommandShowSetSoundtrack::kShowFieldNumber;
+const int CommandShowSetSoundtrack::kSoundtrackFieldNumber;
+const int CommandShowSetSoundtrack::kOldSoundtrackFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSoundtrackSetValue_PropertyValue::CommandSoundtrackSetValue_PropertyValue()
+CommandShowSetSoundtrack::CommandShowSetSoundtrack()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSoundtrackSetValue_PropertyValue::InitAsDefaultInstance() {
+void CommandShowSetSoundtrack::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  show_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  soundtrack_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_soundtrack_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSoundtrackSetValue_PropertyValue::CommandSoundtrackSetValue_PropertyValue(const CommandSoundtrackSetValue_PropertyValue& from)
+CommandShowSetSoundtrack::CommandShowSetSoundtrack(const CommandShowSetSoundtrack& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSoundtrackSetValue_PropertyValue::SharedCtor() {
+void CommandShowSetSoundtrack::SharedCtor() {
   _cached_size_ = 0;
-  double_value_ = 0;
-  mode_value_ = 0;
+  super_ = NULL;
+  show_ = NULL;
+  soundtrack_ = NULL;
+  old_soundtrack_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSoundtrackSetValue_PropertyValue::~CommandSoundtrackSetValue_PropertyValue() {
+CommandShowSetSoundtrack::~CommandShowSetSoundtrack() {
   SharedDtor();
 }
 
-void CommandSoundtrackSetValue_PropertyValue::SharedDtor() {
+void CommandShowSetSoundtrack::SharedDtor() {
   if (this != default_instance_) {
+    delete super_;
+    delete show_;
+    delete soundtrack_;
+    delete old_soundtrack_;
   }
 }
 
-void CommandSoundtrackSetValue_PropertyValue::SetCachedSize(int size) const {
+void CommandShowSetSoundtrack::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSoundtrackSetValue_PropertyValue::descriptor() {
+const ::google::protobuf::Descriptor* CommandShowSetSoundtrack::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSoundtrackSetValue_PropertyValue_descriptor_;
+  return CommandShowSetSoundtrack_descriptor_;
 }
 
-const CommandSoundtrackSetValue_PropertyValue& CommandSoundtrackSetValue_PropertyValue::default_instance() {
+const CommandShowSetSoundtrack& CommandShowSetSoundtrack::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSoundtrackSetValue_PropertyValue* CommandSoundtrackSetValue_PropertyValue::default_instance_ = NULL;
+CommandShowSetSoundtrack* CommandShowSetSoundtrack::default_instance_ = NULL;
 
-CommandSoundtrackSetValue_PropertyValue* CommandSoundtrackSetValue_PropertyValue::New() const {
-  return new CommandSoundtrackSetValue_PropertyValue;
+CommandShowSetSoundtrack* CommandShowSetSoundtrack::New() const {
+  return new CommandShowSetSoundtrack;
 }
 
-void CommandSoundtrackSetValue_PropertyValue::Clear() {
+void CommandShowSetSoundtrack::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    double_value_ = 0;
-    mode_value_ = 0;
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_show()) {
+      if (show_ != NULL) show_->::TSP::Reference::Clear();
+    }
+    if (has_soundtrack()) {
+      if (soundtrack_ != NULL) soundtrack_->::TSP::Reference::Clear();
+    }
+    if (has_old_soundtrack()) {
+      if (old_soundtrack_ != NULL) old_soundtrack_->::TSP::Reference::Clear();
+    }
   }
-  media_reference_values_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSoundtrackSetValue_PropertyValue::MergePartialFromCodedStream(
+bool CommandShowSetSoundtrack::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional double double_value = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &double_value_)));
-          set_has_double_value();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_mode_value;
+        if (input->ExpectTag(18)) goto parse_show;
         break;
       }
 
-      // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
+      // optional .TSP.Reference show = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_mode_value:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::KN::Soundtrack_SoundtrackMode_IsValid(value)) {
-            set_mode_value(static_cast< ::KN::Soundtrack_SoundtrackMode >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_show:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_show()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_media_reference_values;
+        if (input->ExpectTag(26)) goto parse_soundtrack;
         break;
       }
 
-      // repeated .TSP.DataReference media_reference_values = 3;
+      // optional .TSP.Reference soundtrack = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_media_reference_values:
+         parse_soundtrack:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_media_reference_values()));
+               input, mutable_soundtrack()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_old_soundtrack;
+        break;
+      }
+
+      // optional .TSP.Reference old_soundtrack = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_soundtrack:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_soundtrack()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_media_reference_values;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -19278,23 +19603,30 @@ bool CommandSoundtrackSetValue_PropertyValue::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSoundtrackSetValue_PropertyValue::SerializeWithCachedSizes(
+void CommandShowSetSoundtrack::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional double double_value = 1;
-  if (has_double_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->double_value(), output);
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
   }
 
-  // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
-  if (has_mode_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->mode_value(), output);
+  // optional .TSP.Reference show = 2;
+  if (has_show()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->show(), output);
   }
 
-  // repeated .TSP.DataReference media_reference_values = 3;
-  for (int i = 0; i < this->media_reference_values_size(); i++) {
+  // optional .TSP.Reference soundtrack = 3;
+  if (has_soundtrack()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->media_reference_values(i), output);
+      3, this->soundtrack(), output);
+  }
+
+  // optional .TSP.Reference old_soundtrack = 4;
+  if (has_old_soundtrack()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->old_soundtrack(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -19303,24 +19635,34 @@ void CommandSoundtrackSetValue_PropertyValue::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSoundtrackSetValue_PropertyValue::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandShowSetSoundtrack::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional double double_value = 1;
-  if (has_double_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->double_value(), target);
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
   }
 
-  // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
-  if (has_mode_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->mode_value(), target);
+  // optional .TSP.Reference show = 2;
+  if (has_show()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->show(), target);
   }
 
-  // repeated .TSP.DataReference media_reference_values = 3;
-  for (int i = 0; i < this->media_reference_values_size(); i++) {
+  // optional .TSP.Reference soundtrack = 3;
+  if (has_soundtrack()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->media_reference_values(i), target);
+        3, this->soundtrack(), target);
+  }
+
+  // optional .TSP.Reference old_soundtrack = 4;
+  if (has_old_soundtrack()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->old_soundtrack(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -19330,30 +19672,748 @@ ::google::protobuf::uint8* CommandSoundtrackSetValue_PropertyValue::SerializeWit
   return target;
 }
 
-int CommandSoundtrackSetValue_PropertyValue::ByteSize() const {
+int CommandShowSetSoundtrack::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional double double_value = 1;
-    if (has_double_value()) {
-      total_size += 1 + 8;
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
     }
 
-    // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
-    if (has_mode_value()) {
+    // optional .TSP.Reference show = 2;
+    if (has_show()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->mode_value());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->show());
+    }
+
+    // optional .TSP.Reference soundtrack = 3;
+    if (has_soundtrack()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->soundtrack());
+    }
+
+    // optional .TSP.Reference old_soundtrack = 4;
+    if (has_old_soundtrack()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_soundtrack());
     }
 
   }
-  // repeated .TSP.DataReference media_reference_values = 3;
-  total_size += 1 * this->media_reference_values_size();
-  for (int i = 0; i < this->media_reference_values_size(); i++) {
+  if (!unknown_fields().empty()) {
     total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->media_reference_values(i));
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandShowSetSoundtrack::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandShowSetSoundtrack* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandShowSetSoundtrack*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
   }
+}
+
+void CommandShowSetSoundtrack::MergeFrom(const CommandShowSetSoundtrack& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_show()) {
+      mutable_show()->::TSP::Reference::MergeFrom(from.show());
+    }
+    if (from.has_soundtrack()) {
+      mutable_soundtrack()->::TSP::Reference::MergeFrom(from.soundtrack());
+    }
+    if (from.has_old_soundtrack()) {
+      mutable_old_soundtrack()->::TSP::Reference::MergeFrom(from.old_soundtrack());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandShowSetSoundtrack::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandShowSetSoundtrack::CopyFrom(const CommandShowSetSoundtrack& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandShowSetSoundtrack::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_show()) {
+    if (!this->show().IsInitialized()) return false;
+  }
+  if (has_soundtrack()) {
+    if (!this->soundtrack().IsInitialized()) return false;
+  }
+  if (has_old_soundtrack()) {
+    if (!this->old_soundtrack().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandShowSetSoundtrack::Swap(CommandShowSetSoundtrack* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(show_, other->show_);
+    std::swap(soundtrack_, other->soundtrack_);
+    std::swap(old_soundtrack_, other->old_soundtrack_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandShowSetSoundtrack::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandShowSetSoundtrack_descriptor_;
+  metadata.reflection = CommandShowSetSoundtrack_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSoundtrackSetValue_PropertyValue::kDoubleValueFieldNumber;
+const int CommandSoundtrackSetValue_PropertyValue::kModeValueFieldNumber;
+const int CommandSoundtrackSetValue_PropertyValue::kMediaReferenceValuesFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSoundtrackSetValue_PropertyValue::CommandSoundtrackSetValue_PropertyValue()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSoundtrackSetValue_PropertyValue::InitAsDefaultInstance() {
+}
+
+CommandSoundtrackSetValue_PropertyValue::CommandSoundtrackSetValue_PropertyValue(const CommandSoundtrackSetValue_PropertyValue& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSoundtrackSetValue_PropertyValue::SharedCtor() {
+  _cached_size_ = 0;
+  double_value_ = 0;
+  mode_value_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSoundtrackSetValue_PropertyValue::~CommandSoundtrackSetValue_PropertyValue() {
+  SharedDtor();
+}
+
+void CommandSoundtrackSetValue_PropertyValue::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void CommandSoundtrackSetValue_PropertyValue::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSoundtrackSetValue_PropertyValue::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSoundtrackSetValue_PropertyValue_descriptor_;
+}
+
+const CommandSoundtrackSetValue_PropertyValue& CommandSoundtrackSetValue_PropertyValue::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSoundtrackSetValue_PropertyValue* CommandSoundtrackSetValue_PropertyValue::default_instance_ = NULL;
+
+CommandSoundtrackSetValue_PropertyValue* CommandSoundtrackSetValue_PropertyValue::New() const {
+  return new CommandSoundtrackSetValue_PropertyValue;
+}
+
+void CommandSoundtrackSetValue_PropertyValue::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    double_value_ = 0;
+    mode_value_ = 0;
+  }
+  media_reference_values_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSoundtrackSetValue_PropertyValue::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional double double_value = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &double_value_)));
+          set_has_double_value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_mode_value;
+        break;
+      }
+
+      // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_mode_value:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::KN::Soundtrack_SoundtrackMode_IsValid(value)) {
+            set_mode_value(static_cast< ::KN::Soundtrack_SoundtrackMode >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_media_reference_values;
+        break;
+      }
+
+      // repeated .TSP.DataReference media_reference_values = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_media_reference_values:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_media_reference_values()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_media_reference_values;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSoundtrackSetValue_PropertyValue::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional double double_value = 1;
+  if (has_double_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->double_value(), output);
+  }
+
+  // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
+  if (has_mode_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->mode_value(), output);
+  }
+
+  // repeated .TSP.DataReference media_reference_values = 3;
+  for (int i = 0; i < this->media_reference_values_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->media_reference_values(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSoundtrackSetValue_PropertyValue::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional double double_value = 1;
+  if (has_double_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->double_value(), target);
+  }
+
+  // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
+  if (has_mode_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->mode_value(), target);
+  }
+
+  // repeated .TSP.DataReference media_reference_values = 3;
+  for (int i = 0; i < this->media_reference_values_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->media_reference_values(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSoundtrackSetValue_PropertyValue::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional double double_value = 1;
+    if (has_double_value()) {
+      total_size += 1 + 8;
+    }
+
+    // optional .KN.Soundtrack.SoundtrackMode mode_value = 2;
+    if (has_mode_value()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->mode_value());
+    }
+
+  }
+  // repeated .TSP.DataReference media_reference_values = 3;
+  total_size += 1 * this->media_reference_values_size();
+  for (int i = 0; i < this->media_reference_values_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->media_reference_values(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSoundtrackSetValue_PropertyValue::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSoundtrackSetValue_PropertyValue* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSoundtrackSetValue_PropertyValue*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSoundtrackSetValue_PropertyValue::MergeFrom(const CommandSoundtrackSetValue_PropertyValue& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  media_reference_values_.MergeFrom(from.media_reference_values_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_double_value()) {
+      set_double_value(from.double_value());
+    }
+    if (from.has_mode_value()) {
+      set_mode_value(from.mode_value());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSoundtrackSetValue_PropertyValue::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSoundtrackSetValue_PropertyValue::CopyFrom(const CommandSoundtrackSetValue_PropertyValue& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSoundtrackSetValue_PropertyValue::IsInitialized() const {
+
+  for (int i = 0; i < media_reference_values_size(); i++) {
+    if (!this->media_reference_values(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSoundtrackSetValue_PropertyValue::Swap(CommandSoundtrackSetValue_PropertyValue* other) {
+  if (other != this) {
+    std::swap(double_value_, other->double_value_);
+    std::swap(mode_value_, other->mode_value_);
+    media_reference_values_.Swap(&other->media_reference_values_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSoundtrackSetValue_PropertyValue::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSoundtrackSetValue_PropertyValue_descriptor_;
+  metadata.reflection = CommandSoundtrackSetValue_PropertyValue_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int CommandSoundtrackSetValue::kSuperFieldNumber;
+const int CommandSoundtrackSetValue::kSoundtrackFieldNumber;
+const int CommandSoundtrackSetValue::kPropertyFieldNumber;
+const int CommandSoundtrackSetValue::kOldValueFieldNumber;
+const int CommandSoundtrackSetValue::kNewValueFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSoundtrackSetValue::CommandSoundtrackSetValue()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSoundtrackSetValue::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  soundtrack_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_value_ = const_cast< ::KN::CommandSoundtrackSetValue_PropertyValue*>(&::KN::CommandSoundtrackSetValue_PropertyValue::default_instance());
+  new_value_ = const_cast< ::KN::CommandSoundtrackSetValue_PropertyValue*>(&::KN::CommandSoundtrackSetValue_PropertyValue::default_instance());
+}
+
+CommandSoundtrackSetValue::CommandSoundtrackSetValue(const CommandSoundtrackSetValue& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSoundtrackSetValue::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  soundtrack_ = NULL;
+  property_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  old_value_ = NULL;
+  new_value_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSoundtrackSetValue::~CommandSoundtrackSetValue() {
+  SharedDtor();
+}
+
+void CommandSoundtrackSetValue::SharedDtor() {
+  if (property_ != &::google::protobuf::internal::kEmptyString) {
+    delete property_;
+  }
+  if (this != default_instance_) {
+    delete super_;
+    delete soundtrack_;
+    delete old_value_;
+    delete new_value_;
+  }
+}
+
+void CommandSoundtrackSetValue::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSoundtrackSetValue::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSoundtrackSetValue_descriptor_;
+}
+
+const CommandSoundtrackSetValue& CommandSoundtrackSetValue::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSoundtrackSetValue* CommandSoundtrackSetValue::default_instance_ = NULL;
+
+CommandSoundtrackSetValue* CommandSoundtrackSetValue::New() const {
+  return new CommandSoundtrackSetValue;
+}
+
+void CommandSoundtrackSetValue::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_soundtrack()) {
+      if (soundtrack_ != NULL) soundtrack_->::TSP::Reference::Clear();
+    }
+    if (has_property()) {
+      if (property_ != &::google::protobuf::internal::kEmptyString) {
+        property_->clear();
+      }
+    }
+    if (has_old_value()) {
+      if (old_value_ != NULL) old_value_->::KN::CommandSoundtrackSetValue_PropertyValue::Clear();
+    }
+    if (has_new_value()) {
+      if (new_value_ != NULL) new_value_->::KN::CommandSoundtrackSetValue_PropertyValue::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSoundtrackSetValue::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_soundtrack;
+        break;
+      }
+
+      // optional .TSP.Reference soundtrack = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_soundtrack:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_soundtrack()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_property;
+        break;
+      }
+
+      // optional string property = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_property:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_property()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->property().data(), this->property().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_old_value;
+        break;
+      }
+
+      // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_value:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_value()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_new_value;
+        break;
+      }
+
+      // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_value:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_value()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSoundtrackSetValue::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSP.Reference soundtrack = 2;
+  if (has_soundtrack()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->soundtrack(), output);
+  }
+
+  // optional string property = 3;
+  if (has_property()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->property().data(), this->property().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->property(), output);
+  }
+
+  // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
+  if (has_old_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->old_value(), output);
+  }
+
+  // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
+  if (has_new_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->new_value(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSoundtrackSetValue::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSP.Reference soundtrack = 2;
+  if (has_soundtrack()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->soundtrack(), target);
+  }
+
+  // optional string property = 3;
+  if (has_property()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->property().data(), this->property().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->property(), target);
+  }
+
+  // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
+  if (has_old_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->old_value(), target);
+  }
+
+  // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
+  if (has_new_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->new_value(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSoundtrackSetValue::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSP.Reference soundtrack = 2;
+    if (has_soundtrack()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->soundtrack());
+    }
+
+    // optional string property = 3;
+    if (has_property()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->property());
+    }
+
+    // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
+    if (has_old_value()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_value());
+    }
+
+    // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
+    if (has_new_value()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_value());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -19365,10 +20425,10 @@ int CommandSoundtrackSetValue_PropertyValue::ByteSize() const {
   return total_size;
 }
 
-void CommandSoundtrackSetValue_PropertyValue::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSoundtrackSetValue::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSoundtrackSetValue_PropertyValue* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSoundtrackSetValue_PropertyValue*>(
+  const CommandSoundtrackSetValue* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSoundtrackSetValue*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -19377,160 +20437,167 @@ void CommandSoundtrackSetValue_PropertyValue::MergeFrom(const ::google::protobuf
   }
 }
 
-void CommandSoundtrackSetValue_PropertyValue::MergeFrom(const CommandSoundtrackSetValue_PropertyValue& from) {
+void CommandSoundtrackSetValue::MergeFrom(const CommandSoundtrackSetValue& from) {
   GOOGLE_CHECK_NE(&from, this);
-  media_reference_values_.MergeFrom(from.media_reference_values_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_double_value()) {
-      set_double_value(from.double_value());
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_mode_value()) {
-      set_mode_value(from.mode_value());
+    if (from.has_soundtrack()) {
+      mutable_soundtrack()->::TSP::Reference::MergeFrom(from.soundtrack());
+    }
+    if (from.has_property()) {
+      set_property(from.property());
+    }
+    if (from.has_old_value()) {
+      mutable_old_value()->::KN::CommandSoundtrackSetValue_PropertyValue::MergeFrom(from.old_value());
+    }
+    if (from.has_new_value()) {
+      mutable_new_value()->::KN::CommandSoundtrackSetValue_PropertyValue::MergeFrom(from.new_value());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSoundtrackSetValue_PropertyValue::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSoundtrackSetValue::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSoundtrackSetValue_PropertyValue::CopyFrom(const CommandSoundtrackSetValue_PropertyValue& from) {
+void CommandSoundtrackSetValue::CopyFrom(const CommandSoundtrackSetValue& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSoundtrackSetValue_PropertyValue::IsInitialized() const {
+bool CommandSoundtrackSetValue::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  for (int i = 0; i < media_reference_values_size(); i++) {
-    if (!this->media_reference_values(i).IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_soundtrack()) {
+    if (!this->soundtrack().IsInitialized()) return false;
+  }
+  if (has_old_value()) {
+    if (!this->old_value().IsInitialized()) return false;
+  }
+  if (has_new_value()) {
+    if (!this->new_value().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSoundtrackSetValue_PropertyValue::Swap(CommandSoundtrackSetValue_PropertyValue* other) {
+void CommandSoundtrackSetValue::Swap(CommandSoundtrackSetValue* other) {
   if (other != this) {
-    std::swap(double_value_, other->double_value_);
-    std::swap(mode_value_, other->mode_value_);
-    media_reference_values_.Swap(&other->media_reference_values_);
+    std::swap(super_, other->super_);
+    std::swap(soundtrack_, other->soundtrack_);
+    std::swap(property_, other->property_);
+    std::swap(old_value_, other->old_value_);
+    std::swap(new_value_, other->new_value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSoundtrackSetValue_PropertyValue::GetMetadata() const {
+::google::protobuf::Metadata CommandSoundtrackSetValue::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSoundtrackSetValue_PropertyValue_descriptor_;
-  metadata.reflection = CommandSoundtrackSetValue_PropertyValue_reflection_;
+  metadata.descriptor = CommandSoundtrackSetValue_descriptor_;
+  metadata.reflection = CommandSoundtrackSetValue_reflection_;
   return metadata;
 }
 
 
-// -------------------------------------------------------------------
+// ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSoundtrackSetValue::kSuperFieldNumber;
-const int CommandSoundtrackSetValue::kSoundtrackFieldNumber;
-const int CommandSoundtrackSetValue::kPropertyFieldNumber;
-const int CommandSoundtrackSetValue::kOldValueFieldNumber;
-const int CommandSoundtrackSetValue::kNewValueFieldNumber;
+const int CommandSlideUpdateMasterDrawables::kSuperFieldNumber;
+const int CommandSlideUpdateMasterDrawables::kSlideFieldNumber;
+const int CommandSlideUpdateMasterDrawables::kDrawablesToInsertFieldNumber;
+const int CommandSlideUpdateMasterDrawables::kSortedDrawablesToRemoveFieldNumber;
+const int CommandSlideUpdateMasterDrawables::kIndexesOfRemovedDrawablesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSoundtrackSetValue::CommandSoundtrackSetValue()
+CommandSlideUpdateMasterDrawables::CommandSlideUpdateMasterDrawables()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSoundtrackSetValue::InitAsDefaultInstance() {
+void CommandSlideUpdateMasterDrawables::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  soundtrack_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_value_ = const_cast< ::KN::CommandSoundtrackSetValue_PropertyValue*>(&::KN::CommandSoundtrackSetValue_PropertyValue::default_instance());
-  new_value_ = const_cast< ::KN::CommandSoundtrackSetValue_PropertyValue*>(&::KN::CommandSoundtrackSetValue_PropertyValue::default_instance());
+  slide_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  indexes_of_removed_drawables_ = const_cast< ::TSP::IndexSet*>(&::TSP::IndexSet::default_instance());
 }
 
-CommandSoundtrackSetValue::CommandSoundtrackSetValue(const CommandSoundtrackSetValue& from)
+CommandSlideUpdateMasterDrawables::CommandSlideUpdateMasterDrawables(const CommandSlideUpdateMasterDrawables& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSoundtrackSetValue::SharedCtor() {
+void CommandSlideUpdateMasterDrawables::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  soundtrack_ = NULL;
-  property_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  old_value_ = NULL;
-  new_value_ = NULL;
+  slide_ = NULL;
+  indexes_of_removed_drawables_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSoundtrackSetValue::~CommandSoundtrackSetValue() {
+CommandSlideUpdateMasterDrawables::~CommandSlideUpdateMasterDrawables() {
   SharedDtor();
 }
 
-void CommandSoundtrackSetValue::SharedDtor() {
-  if (property_ != &::google::protobuf::internal::kEmptyString) {
-    delete property_;
-  }
+void CommandSlideUpdateMasterDrawables::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete soundtrack_;
-    delete old_value_;
-    delete new_value_;
+    delete slide_;
+    delete indexes_of_removed_drawables_;
   }
 }
 
-void CommandSoundtrackSetValue::SetCachedSize(int size) const {
+void CommandSlideUpdateMasterDrawables::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSoundtrackSetValue::descriptor() {
+const ::google::protobuf::Descriptor* CommandSlideUpdateMasterDrawables::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSoundtrackSetValue_descriptor_;
+  return CommandSlideUpdateMasterDrawables_descriptor_;
 }
 
-const CommandSoundtrackSetValue& CommandSoundtrackSetValue::default_instance() {
+const CommandSlideUpdateMasterDrawables& CommandSlideUpdateMasterDrawables::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_KNCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSoundtrackSetValue* CommandSoundtrackSetValue::default_instance_ = NULL;
+CommandSlideUpdateMasterDrawables* CommandSlideUpdateMasterDrawables::default_instance_ = NULL;
 
-CommandSoundtrackSetValue* CommandSoundtrackSetValue::New() const {
-  return new CommandSoundtrackSetValue;
+CommandSlideUpdateMasterDrawables* CommandSlideUpdateMasterDrawables::New() const {
+  return new CommandSlideUpdateMasterDrawables;
 }
 
-void CommandSoundtrackSetValue::Clear() {
+void CommandSlideUpdateMasterDrawables::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_soundtrack()) {
-      if (soundtrack_ != NULL) soundtrack_->::TSP::Reference::Clear();
-    }
-    if (has_property()) {
-      if (property_ != &::google::protobuf::internal::kEmptyString) {
-        property_->clear();
-      }
-    }
-    if (has_old_value()) {
-      if (old_value_ != NULL) old_value_->::KN::CommandSoundtrackSetValue_PropertyValue::Clear();
+    if (has_slide()) {
+      if (slide_ != NULL) slide_->::TSP::Reference::Clear();
     }
-    if (has_new_value()) {
-      if (new_value_ != NULL) new_value_->::KN::CommandSoundtrackSetValue_PropertyValue::Clear();
+    if (has_indexes_of_removed_drawables()) {
+      if (indexes_of_removed_drawables_ != NULL) indexes_of_removed_drawables_->::TSP::IndexSet::Clear();
     }
   }
+  drawables_to_insert_.Clear();
+  sorted_drawables_to_remove_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSoundtrackSetValue::MergePartialFromCodedStream(
+bool CommandSlideUpdateMasterDrawables::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -19545,62 +20612,61 @@ bool CommandSoundtrackSetValue::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_soundtrack;
+        if (input->ExpectTag(18)) goto parse_slide;
         break;
       }
 
-      // optional .TSP.Reference soundtrack = 2;
+      // required .TSP.Reference slide = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_soundtrack:
+         parse_slide:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_soundtrack()));
+               input, mutable_slide()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_property;
+        if (input->ExpectTag(26)) goto parse_drawables_to_insert;
         break;
       }
 
-      // optional string property = 3;
+      // repeated .TSP.Reference drawables_to_insert = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_property:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_property()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->property().data(), this->property().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+         parse_drawables_to_insert:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_drawables_to_insert()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_old_value;
+        if (input->ExpectTag(26)) goto parse_drawables_to_insert;
+        if (input->ExpectTag(34)) goto parse_sorted_drawables_to_remove;
         break;
       }
 
-      // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
+      // repeated .TSP.Reference sorted_drawables_to_remove = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_value:
+         parse_sorted_drawables_to_remove:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_value()));
+                input, add_sorted_drawables_to_remove()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_new_value;
+        if (input->ExpectTag(34)) goto parse_sorted_drawables_to_remove;
+        if (input->ExpectTag(42)) goto parse_indexes_of_removed_drawables;
         break;
       }
 
-      // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
+      // required .TSP.IndexSet indexes_of_removed_drawables = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_value:
+         parse_indexes_of_removed_drawables:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_value()));
+               input, mutable_indexes_of_removed_drawables()));
         } else {
           goto handle_uninterpreted;
         }
@@ -19624,7 +20690,7 @@ bool CommandSoundtrackSetValue::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSoundtrackSetValue::SerializeWithCachedSizes(
+void CommandSlideUpdateMasterDrawables::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -19632,31 +20698,28 @@ void CommandSoundtrackSetValue::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // optional .TSP.Reference soundtrack = 2;
-  if (has_soundtrack()) {
+  // required .TSP.Reference slide = 2;
+  if (has_slide()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->soundtrack(), output);
+      2, this->slide(), output);
   }
 
-  // optional string property = 3;
-  if (has_property()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->property().data(), this->property().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->property(), output);
+  // repeated .TSP.Reference drawables_to_insert = 3;
+  for (int i = 0; i < this->drawables_to_insert_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->drawables_to_insert(i), output);
   }
 
-  // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
-  if (has_old_value()) {
+  // repeated .TSP.Reference sorted_drawables_to_remove = 4;
+  for (int i = 0; i < this->sorted_drawables_to_remove_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->old_value(), output);
+      4, this->sorted_drawables_to_remove(i), output);
   }
 
-  // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
-  if (has_new_value()) {
+  // required .TSP.IndexSet indexes_of_removed_drawables = 5;
+  if (has_indexes_of_removed_drawables()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->new_value(), output);
+      5, this->indexes_of_removed_drawables(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -19665,7 +20728,7 @@ void CommandSoundtrackSetValue::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSoundtrackSetValue::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSlideUpdateMasterDrawables::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -19674,35 +20737,32 @@ ::google::protobuf::uint8* CommandSoundtrackSetValue::SerializeWithCachedSizesTo
         1, this->super(), target);
   }
 
-  // optional .TSP.Reference soundtrack = 2;
-  if (has_soundtrack()) {
+  // required .TSP.Reference slide = 2;
+  if (has_slide()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->soundtrack(), target);
+        2, this->slide(), target);
   }
 
-  // optional string property = 3;
-  if (has_property()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->property().data(), this->property().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->property(), target);
+  // repeated .TSP.Reference drawables_to_insert = 3;
+  for (int i = 0; i < this->drawables_to_insert_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->drawables_to_insert(i), target);
   }
 
-  // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
-  if (has_old_value()) {
+  // repeated .TSP.Reference sorted_drawables_to_remove = 4;
+  for (int i = 0; i < this->sorted_drawables_to_remove_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->old_value(), target);
+        4, this->sorted_drawables_to_remove(i), target);
   }
 
-  // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
-  if (has_new_value()) {
+  // required .TSP.IndexSet indexes_of_removed_drawables = 5;
+  if (has_indexes_of_removed_drawables()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->new_value(), target);
+        5, this->indexes_of_removed_drawables(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -19712,7 +20772,7 @@ ::google::protobuf::uint8* CommandSoundtrackSetValue::SerializeWithCachedSizesTo
   return target;
 }
 
-int CommandSoundtrackSetValue::ByteSize() const {
+int CommandSlideUpdateMasterDrawables::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -19723,35 +20783,37 @@ int CommandSoundtrackSetValue::ByteSize() const {
           this->super());
     }
 
-    // optional .TSP.Reference soundtrack = 2;
-    if (has_soundtrack()) {
+    // required .TSP.Reference slide = 2;
+    if (has_slide()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->soundtrack());
-    }
-
-    // optional string property = 3;
-    if (has_property()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->property());
+          this->slide());
     }
 
-    // optional .KN.CommandSoundtrackSetValue.PropertyValue old_value = 4;
-    if (has_old_value()) {
+    // required .TSP.IndexSet indexes_of_removed_drawables = 5;
+    if (has_indexes_of_removed_drawables()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_value());
+          this->indexes_of_removed_drawables());
     }
 
-    // optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
-    if (has_new_value()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_value());
-    }
+  }
+  // repeated .TSP.Reference drawables_to_insert = 3;
+  total_size += 1 * this->drawables_to_insert_size();
+  for (int i = 0; i < this->drawables_to_insert_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->drawables_to_insert(i));
+  }
 
+  // repeated .TSP.Reference sorted_drawables_to_remove = 4;
+  total_size += 1 * this->sorted_drawables_to_remove_size();
+  for (int i = 0; i < this->sorted_drawables_to_remove_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->sorted_drawables_to_remove(i));
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -19763,10 +20825,10 @@ int CommandSoundtrackSetValue::ByteSize() const {
   return total_size;
 }
 
-void CommandSoundtrackSetValue::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSlideUpdateMasterDrawables::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSoundtrackSetValue* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSoundtrackSetValue*>(
+  const CommandSlideUpdateMasterDrawables* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSlideUpdateMasterDrawables*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -19775,76 +20837,75 @@ void CommandSoundtrackSetValue::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void CommandSoundtrackSetValue::MergeFrom(const CommandSoundtrackSetValue& from) {
+void CommandSlideUpdateMasterDrawables::MergeFrom(const CommandSlideUpdateMasterDrawables& from) {
   GOOGLE_CHECK_NE(&from, this);
+  drawables_to_insert_.MergeFrom(from.drawables_to_insert_);
+  sorted_drawables_to_remove_.MergeFrom(from.sorted_drawables_to_remove_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_soundtrack()) {
-      mutable_soundtrack()->::TSP::Reference::MergeFrom(from.soundtrack());
-    }
-    if (from.has_property()) {
-      set_property(from.property());
-    }
-    if (from.has_old_value()) {
-      mutable_old_value()->::KN::CommandSoundtrackSetValue_PropertyValue::MergeFrom(from.old_value());
+    if (from.has_slide()) {
+      mutable_slide()->::TSP::Reference::MergeFrom(from.slide());
     }
-    if (from.has_new_value()) {
-      mutable_new_value()->::KN::CommandSoundtrackSetValue_PropertyValue::MergeFrom(from.new_value());
+    if (from.has_indexes_of_removed_drawables()) {
+      mutable_indexes_of_removed_drawables()->::TSP::IndexSet::MergeFrom(from.indexes_of_removed_drawables());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSoundtrackSetValue::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSlideUpdateMasterDrawables::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSoundtrackSetValue::CopyFrom(const CommandSoundtrackSetValue& from) {
+void CommandSlideUpdateMasterDrawables::CopyFrom(const CommandSlideUpdateMasterDrawables& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSoundtrackSetValue::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandSlideUpdateMasterDrawables::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000013) != 0x00000013) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_soundtrack()) {
-    if (!this->soundtrack().IsInitialized()) return false;
+  if (has_slide()) {
+    if (!this->slide().IsInitialized()) return false;
   }
-  if (has_old_value()) {
-    if (!this->old_value().IsInitialized()) return false;
+  for (int i = 0; i < drawables_to_insert_size(); i++) {
+    if (!this->drawables_to_insert(i).IsInitialized()) return false;
   }
-  if (has_new_value()) {
-    if (!this->new_value().IsInitialized()) return false;
+  for (int i = 0; i < sorted_drawables_to_remove_size(); i++) {
+    if (!this->sorted_drawables_to_remove(i).IsInitialized()) return false;
+  }
+  if (has_indexes_of_removed_drawables()) {
+    if (!this->indexes_of_removed_drawables().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSoundtrackSetValue::Swap(CommandSoundtrackSetValue* other) {
+void CommandSlideUpdateMasterDrawables::Swap(CommandSlideUpdateMasterDrawables* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(soundtrack_, other->soundtrack_);
-    std::swap(property_, other->property_);
-    std::swap(old_value_, other->old_value_);
-    std::swap(new_value_, other->new_value_);
+    std::swap(slide_, other->slide_);
+    drawables_to_insert_.Swap(&other->drawables_to_insert_);
+    sorted_drawables_to_remove_.Swap(&other->sorted_drawables_to_remove_);
+    std::swap(indexes_of_removed_drawables_, other->indexes_of_removed_drawables_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSoundtrackSetValue::GetMetadata() const {
+::google::protobuf::Metadata CommandSlideUpdateMasterDrawables::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSoundtrackSetValue_descriptor_;
-  metadata.reflection = CommandSoundtrackSetValue_reflection_;
+  metadata.descriptor = CommandSlideUpdateMasterDrawables_descriptor_;
+  metadata.reflection = CommandSlideUpdateMasterDrawables_reflection_;
   return metadata;
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.h
index dd2e837..52bdce0 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/KNCommandArchives.pb.h
@@ -80,6 +80,7 @@ class CommandShowSetSlideNumberVisibilityArchive;
 class CommandMasterRescaleArchive;
 class CommandMasterSetThumbnailTextArchive;
 class CommandMasterSetBodyStylesArchive;
+class CommandMasterSetSlideObjectsLayerWithMasterArchive;
 class CommandSlideApplyThemeArchive;
 class CommandChangeMasterSlideArchive;
 class CommandSlidePrimitiveSetMasterArchive;
@@ -87,6 +88,7 @@ class CommandSlideReapplyMasterArchive;
 class CommandShowSetSoundtrack;
 class CommandSoundtrackSetValue;
 class CommandSoundtrackSetValue_PropertyValue;
+class CommandSlideUpdateMasterDrawables;
 class SlideCollectionCommandSelectionBehaviorArchive;
 class ChartInfoGeometryCommandArchive;
 
@@ -3197,6 +3199,13 @@ class CommandRemoveMasterArchive : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_master_change_commands();
   inline void set_allocated_master_change_commands(::TSP::Reference* master_change_commands);
 
+  // optional bool default_master_slide_node_was_replaced = 6;
+  inline bool has_default_master_slide_node_was_replaced() const;
+  inline void clear_default_master_slide_node_was_replaced();
+  static const int kDefaultMasterSlideNodeWasReplacedFieldNumber = 6;
+  inline bool default_master_slide_node_was_replaced() const;
+  inline void set_default_master_slide_node_was_replaced(bool value);
+
   // @@protoc_insertion_point(class_scope:KN.CommandRemoveMasterArchive)
  private:
   inline void set_has_super();
@@ -3209,6 +3218,8 @@ class CommandRemoveMasterArchive : public ::google::protobuf::Message {
   inline void clear_has_previous_index();
   inline void set_has_master_change_commands();
   inline void clear_has_master_change_commands();
+  inline void set_has_default_master_slide_node_was_replaced();
+  inline void clear_has_default_master_slide_node_was_replaced();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -3217,9 +3228,10 @@ class CommandRemoveMasterArchive : public ::google::protobuf::Message {
   ::TSP::Reference* master_slide_node_;
   ::TSP::Reference* master_change_commands_;
   ::google::protobuf::uint32 previous_index_;
+  bool default_master_slide_node_was_replaced_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNCommandArchives_2eproto();
   friend void protobuf_AssignDesc_KNCommandArchives_2eproto();
@@ -4368,37 +4380,37 @@ class CommandBuildSetValueArchive : public ::google::protobuf::Message {
   inline ::std::string* release_property();
   inline void set_allocated_property(::std::string* property);
 
-  // repeated string effects = 4;
-  inline int effects_size() const;
-  inline void clear_effects();
+  // repeated string effects = 4 [deprecated = true];
+  inline int effects_size() const PROTOBUF_DEPRECATED;
+  inline void clear_effects() PROTOBUF_DEPRECATED;
   static const int kEffectsFieldNumber = 4;
-  inline const ::std::string& effects(int index) const;
-  inline ::std::string* mutable_effects(int index);
-  inline void set_effects(int index, const ::std::string& value);
-  inline void set_effects(int index, const char* value);
-  inline void set_effects(int index, const char* value, size_t size);
-  inline ::std::string* add_effects();
-  inline void add_effects(const ::std::string& value);
-  inline void add_effects(const char* value);
-  inline void add_effects(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& effects() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_effects();
-
-  // repeated string types = 5;
-  inline int types_size() const;
-  inline void clear_types();
+  inline const ::std::string& effects(int index) const PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_effects(int index) PROTOBUF_DEPRECATED;
+  inline void set_effects(int index, const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_effects(int index, const char* value) PROTOBUF_DEPRECATED;
+  inline void set_effects(int index, const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* add_effects() PROTOBUF_DEPRECATED;
+  inline void add_effects(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void add_effects(const char* value) PROTOBUF_DEPRECATED;
+  inline void add_effects(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& effects() const PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_effects() PROTOBUF_DEPRECATED;
+
+  // repeated string types = 5 [deprecated = true];
+  inline int types_size() const PROTOBUF_DEPRECATED;
+  inline void clear_types() PROTOBUF_DEPRECATED;
   static const int kTypesFieldNumber = 5;
-  inline const ::std::string& types(int index) const;
-  inline ::std::string* mutable_types(int index);
-  inline void set_types(int index, const ::std::string& value);
-  inline void set_types(int index, const char* value);
-  inline void set_types(int index, const char* value, size_t size);
-  inline ::std::string* add_types();
-  inline void add_types(const ::std::string& value);
-  inline void add_types(const char* value);
-  inline void add_types(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& types() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_types();
+  inline const ::std::string& types(int index) const PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_types(int index) PROTOBUF_DEPRECATED;
+  inline void set_types(int index, const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_types(int index, const char* value) PROTOBUF_DEPRECATED;
+  inline void set_types(int index, const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* add_types() PROTOBUF_DEPRECATED;
+  inline void add_types(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void add_types(const char* value) PROTOBUF_DEPRECATED;
+  inline void add_types(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& types() const PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_types() PROTOBUF_DEPRECATED;
 
   // repeated string deliveries = 6;
   inline int deliveries_size() const;
@@ -4416,77 +4428,95 @@ class CommandBuildSetValueArchive : public ::google::protobuf::Message {
   inline const ::google::protobuf::RepeatedPtrField< ::std::string>& deliveries() const;
   inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_deliveries();
 
-  // repeated uint32 directions = 7;
-  inline int directions_size() const;
-  inline void clear_directions();
+  // repeated uint32 directions = 7 [deprecated = true];
+  inline int directions_size() const PROTOBUF_DEPRECATED;
+  inline void clear_directions() PROTOBUF_DEPRECATED;
   static const int kDirectionsFieldNumber = 7;
-  inline ::google::protobuf::uint32 directions(int index) const;
-  inline void set_directions(int index, ::google::protobuf::uint32 value);
-  inline void add_directions(::google::protobuf::uint32 value);
+  inline ::google::protobuf::uint32 directions(int index) const PROTOBUF_DEPRECATED;
+  inline void set_directions(int index, ::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
+  inline void add_directions(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-      directions() const;
+      directions() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-      mutable_directions();
+      mutable_directions() PROTOBUF_DEPRECATED;
 
-  // repeated double durations = 8;
-  inline int durations_size() const;
-  inline void clear_durations();
+  // repeated double durations = 8 [deprecated = true];
+  inline int durations_size() const PROTOBUF_DEPRECATED;
+  inline void clear_durations() PROTOBUF_DEPRECATED;
   static const int kDurationsFieldNumber = 8;
-  inline double durations(int index) const;
-  inline void set_durations(int index, double value);
-  inline void add_durations(double value);
+  inline double durations(int index) const PROTOBUF_DEPRECATED;
+  inline void set_durations(int index, double value) PROTOBUF_DEPRECATED;
+  inline void add_durations(double value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< double >&
-      durations() const;
+      durations() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< double >*
-      mutable_durations();
+      mutable_durations() PROTOBUF_DEPRECATED;
 
-  // repeated double delays = 9;
-  inline int delays_size() const;
-  inline void clear_delays();
+  // repeated double delays = 9 [deprecated = true];
+  inline int delays_size() const PROTOBUF_DEPRECATED;
+  inline void clear_delays() PROTOBUF_DEPRECATED;
   static const int kDelaysFieldNumber = 9;
-  inline double delays(int index) const;
-  inline void set_delays(int index, double value);
-  inline void add_delays(double value);
+  inline double delays(int index) const PROTOBUF_DEPRECATED;
+  inline void set_delays(int index, double value) PROTOBUF_DEPRECATED;
+  inline void add_delays(double value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< double >&
-      delays() const;
+      delays() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< double >*
-      mutable_delays();
+      mutable_delays() PROTOBUF_DEPRECATED;
 
-  // repeated double delayAutomaticAfters = 10;
-  inline int delayautomaticafters_size() const;
-  inline void clear_delayautomaticafters();
+  // repeated double delayAutomaticAfters = 10 [deprecated = true];
+  inline int delayautomaticafters_size() const PROTOBUF_DEPRECATED;
+  inline void clear_delayautomaticafters() PROTOBUF_DEPRECATED;
   static const int kDelayAutomaticAftersFieldNumber = 10;
-  inline double delayautomaticafters(int index) const;
-  inline void set_delayautomaticafters(int index, double value);
-  inline void add_delayautomaticafters(double value);
+  inline double delayautomaticafters(int index) const PROTOBUF_DEPRECATED;
+  inline void set_delayautomaticafters(int index, double value) PROTOBUF_DEPRECATED;
+  inline void add_delayautomaticafters(double value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< double >&
-      delayautomaticafters() const;
+      delayautomaticafters() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< double >*
-      mutable_delayautomaticafters();
+      mutable_delayautomaticafters() PROTOBUF_DEPRECATED;
 
-  // repeated double delayAutomaticWiths = 11;
-  inline int delayautomaticwiths_size() const;
-  inline void clear_delayautomaticwiths();
+  // repeated double delayAutomaticWiths = 11 [deprecated = true];
+  inline int delayautomaticwiths_size() const PROTOBUF_DEPRECATED;
+  inline void clear_delayautomaticwiths() PROTOBUF_DEPRECATED;
   static const int kDelayAutomaticWithsFieldNumber = 11;
-  inline double delayautomaticwiths(int index) const;
-  inline void set_delayautomaticwiths(int index, double value);
-  inline void add_delayautomaticwiths(double value);
+  inline double delayautomaticwiths(int index) const PROTOBUF_DEPRECATED;
+  inline void set_delayautomaticwiths(int index, double value) PROTOBUF_DEPRECATED;
+  inline void add_delayautomaticwiths(double value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< double >&
-      delayautomaticwiths() const;
+      delayautomaticwiths() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< double >*
-      mutable_delayautomaticwiths();
+      mutable_delayautomaticwiths() PROTOBUF_DEPRECATED;
 
-  // repeated bool eventTriggers = 12;
-  inline int eventtriggers_size() const;
-  inline void clear_eventtriggers();
+  // repeated bool eventTriggers = 12 [deprecated = true];
+  inline int eventtriggers_size() const PROTOBUF_DEPRECATED;
+  inline void clear_eventtriggers() PROTOBUF_DEPRECATED;
   static const int kEventTriggersFieldNumber = 12;
-  inline bool eventtriggers(int index) const;
-  inline void set_eventtriggers(int index, bool value);
-  inline void add_eventtriggers(bool value);
+  inline bool eventtriggers(int index) const PROTOBUF_DEPRECATED;
+  inline void set_eventtriggers(int index, bool value) PROTOBUF_DEPRECATED;
+  inline void add_eventtriggers(bool value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< bool >&
-      eventtriggers() const;
+      eventtriggers() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< bool >*
-      mutable_eventtriggers();
+      mutable_eventtriggers() PROTOBUF_DEPRECATED;
+
+  // optional .KN.BuildAttributesArchive oldAttributes = 13;
+  inline bool has_oldattributes() const;
+  inline void clear_oldattributes();
+  static const int kOldAttributesFieldNumber = 13;
+  inline const ::KN::BuildAttributesArchive& oldattributes() const;
+  inline ::KN::BuildAttributesArchive* mutable_oldattributes();
+  inline ::KN::BuildAttributesArchive* release_oldattributes();
+  inline void set_allocated_oldattributes(::KN::BuildAttributesArchive* oldattributes);
+
+  // optional .KN.BuildAttributesArchive currentAttributes = 14;
+  inline bool has_currentattributes() const;
+  inline void clear_currentattributes();
+  static const int kCurrentAttributesFieldNumber = 14;
+  inline const ::KN::BuildAttributesArchive& currentattributes() const;
+  inline ::KN::BuildAttributesArchive* mutable_currentattributes();
+  inline ::KN::BuildAttributesArchive* release_currentattributes();
+  inline void set_allocated_currentattributes(::KN::BuildAttributesArchive* currentattributes);
 
   // @@protoc_insertion_point(class_scope:KN.CommandBuildSetValueArchive)
  private:
@@ -4496,6 +4526,10 @@ class CommandBuildSetValueArchive : public ::google::protobuf::Message {
   inline void clear_has_build();
   inline void set_has_property();
   inline void clear_has_property();
+  inline void set_has_oldattributes();
+  inline void clear_has_oldattributes();
+  inline void set_has_currentattributes();
+  inline void clear_has_currentattributes();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -4511,9 +4545,11 @@ class CommandBuildSetValueArchive : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedField< double > delayautomaticafters_;
   ::google::protobuf::RepeatedField< double > delayautomaticwiths_;
   ::google::protobuf::RepeatedField< bool > eventtriggers_;
+  ::KN::BuildAttributesArchive* oldattributes_;
+  ::KN::BuildAttributesArchive* currentattributes_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(12 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(14 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNCommandArchives_2eproto();
   friend void protobuf_AssignDesc_KNCommandArchives_2eproto();
@@ -4656,12 +4692,12 @@ class CommandBuildChunkSetValueArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedField< double >*
       mutable_delays();
 
-  // optional bool oldOwnsValue = 8;
-  inline bool has_oldownsvalue() const;
-  inline void clear_oldownsvalue();
+  // optional bool oldOwnsValue = 8 [deprecated = true];
+  inline bool has_oldownsvalue() const PROTOBUF_DEPRECATED;
+  inline void clear_oldownsvalue() PROTOBUF_DEPRECATED;
   static const int kOldOwnsValueFieldNumber = 8;
-  inline bool oldownsvalue() const;
-  inline void set_oldownsvalue(bool value);
+  inline bool oldownsvalue() const PROTOBUF_DEPRECATED;
+  inline void set_oldownsvalue(bool value) PROTOBUF_DEPRECATED;
 
   // @@protoc_insertion_point(class_scope:KN.CommandBuildChunkSetValueArchive)
  private:
@@ -4781,117 +4817,135 @@ class CommandTransitionSetValueArchive : public ::google::protobuf::Message {
   inline ::std::string* release_property();
   inline void set_allocated_property(::std::string* property);
 
-  // repeated string effects = 4;
-  inline int effects_size() const;
-  inline void clear_effects();
+  // repeated string effects = 4 [deprecated = true];
+  inline int effects_size() const PROTOBUF_DEPRECATED;
+  inline void clear_effects() PROTOBUF_DEPRECATED;
   static const int kEffectsFieldNumber = 4;
-  inline const ::std::string& effects(int index) const;
-  inline ::std::string* mutable_effects(int index);
-  inline void set_effects(int index, const ::std::string& value);
-  inline void set_effects(int index, const char* value);
-  inline void set_effects(int index, const char* value, size_t size);
-  inline ::std::string* add_effects();
-  inline void add_effects(const ::std::string& value);
-  inline void add_effects(const char* value);
-  inline void add_effects(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& effects() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_effects();
-
-  // repeated string unused = 5;
-  inline int unused_size() const;
-  inline void clear_unused();
+  inline const ::std::string& effects(int index) const PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_effects(int index) PROTOBUF_DEPRECATED;
+  inline void set_effects(int index, const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_effects(int index, const char* value) PROTOBUF_DEPRECATED;
+  inline void set_effects(int index, const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* add_effects() PROTOBUF_DEPRECATED;
+  inline void add_effects(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void add_effects(const char* value) PROTOBUF_DEPRECATED;
+  inline void add_effects(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& effects() const PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_effects() PROTOBUF_DEPRECATED;
+
+  // repeated string unused = 5 [deprecated = true];
+  inline int unused_size() const PROTOBUF_DEPRECATED;
+  inline void clear_unused() PROTOBUF_DEPRECATED;
   static const int kUnusedFieldNumber = 5;
-  inline const ::std::string& unused(int index) const;
-  inline ::std::string* mutable_unused(int index);
-  inline void set_unused(int index, const ::std::string& value);
-  inline void set_unused(int index, const char* value);
-  inline void set_unused(int index, const char* value, size_t size);
-  inline ::std::string* add_unused();
-  inline void add_unused(const ::std::string& value);
-  inline void add_unused(const char* value);
-  inline void add_unused(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& unused() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_unused();
-
-  // repeated string unused2 = 6;
-  inline int unused2_size() const;
-  inline void clear_unused2();
+  inline const ::std::string& unused(int index) const PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_unused(int index) PROTOBUF_DEPRECATED;
+  inline void set_unused(int index, const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_unused(int index, const char* value) PROTOBUF_DEPRECATED;
+  inline void set_unused(int index, const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* add_unused() PROTOBUF_DEPRECATED;
+  inline void add_unused(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void add_unused(const char* value) PROTOBUF_DEPRECATED;
+  inline void add_unused(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& unused() const PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_unused() PROTOBUF_DEPRECATED;
+
+  // repeated string unused2 = 6 [deprecated = true];
+  inline int unused2_size() const PROTOBUF_DEPRECATED;
+  inline void clear_unused2() PROTOBUF_DEPRECATED;
   static const int kUnused2FieldNumber = 6;
-  inline const ::std::string& unused2(int index) const;
-  inline ::std::string* mutable_unused2(int index);
-  inline void set_unused2(int index, const ::std::string& value);
-  inline void set_unused2(int index, const char* value);
-  inline void set_unused2(int index, const char* value, size_t size);
-  inline ::std::string* add_unused2();
-  inline void add_unused2(const ::std::string& value);
-  inline void add_unused2(const char* value);
-  inline void add_unused2(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& unused2() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_unused2();
-
-  // repeated string unused3 = 7;
-  inline int unused3_size() const;
-  inline void clear_unused3();
+  inline const ::std::string& unused2(int index) const PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_unused2(int index) PROTOBUF_DEPRECATED;
+  inline void set_unused2(int index, const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_unused2(int index, const char* value) PROTOBUF_DEPRECATED;
+  inline void set_unused2(int index, const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* add_unused2() PROTOBUF_DEPRECATED;
+  inline void add_unused2(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void add_unused2(const char* value) PROTOBUF_DEPRECATED;
+  inline void add_unused2(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& unused2() const PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_unused2() PROTOBUF_DEPRECATED;
+
+  // repeated string unused3 = 7 [deprecated = true];
+  inline int unused3_size() const PROTOBUF_DEPRECATED;
+  inline void clear_unused3() PROTOBUF_DEPRECATED;
   static const int kUnused3FieldNumber = 7;
-  inline const ::std::string& unused3(int index) const;
-  inline ::std::string* mutable_unused3(int index);
-  inline void set_unused3(int index, const ::std::string& value);
-  inline void set_unused3(int index, const char* value);
-  inline void set_unused3(int index, const char* value, size_t size);
-  inline ::std::string* add_unused3();
-  inline void add_unused3(const ::std::string& value);
-  inline void add_unused3(const char* value);
-  inline void add_unused3(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& unused3() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_unused3();
-
-  // repeated double durations = 8;
-  inline int durations_size() const;
-  inline void clear_durations();
+  inline const ::std::string& unused3(int index) const PROTOBUF_DEPRECATED;
+  inline ::std::string* mutable_unused3(int index) PROTOBUF_DEPRECATED;
+  inline void set_unused3(int index, const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void set_unused3(int index, const char* value) PROTOBUF_DEPRECATED;
+  inline void set_unused3(int index, const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline ::std::string* add_unused3() PROTOBUF_DEPRECATED;
+  inline void add_unused3(const ::std::string& value) PROTOBUF_DEPRECATED;
+  inline void add_unused3(const char* value) PROTOBUF_DEPRECATED;
+  inline void add_unused3(const char* value, size_t size) PROTOBUF_DEPRECATED;
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& unused3() const PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_unused3() PROTOBUF_DEPRECATED;
+
+  // repeated double durations = 8 [deprecated = true];
+  inline int durations_size() const PROTOBUF_DEPRECATED;
+  inline void clear_durations() PROTOBUF_DEPRECATED;
   static const int kDurationsFieldNumber = 8;
-  inline double durations(int index) const;
-  inline void set_durations(int index, double value);
-  inline void add_durations(double value);
+  inline double durations(int index) const PROTOBUF_DEPRECATED;
+  inline void set_durations(int index, double value) PROTOBUF_DEPRECATED;
+  inline void add_durations(double value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< double >&
-      durations() const;
+      durations() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< double >*
-      mutable_durations();
+      mutable_durations() PROTOBUF_DEPRECATED;
 
-  // repeated uint32 directions = 9;
-  inline int directions_size() const;
-  inline void clear_directions();
+  // repeated uint32 directions = 9 [deprecated = true];
+  inline int directions_size() const PROTOBUF_DEPRECATED;
+  inline void clear_directions() PROTOBUF_DEPRECATED;
   static const int kDirectionsFieldNumber = 9;
-  inline ::google::protobuf::uint32 directions(int index) const;
-  inline void set_directions(int index, ::google::protobuf::uint32 value);
-  inline void add_directions(::google::protobuf::uint32 value);
+  inline ::google::protobuf::uint32 directions(int index) const PROTOBUF_DEPRECATED;
+  inline void set_directions(int index, ::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
+  inline void add_directions(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-      directions() const;
+      directions() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-      mutable_directions();
+      mutable_directions() PROTOBUF_DEPRECATED;
 
-  // repeated bool isAutomatics = 10;
-  inline int isautomatics_size() const;
-  inline void clear_isautomatics();
+  // repeated bool isAutomatics = 10 [deprecated = true];
+  inline int isautomatics_size() const PROTOBUF_DEPRECATED;
+  inline void clear_isautomatics() PROTOBUF_DEPRECATED;
   static const int kIsAutomaticsFieldNumber = 10;
-  inline bool isautomatics(int index) const;
-  inline void set_isautomatics(int index, bool value);
-  inline void add_isautomatics(bool value);
+  inline bool isautomatics(int index) const PROTOBUF_DEPRECATED;
+  inline void set_isautomatics(int index, bool value) PROTOBUF_DEPRECATED;
+  inline void add_isautomatics(bool value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< bool >&
-      isautomatics() const;
+      isautomatics() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< bool >*
-      mutable_isautomatics();
+      mutable_isautomatics() PROTOBUF_DEPRECATED;
 
-  // repeated double delays = 11;
-  inline int delays_size() const;
-  inline void clear_delays();
+  // repeated double delays = 11 [deprecated = true];
+  inline int delays_size() const PROTOBUF_DEPRECATED;
+  inline void clear_delays() PROTOBUF_DEPRECATED;
   static const int kDelaysFieldNumber = 11;
-  inline double delays(int index) const;
-  inline void set_delays(int index, double value);
-  inline void add_delays(double value);
+  inline double delays(int index) const PROTOBUF_DEPRECATED;
+  inline void set_delays(int index, double value) PROTOBUF_DEPRECATED;
+  inline void add_delays(double value) PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedField< double >&
-      delays() const;
+      delays() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedField< double >*
-      mutable_delays();
+      mutable_delays() PROTOBUF_DEPRECATED;
+
+  // optional .KN.TransitionAttributesArchive oldAttributes = 12;
+  inline bool has_oldattributes() const;
+  inline void clear_oldattributes();
+  static const int kOldAttributesFieldNumber = 12;
+  inline const ::KN::TransitionAttributesArchive& oldattributes() const;
+  inline ::KN::TransitionAttributesArchive* mutable_oldattributes();
+  inline ::KN::TransitionAttributesArchive* release_oldattributes();
+  inline void set_allocated_oldattributes(::KN::TransitionAttributesArchive* oldattributes);
+
+  // optional .KN.TransitionAttributesArchive currentAttributes = 13;
+  inline bool has_currentattributes() const;
+  inline void clear_currentattributes();
+  static const int kCurrentAttributesFieldNumber = 13;
+  inline const ::KN::TransitionAttributesArchive& currentattributes() const;
+  inline ::KN::TransitionAttributesArchive* mutable_currentattributes();
+  inline ::KN::TransitionAttributesArchive* release_currentattributes();
+  inline void set_allocated_currentattributes(::KN::TransitionAttributesArchive* currentattributes);
 
   // @@protoc_insertion_point(class_scope:KN.CommandTransitionSetValueArchive)
  private:
@@ -4901,6 +4955,10 @@ class CommandTransitionSetValueArchive : public ::google::protobuf::Message {
   inline void clear_has_slidenode();
   inline void set_has_property();
   inline void clear_has_property();
+  inline void set_has_oldattributes();
+  inline void clear_has_oldattributes();
+  inline void set_has_currentattributes();
+  inline void clear_has_currentattributes();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -4915,9 +4973,11 @@ class CommandTransitionSetValueArchive : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > directions_;
   ::google::protobuf::RepeatedField< bool > isautomatics_;
   ::google::protobuf::RepeatedField< double > delays_;
+  ::KN::TransitionAttributesArchive* oldattributes_;
+  ::KN::TransitionAttributesArchive* currentattributes_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(13 + 31) / 32];
 
   friend void  protobuf_AddDesc_KNCommandArchives_2eproto();
   friend void protobuf_AssignDesc_KNCommandArchives_2eproto();
@@ -5426,6 +5486,122 @@ class CommandMasterSetBodyStylesArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class CommandMasterSetSlideObjectsLayerWithMasterArchive : public ::google::protobuf::Message {
+ public:
+  CommandMasterSetSlideObjectsLayerWithMasterArchive();
+  virtual ~CommandMasterSetSlideObjectsLayerWithMasterArchive();
+
+  CommandMasterSetSlideObjectsLayerWithMasterArchive(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from);
+
+  inline CommandMasterSetSlideObjectsLayerWithMasterArchive& operator=(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandMasterSetSlideObjectsLayerWithMasterArchive& default_instance();
+
+  void Swap(CommandMasterSetSlideObjectsLayerWithMasterArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandMasterSetSlideObjectsLayerWithMasterArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from);
+  void MergeFrom(const CommandMasterSetSlideObjectsLayerWithMasterArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // required .TSP.Reference master = 2;
+  inline bool has_master() const;
+  inline void clear_master();
+  static const int kMasterFieldNumber = 2;
+  inline const ::TSP::Reference& master() const;
+  inline ::TSP::Reference* mutable_master();
+  inline ::TSP::Reference* release_master();
+  inline void set_allocated_master(::TSP::Reference* master);
+
+  // required bool new_value = 3;
+  inline bool has_new_value() const;
+  inline void clear_new_value();
+  static const int kNewValueFieldNumber = 3;
+  inline bool new_value() const;
+  inline void set_new_value(bool value);
+
+  // required bool old_value = 4;
+  inline bool has_old_value() const;
+  inline void clear_old_value();
+  static const int kOldValueFieldNumber = 4;
+  inline bool old_value() const;
+  inline void set_old_value(bool value);
+
+  // @@protoc_insertion_point(class_scope:KN.CommandMasterSetSlideObjectsLayerWithMasterArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_master();
+  inline void clear_has_master();
+  inline void set_has_new_value();
+  inline void clear_has_new_value();
+  inline void set_has_old_value();
+  inline void clear_has_old_value();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* master_;
+  bool new_value_;
+  bool old_value_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_KNCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_KNCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_KNCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandMasterSetSlideObjectsLayerWithMasterArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class CommandSlideApplyThemeArchive : public ::google::protobuf::Message {
  public:
   CommandSlideApplyThemeArchive();
@@ -6220,6 +6396,140 @@ class CommandSoundtrackSetValue : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class CommandSlideUpdateMasterDrawables : public ::google::protobuf::Message {
+ public:
+  CommandSlideUpdateMasterDrawables();
+  virtual ~CommandSlideUpdateMasterDrawables();
+
+  CommandSlideUpdateMasterDrawables(const CommandSlideUpdateMasterDrawables& from);
+
+  inline CommandSlideUpdateMasterDrawables& operator=(const CommandSlideUpdateMasterDrawables& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandSlideUpdateMasterDrawables& default_instance();
+
+  void Swap(CommandSlideUpdateMasterDrawables* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandSlideUpdateMasterDrawables* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandSlideUpdateMasterDrawables& from);
+  void MergeFrom(const CommandSlideUpdateMasterDrawables& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // required .TSP.Reference slide = 2;
+  inline bool has_slide() const;
+  inline void clear_slide();
+  static const int kSlideFieldNumber = 2;
+  inline const ::TSP::Reference& slide() const;
+  inline ::TSP::Reference* mutable_slide();
+  inline ::TSP::Reference* release_slide();
+  inline void set_allocated_slide(::TSP::Reference* slide);
+
+  // repeated .TSP.Reference drawables_to_insert = 3;
+  inline int drawables_to_insert_size() const;
+  inline void clear_drawables_to_insert();
+  static const int kDrawablesToInsertFieldNumber = 3;
+  inline const ::TSP::Reference& drawables_to_insert(int index) const;
+  inline ::TSP::Reference* mutable_drawables_to_insert(int index);
+  inline ::TSP::Reference* add_drawables_to_insert();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      drawables_to_insert() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_drawables_to_insert();
+
+  // repeated .TSP.Reference sorted_drawables_to_remove = 4;
+  inline int sorted_drawables_to_remove_size() const;
+  inline void clear_sorted_drawables_to_remove();
+  static const int kSortedDrawablesToRemoveFieldNumber = 4;
+  inline const ::TSP::Reference& sorted_drawables_to_remove(int index) const;
+  inline ::TSP::Reference* mutable_sorted_drawables_to_remove(int index);
+  inline ::TSP::Reference* add_sorted_drawables_to_remove();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      sorted_drawables_to_remove() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_sorted_drawables_to_remove();
+
+  // required .TSP.IndexSet indexes_of_removed_drawables = 5;
+  inline bool has_indexes_of_removed_drawables() const;
+  inline void clear_indexes_of_removed_drawables();
+  static const int kIndexesOfRemovedDrawablesFieldNumber = 5;
+  inline const ::TSP::IndexSet& indexes_of_removed_drawables() const;
+  inline ::TSP::IndexSet* mutable_indexes_of_removed_drawables();
+  inline ::TSP::IndexSet* release_indexes_of_removed_drawables();
+  inline void set_allocated_indexes_of_removed_drawables(::TSP::IndexSet* indexes_of_removed_drawables);
+
+  // @@protoc_insertion_point(class_scope:KN.CommandSlideUpdateMasterDrawables)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_slide();
+  inline void clear_has_slide();
+  inline void set_has_indexes_of_removed_drawables();
+  inline void clear_has_indexes_of_removed_drawables();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* slide_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > drawables_to_insert_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > sorted_drawables_to_remove_;
+  ::TSP::IndexSet* indexes_of_removed_drawables_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+
+  friend void  protobuf_AddDesc_KNCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_KNCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_KNCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandSlideUpdateMasterDrawables* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class SlideCollectionCommandSelectionBehaviorArchive : public ::google::protobuf::Message {
  public:
   SlideCollectionCommandSelectionBehaviorArchive();
@@ -10630,6 +10940,28 @@ inline void CommandRemoveMasterArchive::set_allocated_master_change_commands(::T
   }
 }
 
+// optional bool default_master_slide_node_was_replaced = 6;
+inline bool CommandRemoveMasterArchive::has_default_master_slide_node_was_replaced() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandRemoveMasterArchive::set_has_default_master_slide_node_was_replaced() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandRemoveMasterArchive::clear_has_default_master_slide_node_was_replaced() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandRemoveMasterArchive::clear_default_master_slide_node_was_replaced() {
+  default_master_slide_node_was_replaced_ = false;
+  clear_has_default_master_slide_node_was_replaced();
+}
+inline bool CommandRemoveMasterArchive::default_master_slide_node_was_replaced() const {
+  return default_master_slide_node_was_replaced_;
+}
+inline void CommandRemoveMasterArchive::set_default_master_slide_node_was_replaced(bool value) {
+  set_has_default_master_slide_node_was_replaced();
+  default_master_slide_node_was_replaced_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // CommandRenameMasterArchive
@@ -12008,7 +12340,7 @@ inline void CommandBuildSetValueArchive::set_allocated_property(::std::string* p
   }
 }
 
-// repeated string effects = 4;
+// repeated string effects = 4 [deprecated = true];
 inline int CommandBuildSetValueArchive::effects_size() const {
   return effects_.size();
 }
@@ -12052,7 +12384,7 @@ CommandBuildSetValueArchive::mutable_effects() {
   return &effects_;
 }
 
-// repeated string types = 5;
+// repeated string types = 5 [deprecated = true];
 inline int CommandBuildSetValueArchive::types_size() const {
   return types_.size();
 }
@@ -12140,7 +12472,7 @@ CommandBuildSetValueArchive::mutable_deliveries() {
   return &deliveries_;
 }
 
-// repeated uint32 directions = 7;
+// repeated uint32 directions = 7 [deprecated = true];
 inline int CommandBuildSetValueArchive::directions_size() const {
   return directions_.size();
 }
@@ -12165,7 +12497,7 @@ CommandBuildSetValueArchive::mutable_directions() {
   return &directions_;
 }
 
-// repeated double durations = 8;
+// repeated double durations = 8 [deprecated = true];
 inline int CommandBuildSetValueArchive::durations_size() const {
   return durations_.size();
 }
@@ -12190,7 +12522,7 @@ CommandBuildSetValueArchive::mutable_durations() {
   return &durations_;
 }
 
-// repeated double delays = 9;
+// repeated double delays = 9 [deprecated = true];
 inline int CommandBuildSetValueArchive::delays_size() const {
   return delays_.size();
 }
@@ -12215,7 +12547,7 @@ CommandBuildSetValueArchive::mutable_delays() {
   return &delays_;
 }
 
-// repeated double delayAutomaticAfters = 10;
+// repeated double delayAutomaticAfters = 10 [deprecated = true];
 inline int CommandBuildSetValueArchive::delayautomaticafters_size() const {
   return delayautomaticafters_.size();
 }
@@ -12240,7 +12572,7 @@ CommandBuildSetValueArchive::mutable_delayautomaticafters() {
   return &delayautomaticafters_;
 }
 
-// repeated double delayAutomaticWiths = 11;
+// repeated double delayAutomaticWiths = 11 [deprecated = true];
 inline int CommandBuildSetValueArchive::delayautomaticwiths_size() const {
   return delayautomaticwiths_.size();
 }
@@ -12265,7 +12597,7 @@ CommandBuildSetValueArchive::mutable_delayautomaticwiths() {
   return &delayautomaticwiths_;
 }
 
-// repeated bool eventTriggers = 12;
+// repeated bool eventTriggers = 12 [deprecated = true];
 inline int CommandBuildSetValueArchive::eventtriggers_size() const {
   return eventtriggers_.size();
 }
@@ -12290,6 +12622,82 @@ CommandBuildSetValueArchive::mutable_eventtriggers() {
   return &eventtriggers_;
 }
 
+// optional .KN.BuildAttributesArchive oldAttributes = 13;
+inline bool CommandBuildSetValueArchive::has_oldattributes() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
+}
+inline void CommandBuildSetValueArchive::set_has_oldattributes() {
+  _has_bits_[0] |= 0x00001000u;
+}
+inline void CommandBuildSetValueArchive::clear_has_oldattributes() {
+  _has_bits_[0] &= ~0x00001000u;
+}
+inline void CommandBuildSetValueArchive::clear_oldattributes() {
+  if (oldattributes_ != NULL) oldattributes_->::KN::BuildAttributesArchive::Clear();
+  clear_has_oldattributes();
+}
+inline const ::KN::BuildAttributesArchive& CommandBuildSetValueArchive::oldattributes() const {
+  return oldattributes_ != NULL ? *oldattributes_ : *default_instance_->oldattributes_;
+}
+inline ::KN::BuildAttributesArchive* CommandBuildSetValueArchive::mutable_oldattributes() {
+  set_has_oldattributes();
+  if (oldattributes_ == NULL) oldattributes_ = new ::KN::BuildAttributesArchive;
+  return oldattributes_;
+}
+inline ::KN::BuildAttributesArchive* CommandBuildSetValueArchive::release_oldattributes() {
+  clear_has_oldattributes();
+  ::KN::BuildAttributesArchive* temp = oldattributes_;
+  oldattributes_ = NULL;
+  return temp;
+}
+inline void CommandBuildSetValueArchive::set_allocated_oldattributes(::KN::BuildAttributesArchive* oldattributes) {
+  delete oldattributes_;
+  oldattributes_ = oldattributes;
+  if (oldattributes) {
+    set_has_oldattributes();
+  } else {
+    clear_has_oldattributes();
+  }
+}
+
+// optional .KN.BuildAttributesArchive currentAttributes = 14;
+inline bool CommandBuildSetValueArchive::has_currentattributes() const {
+  return (_has_bits_[0] & 0x00002000u) != 0;
+}
+inline void CommandBuildSetValueArchive::set_has_currentattributes() {
+  _has_bits_[0] |= 0x00002000u;
+}
+inline void CommandBuildSetValueArchive::clear_has_currentattributes() {
+  _has_bits_[0] &= ~0x00002000u;
+}
+inline void CommandBuildSetValueArchive::clear_currentattributes() {
+  if (currentattributes_ != NULL) currentattributes_->::KN::BuildAttributesArchive::Clear();
+  clear_has_currentattributes();
+}
+inline const ::KN::BuildAttributesArchive& CommandBuildSetValueArchive::currentattributes() const {
+  return currentattributes_ != NULL ? *currentattributes_ : *default_instance_->currentattributes_;
+}
+inline ::KN::BuildAttributesArchive* CommandBuildSetValueArchive::mutable_currentattributes() {
+  set_has_currentattributes();
+  if (currentattributes_ == NULL) currentattributes_ = new ::KN::BuildAttributesArchive;
+  return currentattributes_;
+}
+inline ::KN::BuildAttributesArchive* CommandBuildSetValueArchive::release_currentattributes() {
+  clear_has_currentattributes();
+  ::KN::BuildAttributesArchive* temp = currentattributes_;
+  currentattributes_ = NULL;
+  return temp;
+}
+inline void CommandBuildSetValueArchive::set_allocated_currentattributes(::KN::BuildAttributesArchive* currentattributes) {
+  delete currentattributes_;
+  currentattributes_ = currentattributes;
+  if (currentattributes) {
+    set_has_currentattributes();
+  } else {
+    clear_has_currentattributes();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // CommandBuildChunkSetValueArchive
@@ -12540,7 +12948,7 @@ CommandBuildChunkSetValueArchive::mutable_delays() {
   return &delays_;
 }
 
-// optional bool oldOwnsValue = 8;
+// optional bool oldOwnsValue = 8 [deprecated = true];
 inline bool CommandBuildChunkSetValueArchive::has_oldownsvalue() const {
   return (_has_bits_[0] & 0x00000080u) != 0;
 }
@@ -12712,7 +13120,7 @@ inline void CommandTransitionSetValueArchive::set_allocated_property(::std::stri
   }
 }
 
-// repeated string effects = 4;
+// repeated string effects = 4 [deprecated = true];
 inline int CommandTransitionSetValueArchive::effects_size() const {
   return effects_.size();
 }
@@ -12756,7 +13164,7 @@ CommandTransitionSetValueArchive::mutable_effects() {
   return &effects_;
 }
 
-// repeated string unused = 5;
+// repeated string unused = 5 [deprecated = true];
 inline int CommandTransitionSetValueArchive::unused_size() const {
   return unused_.size();
 }
@@ -12800,7 +13208,7 @@ CommandTransitionSetValueArchive::mutable_unused() {
   return &unused_;
 }
 
-// repeated string unused2 = 6;
+// repeated string unused2 = 6 [deprecated = true];
 inline int CommandTransitionSetValueArchive::unused2_size() const {
   return unused2_.size();
 }
@@ -12844,7 +13252,7 @@ CommandTransitionSetValueArchive::mutable_unused2() {
   return &unused2_;
 }
 
-// repeated string unused3 = 7;
+// repeated string unused3 = 7 [deprecated = true];
 inline int CommandTransitionSetValueArchive::unused3_size() const {
   return unused3_.size();
 }
@@ -12888,7 +13296,7 @@ CommandTransitionSetValueArchive::mutable_unused3() {
   return &unused3_;
 }
 
-// repeated double durations = 8;
+// repeated double durations = 8 [deprecated = true];
 inline int CommandTransitionSetValueArchive::durations_size() const {
   return durations_.size();
 }
@@ -12913,7 +13321,7 @@ CommandTransitionSetValueArchive::mutable_durations() {
   return &durations_;
 }
 
-// repeated uint32 directions = 9;
+// repeated uint32 directions = 9 [deprecated = true];
 inline int CommandTransitionSetValueArchive::directions_size() const {
   return directions_.size();
 }
@@ -12938,7 +13346,7 @@ CommandTransitionSetValueArchive::mutable_directions() {
   return &directions_;
 }
 
-// repeated bool isAutomatics = 10;
+// repeated bool isAutomatics = 10 [deprecated = true];
 inline int CommandTransitionSetValueArchive::isautomatics_size() const {
   return isautomatics_.size();
 }
@@ -12963,7 +13371,7 @@ CommandTransitionSetValueArchive::mutable_isautomatics() {
   return &isautomatics_;
 }
 
-// repeated double delays = 11;
+// repeated double delays = 11 [deprecated = true];
 inline int CommandTransitionSetValueArchive::delays_size() const {
   return delays_.size();
 }
@@ -12988,6 +13396,82 @@ CommandTransitionSetValueArchive::mutable_delays() {
   return &delays_;
 }
 
+// optional .KN.TransitionAttributesArchive oldAttributes = 12;
+inline bool CommandTransitionSetValueArchive::has_oldattributes() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
+}
+inline void CommandTransitionSetValueArchive::set_has_oldattributes() {
+  _has_bits_[0] |= 0x00000800u;
+}
+inline void CommandTransitionSetValueArchive::clear_has_oldattributes() {
+  _has_bits_[0] &= ~0x00000800u;
+}
+inline void CommandTransitionSetValueArchive::clear_oldattributes() {
+  if (oldattributes_ != NULL) oldattributes_->::KN::TransitionAttributesArchive::Clear();
+  clear_has_oldattributes();
+}
+inline const ::KN::TransitionAttributesArchive& CommandTransitionSetValueArchive::oldattributes() const {
+  return oldattributes_ != NULL ? *oldattributes_ : *default_instance_->oldattributes_;
+}
+inline ::KN::TransitionAttributesArchive* CommandTransitionSetValueArchive::mutable_oldattributes() {
+  set_has_oldattributes();
+  if (oldattributes_ == NULL) oldattributes_ = new ::KN::TransitionAttributesArchive;
+  return oldattributes_;
+}
+inline ::KN::TransitionAttributesArchive* CommandTransitionSetValueArchive::release_oldattributes() {
+  clear_has_oldattributes();
+  ::KN::TransitionAttributesArchive* temp = oldattributes_;
+  oldattributes_ = NULL;
+  return temp;
+}
+inline void CommandTransitionSetValueArchive::set_allocated_oldattributes(::KN::TransitionAttributesArchive* oldattributes) {
+  delete oldattributes_;
+  oldattributes_ = oldattributes;
+  if (oldattributes) {
+    set_has_oldattributes();
+  } else {
+    clear_has_oldattributes();
+  }
+}
+
+// optional .KN.TransitionAttributesArchive currentAttributes = 13;
+inline bool CommandTransitionSetValueArchive::has_currentattributes() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
+}
+inline void CommandTransitionSetValueArchive::set_has_currentattributes() {
+  _has_bits_[0] |= 0x00001000u;
+}
+inline void CommandTransitionSetValueArchive::clear_has_currentattributes() {
+  _has_bits_[0] &= ~0x00001000u;
+}
+inline void CommandTransitionSetValueArchive::clear_currentattributes() {
+  if (currentattributes_ != NULL) currentattributes_->::KN::TransitionAttributesArchive::Clear();
+  clear_has_currentattributes();
+}
+inline const ::KN::TransitionAttributesArchive& CommandTransitionSetValueArchive::currentattributes() const {
+  return currentattributes_ != NULL ? *currentattributes_ : *default_instance_->currentattributes_;
+}
+inline ::KN::TransitionAttributesArchive* CommandTransitionSetValueArchive::mutable_currentattributes() {
+  set_has_currentattributes();
+  if (currentattributes_ == NULL) currentattributes_ = new ::KN::TransitionAttributesArchive;
+  return currentattributes_;
+}
+inline ::KN::TransitionAttributesArchive* CommandTransitionSetValueArchive::release_currentattributes() {
+  clear_has_currentattributes();
+  ::KN::TransitionAttributesArchive* temp = currentattributes_;
+  currentattributes_ = NULL;
+  return temp;
+}
+inline void CommandTransitionSetValueArchive::set_allocated_currentattributes(::KN::TransitionAttributesArchive* currentattributes) {
+  delete currentattributes_;
+  currentattributes_ = currentattributes;
+  if (currentattributes) {
+    set_has_currentattributes();
+  } else {
+    clear_has_currentattributes();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // CommandShowSetSlideNumberVisibilityArchive
@@ -13632,6 +14116,130 @@ CommandMasterSetBodyStylesArchive::mutable_old_list_styles() {
 
 // -------------------------------------------------------------------
 
+// CommandMasterSetSlideObjectsLayerWithMasterArchive
+
+// required .TSK.CommandArchive super = 1;
+inline bool CommandMasterSetSlideObjectsLayerWithMasterArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::CommandArchive& CommandMasterSetSlideObjectsLayerWithMasterArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::CommandArchive* CommandMasterSetSlideObjectsLayerWithMasterArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
+}
+inline ::TSK::CommandArchive* CommandMasterSetSlideObjectsLayerWithMasterArchive::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required .TSP.Reference master = 2;
+inline bool CommandMasterSetSlideObjectsLayerWithMasterArchive::has_master() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_has_master() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_has_master() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_master() {
+  if (master_ != NULL) master_->::TSP::Reference::Clear();
+  clear_has_master();
+}
+inline const ::TSP::Reference& CommandMasterSetSlideObjectsLayerWithMasterArchive::master() const {
+  return master_ != NULL ? *master_ : *default_instance_->master_;
+}
+inline ::TSP::Reference* CommandMasterSetSlideObjectsLayerWithMasterArchive::mutable_master() {
+  set_has_master();
+  if (master_ == NULL) master_ = new ::TSP::Reference;
+  return master_;
+}
+inline ::TSP::Reference* CommandMasterSetSlideObjectsLayerWithMasterArchive::release_master() {
+  clear_has_master();
+  ::TSP::Reference* temp = master_;
+  master_ = NULL;
+  return temp;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_allocated_master(::TSP::Reference* master) {
+  delete master_;
+  master_ = master;
+  if (master) {
+    set_has_master();
+  } else {
+    clear_has_master();
+  }
+}
+
+// required bool new_value = 3;
+inline bool CommandMasterSetSlideObjectsLayerWithMasterArchive::has_new_value() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_has_new_value() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_has_new_value() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_new_value() {
+  new_value_ = false;
+  clear_has_new_value();
+}
+inline bool CommandMasterSetSlideObjectsLayerWithMasterArchive::new_value() const {
+  return new_value_;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_new_value(bool value) {
+  set_has_new_value();
+  new_value_ = value;
+}
+
+// required bool old_value = 4;
+inline bool CommandMasterSetSlideObjectsLayerWithMasterArchive::has_old_value() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_has_old_value() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_has_old_value() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::clear_old_value() {
+  old_value_ = false;
+  clear_has_old_value();
+}
+inline bool CommandMasterSetSlideObjectsLayerWithMasterArchive::old_value() const {
+  return old_value_;
+}
+inline void CommandMasterSetSlideObjectsLayerWithMasterArchive::set_old_value(bool value) {
+  set_has_old_value();
+  old_value_ = value;
+}
+
+// -------------------------------------------------------------------
+
 // CommandSlideApplyThemeArchive
 
 // required .TSS.ApplyThemeChildCommandArchive super = 1;
@@ -14560,6 +15168,174 @@ inline void CommandSoundtrackSetValue::set_allocated_new_value(::KN::CommandSoun
 
 // -------------------------------------------------------------------
 
+// CommandSlideUpdateMasterDrawables
+
+// required .TSK.CommandArchive super = 1;
+inline bool CommandSlideUpdateMasterDrawables::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandSlideUpdateMasterDrawables::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandSlideUpdateMasterDrawables::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandSlideUpdateMasterDrawables::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::CommandArchive& CommandSlideUpdateMasterDrawables::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::CommandArchive* CommandSlideUpdateMasterDrawables::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
+}
+inline ::TSK::CommandArchive* CommandSlideUpdateMasterDrawables::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandSlideUpdateMasterDrawables::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required .TSP.Reference slide = 2;
+inline bool CommandSlideUpdateMasterDrawables::has_slide() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSlideUpdateMasterDrawables::set_has_slide() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSlideUpdateMasterDrawables::clear_has_slide() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSlideUpdateMasterDrawables::clear_slide() {
+  if (slide_ != NULL) slide_->::TSP::Reference::Clear();
+  clear_has_slide();
+}
+inline const ::TSP::Reference& CommandSlideUpdateMasterDrawables::slide() const {
+  return slide_ != NULL ? *slide_ : *default_instance_->slide_;
+}
+inline ::TSP::Reference* CommandSlideUpdateMasterDrawables::mutable_slide() {
+  set_has_slide();
+  if (slide_ == NULL) slide_ = new ::TSP::Reference;
+  return slide_;
+}
+inline ::TSP::Reference* CommandSlideUpdateMasterDrawables::release_slide() {
+  clear_has_slide();
+  ::TSP::Reference* temp = slide_;
+  slide_ = NULL;
+  return temp;
+}
+inline void CommandSlideUpdateMasterDrawables::set_allocated_slide(::TSP::Reference* slide) {
+  delete slide_;
+  slide_ = slide;
+  if (slide) {
+    set_has_slide();
+  } else {
+    clear_has_slide();
+  }
+}
+
+// repeated .TSP.Reference drawables_to_insert = 3;
+inline int CommandSlideUpdateMasterDrawables::drawables_to_insert_size() const {
+  return drawables_to_insert_.size();
+}
+inline void CommandSlideUpdateMasterDrawables::clear_drawables_to_insert() {
+  drawables_to_insert_.Clear();
+}
+inline const ::TSP::Reference& CommandSlideUpdateMasterDrawables::drawables_to_insert(int index) const {
+  return drawables_to_insert_.Get(index);
+}
+inline ::TSP::Reference* CommandSlideUpdateMasterDrawables::mutable_drawables_to_insert(int index) {
+  return drawables_to_insert_.Mutable(index);
+}
+inline ::TSP::Reference* CommandSlideUpdateMasterDrawables::add_drawables_to_insert() {
+  return drawables_to_insert_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+CommandSlideUpdateMasterDrawables::drawables_to_insert() const {
+  return drawables_to_insert_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+CommandSlideUpdateMasterDrawables::mutable_drawables_to_insert() {
+  return &drawables_to_insert_;
+}
+
+// repeated .TSP.Reference sorted_drawables_to_remove = 4;
+inline int CommandSlideUpdateMasterDrawables::sorted_drawables_to_remove_size() const {
+  return sorted_drawables_to_remove_.size();
+}
+inline void CommandSlideUpdateMasterDrawables::clear_sorted_drawables_to_remove() {
+  sorted_drawables_to_remove_.Clear();
+}
+inline const ::TSP::Reference& CommandSlideUpdateMasterDrawables::sorted_drawables_to_remove(int index) const {
+  return sorted_drawables_to_remove_.Get(index);
+}
+inline ::TSP::Reference* CommandSlideUpdateMasterDrawables::mutable_sorted_drawables_to_remove(int index) {
+  return sorted_drawables_to_remove_.Mutable(index);
+}
+inline ::TSP::Reference* CommandSlideUpdateMasterDrawables::add_sorted_drawables_to_remove() {
+  return sorted_drawables_to_remove_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+CommandSlideUpdateMasterDrawables::sorted_drawables_to_remove() const {
+  return sorted_drawables_to_remove_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+CommandSlideUpdateMasterDrawables::mutable_sorted_drawables_to_remove() {
+  return &sorted_drawables_to_remove_;
+}
+
+// required .TSP.IndexSet indexes_of_removed_drawables = 5;
+inline bool CommandSlideUpdateMasterDrawables::has_indexes_of_removed_drawables() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSlideUpdateMasterDrawables::set_has_indexes_of_removed_drawables() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSlideUpdateMasterDrawables::clear_has_indexes_of_removed_drawables() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSlideUpdateMasterDrawables::clear_indexes_of_removed_drawables() {
+  if (indexes_of_removed_drawables_ != NULL) indexes_of_removed_drawables_->::TSP::IndexSet::Clear();
+  clear_has_indexes_of_removed_drawables();
+}
+inline const ::TSP::IndexSet& CommandSlideUpdateMasterDrawables::indexes_of_removed_drawables() const {
+  return indexes_of_removed_drawables_ != NULL ? *indexes_of_removed_drawables_ : *default_instance_->indexes_of_removed_drawables_;
+}
+inline ::TSP::IndexSet* CommandSlideUpdateMasterDrawables::mutable_indexes_of_removed_drawables() {
+  set_has_indexes_of_removed_drawables();
+  if (indexes_of_removed_drawables_ == NULL) indexes_of_removed_drawables_ = new ::TSP::IndexSet;
+  return indexes_of_removed_drawables_;
+}
+inline ::TSP::IndexSet* CommandSlideUpdateMasterDrawables::release_indexes_of_removed_drawables() {
+  clear_has_indexes_of_removed_drawables();
+  ::TSP::IndexSet* temp = indexes_of_removed_drawables_;
+  indexes_of_removed_drawables_ = NULL;
+  return temp;
+}
+inline void CommandSlideUpdateMasterDrawables::set_allocated_indexes_of_removed_drawables(::TSP::IndexSet* indexes_of_removed_drawables) {
+  delete indexes_of_removed_drawables_;
+  indexes_of_removed_drawables_ = indexes_of_removed_drawables;
+  if (indexes_of_removed_drawables) {
+    set_has_indexes_of_removed_drawables();
+  } else {
+    clear_has_indexes_of_removed_drawables();
+  }
+}
+
+// -------------------------------------------------------------------
+
 // SlideCollectionCommandSelectionBehaviorArchive
 
 // optional .TSP.Reference archived_new_selection = 1;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNArchives.proto
index aa36026..9772227 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNArchives.proto
@@ -41,12 +41,13 @@ message TransitionAttributesArchive {
   optional bool custom_magic_move_fade_unmatched_objects = 13;
   optional .KN.TransitionAttributesArchive.TransitionCustomAttributesTimingCurveType custom_timing_curve = 15;
   optional .KN.TransitionAttributesArchive.TransitionCustomAttributesTextDeliveryType custom_text_delivery_type = 16;
-  optional string database_animationType = 1;
-  optional string database_effect = 2;
-  optional double database_duration = 3;
-  optional uint32 database_direction = 4;
-  optional float database_delay = 5;
-  optional .TSP.Color database_color = 7;
+  optional bool custom_motion_blur = 17;
+  optional string database_animationType = 1 [deprecated = true];
+  optional string database_effect = 2 [deprecated = true];
+  optional double database_duration = 3 [deprecated = true];
+  optional uint32 database_direction = 4 [deprecated = true];
+  optional float database_delay = 5 [deprecated = true];
+  optional .TSP.Color database_color = 7 [deprecated = true];
 }
 
 message TransitionArchive {
@@ -99,8 +100,8 @@ message BuildAttributesArchive {
   }
   optional .KN.AnimationAttributesArchive animationAttributes = 18;
   optional uint32 eventTrigger = 4;
-  optional double delayAutomaticAfter = 6;
-  optional double delayAutomaticWith = 7;
+  optional double delayAutomaticAfter = 6 [deprecated = true];
+  optional double delayAutomaticWith = 7 [deprecated = true];
   optional .KN.BuildAttributesArchive.BuildAttributesCurveStyle curveStyle = 14;
   optional double ChartRotation3D = 17;
   optional uint32 startOffset = 27;
@@ -118,12 +119,13 @@ message BuildAttributesArchive {
   optional uint32 custom_action_repeatCount = 24;
   optional double custom_action_scale = 25;
   optional .KN.BuildAttributesArchive.ActionBuildAttributesJiggleIntensity custom_action_jiggleIntensity = 26;
-  optional string database_animationType = 1;
-  optional string database_effect = 2;
-  optional uint32 database_direction = 3;
-  optional double database_delay = 5;
-  optional double database_duration = 8;
-  optional .TSP.Color database_color = 16;
+  optional bool custom_motion_blur = 29;
+  optional string database_animationType = 1 [deprecated = true];
+  optional string database_effect = 2 [deprecated = true];
+  optional uint32 database_direction = 3 [deprecated = true];
+  optional double database_delay = 5 [deprecated = true];
+  optional double database_duration = 8 [deprecated = true];
+  optional .TSP.Color database_color = 16 [deprecated = true];
   optional string motionPathString = 15 [deprecated = true];
 }
 
@@ -174,7 +176,8 @@ message SlideArchive {
   optional .TSP.Reference bodyPlaceholder = 6;
   optional .TSP.Reference objectPlaceholder = 30;
   optional .TSP.Reference slideNumberPlaceholder = 20;
-  repeated .TSP.Reference drawables = 7;
+  repeated .TSP.Reference owned_drawables = 7;
+  repeated .TSP.Reference drawables_z_order = 42;
   repeated .KN.SlideArchive.SageTagMapEntry sage_tag_to_info_map = 28;
   optional string name = 10;
   optional .TSD.GeometryArchive titlePlaceholderGeometry = 11;
@@ -194,6 +197,7 @@ message SlideArchive {
   repeated .TSP.Reference bodyListStyles = 35;
   optional string thumbnailTextForTitlePlaceholder = 37;
   optional string thumbnailTextForBodyPlaceholder = 38;
+  optional bool slideObjectsLayerWithMaster = 41 [default = false];
   optional .TSP.Reference master = 17;
   repeated .TSD.GuideArchive staticGuides = 18;
   optional .TSP.Reference userDefinedGuideStorage = 36;
@@ -214,7 +218,7 @@ message SlideNodeArchive {
   required bool isCollapsed = 5 [deprecated = true];
   optional bool isCollapsedInOutlineView = 17;
   optional bool hasBodyInOutlineView = 19;
-  required bool hasBuilds = 6;
+  required bool hasBuilds = 6 [deprecated = true];
   required bool hasTransition = 7;
   optional bool hasNote = 8;
   optional bool isSlideNumberVisible = 18 [default = false];
@@ -222,6 +226,7 @@ message SlideNodeArchive {
   optional string copyFromSlideIdentifier = 12;
   optional uint32 slideSpecificHyperlinkCount = 13;
   optional uint32 eventCount = 15;
+  optional bool has_explicit_builds = 20;
   optional .TSP.Reference database_thumbnail = 3;
   repeated .TSP.Reference database_thumbnails = 9;
 }
@@ -269,6 +274,9 @@ message UIStateArchive {
   optional float desktop_navigator_view_width = 22;
   optional float desktop_outline_view_width = 23;
   optional .TSP.Size desktop_main_content_size = 24;
+  optional float desktop_presenter_notes_view_height = 25;
+  optional .TSP.Point desktop_main_window_origin = 26;
+  optional bool light_table_hides_skipped_slides = 27;
 }
 
 message CanvasSelectionArchive {
@@ -283,6 +291,8 @@ message ThemeArchive {
   optional string uuid = 3;
   repeated .TSP.Reference classicThemeRecords = 4;
   optional .TSP.Reference defaultMasterSlideNode = 5;
+  optional .TSP.Reference default_master_slide_node_reference = 6;
+  optional bool default_master_slide_node_is_our_best_guess = 7;
 }
 
 message SlideTreeArchive {
@@ -339,8 +349,11 @@ message PasteboardNativeStorageArchive {
   repeated .TSP.Reference builds = 2;
   repeated .KN.BuildChunkArchive buildChunks = 3;
   repeated .TSP.Reference slideNodes = 4;
+  repeated .TSP.Reference masterSlideNodes = 9;
   optional .TSP.Size originalShowSize = 5;
   repeated .TSP.Range titleRanges = 6;
+  repeated .TSD.GeometryArchive geometries_in_root = 7;
+  optional string slide_node_unique_identifier = 8;
 }
 
 message MasterChangeBlobArchive {
@@ -390,7 +403,8 @@ message RecordingNavigationEventArchive {
 }
 
 message RecordingLaserEventArchive {
-  optional .TSP.Point unscaled_location = 1;
+  optional .TSP.Point unscaled_location = 1 [deprecated = true];
+  optional .TSP.Point unit_location = 2;
 }
 
 message RecordingPauseEventArchive {
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNCommandArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNCommandArchives.proto
index b76fd7b..1bac60e 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNCommandArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/KNCommandArchives.proto
@@ -194,6 +194,7 @@ message CommandRemoveMasterArchive {
   required .TSP.Reference master_slide_node = 3;
   required uint32 previous_index = 4;
   optional .TSP.Reference master_change_commands = 5;
+  optional bool default_master_slide_node_was_replaced = 6;
 }
 
 message CommandRenameMasterArchive {
@@ -262,15 +263,17 @@ message CommandBuildSetValueArchive {
   required .TSK.CommandArchive super = 1;
   required .TSP.Reference build = 2;
   required string property = 3;
-  repeated string effects = 4;
-  repeated string types = 5;
+  repeated string effects = 4 [deprecated = true];
+  repeated string types = 5 [deprecated = true];
   repeated string deliveries = 6;
-  repeated uint32 directions = 7;
-  repeated double durations = 8;
-  repeated double delays = 9;
-  repeated double delayAutomaticAfters = 10;
-  repeated double delayAutomaticWiths = 11;
-  repeated bool eventTriggers = 12;
+  repeated uint32 directions = 7 [deprecated = true];
+  repeated double durations = 8 [deprecated = true];
+  repeated double delays = 9 [deprecated = true];
+  repeated double delayAutomaticAfters = 10 [deprecated = true];
+  repeated double delayAutomaticWiths = 11 [deprecated = true];
+  repeated bool eventTriggers = 12 [deprecated = true];
+  optional .KN.BuildAttributesArchive oldAttributes = 13;
+  optional .KN.BuildAttributesArchive currentAttributes = 14;
 }
 
 message CommandBuildChunkSetValueArchive {
@@ -281,21 +284,23 @@ message CommandBuildChunkSetValueArchive {
   repeated bool automatics = 5;
   repeated double durations = 6;
   repeated double delays = 7;
-  optional bool oldOwnsValue = 8;
+  optional bool oldOwnsValue = 8 [deprecated = true];
 }
 
 message CommandTransitionSetValueArchive {
   required .TSK.CommandArchive super = 1;
   required .TSP.Reference slideNode = 2;
   required string property = 3;
-  repeated string effects = 4;
-  repeated string unused = 5;
-  repeated string unused2 = 6;
-  repeated string unused3 = 7;
-  repeated double durations = 8;
-  repeated uint32 directions = 9;
-  repeated bool isAutomatics = 10;
-  repeated double delays = 11;
+  repeated string effects = 4 [deprecated = true];
+  repeated string unused = 5 [deprecated = true];
+  repeated string unused2 = 6 [deprecated = true];
+  repeated string unused3 = 7 [deprecated = true];
+  repeated double durations = 8 [deprecated = true];
+  repeated uint32 directions = 9 [deprecated = true];
+  repeated bool isAutomatics = 10 [deprecated = true];
+  repeated double delays = 11 [deprecated = true];
+  optional .KN.TransitionAttributesArchive oldAttributes = 12;
+  optional .KN.TransitionAttributesArchive currentAttributes = 13;
 }
 
 message CommandShowSetSlideNumberVisibilityArchive {
@@ -327,6 +332,13 @@ message CommandMasterSetBodyStylesArchive {
   repeated .TSP.Reference old_list_styles = 6;
 }
 
+message CommandMasterSetSlideObjectsLayerWithMasterArchive {
+  required .TSK.CommandArchive super = 1;
+  required .TSP.Reference master = 2;
+  required bool new_value = 3;
+  required bool old_value = 4;
+}
+
 message CommandSlideApplyThemeArchive {
   required .TSS.ApplyThemeChildCommandArchive super = 1;
   required .KN.MasterChangeBlobArchive blob = 2;
@@ -371,6 +383,14 @@ message CommandSoundtrackSetValue {
   optional .KN.CommandSoundtrackSetValue.PropertyValue new_value = 5;
 }
 
+message CommandSlideUpdateMasterDrawables {
+  required .TSK.CommandArchive super = 1;
+  required .TSP.Reference slide = 2;
+  repeated .TSP.Reference drawables_to_insert = 3;
+  repeated .TSP.Reference sorted_drawables_to_remove = 4;
+  required .TSP.IndexSet indexes_of_removed_drawables = 5;
+}
+
 message SlideCollectionCommandSelectionBehaviorArchive {
   enum Type {
     kKindSlideSelectionBehaviorTypeGeneral = 0;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSAArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSAArchives.proto
index 986b8d5..b3f7a37 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSAArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSAArchives.proto
@@ -16,6 +16,7 @@ message DocumentArchive {
   optional .TSP.Reference tables_custom_format_list = 7;
   optional bool needs_movie_compatibility_upgrade = 8;
   optional string template_identifier = 9;
+  optional .TSP.Reference shortcut_controller = 10;
 }
 
 message FunctionBrowserStateArchive {
@@ -30,7 +31,43 @@ message TestDocumentArchive {
   optional string value = 2;
 }
 
+message ShortcutControllerArchive {
+  message ShortcutMapEntry {
+    required string shortcut = 1;
+    required .TSP.Reference style = 2;
+  }
+  repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+}
+
 message PropagatePresetCommandArchive {
   required .TSK.CommandArchive super = 1;
 }
 
+message ShortcutCommandArchive {
+  optional .TSK.CommandArchive super = 1;
+  optional .TSP.Reference old_style = 2;
+  optional .TSP.Reference new_style = 3;
+  optional string old_shortcut = 4;
+  optional string new_shortcut = 5;
+}
+
+message AddCustomFormatCommandArchive {
+  required .TSK.CommandArchive super = 1;
+  optional .TSK.CustomFormatArchive custom_format = 2;
+  optional bool for_replacement = 3;
+}
+
+message UpdateCustomFormatCommandArchive {
+  optional .TSK.CommandArchive super = 1;
+  optional .TSK.CustomFormatArchive custom_format = 2;
+  optional .TSK.CustomFormatArchive old_custom_format = 3;
+  optional uint32 custom_format_id = 4;
+}
+
+message ReplaceCustomFormatCommandArchive {
+  optional .TSK.CommandArchive super = 1;
+  optional .TSK.CustomFormatArchive custom_format = 2;
+  optional uint32 custom_format_id = 3;
+  optional .TSK.FormatStructArchive replacement_format = 4;
+}
+
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCEArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCEArchives.proto
index efd7d20..043b1ea 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCEArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCEArchives.proto
@@ -90,6 +90,8 @@ message VolatileDependenciesArchive {
   repeated uint32 volatile_location_cell_row = 6;
   repeated uint32 volatile_compass_cell_column = 7;
   repeated uint32 volatile_compass_cell_row = 8;
+  repeated uint32 volatile_sheet_table_name_cell_column = 17;
+  repeated uint32 volatile_sheet_table_name_cell_row = 18;
   repeated uint32 calculated_dependency_cell_column = 9;
   repeated uint32 calculated_dependency_cell_row = 10;
   repeated .TSCE.CellReferenceArchive volatile_geometry_cell_reference = 13;
@@ -187,8 +189,8 @@ message OwnerIDMapArchive {
 
 message DependencyTrackerArchive {
   repeated .TSCE.FormulaOwnerInfoArchive formula_owner_info = 1;
-  repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
-  repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
+  repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
+  repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
   optional .TSCE.OwnerIDMapArchive owner_id_map = 3;
 }
 
@@ -498,7 +500,8 @@ message DateCellValueArchive {
 
 message NumberCellValueArchive {
   required double value = 1;
-  required int32 unit = 2;
+  optional int32 unit_index = 2;
+  optional string currency_code = 5;
   required .TSK.FormatStructArchive format = 3;
   optional bool format_is_implicit = 4 [default = true];
 }
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.GEN.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.GEN.proto
index 9c557c0..00efa6d 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.GEN.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.GEN.proto
@@ -125,7 +125,11 @@ message ChartAxisStyleArchive {
 
 message ChartAxisNonStyleArchive {
   optional int32 tschchartaxisdefault3dlabelposition = 1;
-  optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
+  optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
+  optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
+  optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+  optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+  optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
   optional int32 tschchartaxisdefaultnumberformattype = 3;
   optional int32 tschchartaxisvaluenumberofdecades = 4;
   optional int32 tschchartaxisvaluenumberofmajorgridlines = 5;
@@ -272,8 +276,13 @@ message ChartSeriesNonStyleArchive {
   optional int32 tschchartserieslinelinetype = 18;
   optional int32 tschchartseriesmixedlinelinetype = 19;
   optional int32 tschchartseriesscatterlinetype = 20;
-  optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
-  optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
+  optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
+  optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
+  optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+  optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+  optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+  optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
+  optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
   optional int32 tschchartseriesdefaultnumberformattype = 23;
   optional int32 tschchartseriespienumberformattype = 24;
   optional .TSK.FormatStructArchive tschchartseriesstackedpercentnumberformat = 25;
@@ -320,8 +329,168 @@ message ChartSeriesNonStyleArchive {
   optional int32 tschchartseriesbubblevaluelabelsaxis = 66;
   optional bool tschchartseriesscattershowserieslabels = 67;
   optional int32 tschchartseriesscattervaluelabelsaxis = 68;
+  optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+  optional bool tschchartseriesbubbleshowlabelsinfront = 101;
   extend .TSCH.ChartSeriesNonStyleArchive {
     optional .TSCH.Generated.ChartSeriesNonStyleArchive current = 10000;
   }
 }
 
+message ChartGenericPropertyMapArchive {
+  optional int32 tschchartinfo3dbarshape = 1;
+  optional bool tschchartinfo3dbeveledges = 2;
+  optional float tschchartinfo3dintersetdepthgap = 3;
+  optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+  optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+  optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+  optional float tschchartinfopiestartangle = 7;
+  optional bool tschchartinfoshowlegend = 8;
+  optional bool tschchartinfoshowtitle = 9;
+  optional bool tschchartinfoskiphiddendata = 10;
+  optional string tschchartinfotitle = 11;
+  optional int32 tschchartinfodatasetnamelocation = 12;
+  optional int32 tschchartinfomultidatacontroltype = 13;
+  optional float tschchartinfo3dchartopacity = 14;
+  optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+  optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+  optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+  optional float tschchartinfoborderopacity = 18;
+  optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+  optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+  optional bool tschchartinfocombinelayers = 21;
+  optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+  optional float tschchartinfogridbackgroundopacity = 23;
+  optional float tschchartinfointerbargap = 24;
+  optional float tschchartinfointersetgap = 25;
+  optional bool tschchartinfoshowborder = 26;
+  optional .TSP.Color tschchartinfotitlecolor = 27;
+  optional int32 tschchartinfotitleparagraphstyleindex = 28;
+  optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+}
+
+message LegendGenericPropertyMapArchive {
+  optional .TSD.FillArchive tschlegendmodelfill = 1;
+  optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+  optional float tschlegendmodelopacity = 3;
+  optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+  optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+}
+
+message ChartAxisGenericPropertyMapArchive {
+  optional int32 tschchartaxis3dlabelposition = 1;
+  optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+  optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+  optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+  optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+  optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+  optional int32 tschchartaxisnumberformattype = 7;
+  optional int32 tschchartaxisnumberofdecades = 8;
+  optional int32 tschchartaxisnumberofmajorgridlines = 9;
+  optional int32 tschchartaxisnumberofminorgridlines = 10;
+  optional bool tschchartaxisplottoedges = 11;
+  optional int32 tschchartaxisscale = 12;
+  optional bool tschchartaxisshowlabels = 13;
+  optional bool tschchartaxisshowserieslabels = 14;
+  optional bool tschchartaxisshowtitle = 15;
+  optional string tschchartaxistitle = 16;
+  optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+  optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+  optional float tschchartaxis3dgridlineopacity = 19;
+  optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+  optional int32 tschchartaxishorizontalspacing = 21;
+  optional int32 tschchartaxislabelparagraphstyleindex = 22;
+  optional float tschchartaxislabelsorientation = 23;
+  optional float tschchartaxismajorgridlineopacity = 24;
+  optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+  optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+  optional float tschchartaxisminorgridlineopacity = 27;
+  optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+  optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+  optional bool tschchartaxisshowaxis = 30;
+  optional bool tschchartaxisshowlastlabel = 31;
+  optional bool tschchartaxisshowmajorgridlines = 32;
+  optional bool tschchartaxisshowmajortickmarks = 33;
+  optional bool tschchartaxisshowminimumlabel = 34;
+  optional bool tschchartaxisshowminorgridlines = 35;
+  optional bool tschchartaxisshowminortickmarks = 36;
+  optional int32 tschchartaxistickmarklocation = 37;
+  optional int32 tschchartaxistitleparagraphstyleindex = 38;
+  optional int32 tschchartaxisverticalspacing = 39;
+}
+
+message ChartSeriesGenericPropertyMapArchive {
+  optional float tschchartseriesadjustmentscale = 1;
+  optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+  optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+  optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+  optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+  optional float tschchartserieserrorbarfixedvalue = 6;
+  optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+  optional float tschchartserieserrorbarpercentvalue = 8;
+  optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+  optional int32 tschchartserieserrorbarsetting = 10;
+  optional int32 tschchartserieserrorbarsettingscatterx = 11;
+  optional float tschchartserieserrorbarstddevvalue = 12;
+  optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+  optional int32 tschchartserieserrorbartype = 14;
+  optional int32 tschchartserieserrorbartypescatterx = 15;
+  optional float tschchartserieslabelexplosion = 16;
+  optional int32 tschchartserieslinetype = 17;
+  optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+  optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+  optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+  optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+  optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+  optional int32 tschchartseriesnumberformattype = 23;
+  optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+  optional int32 tschchartseriesseriestype = 25;
+  optional bool tschchartseriesshowerrorbar = 26;
+  optional bool tschchartseriesshowerrorbarscatterx = 27;
+  optional bool tschchartseriesshowline = 28;
+  optional bool tschchartseriesshownegativedata = 29;
+  optional bool tschchartseriesshowserieslabels = 30;
+  optional bool tschchartseriesshowsymbol = 31;
+  optional bool tschchartseriesshowtrendline = 32;
+  optional bool tschchartseriesshowvaluelabels = 33;
+  optional int32 tschchartseriessizedimension = 34;
+  optional int32 tschchartseriessymboltype = 35;
+  optional float tschchartseriestrendlineequationoffsetx = 36;
+  optional float tschchartseriestrendlineequationoffsety = 37;
+  optional string tschchartseriestrendlinelabelstring = 38;
+  optional int32 tschchartseriestrendlineorder = 39;
+  optional int32 tschchartseriestrendlineperiod = 40;
+  optional float tschchartseriestrendlinersquaredoffsetx = 41;
+  optional float tschchartseriestrendlinersquaredoffsety = 42;
+  optional bool tschchartseriestrendlineshowequation = 43;
+  optional bool tschchartseriestrendlineshowlabel = 44;
+  optional bool tschchartseriestrendlineshowr2value = 45;
+  optional int32 tschchartseriestrendlinetype = 46;
+  optional float tschchartserieswedgeexplosion = 47;
+  optional int32 tschchartseriesyaxisordinal = 48;
+  optional int32 tschchartseriesvaluelabelsaxis = 49;
+  optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+  optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+  optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+  optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+  optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+  optional .TSD.FillArchive tschchartseriesfill = 55;
+  optional int32 tschchartserieslabelparagraphstyleindex = 56;
+  optional float tschchartseriesopacity = 57;
+  optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+  optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+  optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+  optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+  optional bool tschchartseriessymbolfilluseseriesfill = 62;
+  optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+  optional float tschchartseriessymbolsize = 64;
+  optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+  optional float tschchartseriestrendlineequationopacity = 66;
+  optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+  optional float tschchartseriestrendlinersquaredopacity = 68;
+  optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+  optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+  optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+  optional int32 tschchartseriesvaluelabelposition = 72;
+  optional bool tschchartseriesshowlabelsinfront = 73;
+}
+
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.proto
index 03aa93e..dbdc3db 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHArchives.proto
@@ -48,6 +48,7 @@ message ChartPasteboardAdditionsArchive {
   extend .TSCH.ChartArchive {
     optional uint32 preset_index_for_pasteboard = 10000;
     optional bytes preset_uuid_for_pasteboard = 10001;
+    optional .TSP.Reference custom_format_list_for_pasteboard = 10003;
   }
 }
 
@@ -55,13 +56,24 @@ message ChartGridArchive {
   message GridRow {
     message GridValue {
       optional double numeric_value = 1;
-      optional double date_value = 2;
+      optional double date_value_1_0 = 2;
+      optional double duration_value = 3;
+      optional double date_value = 4;
     }
     repeated .TSCH.ChartGridArchive.GridRow.GridValue value = 1;
   }
+  message ChartGridRowColumnIdMap {
+    message Entry {
+      required string uniqueId = 1;
+      required uint32 index = 2;
+    }
+    repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+    repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+  }
   repeated string row_name = 1;
   repeated string column_name = 2;
   repeated .TSCH.ChartGridArchive.GridRow grid_row = 3;
+  optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
 }
 
 message ChartMediatorArchive {
@@ -140,6 +152,7 @@ message ChartUIState {
   optional int32 cde_last_col_selected = 3;
   optional int32 cde_last_row_count = 4;
   optional int32 cde_last_col_count = 5;
+  optional bool cde_use_full_keyboard = 6;
 }
 
 message ChartFormatStructExtensions {
@@ -151,5 +164,16 @@ message ChartFormatStructExtensions {
 
 extend .TSCH.ChartArchive {
   optional bool scene3d_settings_constant_depth = 10002;
+  optional string last_applied_fill_set_lookup_string = 10004;
+}
+
+extend .TSCH.ChartSeriesNonStyleArchive {
+  optional bool series_supports_custom_number_format = 10001;
+  optional bool series_supports_custom_date_format = 10002;
+}
+
+extend .TSCH.ChartAxisNonStyleArchive {
+  optional bool axis_supports_custom_number_format = 10001;
+  optional bool axis_supports_custom_date_format = 10002;
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHCommandArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHCommandArchives.proto
index 959015a..a104755 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHCommandArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSCHCommandArchives.proto
@@ -8,6 +8,7 @@ import "TSCHArchives.Common.proto";
 import "TSCHArchives.GEN.proto";
 import "TSCH3DArchives.proto";
 import "TSCHArchives.proto";
+import "TSWPArchives.proto";
 package TSCH;
 
 enum StyleOwnerType {
@@ -47,16 +48,6 @@ message CommandSetChartTypeArchive {
   optional .TSCH.RectArchive original_legend_rect = 7;
 }
 
-message PropertyMutationUndoTupleArchive {
-  optional .TSP.Reference chart_info = 1;
-  optional .TSCH.StyleOwnerType style_owner_type = 2;
-  optional uint32 index = 3;
-  optional .TSP.Reference old_style = 4;
-  optional .TSP.Reference new_style = 5;
-  optional .TSP.Reference old_non_style = 6;
-  optional .TSP.Reference new_non_style = 7;
-}
-
 message StyleSwapUndoTupleArchive {
   optional .TSP.Reference chart_info = 1;
   optional .TSCH.StyleSwapType swap_type = 2;
@@ -70,6 +61,65 @@ message CommandStyleSwapArchive {
   repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
 }
 
+message CommandMutatePropertiesArchive {
+  message GenericPropertyDeltaMap {
+    message GenericMapUnion {
+      optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+      optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+      optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+      optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+    }
+    optional .TSCH.StyleOwnerType style_owner_type = 1;
+    optional uint32 style_owner_index = 2;
+    optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
+    optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
+  }
+  message ParagraphStyleDeltaMap {
+    message ParagraphStylePropertyMapArchive {
+      optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
+      optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
+    }
+    optional .TSCH.StyleOwnerType style_owner_type = 1;
+    optional uint32 style_owner_index = 2;
+    optional uint32 paragraph_style_index_property = 3;
+    optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
+    optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+  }
+  required .TSCH.ChartCommandArchive super = 1;
+  optional .TSP.Reference rollback_cmd = 2;
+  repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
+  repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
+}
+
+message CommandScaleAllTextArchive {
+  required .TSCH.ChartCommandArchive super = 1;
+  optional .TSP.Reference rollback_cmd = 2;
+  optional double scale_factor = 3;
+}
+
+message CommandSetFontFamilyArchive {
+  required .TSCH.ChartCommandArchive super = 1;
+  optional .TSP.Reference rollback_cmd = 2;
+  optional string new_font_family = 3;
+  optional string old_font_family = 4;
+  repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+}
+
+message CommandApplyFillSetArchive {
+  message CapturedFillSetArchive {
+    optional string identifier = 1;
+    optional uint32 number_of_theme_series_styles = 2;
+    repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+  }
+  required .TSCH.ChartCommandArchive super = 1;
+  optional .TSP.Reference rollback_cmd = 2;
+  optional string fwd_fill_set_lookup_string = 3;
+  optional string rev_fill_set_lookup_string = 4;
+  optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+  optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+  optional string rev_last_applied_fill_set_lookup_string = 7;
+}
+
 message CommandSetSeriesNameArchive {
   required .TSCH.ChartCommandArchive super = 1;
   required uint32 seriesIndex = 2;
@@ -90,6 +140,7 @@ message CommandAddGridRowsArchive {
   required uint32 location = 2;
   optional uint32 length = 3;
   repeated string name = 4;
+  repeated string ids = 5;
 }
 
 message CommandAddGridColumnsArchive {
@@ -97,6 +148,7 @@ message CommandAddGridColumnsArchive {
   required uint32 location = 2;
   optional uint32 length = 3;
   repeated string name = 4;
+  repeated string ids = 5;
 }
 
 message CommandMoveGridRowsArchive {
@@ -124,6 +176,9 @@ message CommandDeleteGridRowsArchive {
   repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
   optional bool removed_all_rows = 7;
   repeated string column_names = 8;
+  repeated string row_ids = 9;
+  repeated string column_ids = 10;
+  required bool add_dummy_data_on_delete_all = 11;
 }
 
 message CommandDeleteGridColumnsArchive {
@@ -137,6 +192,9 @@ message CommandDeleteGridColumnsArchive {
   repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
   optional bool removed_all_columns = 7;
   repeated string row_names = 8;
+  repeated string row_ids = 9;
+  repeated string column_ids = 10;
+  required bool add_dummy_data_on_delete_all = 11;
 }
 
 message CommandSetPreviewLocArchive {
@@ -244,6 +302,8 @@ message CommandReplaceGridValuesArchive {
   repeated string new_col_names = 9;
   optional uint32 rows_to_add = 10;
   optional uint32 cols_to_add = 11;
+  repeated string row_ids = 12;
+  repeated string column_ids = 13;
 }
 
 message CommandReplaceThemePresetArchive {
@@ -263,3 +323,32 @@ message CommandInvalidateWPCaches {
   required .TSK.CommandArchive super = 1;
 }
 
+message CommandSetGridColumnNameArchive {
+  required .TSCH.ChartCommandArchive super = 1;
+  required uint32 columnindex = 2;
+  required string oldvalue = 3;
+  required string newvalue = 4;
+}
+
+message CommandSetGridRowNameArchive {
+  required .TSCH.ChartCommandArchive super = 1;
+  required uint32 rowindex = 2;
+  required string oldvalue = 3;
+  required string newvalue = 4;
+}
+
+message CommandReplaceCustomFormatArchive {
+  message FormatObjectMutation {
+    optional .TSCH.StyleOwnerType style_owner_type = 1;
+    optional uint32 style_owner_index = 2;
+    optional uint32 format_object_property = 3;
+    optional .TSK.FormatStructArchive format_object = 4;
+  }
+  required .TSCH.ChartCommandArchive super = 1;
+  optional .TSP.Reference rollback_cmd = 2;
+  optional .TSK.FormatStructArchive old_format_object = 3;
+  optional .TSK.FormatStructArchive new_format_object = 4;
+  repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+  repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+}
+
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDArchives.proto
index d8bc209..f3f82d7 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDArchives.proto
@@ -373,6 +373,11 @@ message MaskArchive {
 }
 
 message MovieArchive {
+  enum MovieLoopOption {
+    None = 0;
+    Repeat = 1;
+    BackAndForth = 2;
+  }
   required .TSD.DrawableArchive super = 1;
   optional .TSP.DataReference movieData = 14;
   optional .TSP.DataReference importedAuxiliaryMovieData = 22;
@@ -380,13 +385,15 @@ message MovieArchive {
   optional float startTime = 3;
   optional float endTime = 4;
   optional float posterTime = 5;
-  optional uint32 loopOption = 6;
+  optional uint32 loopOptionAsInteger = 6 [deprecated = true];
+  optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
   optional float volume = 7;
   optional bool autoPlay = 8 [deprecated = true];
   optional bool audioOnly = 9;
   optional bool streaming = 18;
   optional .TSP.DataReference posterImageData = 15;
   optional .TSP.DataReference audioOnlyImageData = 16;
+  optional bool poster_image_generated_with_alpha_support = 23;
   optional uint32 playableState = 12;
   optional uint32 flags = 13;
   optional .TSP.Reference database_movieData = 2;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDCommandArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDCommandArchives.proto
index 5ad1944..4451eed 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDCommandArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSDCommandArchives.proto
@@ -242,6 +242,7 @@ message CommandSelectionBehaviorArchive {
   optional .TSD.CommandSelectionBehaviorArchive.CommandSelectionBehaviorType type = 3;
   optional .TSP.Reference archived_selection = 4;
   optional .TSP.Reference archived_new_selection = 5;
+  optional .TSP.Reference old_model_for_selection = 6;
 }
 
 message ImageReplaceCommandArchive {
@@ -279,6 +280,7 @@ message GuideCommandArchive {
   optional .TSD.UserDefinedGuideArchive old_guide = 3;
   optional .TSD.UserDefinedGuideArchive new_guide = 4;
   optional .TSD.GuideCommandArchive.GuideCommandMode mode = 5;
+  optional .TSP.Reference old_storage = 6;
 }
 
 message DrawableAspectRatioLockedCommandArchive {
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPArchiveMessages.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPArchiveMessages.proto
index 7d7ef16..593c3ce 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPArchiveMessages.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPArchiveMessages.proto
@@ -48,9 +48,9 @@ message ComponentInfo {
   repeated uint32 write_version = 5 [packed = true];
   repeated .TSP.ComponentExternalReference external_references = 6;
   repeated .TSP.ComponentDataReference data_references = 7;
-  optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-  optional bool dirties_document_package = 9 [default = true];
+  repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
   optional bool is_stored_outside_object_archive = 10 [default = false];
+  optional uint64 save_token = 12 [default = 0];
 }
 
 message ComponentExternalReference {
@@ -63,12 +63,30 @@ message ComponentDataReference {
   required uint64 data_identifier = 1;
 }
 
+message UUIDInternal {
+  required uint64 lower = 1;
+  required uint64 upper = 2;
+}
+
+message ObjectUUIDMapEntry {
+  required uint64 identifier = 1;
+  required .TSP.UUIDInternal uuid = 2;
+}
+
 message PackageMetadata {
   required uint64 last_object_identifier = 1;
+  optional .TSP.DocumentRevision revision = 2;
   repeated .TSP.ComponentInfo components = 3;
   repeated .TSP.DataInfo datas = 4;
   repeated uint32 read_version = 5 [packed = true];
   repeated uint32 write_version = 6 [packed = true];
+  repeated uint32 file_format_version = 7 [packed = true];
+  optional uint64 save_token = 8 [default = 0];
+}
+
+message DocumentRevision {
+  optional uint64 sequence = 1 [default = 0];
+  optional string identifier = 2;
 }
 
 message PasteboardMetadata {
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPMessages.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPMessages.proto
index edc960c..66cdcfa 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPMessages.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSPMessages.proto
@@ -76,6 +76,15 @@ message ReferenceDictionary {
   repeated .TSP.ReferenceDictionary.Entry entries = 1;
 }
 
+message UUID {
+  required uint64 lower = 1;
+  required uint64 upper = 2;
+}
+
+message UUIDPath {
+  repeated .TSP.UUID uuids = 1;
+}
+
 message PasteboardObject {
   optional .TSP.Reference stylesheet = 1;
   repeated .TSP.Reference drawables = 2;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSSArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSSArchives.proto
index 503d70a..37dd1e4 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSSArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSSArchives.proto
@@ -4,6 +4,13 @@ import "TSPMessages.proto";
 import "TSKArchives.proto";
 package TSS;
 
+enum ValueType {
+  ObjectType = 0;
+  IntType = 1;
+  FloatType = 2;
+  DoubleType = 3;
+}
+
 message StyleArchive {
   optional string name = 1;
   optional string style_identifier = 2;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTArchives.proto
index 0cdbe70..6f55b74 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTArchives.proto
@@ -124,6 +124,43 @@ message PopUpMenuModel {
   repeated .TSCE.CellValueArchive tsce_item = 2;
 }
 
+message ImportWarningSetArchive {
+  message FormulaImportWarning {
+    required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
+    optional string original_formula = 2;
+    optional string supplementary_text = 3;
+  }
+  enum FormulaWarningType {
+    THREE_D_REFERENCE = 1;
+    ARRAYED_FORMULA = 2;
+    DIFFERENT_BEHAVIOR_FOR_FUNCTION = 3;
+    ERROR_TOKEN = 4;
+    EXTERNAL_REFERENCE = 5;
+    NATURAL_LANGUAGE_FORMULA = 6;
+    REFERENCE_OUT_OF_BOUNDS = 7;
+    SHARED_FORMULA_BASE_NOT_FOUND = 8;
+    UNKNOWN_NAME = 9;
+    UNSUPPORTED_FORMULA = 10;
+    UNSUPPORTED_FUNCTION = 11;
+    UNSUPPORTED_NAME = 12;
+  }
+  optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
+  optional bool cond_format_above_avg_equal_avg = 2 [default = false];
+  optional bool cond_format_above_avg_std_dev = 3 [default = false];
+  optional bool cond_format_complex_formula = 4 [default = false];
+  optional bool cond_format_contains_errors = 5 [default = false];
+  optional bool cond_format_expr = 6 [default = false];
+  optional bool cond_format_not_contains_errors = 7 [default = false];
+  optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+  optional bool cond_format_stop_if_true = 9 [default = false];
+  optional bool cond_format_unsupported_operator = 10 [default = false];
+  optional bool cond_format_unsupported_styling = 11 [default = false];
+  optional bool cond_format_unsupported_time_period = 12 [default = false];
+  optional bool error_cell_with_no_formula = 13 [default = false];
+  optional bool unsupported_cond_format = 14 [default = false];
+  optional string original_data_format = 15;
+}
+
 message TableDataList {
   message ListEntry {
     required uint32 key = 1;
@@ -136,6 +173,7 @@ message TableDataList {
     optional .TSK.CustomFormatArchive custom_format = 8;
     optional .TSP.Reference richTextPayload = 9;
     optional .TSP.Reference comment_storage = 10;
+    optional .TST.ImportWarningSetArchive import_warning_set = 11;
   }
   enum ListType {
     STRING = 1;
@@ -148,6 +186,7 @@ message TableDataList {
     RICH_TEXT_PAYLOAD = 8;
     CONDITIONAL_STYLE = 9;
     COMMENT_STORAGE = 10;
+    IMPORT_WARNING = 11;
   }
   required .TST.TableDataList.ListType listType = 1;
   required uint32 nextListID = 2;
@@ -200,6 +239,7 @@ message DataStore {
   optional .TSP.Reference richTextPayloadTable = 17;
   optional .TSP.Reference conditionalstyletable = 18;
   optional .TSP.Reference commentStorageTable = 19;
+  optional .TSP.Reference importWarningSetTable = 20;
 }
 
 message TableInfoArchive {
@@ -238,6 +278,27 @@ message TableStyleNetworkArchive {
   optional uint32 preset_index = 12;
 }
 
+message TableSortOrderArchive {
+  message SortRuleArchive {
+    enum Direction {
+      ascending = 0;
+      descending = 1;
+    }
+    required uint32 column = 1;
+    required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+  }
+  enum SortType {
+    entire_table = 0;
+    row_range = 1;
+  }
+  required .TST.TableSortOrderArchive.SortType type = 1;
+  repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+}
+
+message SortRuleReferenceTrackerArchive {
+  required .TSP.Reference reference_tracker = 1;
+}
+
 message TableModelArchive {
   required string table_id = 1;
   optional string from_table_id = 43;
@@ -280,7 +341,9 @@ message TableModelArchive {
   optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
   optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
   optional .TSP.Reference filter_set = 38;
+  optional .TST.TableSortOrderArchive sort_order = 44;
   optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
+  optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
 }
 
 message DurationWrapperArchive {
@@ -310,6 +373,7 @@ message Cell {
   optional .TSP.Reference multiple_choice_list = 22;
   optional .TSP.Reference comment_storage = 23;
   optional uint32 conditional_style_applied_rule = 24;
+  optional .TST.ImportWarningSetArchive import_warning_set = 25;
 }
 
 message MergeRegionMapArchive {
@@ -329,6 +393,43 @@ message CellMapArchive {
   optional bool applies_to_hidden = 6 [default = false];
 }
 
+message CellMapTileArchive {
+  message CellMapEntry {
+    required .TST.CellID cellID = 1;
+    optional .TST.Cell cell = 2;
+  }
+  repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+}
+
+message TiledCellMapArchive {
+  repeated .TSP.Reference cellmap_tile = 1;
+  optional bool may_modify_formulas_in_cells = 2 [default = true];
+  optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+  optional bool applies_to_hidden = 4 [default = false];
+}
+
+message PropertyMapEntryArchive {
+  required uint32 property = 1;
+  required .TSS.ValueType valueType = 2;
+  optional int32 int_value = 3;
+  optional float float_value = 4;
+  optional double double_value = 5;
+  optional bool is_nsnull = 6 [default = false];
+  optional .TSP.Reference tsp_reference = 7;
+  optional .TSD.FillArchive fill = 8;
+  optional .TST.ImportWarningSetArchive import_warning_set = 9;
+}
+
+message CellDiffArchive {
+  repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
+  repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
+}
+
+message CellDiffMapArchive {
+  repeated .TST.CellID cell_ids = 1;
+  repeated .TSP.Reference cell_diffs = 2;
+}
+
 message DoubleStyleMapArchive {
   message DoubleStyleMapEntryArchive {
     required .TST.CellID cell_id = 1;
@@ -613,3 +714,26 @@ message CellRegion {
   repeated .TST.CellRange cell_ranges = 1;
 }
 
+message CellFillStandIn {
+  required .TSD.FillArchive fill = 1;
+  optional bool type_is_mixed = 2;
+  optional bool color_has_been_modified = 3;
+  optional bool color_is_mixed = 4;
+  optional bool first_color_has_been_modified = 5;
+  optional bool first_color_is_mixed = 6;
+  optional bool last_color_has_been_modified = 7;
+  optional bool last_color_is_mixed = 8;
+  optional bool gradient_type_has_been_modified = 9;
+  optional bool gradient_type_is_mixed = 10;
+  optional bool gradient_angle_has_been_modified = 11;
+  optional bool gradient_angle_is_mixed = 12;
+  optional bool image_data_has_been_modified = 13;
+  optional bool image_data_is_mixed = 14;
+  optional bool tint_color_has_been_modified = 15;
+  optional bool tint_color_is_mixed = 16;
+  optional bool scale_has_been_modified = 17;
+  optional bool scale_is_mixed = 18;
+  optional bool technique_has_been_modified = 19;
+  optional bool technique_is_mixed = 20;
+}
+
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTCommandArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTCommandArchives.proto
index 0276d9d..92c6947 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTCommandArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSTCommandArchives.proto
@@ -28,6 +28,13 @@ message TableCommandArchive {
   optional uint32 editing_mode_at_start = 4;
 }
 
+message CommandApplyCellDiffArchive {
+  required .TST.TableCommandArchive super = 1;
+  required .TST.CellRegion cell_region = 2;
+  required .TSP.Reference cell_diff = 3;
+  required .TSP.Reference inverse_cell_diff_map = 4;
+}
+
 message CommandChangeFreezeHeaderStateArchive {
   required .TST.CommandDirectionArchive direction = 1;
   required bool new_freeze_state = 2;
@@ -104,6 +111,12 @@ message CommandSetAutomaticDurationUnitsArchive {
   required .TST.TableCommandArchive super = 6;
 }
 
+message CommandReplaceCustomFormatArchive {
+  required .TST.CellMapArchive undo_map = 1;
+  required .TST.CellMapArchive redo_map = 2;
+  required .TST.TableCommandArchive super = 6;
+}
+
 message CommandInsertColumnsOrRowsArchive {
   message StyleIndexPair {
     required .TSP.Reference style = 1;
@@ -136,8 +149,8 @@ message CommandInsertColumnsOrRowsArchive {
 message CommandPasteArchive {
   required .TST.SelectionArchive user_selection = 1;
   required .TST.SelectionArchive final_selection = 2;
-  required .TST.CellMapArchive undo_cell_map = 3;
-  required .TST.CellMapArchive redo_cell_map = 4;
+  required .TST.TiledCellMapArchive undo_cell_map = 3;
+  required .TST.TiledCellMapArchive redo_cell_map = 4;
   optional .TSP.Reference command_undo = 6;
   required bool invalidate_comments = 7;
   required .TST.TableCommandArchive super = 11;
@@ -285,6 +298,15 @@ message CommandStyleCellsArchive {
   optional .TSP.Reference text_undo = 6;
 }
 
+message CommandSetFillPropertyArchive {
+  required .TST.TableCommandArchive super = 1;
+  optional .TSD.FillArchive fill = 2;
+  optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+  required .TST.SelectionArchive selection = 4;
+  required .TST.CellMapArchive undo_cell_map = 5;
+  required .TST.CellMapArchive redo_cell_map = 6;
+}
+
 message CommandStyleTableArchive {
   required .TST.TableCommandArchive super = 1;
   optional .TSP.ReferenceDictionary format_properties = 2;
@@ -362,6 +384,28 @@ message CommandApplyStrokePresetArchive {
   required int32 preset_index = 5;
 }
 
+message CommandAddTableStylePresetArchive {
+  required .TST.TableCommandArchive super = 1;
+  required int32 preset_index = 2;
+  required .TST.TableStyleNetworkArchive table_styles = 3;
+  required bool send_notification = 4;
+}
+
+message CommandRemoveTableStylePresetArchive {
+  required .TSK.CommandArchive super = 1;
+  required .TSP.Reference theme = 2;
+  required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+  required int32 preset_id = 4;
+  required int32 preset_index_in_theme = 5;
+}
+
+message CommandReplaceTableStylePresetArchive {
+  required .TSK.CommandArchive super = 1;
+  required .TSP.Reference theme = 2;
+  required .TST.TableStyleNetworkArchive old_table_styles = 3;
+  required .TST.TableStyleNetworkArchive new_table_styles = 4;
+}
+
 message CommandApplyTableStylePresetArchive {
   message StyleIndexTuple {
     required uint32 index = 1;
@@ -373,7 +417,7 @@ message CommandApplyTableStylePresetArchive {
   required .TST.CellMapArchive redo_cell_map = 4;
   required int32 preset_index = 5;
   required .TST.TableStyleNetworkArchive old_table_styles = 7;
-  required .TST.TableStyleNetworkArchive new_table_styles = 8;
+  optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
   optional bool apply_clears_all = 10;
   optional .TSP.Reference font_size_command = 11;
   optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
@@ -771,3 +815,29 @@ message CommandSetStorageLanguageArchive {
   optional .TSWP.UndoTransaction undo_transaction = 6;
 }
 
+message CommandSetSortOrderArchive {
+  required .TST.TableCommandArchive super = 1;
+  optional .TST.TableSortOrderArchive old_sort_order = 2;
+  optional .TST.TableSortOrderArchive new_sort_order = 3;
+}
+
+message CommandRewriteSortOrderForTectonicShiftArchive {
+  required .TST.TableCommandArchive super = 1;
+  required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+  optional .TST.TableSortOrderArchive old_sort_order = 3;
+  optional .TST.TableSortOrderArchive new_sort_order = 4;
+}
+
+message CommandRewriteSortOrderForSortArchive {
+  required .TST.TableCommandArchive super = 1;
+  required .TSK.ShuffleMappingArchive sort_mapping = 2;
+  optional .TST.TableSortOrderArchive old_sort_order = 3;
+  optional .TST.TableSortOrderArchive new_sort_order = 4;
+}
+
+message CommandRewriteSortOrderForTableResizeArchive {
+  required .TST.TableCommandArchive super = 1;
+  optional .TST.TableSortOrderArchive old_sort_order = 2;
+  optional .TST.TableSortOrderArchive new_sort_order = 3;
+}
+
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSWPArchives.proto b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSWPArchives.proto
index 70eaa86..5841561 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSWPArchives.proto
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/Proto/TSWPArchives.proto
@@ -374,6 +374,9 @@ message ListStyleArchive {
     kHebrewAlphaDoubleParenKind = 59;
     kHebrewAlphaRightParenKind = 60;
     kHebrewBiblicalStandardKind = 61;
+    kHebrewBiblicalDecimalKind = 62;
+    kHebrewBiblicalDoubleParenKind = 63;
+    kHebrewBiblicalRightParenKind = 64;
   }
   required .TSS.StyleArchive super = 1;
   optional uint32 override_count = 10 [default = 0];
@@ -522,6 +525,9 @@ message TOCEntryInstanceArchive {
   required uint32 number_format = 3;
   required string heading = 4;
   required .TSP.Reference indexed_style = 5;
+  optional .TSP.Reference indexed_list_style = 6;
+  optional uint32 indexed_list_start = 7;
+  optional uint32 indexed_paragraph_level = 8;
 }
 
 message UndoTransaction {
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.cc
index 1222e99..b9acd31 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.cc
@@ -29,9 +29,27 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* TestDocumentArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   TestDocumentArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ShortcutControllerArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ShortcutControllerArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ShortcutControllerArchive_ShortcutMapEntry_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ShortcutControllerArchive_ShortcutMapEntry_reflection_ = NULL;
 const ::google::protobuf::Descriptor* PropagatePresetCommandArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PropagatePresetCommandArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ShortcutCommandArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ShortcutCommandArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* AddCustomFormatCommandArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  AddCustomFormatCommandArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* UpdateCustomFormatCommandArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  UpdateCustomFormatCommandArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ReplaceCustomFormatCommandArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ReplaceCustomFormatCommandArchive_reflection_ = NULL;
 
 }  // namespace
 
@@ -43,7 +61,7 @@ void protobuf_AssignDesc_TSAArchives_2eproto() {
       "TSAArchives.proto");
   GOOGLE_CHECK(file != NULL);
   DocumentArchive_descriptor_ = file->message_type(0);
-  static const int DocumentArchive_offsets_[9] = {
+  static const int DocumentArchive_offsets_[10] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, text_preset_display_items_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, creation_language_),
@@ -53,6 +71,7 @@ void protobuf_AssignDesc_TSAArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, tables_custom_format_list_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, needs_movie_compatibility_upgrade_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, template_identifier_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentArchive, shortcut_controller_),
   };
   DocumentArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -99,7 +118,38 @@ void protobuf_AssignDesc_TSAArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TestDocumentArchive));
-  PropagatePresetCommandArchive_descriptor_ = file->message_type(3);
+  ShortcutControllerArchive_descriptor_ = file->message_type(3);
+  static const int ShortcutControllerArchive_offsets_[1] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive, entries_),
+  };
+  ShortcutControllerArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ShortcutControllerArchive_descriptor_,
+      ShortcutControllerArchive::default_instance_,
+      ShortcutControllerArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ShortcutControllerArchive));
+  ShortcutControllerArchive_ShortcutMapEntry_descriptor_ = ShortcutControllerArchive_descriptor_->nested_type(0);
+  static const int ShortcutControllerArchive_ShortcutMapEntry_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive_ShortcutMapEntry, shortcut_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive_ShortcutMapEntry, style_),
+  };
+  ShortcutControllerArchive_ShortcutMapEntry_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ShortcutControllerArchive_ShortcutMapEntry_descriptor_,
+      ShortcutControllerArchive_ShortcutMapEntry::default_instance_,
+      ShortcutControllerArchive_ShortcutMapEntry_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive_ShortcutMapEntry, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutControllerArchive_ShortcutMapEntry, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ShortcutControllerArchive_ShortcutMapEntry));
+  PropagatePresetCommandArchive_descriptor_ = file->message_type(4);
   static const int PropagatePresetCommandArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropagatePresetCommandArchive, super_),
   };
@@ -114,6 +164,78 @@ void protobuf_AssignDesc_TSAArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PropagatePresetCommandArchive));
+  ShortcutCommandArchive_descriptor_ = file->message_type(5);
+  static const int ShortcutCommandArchive_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, old_style_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, new_style_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, old_shortcut_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, new_shortcut_),
+  };
+  ShortcutCommandArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ShortcutCommandArchive_descriptor_,
+      ShortcutCommandArchive::default_instance_,
+      ShortcutCommandArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ShortcutCommandArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ShortcutCommandArchive));
+  AddCustomFormatCommandArchive_descriptor_ = file->message_type(6);
+  static const int AddCustomFormatCommandArchive_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddCustomFormatCommandArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddCustomFormatCommandArchive, custom_format_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddCustomFormatCommandArchive, for_replacement_),
+  };
+  AddCustomFormatCommandArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      AddCustomFormatCommandArchive_descriptor_,
+      AddCustomFormatCommandArchive::default_instance_,
+      AddCustomFormatCommandArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddCustomFormatCommandArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(AddCustomFormatCommandArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(AddCustomFormatCommandArchive));
+  UpdateCustomFormatCommandArchive_descriptor_ = file->message_type(7);
+  static const int UpdateCustomFormatCommandArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateCustomFormatCommandArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateCustomFormatCommandArchive, custom_format_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateCustomFormatCommandArchive, old_custom_format_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateCustomFormatCommandArchive, custom_format_id_),
+  };
+  UpdateCustomFormatCommandArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      UpdateCustomFormatCommandArchive_descriptor_,
+      UpdateCustomFormatCommandArchive::default_instance_,
+      UpdateCustomFormatCommandArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateCustomFormatCommandArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UpdateCustomFormatCommandArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(UpdateCustomFormatCommandArchive));
+  ReplaceCustomFormatCommandArchive_descriptor_ = file->message_type(8);
+  static const int ReplaceCustomFormatCommandArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReplaceCustomFormatCommandArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReplaceCustomFormatCommandArchive, custom_format_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReplaceCustomFormatCommandArchive, custom_format_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReplaceCustomFormatCommandArchive, replacement_format_),
+  };
+  ReplaceCustomFormatCommandArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ReplaceCustomFormatCommandArchive_descriptor_,
+      ReplaceCustomFormatCommandArchive::default_instance_,
+      ReplaceCustomFormatCommandArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReplaceCustomFormatCommandArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReplaceCustomFormatCommandArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ReplaceCustomFormatCommandArchive));
 }
 
 namespace {
@@ -132,8 +254,20 @@ void protobuf_RegisterTypes(const ::std::string&) {
     FunctionBrowserStateArchive_descriptor_, &FunctionBrowserStateArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     TestDocumentArchive_descriptor_, &TestDocumentArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ShortcutControllerArchive_descriptor_, &ShortcutControllerArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ShortcutControllerArchive_ShortcutMapEntry_descriptor_, &ShortcutControllerArchive_ShortcutMapEntry::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PropagatePresetCommandArchive_descriptor_, &PropagatePresetCommandArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ShortcutCommandArchive_descriptor_, &ShortcutCommandArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    AddCustomFormatCommandArchive_descriptor_, &AddCustomFormatCommandArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    UpdateCustomFormatCommandArchive_descriptor_, &UpdateCustomFormatCommandArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ReplaceCustomFormatCommandArchive_descriptor_, &ReplaceCustomFormatCommandArchive::default_instance());
 }
 
 }  // namespace
@@ -145,8 +279,20 @@ void protobuf_ShutdownFile_TSAArchives_2eproto() {
   delete FunctionBrowserStateArchive_reflection_;
   delete TestDocumentArchive::default_instance_;
   delete TestDocumentArchive_reflection_;
+  delete ShortcutControllerArchive::default_instance_;
+  delete ShortcutControllerArchive_reflection_;
+  delete ShortcutControllerArchive_ShortcutMapEntry::default_instance_;
+  delete ShortcutControllerArchive_ShortcutMapEntry_reflection_;
   delete PropagatePresetCommandArchive::default_instance_;
   delete PropagatePresetCommandArchive_reflection_;
+  delete ShortcutCommandArchive::default_instance_;
+  delete ShortcutCommandArchive_reflection_;
+  delete AddCustomFormatCommandArchive::default_instance_;
+  delete AddCustomFormatCommandArchive_reflection_;
+  delete UpdateCustomFormatCommandArchive::default_instance_;
+  delete UpdateCustomFormatCommandArchive_reflection_;
+  delete ReplaceCustomFormatCommandArchive::default_instance_;
+  delete ReplaceCustomFormatCommandArchive_reflection_;
 }
 
 void protobuf_AddDesc_TSAArchives_2eproto() {
@@ -162,7 +308,7 @@ void protobuf_AddDesc_TSAArchives_2eproto() {
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\021TSAArchives.proto\022\003TSA\032\021TSKArchives.pr"
     "oto\032\021TSPMessages.proto\032\022TSWPArchives.pro"
-    "to\032\021TSSArchives.proto\"\223\003\n\017DocumentArchiv"
+    "to\032\021TSSArchives.proto\"\300\003\n\017DocumentArchiv"
     "e\022#\n\005super\030\001 \002(\0132\024.TSK.DocumentArchive\022E"
     "\n\031text_preset_display_items\030\002 \003(\0132\".TSWP"
     ".TextPresetDisplayItemArchive\022\031\n\021creatio"
@@ -172,24 +318,60 @@ void protobuf_AddDesc_TSAArchives_2eproto() {
     "te\030\006 \001(\0132\016.TSP.Reference\0221\n\031tables_custo"
     "m_format_list\030\007 \001(\0132\016.TSP.Reference\022)\n!n"
     "eeds_movie_compatibility_upgrade\030\010 \001(\010\022\033"
-    "\n\023template_identifier\030\t \001(\t\"\204\001\n\033Function"
-    "BrowserStateArchive\022\030\n\020recent_functions\030"
-    "\001 \003(\r\022\026\n\016back_functions\030\002 \003(\r\022\031\n\021forward"
-    "_functions\030\003 \003(\r\022\030\n\020current_function\030\004 \001"
-    "(\r\"I\n\023TestDocumentArchive\022#\n\005super\030\001 \002(\013"
-    "2\024.TSA.DocumentArchive\022\r\n\005value\030\002 \001(\t\"C\n"
-    "\035PropagatePresetCommandArchive\022\"\n\005super\030"
-    "\001 \002(\0132\023.TSK.CommandArchive", 786);
+    "\n\023template_identifier\030\t \001(\t\022+\n\023shortcut_"
+    "controller\030\n \001(\0132\016.TSP.Reference\"\204\001\n\033Fun"
+    "ctionBrowserStateArchive\022\030\n\020recent_funct"
+    "ions\030\001 \003(\r\022\026\n\016back_functions\030\002 \003(\r\022\031\n\021fo"
+    "rward_functions\030\003 \003(\r\022\030\n\020current_functio"
+    "n\030\004 \001(\r\"I\n\023TestDocumentArchive\022#\n\005super\030"
+    "\001 \002(\0132\024.TSA.DocumentArchive\022\r\n\005value\030\002 \001"
+    "(\t\"\242\001\n\031ShortcutControllerArchive\022@\n\007entr"
+    "ies\030\001 \003(\0132/.TSA.ShortcutControllerArchiv"
+    "e.ShortcutMapEntry\032C\n\020ShortcutMapEntry\022\020"
+    "\n\010shortcut\030\001 \002(\t\022\035\n\005style\030\002 \002(\0132\016.TSP.Re"
+    "ference\"C\n\035PropagatePresetCommandArchive"
+    "\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\"\256\001\n"
+    "\026ShortcutCommandArchive\022\"\n\005super\030\001 \001(\0132\023"
+    ".TSK.CommandArchive\022!\n\told_style\030\002 \001(\0132\016"
+    ".TSP.Reference\022!\n\tnew_style\030\003 \001(\0132\016.TSP."
+    "Reference\022\024\n\014old_shortcut\030\004 \001(\t\022\024\n\014new_s"
+    "hortcut\030\005 \001(\t\"\215\001\n\035AddCustomFormatCommand"
+    "Archive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArch"
+    "ive\022/\n\rcustom_format\030\002 \001(\0132\030.TSK.CustomF"
+    "ormatArchive\022\027\n\017for_replacement\030\003 \001(\010\"\306\001"
+    "\n UpdateCustomFormatCommandArchive\022\"\n\005su"
+    "per\030\001 \001(\0132\023.TSK.CommandArchive\022/\n\rcustom"
+    "_format\030\002 \001(\0132\030.TSK.CustomFormatArchive\022"
+    "3\n\021old_custom_format\030\003 \001(\0132\030.TSK.CustomF"
+    "ormatArchive\022\030\n\020custom_format_id\030\004 \001(\r\"\310"
+    "\001\n!ReplaceCustomFormatCommandArchive\022\"\n\005"
+    "super\030\001 \001(\0132\023.TSK.CommandArchive\022/\n\rcust"
+    "om_format\030\002 \001(\0132\030.TSK.CustomFormatArchiv"
+    "e\022\030\n\020custom_format_id\030\003 \001(\r\0224\n\022replaceme"
+    "nt_format\030\004 \001(\0132\030.TSK.FormatStructArchiv"
+    "e", 1721);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSAArchives.proto", &protobuf_RegisterTypes);
   DocumentArchive::default_instance_ = new DocumentArchive();
   FunctionBrowserStateArchive::default_instance_ = new FunctionBrowserStateArchive();
   TestDocumentArchive::default_instance_ = new TestDocumentArchive();
+  ShortcutControllerArchive::default_instance_ = new ShortcutControllerArchive();
+  ShortcutControllerArchive_ShortcutMapEntry::default_instance_ = new ShortcutControllerArchive_ShortcutMapEntry();
   PropagatePresetCommandArchive::default_instance_ = new PropagatePresetCommandArchive();
+  ShortcutCommandArchive::default_instance_ = new ShortcutCommandArchive();
+  AddCustomFormatCommandArchive::default_instance_ = new AddCustomFormatCommandArchive();
+  UpdateCustomFormatCommandArchive::default_instance_ = new UpdateCustomFormatCommandArchive();
+  ReplaceCustomFormatCommandArchive::default_instance_ = new ReplaceCustomFormatCommandArchive();
   DocumentArchive::default_instance_->InitAsDefaultInstance();
   FunctionBrowserStateArchive::default_instance_->InitAsDefaultInstance();
   TestDocumentArchive::default_instance_->InitAsDefaultInstance();
+  ShortcutControllerArchive::default_instance_->InitAsDefaultInstance();
+  ShortcutControllerArchive_ShortcutMapEntry::default_instance_->InitAsDefaultInstance();
   PropagatePresetCommandArchive::default_instance_->InitAsDefaultInstance();
+  ShortcutCommandArchive::default_instance_->InitAsDefaultInstance();
+  AddCustomFormatCommandArchive::default_instance_->InitAsDefaultInstance();
+  UpdateCustomFormatCommandArchive::default_instance_->InitAsDefaultInstance();
+  ReplaceCustomFormatCommandArchive::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_TSAArchives_2eproto);
 }
 
@@ -212,6 +394,7 @@ const int DocumentArchive::kFunctionBrowserStateFieldNumber;
 const int DocumentArchive::kTablesCustomFormatListFieldNumber;
 const int DocumentArchive::kNeedsMovieCompatibilityUpgradeFieldNumber;
 const int DocumentArchive::kTemplateIdentifierFieldNumber;
+const int DocumentArchive::kShortcutControllerFieldNumber;
 #endif  // !_MSC_VER
 
 DocumentArchive::DocumentArchive()
@@ -225,6 +408,7 @@ void DocumentArchive::InitAsDefaultInstance() {
   view_state_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   function_browser_state_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   tables_custom_format_list_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  shortcut_controller_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
 DocumentArchive::DocumentArchive(const DocumentArchive& from)
@@ -243,6 +427,7 @@ void DocumentArchive::SharedCtor() {
   tables_custom_format_list_ = NULL;
   needs_movie_compatibility_upgrade_ = false;
   template_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  shortcut_controller_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -263,6 +448,7 @@ void DocumentArchive::SharedDtor() {
     delete view_state_;
     delete function_browser_state_;
     delete tables_custom_format_list_;
+    delete shortcut_controller_;
   }
 }
 
@@ -317,6 +503,9 @@ void DocumentArchive::Clear() {
         template_identifier_->clear();
       }
     }
+    if (has_shortcut_controller()) {
+      if (shortcut_controller_ != NULL) shortcut_controller_->::TSP::Reference::Clear();
+    }
   }
   text_preset_display_items_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -459,6 +648,20 @@ bool DocumentArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(82)) goto parse_shortcut_controller;
+        break;
+      }
+
+      // optional .TSP.Reference shortcut_controller = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_shortcut_controller:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_shortcut_controller()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -540,6 +743,12 @@ void DocumentArchive::SerializeWithCachedSizes(
       9, this->template_identifier(), output);
   }
 
+  // optional .TSP.Reference shortcut_controller = 10;
+  if (has_shortcut_controller()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      10, this->shortcut_controller(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -615,6 +824,13 @@ ::google::protobuf::uint8* DocumentArchive::SerializeWithCachedSizesToArray(
         9, this->template_identifier(), target);
   }
 
+  // optional .TSP.Reference shortcut_controller = 10;
+  if (has_shortcut_controller()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        10, this->shortcut_controller(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -682,6 +898,13 @@ int DocumentArchive::ByteSize() const {
           this->template_identifier());
     }
 
+    // optional .TSP.Reference shortcut_controller = 10;
+    if (has_shortcut_controller()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->shortcut_controller());
+    }
+
   }
   // repeated .TSWP.TextPresetDisplayItemArchive text_preset_display_items = 2;
   total_size += 1 * this->text_preset_display_items_size();
@@ -744,6 +967,9 @@ void DocumentArchive::MergeFrom(const DocumentArchive& from) {
     if (from.has_template_identifier()) {
       set_template_identifier(from.template_identifier());
     }
+    if (from.has_shortcut_controller()) {
+      mutable_shortcut_controller()->::TSP::Reference::MergeFrom(from.shortcut_controller());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -781,6 +1007,9 @@ bool DocumentArchive::IsInitialized() const {
   if (has_tables_custom_format_list()) {
     if (!this->tables_custom_format_list().IsInitialized()) return false;
   }
+  if (has_shortcut_controller()) {
+    if (!this->shortcut_controller().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -795,6 +1024,7 @@ void DocumentArchive::Swap(DocumentArchive* other) {
     std::swap(tables_custom_format_list_, other->tables_custom_format_list_);
     std::swap(needs_movie_compatibility_upgrade_, other->needs_movie_compatibility_upgrade_);
     std::swap(template_identifier_, other->template_identifier_);
+    std::swap(shortcut_controller_, other->shortcut_controller_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -1440,83 +1670,110 @@ ::google::protobuf::Metadata TestDocumentArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int PropagatePresetCommandArchive::kSuperFieldNumber;
+const int ShortcutControllerArchive_ShortcutMapEntry::kShortcutFieldNumber;
+const int ShortcutControllerArchive_ShortcutMapEntry::kStyleFieldNumber;
 #endif  // !_MSC_VER
 
-PropagatePresetCommandArchive::PropagatePresetCommandArchive()
+ShortcutControllerArchive_ShortcutMapEntry::ShortcutControllerArchive_ShortcutMapEntry()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void PropagatePresetCommandArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+void ShortcutControllerArchive_ShortcutMapEntry::InitAsDefaultInstance() {
+  style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-PropagatePresetCommandArchive::PropagatePresetCommandArchive(const PropagatePresetCommandArchive& from)
+ShortcutControllerArchive_ShortcutMapEntry::ShortcutControllerArchive_ShortcutMapEntry(const ShortcutControllerArchive_ShortcutMapEntry& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void PropagatePresetCommandArchive::SharedCtor() {
+void ShortcutControllerArchive_ShortcutMapEntry::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
+  shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  style_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-PropagatePresetCommandArchive::~PropagatePresetCommandArchive() {
+ShortcutControllerArchive_ShortcutMapEntry::~ShortcutControllerArchive_ShortcutMapEntry() {
   SharedDtor();
 }
 
-void PropagatePresetCommandArchive::SharedDtor() {
+void ShortcutControllerArchive_ShortcutMapEntry::SharedDtor() {
+  if (shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    delete shortcut_;
+  }
   if (this != default_instance_) {
-    delete super_;
+    delete style_;
   }
 }
 
-void PropagatePresetCommandArchive::SetCachedSize(int size) const {
+void ShortcutControllerArchive_ShortcutMapEntry::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* PropagatePresetCommandArchive::descriptor() {
+const ::google::protobuf::Descriptor* ShortcutControllerArchive_ShortcutMapEntry::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return PropagatePresetCommandArchive_descriptor_;
+  return ShortcutControllerArchive_ShortcutMapEntry_descriptor_;
 }
 
-const PropagatePresetCommandArchive& PropagatePresetCommandArchive::default_instance() {
+const ShortcutControllerArchive_ShortcutMapEntry& ShortcutControllerArchive_ShortcutMapEntry::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
   return *default_instance_;
 }
 
-PropagatePresetCommandArchive* PropagatePresetCommandArchive::default_instance_ = NULL;
+ShortcutControllerArchive_ShortcutMapEntry* ShortcutControllerArchive_ShortcutMapEntry::default_instance_ = NULL;
 
-PropagatePresetCommandArchive* PropagatePresetCommandArchive::New() const {
-  return new PropagatePresetCommandArchive;
+ShortcutControllerArchive_ShortcutMapEntry* ShortcutControllerArchive_ShortcutMapEntry::New() const {
+  return new ShortcutControllerArchive_ShortcutMapEntry;
 }
 
-void PropagatePresetCommandArchive::Clear() {
+void ShortcutControllerArchive_ShortcutMapEntry::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    if (has_shortcut()) {
+      if (shortcut_ != &::google::protobuf::internal::kEmptyString) {
+        shortcut_->clear();
+      }
+    }
+    if (has_style()) {
+      if (style_ != NULL) style_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool PropagatePresetCommandArchive::MergePartialFromCodedStream(
+bool ShortcutControllerArchive_ShortcutMapEntry::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // required string shortcut = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_shortcut()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->shortcut().data(), this->shortcut().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_style;
+        break;
+      }
+
+      // required .TSP.Reference style = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_style()));
         } else {
           goto handle_uninterpreted;
         }
@@ -1540,12 +1797,21 @@ bool PropagatePresetCommandArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void PropagatePresetCommandArchive::SerializeWithCachedSizes(
+void ShortcutControllerArchive_ShortcutMapEntry::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
-  if (has_super()) {
+  // required string shortcut = 1;
+  if (has_shortcut()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->shortcut().data(), this->shortcut().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->shortcut(), output);
+  }
+
+  // required .TSP.Reference style = 2;
+  if (has_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+      2, this->style(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -1554,13 +1820,23 @@ void PropagatePresetCommandArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* PropagatePresetCommandArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* ShortcutControllerArchive_ShortcutMapEntry::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
-  if (has_super()) {
+  // required string shortcut = 1;
+  if (has_shortcut()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->shortcut().data(), this->shortcut().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->shortcut(), target);
+  }
+
+  // required .TSP.Reference style = 2;
+  if (has_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+        2, this->style(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -1570,15 +1846,22 @@ ::google::protobuf::uint8* PropagatePresetCommandArchive::SerializeWithCachedSiz
   return target;
 }
 
-int PropagatePresetCommandArchive::ByteSize() const {
+int ShortcutControllerArchive_ShortcutMapEntry::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
-    if (has_super()) {
+    // required string shortcut = 1;
+    if (has_shortcut()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->shortcut());
+    }
+
+    // required .TSP.Reference style = 2;
+    if (has_style()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+          this->style());
     }
 
   }
@@ -1593,10 +1876,10 @@ int PropagatePresetCommandArchive::ByteSize() const {
   return total_size;
 }
 
-void PropagatePresetCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void ShortcutControllerArchive_ShortcutMapEntry::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const PropagatePresetCommandArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const PropagatePresetCommandArchive*>(
+  const ShortcutControllerArchive_ShortcutMapEntry* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ShortcutControllerArchive_ShortcutMapEntry*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -1605,51 +1888,1911 @@ void PropagatePresetCommandArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void PropagatePresetCommandArchive::MergeFrom(const PropagatePresetCommandArchive& from) {
+void ShortcutControllerArchive_ShortcutMapEntry::MergeFrom(const ShortcutControllerArchive_ShortcutMapEntry& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    if (from.has_shortcut()) {
+      set_shortcut(from.shortcut());
+    }
+    if (from.has_style()) {
+      mutable_style()->::TSP::Reference::MergeFrom(from.style());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void PropagatePresetCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void ShortcutControllerArchive_ShortcutMapEntry::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void PropagatePresetCommandArchive::CopyFrom(const PropagatePresetCommandArchive& from) {
+void ShortcutControllerArchive_ShortcutMapEntry::CopyFrom(const ShortcutControllerArchive_ShortcutMapEntry& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool PropagatePresetCommandArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool ShortcutControllerArchive_ShortcutMapEntry::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_style()) {
+    if (!this->style().IsInitialized()) return false;
   }
   return true;
 }
 
-void PropagatePresetCommandArchive::Swap(PropagatePresetCommandArchive* other) {
+void ShortcutControllerArchive_ShortcutMapEntry::Swap(ShortcutControllerArchive_ShortcutMapEntry* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
+    std::swap(shortcut_, other->shortcut_);
+    std::swap(style_, other->style_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata PropagatePresetCommandArchive::GetMetadata() const {
+::google::protobuf::Metadata ShortcutControllerArchive_ShortcutMapEntry::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = PropagatePresetCommandArchive_descriptor_;
-  metadata.reflection = PropagatePresetCommandArchive_reflection_;
+  metadata.descriptor = ShortcutControllerArchive_ShortcutMapEntry_descriptor_;
+  metadata.reflection = ShortcutControllerArchive_ShortcutMapEntry_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int ShortcutControllerArchive::kEntriesFieldNumber;
+#endif  // !_MSC_VER
+
+ShortcutControllerArchive::ShortcutControllerArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ShortcutControllerArchive::InitAsDefaultInstance() {
+}
+
+ShortcutControllerArchive::ShortcutControllerArchive(const ShortcutControllerArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ShortcutControllerArchive::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ShortcutControllerArchive::~ShortcutControllerArchive() {
+  SharedDtor();
+}
+
+void ShortcutControllerArchive::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void ShortcutControllerArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ShortcutControllerArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ShortcutControllerArchive_descriptor_;
+}
+
+const ShortcutControllerArchive& ShortcutControllerArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
+  return *default_instance_;
+}
+
+ShortcutControllerArchive* ShortcutControllerArchive::default_instance_ = NULL;
+
+ShortcutControllerArchive* ShortcutControllerArchive::New() const {
+  return new ShortcutControllerArchive;
+}
+
+void ShortcutControllerArchive::Clear() {
+  entries_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ShortcutControllerArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_entries:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_entries()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_entries;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ShortcutControllerArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+  for (int i = 0; i < this->entries_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->entries(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ShortcutControllerArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+  for (int i = 0; i < this->entries_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->entries(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ShortcutControllerArchive::ByteSize() const {
+  int total_size = 0;
+
+  // repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+  total_size += 1 * this->entries_size();
+  for (int i = 0; i < this->entries_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->entries(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ShortcutControllerArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ShortcutControllerArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ShortcutControllerArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ShortcutControllerArchive::MergeFrom(const ShortcutControllerArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  entries_.MergeFrom(from.entries_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ShortcutControllerArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ShortcutControllerArchive::CopyFrom(const ShortcutControllerArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ShortcutControllerArchive::IsInitialized() const {
+
+  for (int i = 0; i < entries_size(); i++) {
+    if (!this->entries(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ShortcutControllerArchive::Swap(ShortcutControllerArchive* other) {
+  if (other != this) {
+    entries_.Swap(&other->entries_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ShortcutControllerArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ShortcutControllerArchive_descriptor_;
+  metadata.reflection = ShortcutControllerArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int PropagatePresetCommandArchive::kSuperFieldNumber;
+#endif  // !_MSC_VER
+
+PropagatePresetCommandArchive::PropagatePresetCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void PropagatePresetCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+}
+
+PropagatePresetCommandArchive::PropagatePresetCommandArchive(const PropagatePresetCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void PropagatePresetCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+PropagatePresetCommandArchive::~PropagatePresetCommandArchive() {
+  SharedDtor();
+}
+
+void PropagatePresetCommandArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+  }
+}
+
+void PropagatePresetCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* PropagatePresetCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return PropagatePresetCommandArchive_descriptor_;
+}
+
+const PropagatePresetCommandArchive& PropagatePresetCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
+  return *default_instance_;
+}
+
+PropagatePresetCommandArchive* PropagatePresetCommandArchive::default_instance_ = NULL;
+
+PropagatePresetCommandArchive* PropagatePresetCommandArchive::New() const {
+  return new PropagatePresetCommandArchive;
+}
+
+void PropagatePresetCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool PropagatePresetCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void PropagatePresetCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* PropagatePresetCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int PropagatePresetCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void PropagatePresetCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const PropagatePresetCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const PropagatePresetCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void PropagatePresetCommandArchive::MergeFrom(const PropagatePresetCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void PropagatePresetCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void PropagatePresetCommandArchive::CopyFrom(const PropagatePresetCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool PropagatePresetCommandArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void PropagatePresetCommandArchive::Swap(PropagatePresetCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata PropagatePresetCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = PropagatePresetCommandArchive_descriptor_;
+  metadata.reflection = PropagatePresetCommandArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ShortcutCommandArchive::kSuperFieldNumber;
+const int ShortcutCommandArchive::kOldStyleFieldNumber;
+const int ShortcutCommandArchive::kNewStyleFieldNumber;
+const int ShortcutCommandArchive::kOldShortcutFieldNumber;
+const int ShortcutCommandArchive::kNewShortcutFieldNumber;
+#endif  // !_MSC_VER
+
+ShortcutCommandArchive::ShortcutCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ShortcutCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  old_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  new_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+ShortcutCommandArchive::ShortcutCommandArchive(const ShortcutCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ShortcutCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  old_style_ = NULL;
+  new_style_ = NULL;
+  old_shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  new_shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ShortcutCommandArchive::~ShortcutCommandArchive() {
+  SharedDtor();
+}
+
+void ShortcutCommandArchive::SharedDtor() {
+  if (old_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    delete old_shortcut_;
+  }
+  if (new_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    delete new_shortcut_;
+  }
+  if (this != default_instance_) {
+    delete super_;
+    delete old_style_;
+    delete new_style_;
+  }
+}
+
+void ShortcutCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ShortcutCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ShortcutCommandArchive_descriptor_;
+}
+
+const ShortcutCommandArchive& ShortcutCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
+  return *default_instance_;
+}
+
+ShortcutCommandArchive* ShortcutCommandArchive::default_instance_ = NULL;
+
+ShortcutCommandArchive* ShortcutCommandArchive::New() const {
+  return new ShortcutCommandArchive;
+}
+
+void ShortcutCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_old_style()) {
+      if (old_style_ != NULL) old_style_->::TSP::Reference::Clear();
+    }
+    if (has_new_style()) {
+      if (new_style_ != NULL) new_style_->::TSP::Reference::Clear();
+    }
+    if (has_old_shortcut()) {
+      if (old_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+        old_shortcut_->clear();
+      }
+    }
+    if (has_new_shortcut()) {
+      if (new_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+        new_shortcut_->clear();
+      }
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ShortcutCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_old_style;
+        break;
+      }
+
+      // optional .TSP.Reference old_style = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_new_style;
+        break;
+      }
+
+      // optional .TSP.Reference new_style = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_old_shortcut;
+        break;
+      }
+
+      // optional string old_shortcut = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_shortcut:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_old_shortcut()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->old_shortcut().data(), this->old_shortcut().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_new_shortcut;
+        break;
+      }
+
+      // optional string new_shortcut = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_shortcut:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_new_shortcut()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->new_shortcut().data(), this->new_shortcut().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ShortcutCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSP.Reference old_style = 2;
+  if (has_old_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->old_style(), output);
+  }
+
+  // optional .TSP.Reference new_style = 3;
+  if (has_new_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->new_style(), output);
+  }
+
+  // optional string old_shortcut = 4;
+  if (has_old_shortcut()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->old_shortcut().data(), this->old_shortcut().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->old_shortcut(), output);
+  }
+
+  // optional string new_shortcut = 5;
+  if (has_new_shortcut()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->new_shortcut().data(), this->new_shortcut().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      5, this->new_shortcut(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ShortcutCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSP.Reference old_style = 2;
+  if (has_old_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->old_style(), target);
+  }
+
+  // optional .TSP.Reference new_style = 3;
+  if (has_new_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->new_style(), target);
+  }
+
+  // optional string old_shortcut = 4;
+  if (has_old_shortcut()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->old_shortcut().data(), this->old_shortcut().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->old_shortcut(), target);
+  }
+
+  // optional string new_shortcut = 5;
+  if (has_new_shortcut()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->new_shortcut().data(), this->new_shortcut().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->new_shortcut(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ShortcutCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSP.Reference old_style = 2;
+    if (has_old_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_style());
+    }
+
+    // optional .TSP.Reference new_style = 3;
+    if (has_new_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_style());
+    }
+
+    // optional string old_shortcut = 4;
+    if (has_old_shortcut()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->old_shortcut());
+    }
+
+    // optional string new_shortcut = 5;
+    if (has_new_shortcut()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->new_shortcut());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ShortcutCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ShortcutCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ShortcutCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ShortcutCommandArchive::MergeFrom(const ShortcutCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_old_style()) {
+      mutable_old_style()->::TSP::Reference::MergeFrom(from.old_style());
+    }
+    if (from.has_new_style()) {
+      mutable_new_style()->::TSP::Reference::MergeFrom(from.new_style());
+    }
+    if (from.has_old_shortcut()) {
+      set_old_shortcut(from.old_shortcut());
+    }
+    if (from.has_new_shortcut()) {
+      set_new_shortcut(from.new_shortcut());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ShortcutCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ShortcutCommandArchive::CopyFrom(const ShortcutCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ShortcutCommandArchive::IsInitialized() const {
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_old_style()) {
+    if (!this->old_style().IsInitialized()) return false;
+  }
+  if (has_new_style()) {
+    if (!this->new_style().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ShortcutCommandArchive::Swap(ShortcutCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(old_style_, other->old_style_);
+    std::swap(new_style_, other->new_style_);
+    std::swap(old_shortcut_, other->old_shortcut_);
+    std::swap(new_shortcut_, other->new_shortcut_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ShortcutCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ShortcutCommandArchive_descriptor_;
+  metadata.reflection = ShortcutCommandArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int AddCustomFormatCommandArchive::kSuperFieldNumber;
+const int AddCustomFormatCommandArchive::kCustomFormatFieldNumber;
+const int AddCustomFormatCommandArchive::kForReplacementFieldNumber;
+#endif  // !_MSC_VER
+
+AddCustomFormatCommandArchive::AddCustomFormatCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void AddCustomFormatCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  custom_format_ = const_cast< ::TSK::CustomFormatArchive*>(&::TSK::CustomFormatArchive::default_instance());
+}
+
+AddCustomFormatCommandArchive::AddCustomFormatCommandArchive(const AddCustomFormatCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void AddCustomFormatCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  custom_format_ = NULL;
+  for_replacement_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+AddCustomFormatCommandArchive::~AddCustomFormatCommandArchive() {
+  SharedDtor();
+}
+
+void AddCustomFormatCommandArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete custom_format_;
+  }
+}
+
+void AddCustomFormatCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* AddCustomFormatCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return AddCustomFormatCommandArchive_descriptor_;
+}
+
+const AddCustomFormatCommandArchive& AddCustomFormatCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
+  return *default_instance_;
+}
+
+AddCustomFormatCommandArchive* AddCustomFormatCommandArchive::default_instance_ = NULL;
+
+AddCustomFormatCommandArchive* AddCustomFormatCommandArchive::New() const {
+  return new AddCustomFormatCommandArchive;
+}
+
+void AddCustomFormatCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_custom_format()) {
+      if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+    }
+    for_replacement_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool AddCustomFormatCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_custom_format;
+        break;
+      }
+
+      // optional .TSK.CustomFormatArchive custom_format = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_custom_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_custom_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_for_replacement;
+        break;
+      }
+
+      // optional bool for_replacement = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_for_replacement:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &for_replacement_)));
+          set_has_for_replacement();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void AddCustomFormatCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  if (has_custom_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->custom_format(), output);
+  }
+
+  // optional bool for_replacement = 3;
+  if (has_for_replacement()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->for_replacement(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* AddCustomFormatCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  if (has_custom_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->custom_format(), target);
+  }
+
+  // optional bool for_replacement = 3;
+  if (has_for_replacement()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->for_replacement(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int AddCustomFormatCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSK.CustomFormatArchive custom_format = 2;
+    if (has_custom_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->custom_format());
+    }
+
+    // optional bool for_replacement = 3;
+    if (has_for_replacement()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void AddCustomFormatCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const AddCustomFormatCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const AddCustomFormatCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void AddCustomFormatCommandArchive::MergeFrom(const AddCustomFormatCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_custom_format()) {
+      mutable_custom_format()->::TSK::CustomFormatArchive::MergeFrom(from.custom_format());
+    }
+    if (from.has_for_replacement()) {
+      set_for_replacement(from.for_replacement());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void AddCustomFormatCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void AddCustomFormatCommandArchive::CopyFrom(const AddCustomFormatCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool AddCustomFormatCommandArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_custom_format()) {
+    if (!this->custom_format().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void AddCustomFormatCommandArchive::Swap(AddCustomFormatCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(custom_format_, other->custom_format_);
+    std::swap(for_replacement_, other->for_replacement_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata AddCustomFormatCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = AddCustomFormatCommandArchive_descriptor_;
+  metadata.reflection = AddCustomFormatCommandArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int UpdateCustomFormatCommandArchive::kSuperFieldNumber;
+const int UpdateCustomFormatCommandArchive::kCustomFormatFieldNumber;
+const int UpdateCustomFormatCommandArchive::kOldCustomFormatFieldNumber;
+const int UpdateCustomFormatCommandArchive::kCustomFormatIdFieldNumber;
+#endif  // !_MSC_VER
+
+UpdateCustomFormatCommandArchive::UpdateCustomFormatCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void UpdateCustomFormatCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  custom_format_ = const_cast< ::TSK::CustomFormatArchive*>(&::TSK::CustomFormatArchive::default_instance());
+  old_custom_format_ = const_cast< ::TSK::CustomFormatArchive*>(&::TSK::CustomFormatArchive::default_instance());
+}
+
+UpdateCustomFormatCommandArchive::UpdateCustomFormatCommandArchive(const UpdateCustomFormatCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void UpdateCustomFormatCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  custom_format_ = NULL;
+  old_custom_format_ = NULL;
+  custom_format_id_ = 0u;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+UpdateCustomFormatCommandArchive::~UpdateCustomFormatCommandArchive() {
+  SharedDtor();
+}
+
+void UpdateCustomFormatCommandArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete custom_format_;
+    delete old_custom_format_;
+  }
+}
+
+void UpdateCustomFormatCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* UpdateCustomFormatCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return UpdateCustomFormatCommandArchive_descriptor_;
+}
+
+const UpdateCustomFormatCommandArchive& UpdateCustomFormatCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
+  return *default_instance_;
+}
+
+UpdateCustomFormatCommandArchive* UpdateCustomFormatCommandArchive::default_instance_ = NULL;
+
+UpdateCustomFormatCommandArchive* UpdateCustomFormatCommandArchive::New() const {
+  return new UpdateCustomFormatCommandArchive;
+}
+
+void UpdateCustomFormatCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_custom_format()) {
+      if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+    }
+    if (has_old_custom_format()) {
+      if (old_custom_format_ != NULL) old_custom_format_->::TSK::CustomFormatArchive::Clear();
+    }
+    custom_format_id_ = 0u;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool UpdateCustomFormatCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_custom_format;
+        break;
+      }
+
+      // optional .TSK.CustomFormatArchive custom_format = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_custom_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_custom_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_old_custom_format;
+        break;
+      }
+
+      // optional .TSK.CustomFormatArchive old_custom_format = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_custom_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_custom_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_custom_format_id;
+        break;
+      }
+
+      // optional uint32 custom_format_id = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_custom_format_id:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &custom_format_id_)));
+          set_has_custom_format_id();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void UpdateCustomFormatCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  if (has_custom_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->custom_format(), output);
+  }
+
+  // optional .TSK.CustomFormatArchive old_custom_format = 3;
+  if (has_old_custom_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->old_custom_format(), output);
+  }
+
+  // optional uint32 custom_format_id = 4;
+  if (has_custom_format_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->custom_format_id(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* UpdateCustomFormatCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  if (has_custom_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->custom_format(), target);
+  }
+
+  // optional .TSK.CustomFormatArchive old_custom_format = 3;
+  if (has_old_custom_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->old_custom_format(), target);
+  }
+
+  // optional uint32 custom_format_id = 4;
+  if (has_custom_format_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->custom_format_id(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int UpdateCustomFormatCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSK.CustomFormatArchive custom_format = 2;
+    if (has_custom_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->custom_format());
+    }
+
+    // optional .TSK.CustomFormatArchive old_custom_format = 3;
+    if (has_old_custom_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_custom_format());
+    }
+
+    // optional uint32 custom_format_id = 4;
+    if (has_custom_format_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->custom_format_id());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void UpdateCustomFormatCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const UpdateCustomFormatCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const UpdateCustomFormatCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void UpdateCustomFormatCommandArchive::MergeFrom(const UpdateCustomFormatCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_custom_format()) {
+      mutable_custom_format()->::TSK::CustomFormatArchive::MergeFrom(from.custom_format());
+    }
+    if (from.has_old_custom_format()) {
+      mutable_old_custom_format()->::TSK::CustomFormatArchive::MergeFrom(from.old_custom_format());
+    }
+    if (from.has_custom_format_id()) {
+      set_custom_format_id(from.custom_format_id());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void UpdateCustomFormatCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void UpdateCustomFormatCommandArchive::CopyFrom(const UpdateCustomFormatCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool UpdateCustomFormatCommandArchive::IsInitialized() const {
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_custom_format()) {
+    if (!this->custom_format().IsInitialized()) return false;
+  }
+  if (has_old_custom_format()) {
+    if (!this->old_custom_format().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void UpdateCustomFormatCommandArchive::Swap(UpdateCustomFormatCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(custom_format_, other->custom_format_);
+    std::swap(old_custom_format_, other->old_custom_format_);
+    std::swap(custom_format_id_, other->custom_format_id_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata UpdateCustomFormatCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = UpdateCustomFormatCommandArchive_descriptor_;
+  metadata.reflection = UpdateCustomFormatCommandArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ReplaceCustomFormatCommandArchive::kSuperFieldNumber;
+const int ReplaceCustomFormatCommandArchive::kCustomFormatFieldNumber;
+const int ReplaceCustomFormatCommandArchive::kCustomFormatIdFieldNumber;
+const int ReplaceCustomFormatCommandArchive::kReplacementFormatFieldNumber;
+#endif  // !_MSC_VER
+
+ReplaceCustomFormatCommandArchive::ReplaceCustomFormatCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ReplaceCustomFormatCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  custom_format_ = const_cast< ::TSK::CustomFormatArchive*>(&::TSK::CustomFormatArchive::default_instance());
+  replacement_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+}
+
+ReplaceCustomFormatCommandArchive::ReplaceCustomFormatCommandArchive(const ReplaceCustomFormatCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ReplaceCustomFormatCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  custom_format_ = NULL;
+  custom_format_id_ = 0u;
+  replacement_format_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ReplaceCustomFormatCommandArchive::~ReplaceCustomFormatCommandArchive() {
+  SharedDtor();
+}
+
+void ReplaceCustomFormatCommandArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete custom_format_;
+    delete replacement_format_;
+  }
+}
+
+void ReplaceCustomFormatCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ReplaceCustomFormatCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ReplaceCustomFormatCommandArchive_descriptor_;
+}
+
+const ReplaceCustomFormatCommandArchive& ReplaceCustomFormatCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSAArchives_2eproto();
+  return *default_instance_;
+}
+
+ReplaceCustomFormatCommandArchive* ReplaceCustomFormatCommandArchive::default_instance_ = NULL;
+
+ReplaceCustomFormatCommandArchive* ReplaceCustomFormatCommandArchive::New() const {
+  return new ReplaceCustomFormatCommandArchive;
+}
+
+void ReplaceCustomFormatCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_custom_format()) {
+      if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+    }
+    custom_format_id_ = 0u;
+    if (has_replacement_format()) {
+      if (replacement_format_ != NULL) replacement_format_->::TSK::FormatStructArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ReplaceCustomFormatCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_custom_format;
+        break;
+      }
+
+      // optional .TSK.CustomFormatArchive custom_format = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_custom_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_custom_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_custom_format_id;
+        break;
+      }
+
+      // optional uint32 custom_format_id = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_custom_format_id:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &custom_format_id_)));
+          set_has_custom_format_id();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_replacement_format;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive replacement_format = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_replacement_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_replacement_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ReplaceCustomFormatCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  if (has_custom_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->custom_format(), output);
+  }
+
+  // optional uint32 custom_format_id = 3;
+  if (has_custom_format_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->custom_format_id(), output);
+  }
+
+  // optional .TSK.FormatStructArchive replacement_format = 4;
+  if (has_replacement_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->replacement_format(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ReplaceCustomFormatCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  if (has_custom_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->custom_format(), target);
+  }
+
+  // optional uint32 custom_format_id = 3;
+  if (has_custom_format_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->custom_format_id(), target);
+  }
+
+  // optional .TSK.FormatStructArchive replacement_format = 4;
+  if (has_replacement_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->replacement_format(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ReplaceCustomFormatCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSK.CustomFormatArchive custom_format = 2;
+    if (has_custom_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->custom_format());
+    }
+
+    // optional uint32 custom_format_id = 3;
+    if (has_custom_format_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->custom_format_id());
+    }
+
+    // optional .TSK.FormatStructArchive replacement_format = 4;
+    if (has_replacement_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->replacement_format());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ReplaceCustomFormatCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ReplaceCustomFormatCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ReplaceCustomFormatCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ReplaceCustomFormatCommandArchive::MergeFrom(const ReplaceCustomFormatCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_custom_format()) {
+      mutable_custom_format()->::TSK::CustomFormatArchive::MergeFrom(from.custom_format());
+    }
+    if (from.has_custom_format_id()) {
+      set_custom_format_id(from.custom_format_id());
+    }
+    if (from.has_replacement_format()) {
+      mutable_replacement_format()->::TSK::FormatStructArchive::MergeFrom(from.replacement_format());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ReplaceCustomFormatCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ReplaceCustomFormatCommandArchive::CopyFrom(const ReplaceCustomFormatCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ReplaceCustomFormatCommandArchive::IsInitialized() const {
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_custom_format()) {
+    if (!this->custom_format().IsInitialized()) return false;
+  }
+  if (has_replacement_format()) {
+    if (!this->replacement_format().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ReplaceCustomFormatCommandArchive::Swap(ReplaceCustomFormatCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(custom_format_, other->custom_format_);
+    std::swap(custom_format_id_, other->custom_format_id_);
+    std::swap(replacement_format_, other->replacement_format_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ReplaceCustomFormatCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ReplaceCustomFormatCommandArchive_descriptor_;
+  metadata.reflection = ReplaceCustomFormatCommandArchive_reflection_;
   return metadata;
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.h
index bd514ee..9bc6e5c 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSAArchives.pb.h
@@ -40,7 +40,13 @@ void protobuf_ShutdownFile_TSAArchives_2eproto();
 class DocumentArchive;
 class FunctionBrowserStateArchive;
 class TestDocumentArchive;
+class ShortcutControllerArchive;
+class ShortcutControllerArchive_ShortcutMapEntry;
 class PropagatePresetCommandArchive;
+class ShortcutCommandArchive;
+class AddCustomFormatCommandArchive;
+class UpdateCustomFormatCommandArchive;
+class ReplaceCustomFormatCommandArchive;
 
 // ===================================================================
 
@@ -186,6 +192,15 @@ class DocumentArchive : public ::google::protobuf::Message {
   inline ::std::string* release_template_identifier();
   inline void set_allocated_template_identifier(::std::string* template_identifier);
 
+  // optional .TSP.Reference shortcut_controller = 10;
+  inline bool has_shortcut_controller() const;
+  inline void clear_shortcut_controller();
+  static const int kShortcutControllerFieldNumber = 10;
+  inline const ::TSP::Reference& shortcut_controller() const;
+  inline ::TSP::Reference* mutable_shortcut_controller();
+  inline ::TSP::Reference* release_shortcut_controller();
+  inline void set_allocated_shortcut_controller(::TSP::Reference* shortcut_controller);
+
   // @@protoc_insertion_point(class_scope:TSA.DocumentArchive)
  private:
   inline void set_has_super();
@@ -204,6 +219,8 @@ class DocumentArchive : public ::google::protobuf::Message {
   inline void clear_has_needs_movie_compatibility_upgrade();
   inline void set_has_template_identifier();
   inline void clear_has_template_identifier();
+  inline void set_has_shortcut_controller();
+  inline void clear_has_shortcut_controller();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -215,10 +232,11 @@ class DocumentArchive : public ::google::protobuf::Message {
   ::TSP::Reference* function_browser_state_;
   ::TSP::Reference* tables_custom_format_list_;
   ::std::string* template_identifier_;
+  ::TSP::Reference* shortcut_controller_;
   bool needs_movie_compatibility_upgrade_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(9 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(10 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSAArchives_2eproto();
   friend void protobuf_AssignDesc_TSAArchives_2eproto();
@@ -449,6 +467,192 @@ class TestDocumentArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class ShortcutControllerArchive_ShortcutMapEntry : public ::google::protobuf::Message {
+ public:
+  ShortcutControllerArchive_ShortcutMapEntry();
+  virtual ~ShortcutControllerArchive_ShortcutMapEntry();
+
+  ShortcutControllerArchive_ShortcutMapEntry(const ShortcutControllerArchive_ShortcutMapEntry& from);
+
+  inline ShortcutControllerArchive_ShortcutMapEntry& operator=(const ShortcutControllerArchive_ShortcutMapEntry& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ShortcutControllerArchive_ShortcutMapEntry& default_instance();
+
+  void Swap(ShortcutControllerArchive_ShortcutMapEntry* other);
+
+  // implements Message ----------------------------------------------
+
+  ShortcutControllerArchive_ShortcutMapEntry* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ShortcutControllerArchive_ShortcutMapEntry& from);
+  void MergeFrom(const ShortcutControllerArchive_ShortcutMapEntry& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required string shortcut = 1;
+  inline bool has_shortcut() const;
+  inline void clear_shortcut();
+  static const int kShortcutFieldNumber = 1;
+  inline const ::std::string& shortcut() const;
+  inline void set_shortcut(const ::std::string& value);
+  inline void set_shortcut(const char* value);
+  inline void set_shortcut(const char* value, size_t size);
+  inline ::std::string* mutable_shortcut();
+  inline ::std::string* release_shortcut();
+  inline void set_allocated_shortcut(::std::string* shortcut);
+
+  // required .TSP.Reference style = 2;
+  inline bool has_style() const;
+  inline void clear_style();
+  static const int kStyleFieldNumber = 2;
+  inline const ::TSP::Reference& style() const;
+  inline ::TSP::Reference* mutable_style();
+  inline ::TSP::Reference* release_style();
+  inline void set_allocated_style(::TSP::Reference* style);
+
+  // @@protoc_insertion_point(class_scope:TSA.ShortcutControllerArchive.ShortcutMapEntry)
+ private:
+  inline void set_has_shortcut();
+  inline void clear_has_shortcut();
+  inline void set_has_style();
+  inline void clear_has_style();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::std::string* shortcut_;
+  ::TSP::Reference* style_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSAArchives_2eproto();
+  friend void protobuf_AssignDesc_TSAArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSAArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ShortcutControllerArchive_ShortcutMapEntry* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ShortcutControllerArchive : public ::google::protobuf::Message {
+ public:
+  ShortcutControllerArchive();
+  virtual ~ShortcutControllerArchive();
+
+  ShortcutControllerArchive(const ShortcutControllerArchive& from);
+
+  inline ShortcutControllerArchive& operator=(const ShortcutControllerArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ShortcutControllerArchive& default_instance();
+
+  void Swap(ShortcutControllerArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ShortcutControllerArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ShortcutControllerArchive& from);
+  void MergeFrom(const ShortcutControllerArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef ShortcutControllerArchive_ShortcutMapEntry ShortcutMapEntry;
+
+  // accessors -------------------------------------------------------
+
+  // repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+  inline int entries_size() const;
+  inline void clear_entries();
+  static const int kEntriesFieldNumber = 1;
+  inline const ::TSA::ShortcutControllerArchive_ShortcutMapEntry& entries(int index) const;
+  inline ::TSA::ShortcutControllerArchive_ShortcutMapEntry* mutable_entries(int index);
+  inline ::TSA::ShortcutControllerArchive_ShortcutMapEntry* add_entries();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSA::ShortcutControllerArchive_ShortcutMapEntry >&
+      entries() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSA::ShortcutControllerArchive_ShortcutMapEntry >*
+      mutable_entries();
+
+  // @@protoc_insertion_point(class_scope:TSA.ShortcutControllerArchive)
+ private:
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedPtrField< ::TSA::ShortcutControllerArchive_ShortcutMapEntry > entries_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSAArchives_2eproto();
+  friend void protobuf_AssignDesc_TSAArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSAArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ShortcutControllerArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class PropagatePresetCommandArchive : public ::google::protobuf::Message {
  public:
   PropagatePresetCommandArchive();
@@ -531,524 +735,1697 @@ class PropagatePresetCommandArchive : public ::google::protobuf::Message {
   void InitAsDefaultInstance();
   static PropagatePresetCommandArchive* default_instance_;
 };
-// ===================================================================
-
+// -------------------------------------------------------------------
 
-// ===================================================================
+class ShortcutCommandArchive : public ::google::protobuf::Message {
+ public:
+  ShortcutCommandArchive();
+  virtual ~ShortcutCommandArchive();
 
-// DocumentArchive
+  ShortcutCommandArchive(const ShortcutCommandArchive& from);
 
-// required .TSK.DocumentArchive super = 1;
-inline bool DocumentArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void DocumentArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void DocumentArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void DocumentArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::DocumentArchive::Clear();
-  clear_has_super();
-}
-inline const ::TSK::DocumentArchive& DocumentArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
-}
-inline ::TSK::DocumentArchive* DocumentArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::DocumentArchive;
-  return super_;
-}
-inline ::TSK::DocumentArchive* DocumentArchive::release_super() {
-  clear_has_super();
-  ::TSK::DocumentArchive* temp = super_;
-  super_ = NULL;
-  return temp;
-}
-inline void DocumentArchive::set_allocated_super(::TSK::DocumentArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
+  inline ShortcutCommandArchive& operator=(const ShortcutCommandArchive& from) {
+    CopyFrom(from);
+    return *this;
   }
-}
-
-// repeated .TSWP.TextPresetDisplayItemArchive text_preset_display_items = 2;
-inline int DocumentArchive::text_preset_display_items_size() const {
-  return text_preset_display_items_.size();
-}
-inline void DocumentArchive::clear_text_preset_display_items() {
-  text_preset_display_items_.Clear();
-}
-inline const ::TSWP::TextPresetDisplayItemArchive& DocumentArchive::text_preset_display_items(int index) const {
-  return text_preset_display_items_.Get(index);
-}
-inline ::TSWP::TextPresetDisplayItemArchive* DocumentArchive::mutable_text_preset_display_items(int index) {
-  return text_preset_display_items_.Mutable(index);
-}
-inline ::TSWP::TextPresetDisplayItemArchive* DocumentArchive::add_text_preset_display_items() {
-  return text_preset_display_items_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::TSWP::TextPresetDisplayItemArchive >&
-DocumentArchive::text_preset_display_items() const {
-  return text_preset_display_items_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::TSWP::TextPresetDisplayItemArchive >*
-DocumentArchive::mutable_text_preset_display_items() {
-  return &text_preset_display_items_;
-}
 
-// optional string creation_language = 3;
-inline bool DocumentArchive::has_creation_language() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void DocumentArchive::set_has_creation_language() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void DocumentArchive::clear_has_creation_language() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void DocumentArchive::clear_creation_language() {
-  if (creation_language_ != &::google::protobuf::internal::kEmptyString) {
-    creation_language_->clear();
-  }
-  clear_has_creation_language();
-}
-inline const ::std::string& DocumentArchive::creation_language() const {
-  return *creation_language_;
-}
-inline void DocumentArchive::set_creation_language(const ::std::string& value) {
-  set_has_creation_language();
-  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
-    creation_language_ = new ::std::string;
-  }
-  creation_language_->assign(value);
-}
-inline void DocumentArchive::set_creation_language(const char* value) {
-  set_has_creation_language();
-  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
-    creation_language_ = new ::std::string;
-  }
-  creation_language_->assign(value);
-}
-inline void DocumentArchive::set_creation_language(const char* value, size_t size) {
-  set_has_creation_language();
-  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
-    creation_language_ = new ::std::string;
-  }
-  creation_language_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* DocumentArchive::mutable_creation_language() {
-  set_has_creation_language();
-  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
-    creation_language_ = new ::std::string;
-  }
-  return creation_language_;
-}
-inline ::std::string* DocumentArchive::release_creation_language() {
-  clear_has_creation_language();
-  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = creation_language_;
-    creation_language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
   }
-}
-inline void DocumentArchive::set_allocated_creation_language(::std::string* creation_language) {
-  if (creation_language_ != &::google::protobuf::internal::kEmptyString) {
-    delete creation_language_;
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
   }
-  if (creation_language) {
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ShortcutCommandArchive& default_instance();
+
+  void Swap(ShortcutCommandArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ShortcutCommandArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ShortcutCommandArchive& from);
+  void MergeFrom(const ShortcutCommandArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // optional .TSP.Reference old_style = 2;
+  inline bool has_old_style() const;
+  inline void clear_old_style();
+  static const int kOldStyleFieldNumber = 2;
+  inline const ::TSP::Reference& old_style() const;
+  inline ::TSP::Reference* mutable_old_style();
+  inline ::TSP::Reference* release_old_style();
+  inline void set_allocated_old_style(::TSP::Reference* old_style);
+
+  // optional .TSP.Reference new_style = 3;
+  inline bool has_new_style() const;
+  inline void clear_new_style();
+  static const int kNewStyleFieldNumber = 3;
+  inline const ::TSP::Reference& new_style() const;
+  inline ::TSP::Reference* mutable_new_style();
+  inline ::TSP::Reference* release_new_style();
+  inline void set_allocated_new_style(::TSP::Reference* new_style);
+
+  // optional string old_shortcut = 4;
+  inline bool has_old_shortcut() const;
+  inline void clear_old_shortcut();
+  static const int kOldShortcutFieldNumber = 4;
+  inline const ::std::string& old_shortcut() const;
+  inline void set_old_shortcut(const ::std::string& value);
+  inline void set_old_shortcut(const char* value);
+  inline void set_old_shortcut(const char* value, size_t size);
+  inline ::std::string* mutable_old_shortcut();
+  inline ::std::string* release_old_shortcut();
+  inline void set_allocated_old_shortcut(::std::string* old_shortcut);
+
+  // optional string new_shortcut = 5;
+  inline bool has_new_shortcut() const;
+  inline void clear_new_shortcut();
+  static const int kNewShortcutFieldNumber = 5;
+  inline const ::std::string& new_shortcut() const;
+  inline void set_new_shortcut(const ::std::string& value);
+  inline void set_new_shortcut(const char* value);
+  inline void set_new_shortcut(const char* value, size_t size);
+  inline ::std::string* mutable_new_shortcut();
+  inline ::std::string* release_new_shortcut();
+  inline void set_allocated_new_shortcut(::std::string* new_shortcut);
+
+  // @@protoc_insertion_point(class_scope:TSA.ShortcutCommandArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_old_style();
+  inline void clear_has_old_style();
+  inline void set_has_new_style();
+  inline void clear_has_new_style();
+  inline void set_has_old_shortcut();
+  inline void clear_has_old_shortcut();
+  inline void set_has_new_shortcut();
+  inline void clear_has_new_shortcut();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* old_style_;
+  ::TSP::Reference* new_style_;
+  ::std::string* old_shortcut_;
+  ::std::string* new_shortcut_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSAArchives_2eproto();
+  friend void protobuf_AssignDesc_TSAArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSAArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ShortcutCommandArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class AddCustomFormatCommandArchive : public ::google::protobuf::Message {
+ public:
+  AddCustomFormatCommandArchive();
+  virtual ~AddCustomFormatCommandArchive();
+
+  AddCustomFormatCommandArchive(const AddCustomFormatCommandArchive& from);
+
+  inline AddCustomFormatCommandArchive& operator=(const AddCustomFormatCommandArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const AddCustomFormatCommandArchive& default_instance();
+
+  void Swap(AddCustomFormatCommandArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  AddCustomFormatCommandArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const AddCustomFormatCommandArchive& from);
+  void MergeFrom(const AddCustomFormatCommandArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  inline bool has_custom_format() const;
+  inline void clear_custom_format();
+  static const int kCustomFormatFieldNumber = 2;
+  inline const ::TSK::CustomFormatArchive& custom_format() const;
+  inline ::TSK::CustomFormatArchive* mutable_custom_format();
+  inline ::TSK::CustomFormatArchive* release_custom_format();
+  inline void set_allocated_custom_format(::TSK::CustomFormatArchive* custom_format);
+
+  // optional bool for_replacement = 3;
+  inline bool has_for_replacement() const;
+  inline void clear_for_replacement();
+  static const int kForReplacementFieldNumber = 3;
+  inline bool for_replacement() const;
+  inline void set_for_replacement(bool value);
+
+  // @@protoc_insertion_point(class_scope:TSA.AddCustomFormatCommandArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_custom_format();
+  inline void clear_has_custom_format();
+  inline void set_has_for_replacement();
+  inline void clear_has_for_replacement();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSK::CustomFormatArchive* custom_format_;
+  bool for_replacement_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSAArchives_2eproto();
+  friend void protobuf_AssignDesc_TSAArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSAArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static AddCustomFormatCommandArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class UpdateCustomFormatCommandArchive : public ::google::protobuf::Message {
+ public:
+  UpdateCustomFormatCommandArchive();
+  virtual ~UpdateCustomFormatCommandArchive();
+
+  UpdateCustomFormatCommandArchive(const UpdateCustomFormatCommandArchive& from);
+
+  inline UpdateCustomFormatCommandArchive& operator=(const UpdateCustomFormatCommandArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const UpdateCustomFormatCommandArchive& default_instance();
+
+  void Swap(UpdateCustomFormatCommandArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  UpdateCustomFormatCommandArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const UpdateCustomFormatCommandArchive& from);
+  void MergeFrom(const UpdateCustomFormatCommandArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  inline bool has_custom_format() const;
+  inline void clear_custom_format();
+  static const int kCustomFormatFieldNumber = 2;
+  inline const ::TSK::CustomFormatArchive& custom_format() const;
+  inline ::TSK::CustomFormatArchive* mutable_custom_format();
+  inline ::TSK::CustomFormatArchive* release_custom_format();
+  inline void set_allocated_custom_format(::TSK::CustomFormatArchive* custom_format);
+
+  // optional .TSK.CustomFormatArchive old_custom_format = 3;
+  inline bool has_old_custom_format() const;
+  inline void clear_old_custom_format();
+  static const int kOldCustomFormatFieldNumber = 3;
+  inline const ::TSK::CustomFormatArchive& old_custom_format() const;
+  inline ::TSK::CustomFormatArchive* mutable_old_custom_format();
+  inline ::TSK::CustomFormatArchive* release_old_custom_format();
+  inline void set_allocated_old_custom_format(::TSK::CustomFormatArchive* old_custom_format);
+
+  // optional uint32 custom_format_id = 4;
+  inline bool has_custom_format_id() const;
+  inline void clear_custom_format_id();
+  static const int kCustomFormatIdFieldNumber = 4;
+  inline ::google::protobuf::uint32 custom_format_id() const;
+  inline void set_custom_format_id(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TSA.UpdateCustomFormatCommandArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_custom_format();
+  inline void clear_has_custom_format();
+  inline void set_has_old_custom_format();
+  inline void clear_has_old_custom_format();
+  inline void set_has_custom_format_id();
+  inline void clear_has_custom_format_id();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSK::CustomFormatArchive* custom_format_;
+  ::TSK::CustomFormatArchive* old_custom_format_;
+  ::google::protobuf::uint32 custom_format_id_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSAArchives_2eproto();
+  friend void protobuf_AssignDesc_TSAArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSAArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static UpdateCustomFormatCommandArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ReplaceCustomFormatCommandArchive : public ::google::protobuf::Message {
+ public:
+  ReplaceCustomFormatCommandArchive();
+  virtual ~ReplaceCustomFormatCommandArchive();
+
+  ReplaceCustomFormatCommandArchive(const ReplaceCustomFormatCommandArchive& from);
+
+  inline ReplaceCustomFormatCommandArchive& operator=(const ReplaceCustomFormatCommandArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ReplaceCustomFormatCommandArchive& default_instance();
+
+  void Swap(ReplaceCustomFormatCommandArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ReplaceCustomFormatCommandArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ReplaceCustomFormatCommandArchive& from);
+  void MergeFrom(const ReplaceCustomFormatCommandArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // optional .TSK.CustomFormatArchive custom_format = 2;
+  inline bool has_custom_format() const;
+  inline void clear_custom_format();
+  static const int kCustomFormatFieldNumber = 2;
+  inline const ::TSK::CustomFormatArchive& custom_format() const;
+  inline ::TSK::CustomFormatArchive* mutable_custom_format();
+  inline ::TSK::CustomFormatArchive* release_custom_format();
+  inline void set_allocated_custom_format(::TSK::CustomFormatArchive* custom_format);
+
+  // optional uint32 custom_format_id = 3;
+  inline bool has_custom_format_id() const;
+  inline void clear_custom_format_id();
+  static const int kCustomFormatIdFieldNumber = 3;
+  inline ::google::protobuf::uint32 custom_format_id() const;
+  inline void set_custom_format_id(::google::protobuf::uint32 value);
+
+  // optional .TSK.FormatStructArchive replacement_format = 4;
+  inline bool has_replacement_format() const;
+  inline void clear_replacement_format();
+  static const int kReplacementFormatFieldNumber = 4;
+  inline const ::TSK::FormatStructArchive& replacement_format() const;
+  inline ::TSK::FormatStructArchive* mutable_replacement_format();
+  inline ::TSK::FormatStructArchive* release_replacement_format();
+  inline void set_allocated_replacement_format(::TSK::FormatStructArchive* replacement_format);
+
+  // @@protoc_insertion_point(class_scope:TSA.ReplaceCustomFormatCommandArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_custom_format();
+  inline void clear_has_custom_format();
+  inline void set_has_custom_format_id();
+  inline void clear_has_custom_format_id();
+  inline void set_has_replacement_format();
+  inline void clear_has_replacement_format();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSK::CustomFormatArchive* custom_format_;
+  ::TSK::FormatStructArchive* replacement_format_;
+  ::google::protobuf::uint32 custom_format_id_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSAArchives_2eproto();
+  friend void protobuf_AssignDesc_TSAArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSAArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ReplaceCustomFormatCommandArchive* default_instance_;
+};
+// ===================================================================
+
+
+// ===================================================================
+
+// DocumentArchive
+
+// required .TSK.DocumentArchive super = 1;
+inline bool DocumentArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void DocumentArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void DocumentArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void DocumentArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::DocumentArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::DocumentArchive& DocumentArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::DocumentArchive* DocumentArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::DocumentArchive;
+  return super_;
+}
+inline ::TSK::DocumentArchive* DocumentArchive::release_super() {
+  clear_has_super();
+  ::TSK::DocumentArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void DocumentArchive::set_allocated_super(::TSK::DocumentArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// repeated .TSWP.TextPresetDisplayItemArchive text_preset_display_items = 2;
+inline int DocumentArchive::text_preset_display_items_size() const {
+  return text_preset_display_items_.size();
+}
+inline void DocumentArchive::clear_text_preset_display_items() {
+  text_preset_display_items_.Clear();
+}
+inline const ::TSWP::TextPresetDisplayItemArchive& DocumentArchive::text_preset_display_items(int index) const {
+  return text_preset_display_items_.Get(index);
+}
+inline ::TSWP::TextPresetDisplayItemArchive* DocumentArchive::mutable_text_preset_display_items(int index) {
+  return text_preset_display_items_.Mutable(index);
+}
+inline ::TSWP::TextPresetDisplayItemArchive* DocumentArchive::add_text_preset_display_items() {
+  return text_preset_display_items_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSWP::TextPresetDisplayItemArchive >&
+DocumentArchive::text_preset_display_items() const {
+  return text_preset_display_items_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSWP::TextPresetDisplayItemArchive >*
+DocumentArchive::mutable_text_preset_display_items() {
+  return &text_preset_display_items_;
+}
+
+// optional string creation_language = 3;
+inline bool DocumentArchive::has_creation_language() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void DocumentArchive::set_has_creation_language() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void DocumentArchive::clear_has_creation_language() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void DocumentArchive::clear_creation_language() {
+  if (creation_language_ != &::google::protobuf::internal::kEmptyString) {
+    creation_language_->clear();
+  }
+  clear_has_creation_language();
+}
+inline const ::std::string& DocumentArchive::creation_language() const {
+  return *creation_language_;
+}
+inline void DocumentArchive::set_creation_language(const ::std::string& value) {
+  set_has_creation_language();
+  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
+    creation_language_ = new ::std::string;
+  }
+  creation_language_->assign(value);
+}
+inline void DocumentArchive::set_creation_language(const char* value) {
+  set_has_creation_language();
+  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
+    creation_language_ = new ::std::string;
+  }
+  creation_language_->assign(value);
+}
+inline void DocumentArchive::set_creation_language(const char* value, size_t size) {
+  set_has_creation_language();
+  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
+    creation_language_ = new ::std::string;
+  }
+  creation_language_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* DocumentArchive::mutable_creation_language() {
+  set_has_creation_language();
+  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
+    creation_language_ = new ::std::string;
+  }
+  return creation_language_;
+}
+inline ::std::string* DocumentArchive::release_creation_language() {
+  clear_has_creation_language();
+  if (creation_language_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = creation_language_;
+    creation_language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void DocumentArchive::set_allocated_creation_language(::std::string* creation_language) {
+  if (creation_language_ != &::google::protobuf::internal::kEmptyString) {
+    delete creation_language_;
+  }
+  if (creation_language) {
     set_has_creation_language();
     creation_language_ = creation_language;
   } else {
-    clear_has_creation_language();
-    creation_language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_creation_language();
+    creation_language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional .TSP.Reference calculation_engine = 4;
+inline bool DocumentArchive::has_calculation_engine() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void DocumentArchive::set_has_calculation_engine() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void DocumentArchive::clear_has_calculation_engine() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void DocumentArchive::clear_calculation_engine() {
+  if (calculation_engine_ != NULL) calculation_engine_->::TSP::Reference::Clear();
+  clear_has_calculation_engine();
+}
+inline const ::TSP::Reference& DocumentArchive::calculation_engine() const {
+  return calculation_engine_ != NULL ? *calculation_engine_ : *default_instance_->calculation_engine_;
+}
+inline ::TSP::Reference* DocumentArchive::mutable_calculation_engine() {
+  set_has_calculation_engine();
+  if (calculation_engine_ == NULL) calculation_engine_ = new ::TSP::Reference;
+  return calculation_engine_;
+}
+inline ::TSP::Reference* DocumentArchive::release_calculation_engine() {
+  clear_has_calculation_engine();
+  ::TSP::Reference* temp = calculation_engine_;
+  calculation_engine_ = NULL;
+  return temp;
+}
+inline void DocumentArchive::set_allocated_calculation_engine(::TSP::Reference* calculation_engine) {
+  delete calculation_engine_;
+  calculation_engine_ = calculation_engine;
+  if (calculation_engine) {
+    set_has_calculation_engine();
+  } else {
+    clear_has_calculation_engine();
+  }
+}
+
+// optional .TSP.Reference view_state = 5;
+inline bool DocumentArchive::has_view_state() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void DocumentArchive::set_has_view_state() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void DocumentArchive::clear_has_view_state() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void DocumentArchive::clear_view_state() {
+  if (view_state_ != NULL) view_state_->::TSP::Reference::Clear();
+  clear_has_view_state();
+}
+inline const ::TSP::Reference& DocumentArchive::view_state() const {
+  return view_state_ != NULL ? *view_state_ : *default_instance_->view_state_;
+}
+inline ::TSP::Reference* DocumentArchive::mutable_view_state() {
+  set_has_view_state();
+  if (view_state_ == NULL) view_state_ = new ::TSP::Reference;
+  return view_state_;
+}
+inline ::TSP::Reference* DocumentArchive::release_view_state() {
+  clear_has_view_state();
+  ::TSP::Reference* temp = view_state_;
+  view_state_ = NULL;
+  return temp;
+}
+inline void DocumentArchive::set_allocated_view_state(::TSP::Reference* view_state) {
+  delete view_state_;
+  view_state_ = view_state;
+  if (view_state) {
+    set_has_view_state();
+  } else {
+    clear_has_view_state();
+  }
+}
+
+// optional .TSP.Reference function_browser_state = 6;
+inline bool DocumentArchive::has_function_browser_state() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void DocumentArchive::set_has_function_browser_state() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void DocumentArchive::clear_has_function_browser_state() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void DocumentArchive::clear_function_browser_state() {
+  if (function_browser_state_ != NULL) function_browser_state_->::TSP::Reference::Clear();
+  clear_has_function_browser_state();
+}
+inline const ::TSP::Reference& DocumentArchive::function_browser_state() const {
+  return function_browser_state_ != NULL ? *function_browser_state_ : *default_instance_->function_browser_state_;
+}
+inline ::TSP::Reference* DocumentArchive::mutable_function_browser_state() {
+  set_has_function_browser_state();
+  if (function_browser_state_ == NULL) function_browser_state_ = new ::TSP::Reference;
+  return function_browser_state_;
+}
+inline ::TSP::Reference* DocumentArchive::release_function_browser_state() {
+  clear_has_function_browser_state();
+  ::TSP::Reference* temp = function_browser_state_;
+  function_browser_state_ = NULL;
+  return temp;
+}
+inline void DocumentArchive::set_allocated_function_browser_state(::TSP::Reference* function_browser_state) {
+  delete function_browser_state_;
+  function_browser_state_ = function_browser_state;
+  if (function_browser_state) {
+    set_has_function_browser_state();
+  } else {
+    clear_has_function_browser_state();
+  }
+}
+
+// optional .TSP.Reference tables_custom_format_list = 7;
+inline bool DocumentArchive::has_tables_custom_format_list() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void DocumentArchive::set_has_tables_custom_format_list() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void DocumentArchive::clear_has_tables_custom_format_list() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void DocumentArchive::clear_tables_custom_format_list() {
+  if (tables_custom_format_list_ != NULL) tables_custom_format_list_->::TSP::Reference::Clear();
+  clear_has_tables_custom_format_list();
+}
+inline const ::TSP::Reference& DocumentArchive::tables_custom_format_list() const {
+  return tables_custom_format_list_ != NULL ? *tables_custom_format_list_ : *default_instance_->tables_custom_format_list_;
+}
+inline ::TSP::Reference* DocumentArchive::mutable_tables_custom_format_list() {
+  set_has_tables_custom_format_list();
+  if (tables_custom_format_list_ == NULL) tables_custom_format_list_ = new ::TSP::Reference;
+  return tables_custom_format_list_;
+}
+inline ::TSP::Reference* DocumentArchive::release_tables_custom_format_list() {
+  clear_has_tables_custom_format_list();
+  ::TSP::Reference* temp = tables_custom_format_list_;
+  tables_custom_format_list_ = NULL;
+  return temp;
+}
+inline void DocumentArchive::set_allocated_tables_custom_format_list(::TSP::Reference* tables_custom_format_list) {
+  delete tables_custom_format_list_;
+  tables_custom_format_list_ = tables_custom_format_list;
+  if (tables_custom_format_list) {
+    set_has_tables_custom_format_list();
+  } else {
+    clear_has_tables_custom_format_list();
+  }
+}
+
+// optional bool needs_movie_compatibility_upgrade = 8;
+inline bool DocumentArchive::has_needs_movie_compatibility_upgrade() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void DocumentArchive::set_has_needs_movie_compatibility_upgrade() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void DocumentArchive::clear_has_needs_movie_compatibility_upgrade() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void DocumentArchive::clear_needs_movie_compatibility_upgrade() {
+  needs_movie_compatibility_upgrade_ = false;
+  clear_has_needs_movie_compatibility_upgrade();
+}
+inline bool DocumentArchive::needs_movie_compatibility_upgrade() const {
+  return needs_movie_compatibility_upgrade_;
+}
+inline void DocumentArchive::set_needs_movie_compatibility_upgrade(bool value) {
+  set_has_needs_movie_compatibility_upgrade();
+  needs_movie_compatibility_upgrade_ = value;
+}
+
+// optional string template_identifier = 9;
+inline bool DocumentArchive::has_template_identifier() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void DocumentArchive::set_has_template_identifier() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void DocumentArchive::clear_has_template_identifier() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void DocumentArchive::clear_template_identifier() {
+  if (template_identifier_ != &::google::protobuf::internal::kEmptyString) {
+    template_identifier_->clear();
+  }
+  clear_has_template_identifier();
+}
+inline const ::std::string& DocumentArchive::template_identifier() const {
+  return *template_identifier_;
+}
+inline void DocumentArchive::set_template_identifier(const ::std::string& value) {
+  set_has_template_identifier();
+  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    template_identifier_ = new ::std::string;
+  }
+  template_identifier_->assign(value);
+}
+inline void DocumentArchive::set_template_identifier(const char* value) {
+  set_has_template_identifier();
+  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    template_identifier_ = new ::std::string;
+  }
+  template_identifier_->assign(value);
+}
+inline void DocumentArchive::set_template_identifier(const char* value, size_t size) {
+  set_has_template_identifier();
+  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    template_identifier_ = new ::std::string;
+  }
+  template_identifier_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* DocumentArchive::mutable_template_identifier() {
+  set_has_template_identifier();
+  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    template_identifier_ = new ::std::string;
+  }
+  return template_identifier_;
+}
+inline ::std::string* DocumentArchive::release_template_identifier() {
+  clear_has_template_identifier();
+  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = template_identifier_;
+    template_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void DocumentArchive::set_allocated_template_identifier(::std::string* template_identifier) {
+  if (template_identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete template_identifier_;
+  }
+  if (template_identifier) {
+    set_has_template_identifier();
+    template_identifier_ = template_identifier;
+  } else {
+    clear_has_template_identifier();
+    template_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional .TSP.Reference shortcut_controller = 10;
+inline bool DocumentArchive::has_shortcut_controller() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void DocumentArchive::set_has_shortcut_controller() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void DocumentArchive::clear_has_shortcut_controller() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void DocumentArchive::clear_shortcut_controller() {
+  if (shortcut_controller_ != NULL) shortcut_controller_->::TSP::Reference::Clear();
+  clear_has_shortcut_controller();
+}
+inline const ::TSP::Reference& DocumentArchive::shortcut_controller() const {
+  return shortcut_controller_ != NULL ? *shortcut_controller_ : *default_instance_->shortcut_controller_;
+}
+inline ::TSP::Reference* DocumentArchive::mutable_shortcut_controller() {
+  set_has_shortcut_controller();
+  if (shortcut_controller_ == NULL) shortcut_controller_ = new ::TSP::Reference;
+  return shortcut_controller_;
+}
+inline ::TSP::Reference* DocumentArchive::release_shortcut_controller() {
+  clear_has_shortcut_controller();
+  ::TSP::Reference* temp = shortcut_controller_;
+  shortcut_controller_ = NULL;
+  return temp;
+}
+inline void DocumentArchive::set_allocated_shortcut_controller(::TSP::Reference* shortcut_controller) {
+  delete shortcut_controller_;
+  shortcut_controller_ = shortcut_controller;
+  if (shortcut_controller) {
+    set_has_shortcut_controller();
+  } else {
+    clear_has_shortcut_controller();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// FunctionBrowserStateArchive
+
+// repeated uint32 recent_functions = 1;
+inline int FunctionBrowserStateArchive::recent_functions_size() const {
+  return recent_functions_.size();
+}
+inline void FunctionBrowserStateArchive::clear_recent_functions() {
+  recent_functions_.Clear();
+}
+inline ::google::protobuf::uint32 FunctionBrowserStateArchive::recent_functions(int index) const {
+  return recent_functions_.Get(index);
+}
+inline void FunctionBrowserStateArchive::set_recent_functions(int index, ::google::protobuf::uint32 value) {
+  recent_functions_.Set(index, value);
+}
+inline void FunctionBrowserStateArchive::add_recent_functions(::google::protobuf::uint32 value) {
+  recent_functions_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+FunctionBrowserStateArchive::recent_functions() const {
+  return recent_functions_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+FunctionBrowserStateArchive::mutable_recent_functions() {
+  return &recent_functions_;
+}
+
+// repeated uint32 back_functions = 2;
+inline int FunctionBrowserStateArchive::back_functions_size() const {
+  return back_functions_.size();
+}
+inline void FunctionBrowserStateArchive::clear_back_functions() {
+  back_functions_.Clear();
+}
+inline ::google::protobuf::uint32 FunctionBrowserStateArchive::back_functions(int index) const {
+  return back_functions_.Get(index);
+}
+inline void FunctionBrowserStateArchive::set_back_functions(int index, ::google::protobuf::uint32 value) {
+  back_functions_.Set(index, value);
+}
+inline void FunctionBrowserStateArchive::add_back_functions(::google::protobuf::uint32 value) {
+  back_functions_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+FunctionBrowserStateArchive::back_functions() const {
+  return back_functions_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+FunctionBrowserStateArchive::mutable_back_functions() {
+  return &back_functions_;
+}
+
+// repeated uint32 forward_functions = 3;
+inline int FunctionBrowserStateArchive::forward_functions_size() const {
+  return forward_functions_.size();
+}
+inline void FunctionBrowserStateArchive::clear_forward_functions() {
+  forward_functions_.Clear();
+}
+inline ::google::protobuf::uint32 FunctionBrowserStateArchive::forward_functions(int index) const {
+  return forward_functions_.Get(index);
+}
+inline void FunctionBrowserStateArchive::set_forward_functions(int index, ::google::protobuf::uint32 value) {
+  forward_functions_.Set(index, value);
+}
+inline void FunctionBrowserStateArchive::add_forward_functions(::google::protobuf::uint32 value) {
+  forward_functions_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+FunctionBrowserStateArchive::forward_functions() const {
+  return forward_functions_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+FunctionBrowserStateArchive::mutable_forward_functions() {
+  return &forward_functions_;
+}
+
+// optional uint32 current_function = 4;
+inline bool FunctionBrowserStateArchive::has_current_function() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void FunctionBrowserStateArchive::set_has_current_function() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void FunctionBrowserStateArchive::clear_has_current_function() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void FunctionBrowserStateArchive::clear_current_function() {
+  current_function_ = 0u;
+  clear_has_current_function();
+}
+inline ::google::protobuf::uint32 FunctionBrowserStateArchive::current_function() const {
+  return current_function_;
+}
+inline void FunctionBrowserStateArchive::set_current_function(::google::protobuf::uint32 value) {
+  set_has_current_function();
+  current_function_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// TestDocumentArchive
+
+// required .TSA.DocumentArchive super = 1;
+inline bool TestDocumentArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TestDocumentArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TestDocumentArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TestDocumentArchive::clear_super() {
+  if (super_ != NULL) super_->::TSA::DocumentArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSA::DocumentArchive& TestDocumentArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSA::DocumentArchive* TestDocumentArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSA::DocumentArchive;
+  return super_;
+}
+inline ::TSA::DocumentArchive* TestDocumentArchive::release_super() {
+  clear_has_super();
+  ::TSA::DocumentArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void TestDocumentArchive::set_allocated_super(::TSA::DocumentArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// optional string value = 2;
+inline bool TestDocumentArchive::has_value() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TestDocumentArchive::set_has_value() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TestDocumentArchive::clear_has_value() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TestDocumentArchive::clear_value() {
+  if (value_ != &::google::protobuf::internal::kEmptyString) {
+    value_->clear();
+  }
+  clear_has_value();
+}
+inline const ::std::string& TestDocumentArchive::value() const {
+  return *value_;
+}
+inline void TestDocumentArchive::set_value(const ::std::string& value) {
+  set_has_value();
+  if (value_ == &::google::protobuf::internal::kEmptyString) {
+    value_ = new ::std::string;
+  }
+  value_->assign(value);
+}
+inline void TestDocumentArchive::set_value(const char* value) {
+  set_has_value();
+  if (value_ == &::google::protobuf::internal::kEmptyString) {
+    value_ = new ::std::string;
+  }
+  value_->assign(value);
+}
+inline void TestDocumentArchive::set_value(const char* value, size_t size) {
+  set_has_value();
+  if (value_ == &::google::protobuf::internal::kEmptyString) {
+    value_ = new ::std::string;
+  }
+  value_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* TestDocumentArchive::mutable_value() {
+  set_has_value();
+  if (value_ == &::google::protobuf::internal::kEmptyString) {
+    value_ = new ::std::string;
+  }
+  return value_;
+}
+inline ::std::string* TestDocumentArchive::release_value() {
+  clear_has_value();
+  if (value_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = value_;
+    value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void TestDocumentArchive::set_allocated_value(::std::string* value) {
+  if (value_ != &::google::protobuf::internal::kEmptyString) {
+    delete value_;
+  }
+  if (value) {
+    set_has_value();
+    value_ = value;
+  } else {
+    clear_has_value();
+    value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// -------------------------------------------------------------------
+
+// ShortcutControllerArchive_ShortcutMapEntry
+
+// required string shortcut = 1;
+inline bool ShortcutControllerArchive_ShortcutMapEntry::has_shortcut() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_has_shortcut() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::clear_has_shortcut() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::clear_shortcut() {
+  if (shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    shortcut_->clear();
+  }
+  clear_has_shortcut();
+}
+inline const ::std::string& ShortcutControllerArchive_ShortcutMapEntry::shortcut() const {
+  return *shortcut_;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_shortcut(const ::std::string& value) {
+  set_has_shortcut();
+  if (shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    shortcut_ = new ::std::string;
+  }
+  shortcut_->assign(value);
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_shortcut(const char* value) {
+  set_has_shortcut();
+  if (shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    shortcut_ = new ::std::string;
+  }
+  shortcut_->assign(value);
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_shortcut(const char* value, size_t size) {
+  set_has_shortcut();
+  if (shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    shortcut_ = new ::std::string;
+  }
+  shortcut_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ShortcutControllerArchive_ShortcutMapEntry::mutable_shortcut() {
+  set_has_shortcut();
+  if (shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    shortcut_ = new ::std::string;
+  }
+  return shortcut_;
+}
+inline ::std::string* ShortcutControllerArchive_ShortcutMapEntry::release_shortcut() {
+  clear_has_shortcut();
+  if (shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = shortcut_;
+    shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_allocated_shortcut(::std::string* shortcut) {
+  if (shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    delete shortcut_;
+  }
+  if (shortcut) {
+    set_has_shortcut();
+    shortcut_ = shortcut;
+  } else {
+    clear_has_shortcut();
+    shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required .TSP.Reference style = 2;
+inline bool ShortcutControllerArchive_ShortcutMapEntry::has_style() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_has_style() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::clear_has_style() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::clear_style() {
+  if (style_ != NULL) style_->::TSP::Reference::Clear();
+  clear_has_style();
+}
+inline const ::TSP::Reference& ShortcutControllerArchive_ShortcutMapEntry::style() const {
+  return style_ != NULL ? *style_ : *default_instance_->style_;
+}
+inline ::TSP::Reference* ShortcutControllerArchive_ShortcutMapEntry::mutable_style() {
+  set_has_style();
+  if (style_ == NULL) style_ = new ::TSP::Reference;
+  return style_;
+}
+inline ::TSP::Reference* ShortcutControllerArchive_ShortcutMapEntry::release_style() {
+  clear_has_style();
+  ::TSP::Reference* temp = style_;
+  style_ = NULL;
+  return temp;
+}
+inline void ShortcutControllerArchive_ShortcutMapEntry::set_allocated_style(::TSP::Reference* style) {
+  delete style_;
+  style_ = style;
+  if (style) {
+    set_has_style();
+  } else {
+    clear_has_style();
   }
 }
 
-// optional .TSP.Reference calculation_engine = 4;
-inline bool DocumentArchive::has_calculation_engine() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// -------------------------------------------------------------------
+
+// ShortcutControllerArchive
+
+// repeated .TSA.ShortcutControllerArchive.ShortcutMapEntry entries = 1;
+inline int ShortcutControllerArchive::entries_size() const {
+  return entries_.size();
 }
-inline void DocumentArchive::set_has_calculation_engine() {
-  _has_bits_[0] |= 0x00000008u;
+inline void ShortcutControllerArchive::clear_entries() {
+  entries_.Clear();
 }
-inline void DocumentArchive::clear_has_calculation_engine() {
-  _has_bits_[0] &= ~0x00000008u;
+inline const ::TSA::ShortcutControllerArchive_ShortcutMapEntry& ShortcutControllerArchive::entries(int index) const {
+  return entries_.Get(index);
 }
-inline void DocumentArchive::clear_calculation_engine() {
-  if (calculation_engine_ != NULL) calculation_engine_->::TSP::Reference::Clear();
-  clear_has_calculation_engine();
+inline ::TSA::ShortcutControllerArchive_ShortcutMapEntry* ShortcutControllerArchive::mutable_entries(int index) {
+  return entries_.Mutable(index);
 }
-inline const ::TSP::Reference& DocumentArchive::calculation_engine() const {
-  return calculation_engine_ != NULL ? *calculation_engine_ : *default_instance_->calculation_engine_;
+inline ::TSA::ShortcutControllerArchive_ShortcutMapEntry* ShortcutControllerArchive::add_entries() {
+  return entries_.Add();
 }
-inline ::TSP::Reference* DocumentArchive::mutable_calculation_engine() {
-  set_has_calculation_engine();
-  if (calculation_engine_ == NULL) calculation_engine_ = new ::TSP::Reference;
-  return calculation_engine_;
+inline const ::google::protobuf::RepeatedPtrField< ::TSA::ShortcutControllerArchive_ShortcutMapEntry >&
+ShortcutControllerArchive::entries() const {
+  return entries_;
 }
-inline ::TSP::Reference* DocumentArchive::release_calculation_engine() {
-  clear_has_calculation_engine();
-  ::TSP::Reference* temp = calculation_engine_;
-  calculation_engine_ = NULL;
+inline ::google::protobuf::RepeatedPtrField< ::TSA::ShortcutControllerArchive_ShortcutMapEntry >*
+ShortcutControllerArchive::mutable_entries() {
+  return &entries_;
+}
+
+// -------------------------------------------------------------------
+
+// PropagatePresetCommandArchive
+
+// required .TSK.CommandArchive super = 1;
+inline bool PropagatePresetCommandArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void PropagatePresetCommandArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void PropagatePresetCommandArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void PropagatePresetCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::CommandArchive& PropagatePresetCommandArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::CommandArchive* PropagatePresetCommandArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
+}
+inline ::TSK::CommandArchive* PropagatePresetCommandArchive::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void DocumentArchive::set_allocated_calculation_engine(::TSP::Reference* calculation_engine) {
-  delete calculation_engine_;
-  calculation_engine_ = calculation_engine;
-  if (calculation_engine) {
-    set_has_calculation_engine();
+inline void PropagatePresetCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_calculation_engine();
+    clear_has_super();
   }
 }
 
-// optional .TSP.Reference view_state = 5;
-inline bool DocumentArchive::has_view_state() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+// -------------------------------------------------------------------
+
+// ShortcutCommandArchive
+
+// optional .TSK.CommandArchive super = 1;
+inline bool ShortcutCommandArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void DocumentArchive::set_has_view_state() {
-  _has_bits_[0] |= 0x00000010u;
+inline void ShortcutCommandArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline void DocumentArchive::clear_has_view_state() {
-  _has_bits_[0] &= ~0x00000010u;
+inline void ShortcutCommandArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void DocumentArchive::clear_view_state() {
-  if (view_state_ != NULL) view_state_->::TSP::Reference::Clear();
-  clear_has_view_state();
+inline void ShortcutCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
 }
-inline const ::TSP::Reference& DocumentArchive::view_state() const {
-  return view_state_ != NULL ? *view_state_ : *default_instance_->view_state_;
+inline const ::TSK::CommandArchive& ShortcutCommandArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSP::Reference* DocumentArchive::mutable_view_state() {
-  set_has_view_state();
-  if (view_state_ == NULL) view_state_ = new ::TSP::Reference;
-  return view_state_;
+inline ::TSK::CommandArchive* ShortcutCommandArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
 }
-inline ::TSP::Reference* DocumentArchive::release_view_state() {
-  clear_has_view_state();
-  ::TSP::Reference* temp = view_state_;
-  view_state_ = NULL;
+inline ::TSK::CommandArchive* ShortcutCommandArchive::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void DocumentArchive::set_allocated_view_state(::TSP::Reference* view_state) {
-  delete view_state_;
-  view_state_ = view_state;
-  if (view_state) {
-    set_has_view_state();
+inline void ShortcutCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_view_state();
+    clear_has_super();
   }
 }
 
-// optional .TSP.Reference function_browser_state = 6;
-inline bool DocumentArchive::has_function_browser_state() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+// optional .TSP.Reference old_style = 2;
+inline bool ShortcutCommandArchive::has_old_style() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void DocumentArchive::set_has_function_browser_state() {
-  _has_bits_[0] |= 0x00000020u;
+inline void ShortcutCommandArchive::set_has_old_style() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void DocumentArchive::clear_has_function_browser_state() {
-  _has_bits_[0] &= ~0x00000020u;
+inline void ShortcutCommandArchive::clear_has_old_style() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void DocumentArchive::clear_function_browser_state() {
-  if (function_browser_state_ != NULL) function_browser_state_->::TSP::Reference::Clear();
-  clear_has_function_browser_state();
+inline void ShortcutCommandArchive::clear_old_style() {
+  if (old_style_ != NULL) old_style_->::TSP::Reference::Clear();
+  clear_has_old_style();
 }
-inline const ::TSP::Reference& DocumentArchive::function_browser_state() const {
-  return function_browser_state_ != NULL ? *function_browser_state_ : *default_instance_->function_browser_state_;
+inline const ::TSP::Reference& ShortcutCommandArchive::old_style() const {
+  return old_style_ != NULL ? *old_style_ : *default_instance_->old_style_;
 }
-inline ::TSP::Reference* DocumentArchive::mutable_function_browser_state() {
-  set_has_function_browser_state();
-  if (function_browser_state_ == NULL) function_browser_state_ = new ::TSP::Reference;
-  return function_browser_state_;
+inline ::TSP::Reference* ShortcutCommandArchive::mutable_old_style() {
+  set_has_old_style();
+  if (old_style_ == NULL) old_style_ = new ::TSP::Reference;
+  return old_style_;
 }
-inline ::TSP::Reference* DocumentArchive::release_function_browser_state() {
-  clear_has_function_browser_state();
-  ::TSP::Reference* temp = function_browser_state_;
-  function_browser_state_ = NULL;
+inline ::TSP::Reference* ShortcutCommandArchive::release_old_style() {
+  clear_has_old_style();
+  ::TSP::Reference* temp = old_style_;
+  old_style_ = NULL;
   return temp;
 }
-inline void DocumentArchive::set_allocated_function_browser_state(::TSP::Reference* function_browser_state) {
-  delete function_browser_state_;
-  function_browser_state_ = function_browser_state;
-  if (function_browser_state) {
-    set_has_function_browser_state();
+inline void ShortcutCommandArchive::set_allocated_old_style(::TSP::Reference* old_style) {
+  delete old_style_;
+  old_style_ = old_style;
+  if (old_style) {
+    set_has_old_style();
   } else {
-    clear_has_function_browser_state();
+    clear_has_old_style();
   }
 }
 
-// optional .TSP.Reference tables_custom_format_list = 7;
-inline bool DocumentArchive::has_tables_custom_format_list() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
+// optional .TSP.Reference new_style = 3;
+inline bool ShortcutCommandArchive::has_new_style() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void DocumentArchive::set_has_tables_custom_format_list() {
-  _has_bits_[0] |= 0x00000040u;
+inline void ShortcutCommandArchive::set_has_new_style() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void DocumentArchive::clear_has_tables_custom_format_list() {
-  _has_bits_[0] &= ~0x00000040u;
+inline void ShortcutCommandArchive::clear_has_new_style() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void DocumentArchive::clear_tables_custom_format_list() {
-  if (tables_custom_format_list_ != NULL) tables_custom_format_list_->::TSP::Reference::Clear();
-  clear_has_tables_custom_format_list();
+inline void ShortcutCommandArchive::clear_new_style() {
+  if (new_style_ != NULL) new_style_->::TSP::Reference::Clear();
+  clear_has_new_style();
 }
-inline const ::TSP::Reference& DocumentArchive::tables_custom_format_list() const {
-  return tables_custom_format_list_ != NULL ? *tables_custom_format_list_ : *default_instance_->tables_custom_format_list_;
+inline const ::TSP::Reference& ShortcutCommandArchive::new_style() const {
+  return new_style_ != NULL ? *new_style_ : *default_instance_->new_style_;
 }
-inline ::TSP::Reference* DocumentArchive::mutable_tables_custom_format_list() {
-  set_has_tables_custom_format_list();
-  if (tables_custom_format_list_ == NULL) tables_custom_format_list_ = new ::TSP::Reference;
-  return tables_custom_format_list_;
+inline ::TSP::Reference* ShortcutCommandArchive::mutable_new_style() {
+  set_has_new_style();
+  if (new_style_ == NULL) new_style_ = new ::TSP::Reference;
+  return new_style_;
 }
-inline ::TSP::Reference* DocumentArchive::release_tables_custom_format_list() {
-  clear_has_tables_custom_format_list();
-  ::TSP::Reference* temp = tables_custom_format_list_;
-  tables_custom_format_list_ = NULL;
+inline ::TSP::Reference* ShortcutCommandArchive::release_new_style() {
+  clear_has_new_style();
+  ::TSP::Reference* temp = new_style_;
+  new_style_ = NULL;
   return temp;
 }
-inline void DocumentArchive::set_allocated_tables_custom_format_list(::TSP::Reference* tables_custom_format_list) {
-  delete tables_custom_format_list_;
-  tables_custom_format_list_ = tables_custom_format_list;
-  if (tables_custom_format_list) {
-    set_has_tables_custom_format_list();
+inline void ShortcutCommandArchive::set_allocated_new_style(::TSP::Reference* new_style) {
+  delete new_style_;
+  new_style_ = new_style;
+  if (new_style) {
+    set_has_new_style();
   } else {
-    clear_has_tables_custom_format_list();
+    clear_has_new_style();
   }
 }
 
-// optional bool needs_movie_compatibility_upgrade = 8;
-inline bool DocumentArchive::has_needs_movie_compatibility_upgrade() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+// optional string old_shortcut = 4;
+inline bool ShortcutCommandArchive::has_old_shortcut() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void DocumentArchive::set_has_needs_movie_compatibility_upgrade() {
-  _has_bits_[0] |= 0x00000080u;
+inline void ShortcutCommandArchive::set_has_old_shortcut() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void DocumentArchive::clear_has_needs_movie_compatibility_upgrade() {
-  _has_bits_[0] &= ~0x00000080u;
+inline void ShortcutCommandArchive::clear_has_old_shortcut() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void DocumentArchive::clear_needs_movie_compatibility_upgrade() {
-  needs_movie_compatibility_upgrade_ = false;
-  clear_has_needs_movie_compatibility_upgrade();
+inline void ShortcutCommandArchive::clear_old_shortcut() {
+  if (old_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    old_shortcut_->clear();
+  }
+  clear_has_old_shortcut();
 }
-inline bool DocumentArchive::needs_movie_compatibility_upgrade() const {
-  return needs_movie_compatibility_upgrade_;
+inline const ::std::string& ShortcutCommandArchive::old_shortcut() const {
+  return *old_shortcut_;
 }
-inline void DocumentArchive::set_needs_movie_compatibility_upgrade(bool value) {
-  set_has_needs_movie_compatibility_upgrade();
-  needs_movie_compatibility_upgrade_ = value;
+inline void ShortcutCommandArchive::set_old_shortcut(const ::std::string& value) {
+  set_has_old_shortcut();
+  if (old_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    old_shortcut_ = new ::std::string;
+  }
+  old_shortcut_->assign(value);
 }
-
-// optional string template_identifier = 9;
-inline bool DocumentArchive::has_template_identifier() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
+inline void ShortcutCommandArchive::set_old_shortcut(const char* value) {
+  set_has_old_shortcut();
+  if (old_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    old_shortcut_ = new ::std::string;
+  }
+  old_shortcut_->assign(value);
 }
-inline void DocumentArchive::set_has_template_identifier() {
-  _has_bits_[0] |= 0x00000100u;
+inline void ShortcutCommandArchive::set_old_shortcut(const char* value, size_t size) {
+  set_has_old_shortcut();
+  if (old_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    old_shortcut_ = new ::std::string;
+  }
+  old_shortcut_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void DocumentArchive::clear_has_template_identifier() {
-  _has_bits_[0] &= ~0x00000100u;
+inline ::std::string* ShortcutCommandArchive::mutable_old_shortcut() {
+  set_has_old_shortcut();
+  if (old_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    old_shortcut_ = new ::std::string;
+  }
+  return old_shortcut_;
 }
-inline void DocumentArchive::clear_template_identifier() {
-  if (template_identifier_ != &::google::protobuf::internal::kEmptyString) {
-    template_identifier_->clear();
+inline ::std::string* ShortcutCommandArchive::release_old_shortcut() {
+  clear_has_old_shortcut();
+  if (old_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = old_shortcut_;
+    old_shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
   }
-  clear_has_template_identifier();
 }
-inline const ::std::string& DocumentArchive::template_identifier() const {
-  return *template_identifier_;
+inline void ShortcutCommandArchive::set_allocated_old_shortcut(::std::string* old_shortcut) {
+  if (old_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    delete old_shortcut_;
+  }
+  if (old_shortcut) {
+    set_has_old_shortcut();
+    old_shortcut_ = old_shortcut;
+  } else {
+    clear_has_old_shortcut();
+    old_shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
-inline void DocumentArchive::set_template_identifier(const ::std::string& value) {
-  set_has_template_identifier();
-  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
-    template_identifier_ = new ::std::string;
+
+// optional string new_shortcut = 5;
+inline bool ShortcutCommandArchive::has_new_shortcut() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void ShortcutCommandArchive::set_has_new_shortcut() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void ShortcutCommandArchive::clear_has_new_shortcut() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void ShortcutCommandArchive::clear_new_shortcut() {
+  if (new_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    new_shortcut_->clear();
   }
-  template_identifier_->assign(value);
+  clear_has_new_shortcut();
 }
-inline void DocumentArchive::set_template_identifier(const char* value) {
-  set_has_template_identifier();
-  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
-    template_identifier_ = new ::std::string;
+inline const ::std::string& ShortcutCommandArchive::new_shortcut() const {
+  return *new_shortcut_;
+}
+inline void ShortcutCommandArchive::set_new_shortcut(const ::std::string& value) {
+  set_has_new_shortcut();
+  if (new_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    new_shortcut_ = new ::std::string;
   }
-  template_identifier_->assign(value);
+  new_shortcut_->assign(value);
 }
-inline void DocumentArchive::set_template_identifier(const char* value, size_t size) {
-  set_has_template_identifier();
-  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
-    template_identifier_ = new ::std::string;
+inline void ShortcutCommandArchive::set_new_shortcut(const char* value) {
+  set_has_new_shortcut();
+  if (new_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    new_shortcut_ = new ::std::string;
   }
-  template_identifier_->assign(reinterpret_cast<const char*>(value), size);
+  new_shortcut_->assign(value);
 }
-inline ::std::string* DocumentArchive::mutable_template_identifier() {
-  set_has_template_identifier();
-  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
-    template_identifier_ = new ::std::string;
+inline void ShortcutCommandArchive::set_new_shortcut(const char* value, size_t size) {
+  set_has_new_shortcut();
+  if (new_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    new_shortcut_ = new ::std::string;
   }
-  return template_identifier_;
+  new_shortcut_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* DocumentArchive::release_template_identifier() {
-  clear_has_template_identifier();
-  if (template_identifier_ == &::google::protobuf::internal::kEmptyString) {
+inline ::std::string* ShortcutCommandArchive::mutable_new_shortcut() {
+  set_has_new_shortcut();
+  if (new_shortcut_ == &::google::protobuf::internal::kEmptyString) {
+    new_shortcut_ = new ::std::string;
+  }
+  return new_shortcut_;
+}
+inline ::std::string* ShortcutCommandArchive::release_new_shortcut() {
+  clear_has_new_shortcut();
+  if (new_shortcut_ == &::google::protobuf::internal::kEmptyString) {
     return NULL;
   } else {
-    ::std::string* temp = template_identifier_;
-    template_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    ::std::string* temp = new_shortcut_;
+    new_shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
     return temp;
   }
 }
-inline void DocumentArchive::set_allocated_template_identifier(::std::string* template_identifier) {
-  if (template_identifier_ != &::google::protobuf::internal::kEmptyString) {
-    delete template_identifier_;
+inline void ShortcutCommandArchive::set_allocated_new_shortcut(::std::string* new_shortcut) {
+  if (new_shortcut_ != &::google::protobuf::internal::kEmptyString) {
+    delete new_shortcut_;
   }
-  if (template_identifier) {
-    set_has_template_identifier();
-    template_identifier_ = template_identifier;
+  if (new_shortcut) {
+    set_has_new_shortcut();
+    new_shortcut_ = new_shortcut;
   } else {
-    clear_has_template_identifier();
-    template_identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_new_shortcut();
+    new_shortcut_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   }
 }
 
 // -------------------------------------------------------------------
 
-// FunctionBrowserStateArchive
+// AddCustomFormatCommandArchive
 
-// repeated uint32 recent_functions = 1;
-inline int FunctionBrowserStateArchive::recent_functions_size() const {
-  return recent_functions_.size();
-}
-inline void FunctionBrowserStateArchive::clear_recent_functions() {
-  recent_functions_.Clear();
-}
-inline ::google::protobuf::uint32 FunctionBrowserStateArchive::recent_functions(int index) const {
-  return recent_functions_.Get(index);
-}
-inline void FunctionBrowserStateArchive::set_recent_functions(int index, ::google::protobuf::uint32 value) {
-  recent_functions_.Set(index, value);
-}
-inline void FunctionBrowserStateArchive::add_recent_functions(::google::protobuf::uint32 value) {
-  recent_functions_.Add(value);
-}
-inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-FunctionBrowserStateArchive::recent_functions() const {
-  return recent_functions_;
-}
-inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-FunctionBrowserStateArchive::mutable_recent_functions() {
-  return &recent_functions_;
+// required .TSK.CommandArchive super = 1;
+inline bool AddCustomFormatCommandArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-
-// repeated uint32 back_functions = 2;
-inline int FunctionBrowserStateArchive::back_functions_size() const {
-  return back_functions_.size();
+inline void AddCustomFormatCommandArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline void FunctionBrowserStateArchive::clear_back_functions() {
-  back_functions_.Clear();
+inline void AddCustomFormatCommandArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline ::google::protobuf::uint32 FunctionBrowserStateArchive::back_functions(int index) const {
-  return back_functions_.Get(index);
+inline void AddCustomFormatCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
 }
-inline void FunctionBrowserStateArchive::set_back_functions(int index, ::google::protobuf::uint32 value) {
-  back_functions_.Set(index, value);
+inline const ::TSK::CommandArchive& AddCustomFormatCommandArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline void FunctionBrowserStateArchive::add_back_functions(::google::protobuf::uint32 value) {
-  back_functions_.Add(value);
+inline ::TSK::CommandArchive* AddCustomFormatCommandArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
 }
-inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-FunctionBrowserStateArchive::back_functions() const {
-  return back_functions_;
+inline ::TSK::CommandArchive* AddCustomFormatCommandArchive::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
 }
-inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-FunctionBrowserStateArchive::mutable_back_functions() {
-  return &back_functions_;
+inline void AddCustomFormatCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
 }
 
-// repeated uint32 forward_functions = 3;
-inline int FunctionBrowserStateArchive::forward_functions_size() const {
-  return forward_functions_.size();
+// optional .TSK.CustomFormatArchive custom_format = 2;
+inline bool AddCustomFormatCommandArchive::has_custom_format() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void FunctionBrowserStateArchive::clear_forward_functions() {
-  forward_functions_.Clear();
+inline void AddCustomFormatCommandArchive::set_has_custom_format() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline ::google::protobuf::uint32 FunctionBrowserStateArchive::forward_functions(int index) const {
-  return forward_functions_.Get(index);
+inline void AddCustomFormatCommandArchive::clear_has_custom_format() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void FunctionBrowserStateArchive::set_forward_functions(int index, ::google::protobuf::uint32 value) {
-  forward_functions_.Set(index, value);
+inline void AddCustomFormatCommandArchive::clear_custom_format() {
+  if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+  clear_has_custom_format();
 }
-inline void FunctionBrowserStateArchive::add_forward_functions(::google::protobuf::uint32 value) {
-  forward_functions_.Add(value);
+inline const ::TSK::CustomFormatArchive& AddCustomFormatCommandArchive::custom_format() const {
+  return custom_format_ != NULL ? *custom_format_ : *default_instance_->custom_format_;
 }
-inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-FunctionBrowserStateArchive::forward_functions() const {
-  return forward_functions_;
+inline ::TSK::CustomFormatArchive* AddCustomFormatCommandArchive::mutable_custom_format() {
+  set_has_custom_format();
+  if (custom_format_ == NULL) custom_format_ = new ::TSK::CustomFormatArchive;
+  return custom_format_;
 }
-inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-FunctionBrowserStateArchive::mutable_forward_functions() {
-  return &forward_functions_;
+inline ::TSK::CustomFormatArchive* AddCustomFormatCommandArchive::release_custom_format() {
+  clear_has_custom_format();
+  ::TSK::CustomFormatArchive* temp = custom_format_;
+  custom_format_ = NULL;
+  return temp;
+}
+inline void AddCustomFormatCommandArchive::set_allocated_custom_format(::TSK::CustomFormatArchive* custom_format) {
+  delete custom_format_;
+  custom_format_ = custom_format;
+  if (custom_format) {
+    set_has_custom_format();
+  } else {
+    clear_has_custom_format();
+  }
 }
 
-// optional uint32 current_function = 4;
-inline bool FunctionBrowserStateArchive::has_current_function() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// optional bool for_replacement = 3;
+inline bool AddCustomFormatCommandArchive::has_for_replacement() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void FunctionBrowserStateArchive::set_has_current_function() {
-  _has_bits_[0] |= 0x00000008u;
+inline void AddCustomFormatCommandArchive::set_has_for_replacement() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void FunctionBrowserStateArchive::clear_has_current_function() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void AddCustomFormatCommandArchive::clear_has_for_replacement() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void FunctionBrowserStateArchive::clear_current_function() {
-  current_function_ = 0u;
-  clear_has_current_function();
+inline void AddCustomFormatCommandArchive::clear_for_replacement() {
+  for_replacement_ = false;
+  clear_has_for_replacement();
 }
-inline ::google::protobuf::uint32 FunctionBrowserStateArchive::current_function() const {
-  return current_function_;
+inline bool AddCustomFormatCommandArchive::for_replacement() const {
+  return for_replacement_;
 }
-inline void FunctionBrowserStateArchive::set_current_function(::google::protobuf::uint32 value) {
-  set_has_current_function();
-  current_function_ = value;
+inline void AddCustomFormatCommandArchive::set_for_replacement(bool value) {
+  set_has_for_replacement();
+  for_replacement_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// TestDocumentArchive
+// UpdateCustomFormatCommandArchive
 
-// required .TSA.DocumentArchive super = 1;
-inline bool TestDocumentArchive::has_super() const {
+// optional .TSK.CommandArchive super = 1;
+inline bool UpdateCustomFormatCommandArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void TestDocumentArchive::set_has_super() {
+inline void UpdateCustomFormatCommandArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void TestDocumentArchive::clear_has_super() {
+inline void UpdateCustomFormatCommandArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void TestDocumentArchive::clear_super() {
-  if (super_ != NULL) super_->::TSA::DocumentArchive::Clear();
+inline void UpdateCustomFormatCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSA::DocumentArchive& TestDocumentArchive::super() const {
+inline const ::TSK::CommandArchive& UpdateCustomFormatCommandArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSA::DocumentArchive* TestDocumentArchive::mutable_super() {
+inline ::TSK::CommandArchive* UpdateCustomFormatCommandArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSA::DocumentArchive;
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TSA::DocumentArchive* TestDocumentArchive::release_super() {
+inline ::TSK::CommandArchive* UpdateCustomFormatCommandArchive::release_super() {
   clear_has_super();
-  ::TSA::DocumentArchive* temp = super_;
+  ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void TestDocumentArchive::set_allocated_super(::TSA::DocumentArchive* super) {
+inline void UpdateCustomFormatCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -1058,109 +2435,137 @@ inline void TestDocumentArchive::set_allocated_super(::TSA::DocumentArchive* sup
   }
 }
 
-// optional string value = 2;
-inline bool TestDocumentArchive::has_value() const {
+// optional .TSK.CustomFormatArchive custom_format = 2;
+inline bool UpdateCustomFormatCommandArchive::has_custom_format() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void TestDocumentArchive::set_has_value() {
+inline void UpdateCustomFormatCommandArchive::set_has_custom_format() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void TestDocumentArchive::clear_has_value() {
+inline void UpdateCustomFormatCommandArchive::clear_has_custom_format() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void TestDocumentArchive::clear_value() {
-  if (value_ != &::google::protobuf::internal::kEmptyString) {
-    value_->clear();
-  }
-  clear_has_value();
+inline void UpdateCustomFormatCommandArchive::clear_custom_format() {
+  if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+  clear_has_custom_format();
 }
-inline const ::std::string& TestDocumentArchive::value() const {
-  return *value_;
+inline const ::TSK::CustomFormatArchive& UpdateCustomFormatCommandArchive::custom_format() const {
+  return custom_format_ != NULL ? *custom_format_ : *default_instance_->custom_format_;
 }
-inline void TestDocumentArchive::set_value(const ::std::string& value) {
-  set_has_value();
-  if (value_ == &::google::protobuf::internal::kEmptyString) {
-    value_ = new ::std::string;
-  }
-  value_->assign(value);
+inline ::TSK::CustomFormatArchive* UpdateCustomFormatCommandArchive::mutable_custom_format() {
+  set_has_custom_format();
+  if (custom_format_ == NULL) custom_format_ = new ::TSK::CustomFormatArchive;
+  return custom_format_;
 }
-inline void TestDocumentArchive::set_value(const char* value) {
-  set_has_value();
-  if (value_ == &::google::protobuf::internal::kEmptyString) {
-    value_ = new ::std::string;
-  }
-  value_->assign(value);
+inline ::TSK::CustomFormatArchive* UpdateCustomFormatCommandArchive::release_custom_format() {
+  clear_has_custom_format();
+  ::TSK::CustomFormatArchive* temp = custom_format_;
+  custom_format_ = NULL;
+  return temp;
 }
-inline void TestDocumentArchive::set_value(const char* value, size_t size) {
-  set_has_value();
-  if (value_ == &::google::protobuf::internal::kEmptyString) {
-    value_ = new ::std::string;
+inline void UpdateCustomFormatCommandArchive::set_allocated_custom_format(::TSK::CustomFormatArchive* custom_format) {
+  delete custom_format_;
+  custom_format_ = custom_format;
+  if (custom_format) {
+    set_has_custom_format();
+  } else {
+    clear_has_custom_format();
   }
-  value_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* TestDocumentArchive::mutable_value() {
-  set_has_value();
-  if (value_ == &::google::protobuf::internal::kEmptyString) {
-    value_ = new ::std::string;
-  }
-  return value_;
+
+// optional .TSK.CustomFormatArchive old_custom_format = 3;
+inline bool UpdateCustomFormatCommandArchive::has_old_custom_format() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline ::std::string* TestDocumentArchive::release_value() {
-  clear_has_value();
-  if (value_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = value_;
-    value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline void UpdateCustomFormatCommandArchive::set_has_old_custom_format() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void TestDocumentArchive::set_allocated_value(::std::string* value) {
-  if (value_ != &::google::protobuf::internal::kEmptyString) {
-    delete value_;
-  }
-  if (value) {
-    set_has_value();
-    value_ = value;
+inline void UpdateCustomFormatCommandArchive::clear_has_old_custom_format() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void UpdateCustomFormatCommandArchive::clear_old_custom_format() {
+  if (old_custom_format_ != NULL) old_custom_format_->::TSK::CustomFormatArchive::Clear();
+  clear_has_old_custom_format();
+}
+inline const ::TSK::CustomFormatArchive& UpdateCustomFormatCommandArchive::old_custom_format() const {
+  return old_custom_format_ != NULL ? *old_custom_format_ : *default_instance_->old_custom_format_;
+}
+inline ::TSK::CustomFormatArchive* UpdateCustomFormatCommandArchive::mutable_old_custom_format() {
+  set_has_old_custom_format();
+  if (old_custom_format_ == NULL) old_custom_format_ = new ::TSK::CustomFormatArchive;
+  return old_custom_format_;
+}
+inline ::TSK::CustomFormatArchive* UpdateCustomFormatCommandArchive::release_old_custom_format() {
+  clear_has_old_custom_format();
+  ::TSK::CustomFormatArchive* temp = old_custom_format_;
+  old_custom_format_ = NULL;
+  return temp;
+}
+inline void UpdateCustomFormatCommandArchive::set_allocated_old_custom_format(::TSK::CustomFormatArchive* old_custom_format) {
+  delete old_custom_format_;
+  old_custom_format_ = old_custom_format;
+  if (old_custom_format) {
+    set_has_old_custom_format();
   } else {
-    clear_has_value();
-    value_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_old_custom_format();
   }
 }
 
+// optional uint32 custom_format_id = 4;
+inline bool UpdateCustomFormatCommandArchive::has_custom_format_id() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void UpdateCustomFormatCommandArchive::set_has_custom_format_id() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void UpdateCustomFormatCommandArchive::clear_has_custom_format_id() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void UpdateCustomFormatCommandArchive::clear_custom_format_id() {
+  custom_format_id_ = 0u;
+  clear_has_custom_format_id();
+}
+inline ::google::protobuf::uint32 UpdateCustomFormatCommandArchive::custom_format_id() const {
+  return custom_format_id_;
+}
+inline void UpdateCustomFormatCommandArchive::set_custom_format_id(::google::protobuf::uint32 value) {
+  set_has_custom_format_id();
+  custom_format_id_ = value;
+}
+
 // -------------------------------------------------------------------
 
-// PropagatePresetCommandArchive
+// ReplaceCustomFormatCommandArchive
 
-// required .TSK.CommandArchive super = 1;
-inline bool PropagatePresetCommandArchive::has_super() const {
+// optional .TSK.CommandArchive super = 1;
+inline bool ReplaceCustomFormatCommandArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void PropagatePresetCommandArchive::set_has_super() {
+inline void ReplaceCustomFormatCommandArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void PropagatePresetCommandArchive::clear_has_super() {
+inline void ReplaceCustomFormatCommandArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void PropagatePresetCommandArchive::clear_super() {
+inline void ReplaceCustomFormatCommandArchive::clear_super() {
   if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSK::CommandArchive& PropagatePresetCommandArchive::super() const {
+inline const ::TSK::CommandArchive& ReplaceCustomFormatCommandArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSK::CommandArchive* PropagatePresetCommandArchive::mutable_super() {
+inline ::TSK::CommandArchive* ReplaceCustomFormatCommandArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TSK::CommandArchive* PropagatePresetCommandArchive::release_super() {
+inline ::TSK::CommandArchive* ReplaceCustomFormatCommandArchive::release_super() {
   clear_has_super();
   ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void PropagatePresetCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
+inline void ReplaceCustomFormatCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -1170,6 +2575,104 @@ inline void PropagatePresetCommandArchive::set_allocated_super(::TSK::CommandArc
   }
 }
 
+// optional .TSK.CustomFormatArchive custom_format = 2;
+inline bool ReplaceCustomFormatCommandArchive::has_custom_format() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ReplaceCustomFormatCommandArchive::set_has_custom_format() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ReplaceCustomFormatCommandArchive::clear_has_custom_format() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ReplaceCustomFormatCommandArchive::clear_custom_format() {
+  if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+  clear_has_custom_format();
+}
+inline const ::TSK::CustomFormatArchive& ReplaceCustomFormatCommandArchive::custom_format() const {
+  return custom_format_ != NULL ? *custom_format_ : *default_instance_->custom_format_;
+}
+inline ::TSK::CustomFormatArchive* ReplaceCustomFormatCommandArchive::mutable_custom_format() {
+  set_has_custom_format();
+  if (custom_format_ == NULL) custom_format_ = new ::TSK::CustomFormatArchive;
+  return custom_format_;
+}
+inline ::TSK::CustomFormatArchive* ReplaceCustomFormatCommandArchive::release_custom_format() {
+  clear_has_custom_format();
+  ::TSK::CustomFormatArchive* temp = custom_format_;
+  custom_format_ = NULL;
+  return temp;
+}
+inline void ReplaceCustomFormatCommandArchive::set_allocated_custom_format(::TSK::CustomFormatArchive* custom_format) {
+  delete custom_format_;
+  custom_format_ = custom_format;
+  if (custom_format) {
+    set_has_custom_format();
+  } else {
+    clear_has_custom_format();
+  }
+}
+
+// optional uint32 custom_format_id = 3;
+inline bool ReplaceCustomFormatCommandArchive::has_custom_format_id() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void ReplaceCustomFormatCommandArchive::set_has_custom_format_id() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void ReplaceCustomFormatCommandArchive::clear_has_custom_format_id() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void ReplaceCustomFormatCommandArchive::clear_custom_format_id() {
+  custom_format_id_ = 0u;
+  clear_has_custom_format_id();
+}
+inline ::google::protobuf::uint32 ReplaceCustomFormatCommandArchive::custom_format_id() const {
+  return custom_format_id_;
+}
+inline void ReplaceCustomFormatCommandArchive::set_custom_format_id(::google::protobuf::uint32 value) {
+  set_has_custom_format_id();
+  custom_format_id_ = value;
+}
+
+// optional .TSK.FormatStructArchive replacement_format = 4;
+inline bool ReplaceCustomFormatCommandArchive::has_replacement_format() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ReplaceCustomFormatCommandArchive::set_has_replacement_format() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ReplaceCustomFormatCommandArchive::clear_has_replacement_format() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ReplaceCustomFormatCommandArchive::clear_replacement_format() {
+  if (replacement_format_ != NULL) replacement_format_->::TSK::FormatStructArchive::Clear();
+  clear_has_replacement_format();
+}
+inline const ::TSK::FormatStructArchive& ReplaceCustomFormatCommandArchive::replacement_format() const {
+  return replacement_format_ != NULL ? *replacement_format_ : *default_instance_->replacement_format_;
+}
+inline ::TSK::FormatStructArchive* ReplaceCustomFormatCommandArchive::mutable_replacement_format() {
+  set_has_replacement_format();
+  if (replacement_format_ == NULL) replacement_format_ = new ::TSK::FormatStructArchive;
+  return replacement_format_;
+}
+inline ::TSK::FormatStructArchive* ReplaceCustomFormatCommandArchive::release_replacement_format() {
+  clear_has_replacement_format();
+  ::TSK::FormatStructArchive* temp = replacement_format_;
+  replacement_format_ = NULL;
+  return temp;
+}
+inline void ReplaceCustomFormatCommandArchive::set_allocated_replacement_format(::TSK::FormatStructArchive* replacement_format) {
+  delete replacement_format_;
+  replacement_format_ = replacement_format;
+  if (replacement_format) {
+    set_has_replacement_format();
+  } else {
+    clear_has_replacement_format();
+  }
+}
+
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.cc
index 444bc08..78ecd7d 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.cc
@@ -407,7 +407,7 @@ void protobuf_AssignDesc_TSCEArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CellDependenciesArchive));
   VolatileDependenciesArchive_descriptor_ = file->message_type(10);
-  static const int VolatileDependenciesArchive_offsets_[14] = {
+  static const int VolatileDependenciesArchive_offsets_[16] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_time_cell_column_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_time_cell_row_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_random_cell_column_),
@@ -418,6 +418,8 @@ void protobuf_AssignDesc_TSCEArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_location_cell_row_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_compass_cell_column_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_compass_cell_row_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_sheet_table_name_cell_column_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_sheet_table_name_cell_row_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, calculated_dependency_cell_column_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, calculated_dependency_cell_row_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(VolatileDependenciesArchive, volatile_geometry_cell_reference_),
@@ -1332,9 +1334,10 @@ void protobuf_AssignDesc_TSCEArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DateCellValueArchive));
   NumberCellValueArchive_descriptor_ = file->message_type(51);
-  static const int NumberCellValueArchive_offsets_[4] = {
+  static const int NumberCellValueArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberCellValueArchive, value_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberCellValueArchive, unit_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberCellValueArchive, unit_index_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberCellValueArchive, currency_code_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberCellValueArchive, format_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberCellValueArchive, format_is_implicit_),
   };
@@ -1707,7 +1710,7 @@ void protobuf_AddDesc_TSCEArchives_2eproto() {
     "\005edges\030\t \001(\0132\022.TSCE.EdgesArchive\"`\n\027Cell"
     "DependenciesArchive\022,\n\013cell_record\030\001 \003(\013"
     "2\027.TSCE.CellRecordArchive\022\027\n\017num_dirty_c"
-    "ells\030\002 \001(\r\"\330\004\n\033VolatileDependenciesArchi"
+    "ells\030\002 \001(\r\"\263\005\n\033VolatileDependenciesArchi"
     "ve\022!\n\031volatile_time_cell_column\030\001 \003(\r\022\036\n"
     "\026volatile_time_cell_row\030\002 \003(\r\022#\n\033volatil"
     "e_random_cell_column\030\003 \003(\r\022 \n\030volatile_r"
@@ -1717,313 +1720,316 @@ void protobuf_AddDesc_TSCEArchives_2eproto() {
     "lumn\030\005 \003(\r\022\"\n\032volatile_location_cell_row"
     "\030\006 \003(\r\022$\n\034volatile_compass_cell_column\030\007"
     " \003(\r\022!\n\031volatile_compass_cell_row\030\010 \003(\r\022"
-    ")\n!calculated_dependency_cell_column\030\t \003"
-    "(\r\022&\n\036calculated_dependency_cell_row\030\n \003"
-    "(\r\022D\n volatile_geometry_cell_reference\030\r"
-    " \003(\0132\032.TSCE.CellReferenceArchive\022;\n\026vola"
-    "tile_geometry_cell\030\013 \003(\0132\033.TSCE.CellCoor"
-    "dinateArchive\"\314\001\n\032RangeBackDependencyArc"
-    "hive\022\026\n\016cell_coord_row\030\001 \002(\r\022\031\n\021cell_coo"
-    "rd_column\030\002 \002(\r\0224\n\017range_reference\030\003 \001(\013"
-    "2\033.TSCE.RangeReferenceArchive\022E\n\030interna"
-    "l_range_reference\030\004 \001(\0132#.TSCE.InternalR"
-    "angeReferenceArchive\"c\n RTreeInternalNod"
-    "eContentsArchive\022\013\n\003min\030\001 \003(\r\022\013\n\003max\030\002 \003"
-    "(\r\022%\n\005child\030\003 \002(\0132\026.TSCE.RTreeNodeArchiv"
-    "e\"l\n\034RTreeLeafNodeContentsArchive\022\013\n\003min"
-    "\030\001 \003(\r\022\013\n\003max\030\002 \003(\r\0222\n\016cell_reference\030\003 "
-    "\002(\0132\032.TSCE.CellReferenceArchive\"\270\001\n\020RTre"
-    "eNodeArchive\022\r\n\005level\030\001 \002(\r\022\r\n\005count\030\002 \002"
-    "(\r\022F\n\026internal_node_contents\030\003 \003(\0132&.TSC"
-    "E.RTreeInternalNodeContentsArchive\022>\n\022le"
-    "af_node_contents\030\004 \003(\0132\".TSCE.RTreeLeafN"
-    "odeContentsArchive\"\331\001\n\014RTreeArchive\022\024\n\014d"
-    "ata_file_id\030\001 \002(\r\022\021\n\tdata_size\030\002 \002(\r\022\025\n\r"
-    "data_num_dims\030\003 \002(\r\022\026\n\016data_elem_size\030\004 "
-    "\002(\r\022\033\n\023data_elem_real_size\030\005 \002(\r\022\026\n\016data"
-    "_max_nodes\030\006 \002(\r\022\026\n\016data_min_nodes\030\007 \002(\r"
-    "\022$\n\004root\030\010 \002(\0132\026.TSCE.RTreeNodeArchive\"y"
-    "\n\030RangeDependenciesArchive\022\"\n\006r_tree\030\001 \001"
-    "(\0132\022.TSCE.RTreeArchive\0229\n\017back_dependenc"
-    "y\030\002 \003(\0132 .TSCE.RangeBackDependencyArchiv"
-    "e\"\225\007\n\033SpanningDependenciesArchive\022\016\n\006col"
-    "umn\030\001 \003(\r\022E\n\rrange_context\030\002 \003(\0162..TSCE."
-    "SpanningDependenciesArchive.RangeContext"
-    "\022(\n\004cell\030\003 \003(\0132\032.TSCE.CellReferenceArchi"
-    "ve\022C\n\035total_range_for_deleted_table\030\004 \001("
-    "\0132\034.TSCE.RangeCoordinateArchive\022B\n\034body_"
-    "range_for_deleted_table\030\005 \001(\0132\034.TSCE.Ran"
-    "geCoordinateArchive\022f\n\037referring_column_"
-    "to_local_cells\030\006 \003(\0132=.TSCE.SpanningDepe"
-    "ndenciesArchive.ReferringColumnToLocalCe"
-    "lls\022h\n referring_column_to_remote_cells\030"
-    "\007 \003(\0132>.TSCE.SpanningDependenciesArchive"
-    ".ReferringColumnToRemoteCells\032\252\001\n\033Referr"
-    "ingColumnToLocalCells\022\016\n\006column\030\001 \002(\r\022E\n"
-    "\rrange_context\030\002 \002(\0162..TSCE.SpanningDepe"
-    "ndenciesArchive.RangeContext\0224\n\017cell_coo"
-    "rdinate\030\003 \003(\0132\033.TSCE.CellCoordinateArchi"
-    "ve\032\272\001\n\034ReferringColumnToRemoteCells\022\016\n\006c"
-    "olumn\030\001 \002(\r\022E\n\rrange_context\030\002 \002(\0162..TSC"
-    "E.SpanningDependenciesArchive.RangeConte"
-    "xt\022C\n\027internal_cell_reference\030\003 \003(\0132\".TS"
-    "CE.InternalCellReferenceArchive\"0\n\014Range"
-    "Context\022\013\n\007DEFAULT\020\000\022\023\n\017INCLUDE_HEADERS\020"
-    "\001\"[\n\035WholeOwnerDependenciesArchive\022:\n\016de"
-    "pendent_cell\030\001 \003(\0132\".TSCE.InternalCellRe"
-    "ferenceArchive\"\375\003\n\027FormulaOwnerInfoArchi"
-    "ve\022-\n\020formula_owner_id\030\001 \002(\0132\023.TSCE.CFUU"
-    "IDArchive\0228\n\021cell_dependencies\030\002 \001(\0132\035.T"
-    "SCE.CellDependenciesArchive\022:\n\022range_dep"
-    "endencies\030\003 \001(\0132\036.TSCE.RangeDependencies"
-    "Archive\022@\n\025volatile_dependencies\030\004 \001(\0132!"
-    ".TSCE.VolatileDependenciesArchive\022G\n\034spa"
-    "nning_column_dependencies\030\005 \001(\0132!.TSCE.S"
-    "panningDependenciesArchive\022D\n\031spanning_r"
-    "ow_dependencies\030\006 \001(\0132!.TSCE.SpanningDep"
-    "endenciesArchive\022E\n\030whole_owner_dependen"
-    "cies\030\010 \001(\0132#.TSCE.WholeOwnerDependencies"
-    "Archive\022%\n\rformula_owner\030\007 \001(\0132\016.TSP.Ref"
-    "erence\"\262\001\n\021OwnerIDMapArchive\022A\n\tmap_entr"
-    "y\030\001 \003(\0132..TSCE.OwnerIDMapArchive.OwnerID"
-    "MapArchiveEntry\032Z\n\026OwnerIDMapArchiveEntr"
-    "y\022\031\n\021internal_owner_id\030\001 \002(\r\022%\n\010owner_id"
-    "\030\002 \002(\0132\023.TSCE.CFUUIDArchive\"\365\001\n\030Dependen"
-    "cyTrackerArchive\0229\n\022formula_owner_info\030\001"
-    " \003(\0132\035.TSCE.FormulaOwnerInfoArchive\022.\n\nd"
-    "irty_leaf\030\002 \003(\0132\032.TSCE.CellReferenceArch"
-    "ive\022\?\n\023internal_dirty_leaf\030\004 \003(\0132\".TSCE."
-    "InternalCellReferenceArchive\022-\n\014owner_id"
-    "_map\030\003 \001(\0132\027.TSCE.OwnerIDMapArchive\"q\n\030N"
-    "ameTrackedReferencePair\022\014\n\004name\030\001 \002(\t\022)\n"
-    "\021tracked_reference\030\002 \001(\0132\016.TSP.Reference"
-    "\022\034\n\024tracked_reference_id\030\003 \001(\r\"\214\001\n\036Names"
-    "ByTrackedReferenceArchive\022%\n\010table_id\030\001 "
-    "\002(\0132\023.TSCE.CFUUIDArchive\022C\n\033name_tracked"
-    "_reference_pair\030\002 \003(\0132\036.TSCE.NameTracked"
-    "ReferencePair\"\240\001\n\034NamedReferenceManagerA"
-    "rchive\022)\n\021reference_tracker\030\001 \002(\0132\016.TSP."
-    "Reference\022U\n#names_by_tracked_reference_"
-    "by_table\030\002 \003(\0132$.TSCE.NamesByTrackedRefe"
-    "renceArchiveB\002\030\001\"\205\003\n\030CalculationEngineAr"
-    "chive\022\026\n\016base_date_1904\030\001 \001(\010\022:\n\022depende"
-    "ncy_tracker\030\002 \002(\0132\036.TSCE.DependencyTrack"
-    "erArchive\022/\n\027named_reference_manager\030\003 \001"
-    "(\0132\016.TSP.Reference\022b\n\026excel_import_date_"
-    "mode\030\004 \001(\01622.TSCE.CalculationEngineArchi"
-    "ve.ExcelImportDateMode:\016DATE_MODE_1900\022\037"
-    "\n\027saved_locale_identifier\030\005 \001(\t\"_\n\023Excel"
-    "ImportDateMode\022\022\n\016DATE_MODE_1900\020\001\022\031\n\025DA"
-    "TE_MODE_1900_LEGACY\020\002\022\031\n\025DATE_MODE_1904_"
-    "LEGACY\020\003\"\256\031\n\023ASTNodeArrayArchive\022:\n\010AST_"
-    "node\030\001 \003(\0132(.TSCE.ASTNodeArrayArchive.AS"
-    "TNodeArchive\032~\n ASTLocalCellReferenceNod"
-    "eArchive\022\022\n\nrow_handle\030\001 \002(\r\022\025\n\rcolumn_h"
-    "andle\030\002 \002(\r\022\025\n\rrow_is_sticky\030\003 \002(\r\022\030\n\020co"
-    "lumn_is_sticky\030\004 \002(\r\032\372\002\n%ASTCrossTableCe"
-    "llReferenceNodeArchive\022\022\n\nrow_handle\030\001 \002"
-    "(\r\022\025\n\rcolumn_handle\030\002 \002(\r\022\025\n\rrow_is_stic"
-    "ky\030\003 \002(\r\022\030\n\020column_is_sticky\030\004 \002(\r\022%\n\010ta"
-    "ble_id\030\005 \002(\0132\023.TSCE.CFUUIDArchive\0221\n)AST"
-    "_reference_whitespace_after_sheet_name\030\006"
-    " \001(\t\0222\n*AST_reference_whitespace_before_"
-    "table_name\030\007 \001(\t\0221\n)AST_reference_whites"
-    "pace_after_table_name\030\010 \001(\t\0224\n,AST_refer"
-    "ence_whitespace_before_cell_address\030\t \001("
-    "\t\032E\n\032ASTColumnCoordinateArchive\022\016\n\006colum"
-    "n\030\001 \002(\021\022\027\n\010absolute\030\002 \001(\010:\005false\032\?\n\027ASTR"
-    "owCoordinateArchive\022\013\n\003row\030\001 \002(\021\022\027\n\010abso"
-    "lute\030\002 \001(\010:\005false\032\237\002\n&ASTCrossTableRefer"
-    "enceExtraInfoArchive\022%\n\010table_id\030\001 \002(\0132\023"
-    ".TSCE.CFUUIDArchive\0221\n)AST_reference_whi"
-    "tespace_after_sheet_name\030\002 \001(\t\0222\n*AST_re"
-    "ference_whitespace_before_table_name\030\003 \001"
-    "(\t\0221\n)AST_reference_whitespace_after_tab"
-    "le_name\030\004 \001(\t\0224\n,AST_reference_whitespac"
-    "e_before_cell_address\030\005 \001(\t\032\217\013\n\016ASTNodeA"
-    "rchive\022<\n\rAST_node_type\030\001 \002(\0162%.TSCE.AST"
-    "NodeArrayArchive.ASTNodeType\022\037\n\027AST_func"
-    "tion_node_index\030\002 \001(\r\022!\n\031AST_function_no"
-    "de_numArgs\030\003 \001(\r\022\036\n\026AST_number_node_numb"
-    "er\030\004 \001(\001\022 \n\030AST_boolean_node_boolean\030\005 \001"
-    "(\010\022\036\n\026AST_string_node_string\030\006 \001(\t\022\035\n\025AS"
-    "T_date_node_dateNum\030\007 \001(\001\022*\n\"AST_date_no"
-    "de_suppress_date_format\030\023 \001(\010\022*\n\"AST_dat"
-    "e_node_suppress_time_format\030\024 \001(\010\022&\n\036AST"
-    "_date_node_date_time_format\030\025 \001(\t\022!\n\031AST"
-    "_duration_node_unitNum\030\010 \001(\001\022\036\n\026AST_dura"
-    "tion_node_unit\030\t \001(\005\022\037\n\027AST_duration_nod"
-    "e_style\030\026 \001(\r\022/\n\'AST_duration_node_durat"
-    "ion_unit_largest\030\027 \001(\r\0220\n(AST_duration_n"
-    "ode_duration_unit_smallest\030\030 \001(\r\022-\n%AST_"
-    "duration_node_use_automatic_units\030\035 \001(\010\022"
-    "\036\n\026AST_token_node_boolean\030\n \001(\010\022\035\n\025AST_a"
-    "rray_node_numCol\030\013 \001(\r\022\035\n\025AST_array_node"
-    "_numRow\030\014 \001(\r\022\035\n\025AST_list_node_numArgs\030\r"
-    " \001(\r\0227\n\024AST_thunk_node_array\030\016 \001(\0132\031.TSC"
-    "E.ASTNodeArrayArchive\022k\n\'AST_local_cell_"
-    "reference_node_reference\030\017 \001(\0132:.TSCE.AS"
-    "TNodeArrayArchive.ASTLocalCellReferenceN"
-    "odeArchive\022v\n-AST_cross_table_cell_refer"
-    "ence_node_reference\030\020 \001(\0132\?.TSCE.ASTNode"
-    "ArrayArchive.ASTCrossTableCellReferenceN"
-    "odeArchive\022(\n AST_unknown_function_node_"
-    "string\030\021 \001(\t\022)\n!AST_unknown_function_nod"
-    "e_numArgs\030\022 \001(\r\022\026\n\016AST_whitespace\030\031 \001(\t\022"
-    "H\n\nAST_column\030\032 \001(\01324.TSCE.ASTNodeArrayA"
-    "rchive.ASTColumnCoordinateArchive\022B\n\007AST"
-    "_row\030\033 \001(\01321.TSCE.ASTNodeArrayArchive.AS"
-    "TRowCoordinateArchive\022n\n$AST_cross_table"
-    "_reference_extra_info\030\034 \001(\0132@.TSCE.ASTNo"
-    "deArrayArchive.ASTCrossTableReferenceExt"
-    "raInfoArchive\"\241\006\n\013ASTNodeType\022\021\n\rADDITIO"
-    "N_NODE\020\001\022\024\n\020SUBTRACTION_NODE\020\002\022\027\n\023MULTIP"
-    "LICATION_NODE\020\003\022\021\n\rDIVISION_NODE\020\004\022\016\n\nPO"
-    "WER_NODE\020\005\022\026\n\022CONCATENATION_NODE\020\006\022\025\n\021GR"
-    "EATER_THAN_NODE\020\007\022!\n\035GREATER_THAN_OR_EQU"
-    "AL_TO_NODE\020\010\022\022\n\016LESS_THAN_NODE\020\t\022\036\n\032LESS"
-    "_THAN_OR_EQUAL_TO_NODE\020\n\022\021\n\rEQUAL_TO_NOD"
-    "E\020\013\022\025\n\021NOT_EQUAL_TO_NODE\020\014\022\021\n\rNEGATION_N"
-    "ODE\020\r\022\022\n\016PLUS_SIGN_NODE\020\016\022\020\n\014PERCENT_NOD"
-    "E\020\017\022\021\n\rFUNCTION_NODE\020\020\022\017\n\013NUMBER_NODE\020\021\022"
-    "\020\n\014BOOLEAN_NODE\020\022\022\017\n\013STRING_NODE\020\023\022\r\n\tDA"
-    "TE_NODE\020\024\022\021\n\rDURATION_NODE\020\025\022\027\n\023EMPTY_AR"
-    "GUMENT_NODE\020\026\022\016\n\nTOKEN_NODE\020\027\022\016\n\nARRAY_N"
-    "ODE\020\030\022\r\n\tLIST_NODE\020\031\022\016\n\nTHUNK_NODE\020\032\022\035\n\031"
-    "LOCAL_CELL_REFERENCE_NODE\020\033\022#\n\037CROSS_TAB"
-    "LE_CELL_REFERENCE_NODE\020\034\022\016\n\nCOLON_NODE\020\035"
-    "\022\030\n\024REFERENCE_ERROR_NODE\020\036\022\031\n\025UNKNOWN_FU"
-    "NCTION_NODE\020\037\022\032\n\026APPEND_WHITESPACE_NODE\020"
-    " \022\033\n\027PREPEND_WHITESPACE_NODE\020!\022\024\n\020BEGIN_"
-    "THUNK_NODE\020\"\022\022\n\016END_THUNK_NODE\020#\022\027\n\023CELL"
-    "_REFERENCE_NODE\020$\"\205\001\n\036FormulaTranslation"
-    "FlagsArchive\022\'\n\030excel_import_translation"
-    "\030\001 \001(\010:\005false\022:\n+number_to_date_coercion"
-    "_removal_translation\030\002 \001(\010:\005false\"\370\001\n\016Fo"
-    "rmulaArchive\0221\n\016AST_node_array\030\001 \002(\0132\031.T"
-    "SCE.ASTNodeArrayArchive\022\023\n\013host_column\030\002"
-    " \001(\r\022\020\n\010host_row\030\003 \001(\r\022&\n\027host_column_is"
-    "_negative\030\004 \001(\010:\005false\022#\n\024host_row_is_ne"
-    "gative\030\005 \001(\010:\005false\022\?\n\021translation_flags"
-    "\030\006 \001(\0132$.TSCE.FormulaTranslationFlagsArc"
-    "hive\"\271\003\n\023FormatStructArchive\022\023\n\013format_t"
-    "ype\030\001 \002(\r\022\026\n\016decimal_places\030\002 \001(\r\022\025\n\rcur"
-    "rency_code\030\003 \001(\t\022\026\n\016negative_style\030\004 \001(\r"
-    "\022 \n\030show_thousands_separator\030\005 \001(\010\022\034\n\024us"
-    "e_accounting_style\030\006 \001(\010\022\026\n\016duration_sty"
-    "le\030\007 \001(\r\022\014\n\004base\030\010 \001(\r\022\023\n\013base_places\030\t "
-    "\001(\r\022\033\n\023base_use_minus_sign\030\n \001(\010\022\031\n\021frac"
-    "tion_accuracy\030\013 \001(\r\022\034\n\024suppress_date_for"
-    "mat\030\014 \001(\010\022\034\n\024suppress_time_format\030\r \001(\010\022"
-    "\030\n\020date_time_format\030\016 \001(\t\022\035\n\025duration_un"
-    "it_largest\030\017 \001(\r\022\036\n\026duration_unit_smalle"
-    "st\030\020 \001(\r\"~\n\026RangeCoordinateArchive\022\027\n\017to"
-    "p_left_column\030\001 \002(\r\022\024\n\014top_left_row\030\002 \002("
-    "\r\022\033\n\023bottom_right_column\030\003 \002(\r\022\030\n\020bottom"
-    "_right_row\030\004 \002(\r\"\207\004\n\024TectonicShiftArchiv"
-    "e\022 \n\030grid_coordinate_offset_x\030\001 \002(\r\022 \n\030g"
-    "rid_coordinate_offset_y\030\002 \002(\r\022,\n$grid_co"
-    "ordinate_offset_x_is_negative\030\003 \002(\010\022,\n$g"
-    "rid_coordinate_offset_y_is_negative\030\004 \002("
-    "\010\0225\n\017range_for_shift\030\005 \001(\0132\034.TSCE.RangeC"
-    "oordinateArchive\0228\n\022range_for_deletion\030\006"
-    " \001(\0132\034.TSCE.RangeCoordinateArchive\0224\n\016in"
-    "serted_range\030\007 \001(\0132\034.TSCE.RangeCoordinat"
-    "eArchive\022\031\n\021apply_to_absolute\030\010 \002(\010\022\027\n\017i"
-    "nserting_after\030\t \002(\010\022\032\n\022ignore_sticky_bi"
-    "ts\030\n \002(\010\0221\n\013table_range\030\013 \001(\0132\034.TSCE.Ran"
-    "geCoordinateArchive\022%\n\010table_id\030\014 \001(\0132\023."
-    "TSCE.CFUUIDArchive\"\217\001\n\031RewriteSortMappin"
-    "gArchive\022%\n\010table_id\030\001 \002(\0132\023.TSCE.CFUUID"
-    "Archive\0223\n\017shuffle_mapping\030\002 \002(\0132\032.TSK.S"
-    "huffleMappingArchive\022\026\n\016explode_ranges\030\003"
-    " \002(\010\"\224\002\n\025RangeMovedInfoArchive\022%\n\010table_"
-    "id\030\001 \001(\0132\023.TSCE.CFUUIDArchive\0220\n\nfrom_ra"
-    "nge\030\002 \001(\0132\034.TSCE.RangeCoordinateArchive\022"
-    ".\n\010to_range\030\003 \001(\0132\034.TSCE.RangeCoordinate"
-    "Archive\0229\n\024from_range_reference\030\004 \001(\0132\033."
-    "TSCE.RangeReferenceArchive\0227\n\022to_range_r"
-    "eference\030\005 \001(\0132\033.TSCE.RangeReferenceArch"
-    "ive\"\254\001\n\027TableResizedInfoArchive\022%\n\010table"
-    "_id\030\001 \002(\0132\023.TSCE.CFUUIDArchive\0224\n\016new_ta"
-    "ble_size\030\002 \002(\0132\034.TSCE.RangeCoordinateArc"
-    "hive\0224\n\016old_table_size\030\003 \001(\0132\034.TSCE.Rang"
-    "eCoordinateArchive\"q\n\024CellMergeInfoArchi"
-    "ve\022%\n\010table_id\030\001 \002(\0132\023.TSCE.CFUUIDArchiv"
-    "e\0222\n\014merged_range\030\002 \002(\0132\034.TSCE.RangeCoor"
-    "dinateArchive\"\244\004\n\031FormulaRewriteSpecArch"
-    "ive\022A\n\014rewrite_type\030\001 \002(\0162+.TSCE.Formula"
-    "RewriteSpecArchive.RewriteType\0222\n\016tecton"
-    "ic_shift\030\002 \001(\0132\032.TSCE.TectonicShiftArchi"
-    "ve\0225\n\014sort_mapping\030\003 \001(\0132\037.TSCE.RewriteS"
-    "ortMappingArchive\0225\n\020range_moved_info\030\004 "
-    "\001(\0132\033.TSCE.RangeMovedInfoArchive\022-\n\020dele"
-    "ted_owner_id\030\005 \001(\0132\023.TSCE.CFUUIDArchive\022"
-    "9\n\022table_resized_info\030\006 \001(\0132\035.TSCE.Table"
-    "ResizedInfoArchive\0223\n\017cell_merge_info\030\007 "
-    "\001(\0132\032.TSCE.CellMergeInfoArchive\"\202\001\n\013Rewr"
-    "iteType\022\022\n\016TECTONIC_SHIFT\020\001\022\033\n\027REMAP_WIT"
-    "H_SORT_MAPPING\020\002\022\016\n\nMOVE_RANGE\020\003\022\020\n\014DELE"
-    "TE_OWNER\020\004\022\020\n\014TABLE_RESIZE\020\005\022\016\n\nCELL_MER"
-    "GE\020\006\"f\n CellCoordinateFormulaPairArchive"
-    "\022\016\n\006column\030\001 \002(\r\022\013\n\003row\030\002 \002(\r\022%\n\007formula"
-    "\030\003 \001(\0132\024.TSCE.FormulaArchive\"H\n\025CellCoor"
-    "dinateArchive\022\022\n\npackedData\030\001 \001(\007\022\016\n\006col"
-    "umn\030\002 \001(\r\022\013\n\003row\030\003 \001(\r\"S\n\033CellCoordinate"
-    "VectorArchive\0224\n\017cell_coordinate\030\001 \003(\0132\033"
-    ".TSCE.CellCoordinateArchive\"w\n\037CellCoord"
-    "inateObjectPairArchive\0224\n\017cell_coordinat"
-    "e\030\001 \002(\0132\033.TSCE.CellCoordinateArchive\022\036\n\006"
-    "object\030\002 \002(\0132\016.TSP.Reference\"l\n\036CellCoor"
-    "dinateObjectMapArchive\022J\n\033cell_coordinat"
-    "e_object_pair\030\001 \003(\0132%.TSCE.CellCoordinat"
-    "eObjectPairArchive\"a\n\026OwnerFormulaMapArc"
-    "hive\022G\n\027coordinate_formula_pair\030\001 \003(\0132&."
-    "TSCE.CellCoordinateFormulaPairArchive\"q\n"
-    "\034FormulaRewriteCommandArchive\022-\n\025table_r"
-    "ewrite_command\030\001 \001(\0132\016.TSP.Reference\022\"\n\005"
-    "super\030\002 \001(\0132\023.TSK.CommandArchive\"^\n!Numb"
-    "erTrackedReferencePairArchive\022\016\n\006number\030"
-    "\001 \002(\r\022)\n\021tracked_reference\030\002 \001(\0132\016.TSP.R"
-    "eference\"t\n\"NumberToTrackedReferenceMapA"
-    "rchive\022N\n\035number_tracked_reference_pair\030"
-    "\001 \003(\0132\'.TSCE.NumberTrackedReferencePairA"
-    "rchive\"\336\002\n&TrackedReferencesRewriteComma"
-    "ndArchive\022U\n\037references_in_reference_tra"
-    "cker\030\001 \001(\0132(.TSCE.NumberToTrackedReferen"
-    "ceMapArchiveB\002\030\001\022W\n!original_tracked_ref"
-    "erence_copies\030\002 \001(\0132(.TSCE.NumberToTrack"
-    "edReferenceMapArchiveB\002\030\001\0225\n\014rewrite_spe"
-    "c\030\003 \001(\0132\037.TSCE.FormulaRewriteSpecArchive"
-    "\022)\n\021reference_tracker\030\004 \002(\0132\016.TSP.Refere"
-    "nce\022\"\n\005super\030\005 \002(\0132\023.TSK.CommandArchive\""
-    "U\n\027TrackedReferenceArchive\022&\n\003ast\030\001 \002(\0132"
-    "\031.TSCE.ASTNodeArrayArchive\022\022\n\nformula_id"
-    "\030\002 \002(\r\"\257\001\n\027ReferenceTrackerArchive\022!\n\004uu"
-    "id\030\001 \002(\0132\023.TSCE.CFUUIDArchive\022-\n\021tracked"
-    "_reference\030\002 \003(\0132\016.TSP.ReferenceB\002\030\001\022B\n\033"
-    "contained_tracked_reference\030\003 \003(\0132\035.TSCE"
-    ".TrackedReferenceArchive\"(\n\027BooleanCellV"
-    "alueArchive\022\r\n\005value\030\001 \002(\010\"q\n\024DateCellVa"
-    "lueArchive\022\r\n\005value\030\001 \002(\001\022(\n\006format\030\002 \002("
-    "\0132\030.TSK.FormatStructArchive\022 \n\022format_is"
-    "_implicit\030\003 \001(\010:\004true\"\201\001\n\026NumberCellValu"
-    "eArchive\022\r\n\005value\030\001 \002(\001\022\014\n\004unit\030\002 \002(\005\022(\n"
-    "\006format\030\003 \002(\0132\030.TSK.FormatStructArchive\022"
-    " \n\022format_is_implicit\030\004 \001(\010:\004true\"s\n\026Str"
-    "ingCellValueArchive\022\r\n\005value\030\001 \002(\t\022(\n\006fo"
-    "rmat\030\002 \002(\0132\030.TSK.FormatStructArchive\022 \n\022"
-    "format_is_implicit\030\003 \001(\010:\004true\"\201\003\n\020CellV"
-    "alueArchive\022=\n\017cell_value_type\030\001 \002(\0162$.T"
-    "SCE.CellValueArchive.CellValueType\0224\n\rbo"
-    "olean_value\030\002 \001(\0132\035.TSCE.BooleanCellValu"
-    "eArchive\022.\n\ndate_value\030\003 \001(\0132\032.TSCE.Date"
-    "CellValueArchive\0222\n\014number_value\030\004 \001(\0132\034"
-    ".TSCE.NumberCellValueArchive\0222\n\014string_v"
-    "alue\030\005 \001(\0132\034.TSCE.StringCellValueArchive"
-    "\"`\n\rCellValueType\022\014\n\010NIL_TYPE\020\001\022\020\n\014BOOLE"
-    "AN_TYPE\020\002\022\r\n\tDATE_TYPE\020\003\022\017\n\013NUMBER_TYPE\020"
-    "\004\022\017\n\013STRING_TYPE\020\005", 14298);
+    "-\n%volatile_sheet_table_name_cell_column"
+    "\030\021 \003(\r\022*\n\"volatile_sheet_table_name_cell"
+    "_row\030\022 \003(\r\022)\n!calculated_dependency_cell"
+    "_column\030\t \003(\r\022&\n\036calculated_dependency_c"
+    "ell_row\030\n \003(\r\022D\n volatile_geometry_cell_"
+    "reference\030\r \003(\0132\032.TSCE.CellReferenceArch"
+    "ive\022;\n\026volatile_geometry_cell\030\013 \003(\0132\033.TS"
+    "CE.CellCoordinateArchive\"\314\001\n\032RangeBackDe"
+    "pendencyArchive\022\026\n\016cell_coord_row\030\001 \002(\r\022"
+    "\031\n\021cell_coord_column\030\002 \002(\r\0224\n\017range_refe"
+    "rence\030\003 \001(\0132\033.TSCE.RangeReferenceArchive"
+    "\022E\n\030internal_range_reference\030\004 \001(\0132#.TSC"
+    "E.InternalRangeReferenceArchive\"c\n RTree"
+    "InternalNodeContentsArchive\022\013\n\003min\030\001 \003(\r"
+    "\022\013\n\003max\030\002 \003(\r\022%\n\005child\030\003 \002(\0132\026.TSCE.RTre"
+    "eNodeArchive\"l\n\034RTreeLeafNodeContentsArc"
+    "hive\022\013\n\003min\030\001 \003(\r\022\013\n\003max\030\002 \003(\r\0222\n\016cell_r"
+    "eference\030\003 \002(\0132\032.TSCE.CellReferenceArchi"
+    "ve\"\270\001\n\020RTreeNodeArchive\022\r\n\005level\030\001 \002(\r\022\r"
+    "\n\005count\030\002 \002(\r\022F\n\026internal_node_contents\030"
+    "\003 \003(\0132&.TSCE.RTreeInternalNodeContentsAr"
+    "chive\022>\n\022leaf_node_contents\030\004 \003(\0132\".TSCE"
+    ".RTreeLeafNodeContentsArchive\"\331\001\n\014RTreeA"
+    "rchive\022\024\n\014data_file_id\030\001 \002(\r\022\021\n\tdata_siz"
+    "e\030\002 \002(\r\022\025\n\rdata_num_dims\030\003 \002(\r\022\026\n\016data_e"
+    "lem_size\030\004 \002(\r\022\033\n\023data_elem_real_size\030\005 "
+    "\002(\r\022\026\n\016data_max_nodes\030\006 \002(\r\022\026\n\016data_min_"
+    "nodes\030\007 \002(\r\022$\n\004root\030\010 \002(\0132\026.TSCE.RTreeNo"
+    "deArchive\"y\n\030RangeDependenciesArchive\022\"\n"
+    "\006r_tree\030\001 \001(\0132\022.TSCE.RTreeArchive\0229\n\017bac"
+    "k_dependency\030\002 \003(\0132 .TSCE.RangeBackDepen"
+    "dencyArchive\"\225\007\n\033SpanningDependenciesArc"
+    "hive\022\016\n\006column\030\001 \003(\r\022E\n\rrange_context\030\002 "
+    "\003(\0162..TSCE.SpanningDependenciesArchive.R"
+    "angeContext\022(\n\004cell\030\003 \003(\0132\032.TSCE.CellRef"
+    "erenceArchive\022C\n\035total_range_for_deleted"
+    "_table\030\004 \001(\0132\034.TSCE.RangeCoordinateArchi"
+    "ve\022B\n\034body_range_for_deleted_table\030\005 \001(\013"
+    "2\034.TSCE.RangeCoordinateArchive\022f\n\037referr"
+    "ing_column_to_local_cells\030\006 \003(\0132=.TSCE.S"
+    "panningDependenciesArchive.ReferringColu"
+    "mnToLocalCells\022h\n referring_column_to_re"
+    "mote_cells\030\007 \003(\0132>.TSCE.SpanningDependen"
+    "ciesArchive.ReferringColumnToRemoteCells"
+    "\032\252\001\n\033ReferringColumnToLocalCells\022\016\n\006colu"
+    "mn\030\001 \002(\r\022E\n\rrange_context\030\002 \002(\0162..TSCE.S"
+    "panningDependenciesArchive.RangeContext\022"
+    "4\n\017cell_coordinate\030\003 \003(\0132\033.TSCE.CellCoor"
+    "dinateArchive\032\272\001\n\034ReferringColumnToRemot"
+    "eCells\022\016\n\006column\030\001 \002(\r\022E\n\rrange_context\030"
+    "\002 \002(\0162..TSCE.SpanningDependenciesArchive"
+    ".RangeContext\022C\n\027internal_cell_reference"
+    "\030\003 \003(\0132\".TSCE.InternalCellReferenceArchi"
+    "ve\"0\n\014RangeContext\022\013\n\007DEFAULT\020\000\022\023\n\017INCLU"
+    "DE_HEADERS\020\001\"[\n\035WholeOwnerDependenciesAr"
+    "chive\022:\n\016dependent_cell\030\001 \003(\0132\".TSCE.Int"
+    "ernalCellReferenceArchive\"\375\003\n\027FormulaOwn"
+    "erInfoArchive\022-\n\020formula_owner_id\030\001 \002(\0132"
+    "\023.TSCE.CFUUIDArchive\0228\n\021cell_dependencie"
+    "s\030\002 \001(\0132\035.TSCE.CellDependenciesArchive\022:"
+    "\n\022range_dependencies\030\003 \001(\0132\036.TSCE.RangeD"
+    "ependenciesArchive\022@\n\025volatile_dependenc"
+    "ies\030\004 \001(\0132!.TSCE.VolatileDependenciesArc"
+    "hive\022G\n\034spanning_column_dependencies\030\005 \001"
+    "(\0132!.TSCE.SpanningDependenciesArchive\022D\n"
+    "\031spanning_row_dependencies\030\006 \001(\0132!.TSCE."
+    "SpanningDependenciesArchive\022E\n\030whole_own"
+    "er_dependencies\030\010 \001(\0132#.TSCE.WholeOwnerD"
+    "ependenciesArchive\022%\n\rformula_owner\030\007 \001("
+    "\0132\016.TSP.Reference\"\262\001\n\021OwnerIDMapArchive\022"
+    "A\n\tmap_entry\030\001 \003(\0132..TSCE.OwnerIDMapArch"
+    "ive.OwnerIDMapArchiveEntry\032Z\n\026OwnerIDMap"
+    "ArchiveEntry\022\031\n\021internal_owner_id\030\001 \002(\r\022"
+    "%\n\010owner_id\030\002 \002(\0132\023.TSCE.CFUUIDArchive\"\375"
+    "\001\n\030DependencyTrackerArchive\0229\n\022formula_o"
+    "wner_info\030\001 \003(\0132\035.TSCE.FormulaOwnerInfoA"
+    "rchive\0222\n\ndirty_leaf\030\002 \003(\0132\032.TSCE.CellRe"
+    "ferenceArchiveB\002\030\001\022C\n\023internal_dirty_lea"
+    "f\030\004 \003(\0132\".TSCE.InternalCellReferenceArch"
+    "iveB\002\030\001\022-\n\014owner_id_map\030\003 \001(\0132\027.TSCE.Own"
+    "erIDMapArchive\"q\n\030NameTrackedReferencePa"
+    "ir\022\014\n\004name\030\001 \002(\t\022)\n\021tracked_reference\030\002 "
+    "\001(\0132\016.TSP.Reference\022\034\n\024tracked_reference"
+    "_id\030\003 \001(\r\"\214\001\n\036NamesByTrackedReferenceArc"
+    "hive\022%\n\010table_id\030\001 \002(\0132\023.TSCE.CFUUIDArch"
+    "ive\022C\n\033name_tracked_reference_pair\030\002 \003(\013"
+    "2\036.TSCE.NameTrackedReferencePair\"\240\001\n\034Nam"
+    "edReferenceManagerArchive\022)\n\021reference_t"
+    "racker\030\001 \002(\0132\016.TSP.Reference\022U\n#names_by"
+    "_tracked_reference_by_table\030\002 \003(\0132$.TSCE"
+    ".NamesByTrackedReferenceArchiveB\002\030\001\"\205\003\n\030"
+    "CalculationEngineArchive\022\026\n\016base_date_19"
+    "04\030\001 \001(\010\022:\n\022dependency_tracker\030\002 \002(\0132\036.T"
+    "SCE.DependencyTrackerArchive\022/\n\027named_re"
+    "ference_manager\030\003 \001(\0132\016.TSP.Reference\022b\n"
+    "\026excel_import_date_mode\030\004 \001(\01622.TSCE.Cal"
+    "culationEngineArchive.ExcelImportDateMod"
+    "e:\016DATE_MODE_1900\022\037\n\027saved_locale_identi"
+    "fier\030\005 \001(\t\"_\n\023ExcelImportDateMode\022\022\n\016DAT"
+    "E_MODE_1900\020\001\022\031\n\025DATE_MODE_1900_LEGACY\020\002"
+    "\022\031\n\025DATE_MODE_1904_LEGACY\020\003\"\256\031\n\023ASTNodeA"
+    "rrayArchive\022:\n\010AST_node\030\001 \003(\0132(.TSCE.AST"
+    "NodeArrayArchive.ASTNodeArchive\032~\n ASTLo"
+    "calCellReferenceNodeArchive\022\022\n\nrow_handl"
+    "e\030\001 \002(\r\022\025\n\rcolumn_handle\030\002 \002(\r\022\025\n\rrow_is"
+    "_sticky\030\003 \002(\r\022\030\n\020column_is_sticky\030\004 \002(\r\032"
+    "\372\002\n%ASTCrossTableCellReferenceNodeArchiv"
+    "e\022\022\n\nrow_handle\030\001 \002(\r\022\025\n\rcolumn_handle\030\002"
+    " \002(\r\022\025\n\rrow_is_sticky\030\003 \002(\r\022\030\n\020column_is"
+    "_sticky\030\004 \002(\r\022%\n\010table_id\030\005 \002(\0132\023.TSCE.C"
+    "FUUIDArchive\0221\n)AST_reference_whitespace"
+    "_after_sheet_name\030\006 \001(\t\0222\n*AST_reference"
+    "_whitespace_before_table_name\030\007 \001(\t\0221\n)A"
+    "ST_reference_whitespace_after_table_name"
+    "\030\010 \001(\t\0224\n,AST_reference_whitespace_befor"
+    "e_cell_address\030\t \001(\t\032E\n\032ASTColumnCoordin"
+    "ateArchive\022\016\n\006column\030\001 \002(\021\022\027\n\010absolute\030\002"
+    " \001(\010:\005false\032\?\n\027ASTRowCoordinateArchive\022\013"
+    "\n\003row\030\001 \002(\021\022\027\n\010absolute\030\002 \001(\010:\005false\032\237\002\n"
+    "&ASTCrossTableReferenceExtraInfoArchive\022"
+    "%\n\010table_id\030\001 \002(\0132\023.TSCE.CFUUIDArchive\0221"
+    "\n)AST_reference_whitespace_after_sheet_n"
+    "ame\030\002 \001(\t\0222\n*AST_reference_whitespace_be"
+    "fore_table_name\030\003 \001(\t\0221\n)AST_reference_w"
+    "hitespace_after_table_name\030\004 \001(\t\0224\n,AST_"
+    "reference_whitespace_before_cell_address"
+    "\030\005 \001(\t\032\217\013\n\016ASTNodeArchive\022<\n\rAST_node_ty"
+    "pe\030\001 \002(\0162%.TSCE.ASTNodeArrayArchive.ASTN"
+    "odeType\022\037\n\027AST_function_node_index\030\002 \001(\r"
+    "\022!\n\031AST_function_node_numArgs\030\003 \001(\r\022\036\n\026A"
+    "ST_number_node_number\030\004 \001(\001\022 \n\030AST_boole"
+    "an_node_boolean\030\005 \001(\010\022\036\n\026AST_string_node"
+    "_string\030\006 \001(\t\022\035\n\025AST_date_node_dateNum\030\007"
+    " \001(\001\022*\n\"AST_date_node_suppress_date_form"
+    "at\030\023 \001(\010\022*\n\"AST_date_node_suppress_time_"
+    "format\030\024 \001(\010\022&\n\036AST_date_node_date_time_"
+    "format\030\025 \001(\t\022!\n\031AST_duration_node_unitNu"
+    "m\030\010 \001(\001\022\036\n\026AST_duration_node_unit\030\t \001(\005\022"
+    "\037\n\027AST_duration_node_style\030\026 \001(\r\022/\n\'AST_"
+    "duration_node_duration_unit_largest\030\027 \001("
+    "\r\0220\n(AST_duration_node_duration_unit_sma"
+    "llest\030\030 \001(\r\022-\n%AST_duration_node_use_aut"
+    "omatic_units\030\035 \001(\010\022\036\n\026AST_token_node_boo"
+    "lean\030\n \001(\010\022\035\n\025AST_array_node_numCol\030\013 \001("
+    "\r\022\035\n\025AST_array_node_numRow\030\014 \001(\r\022\035\n\025AST_"
+    "list_node_numArgs\030\r \001(\r\0227\n\024AST_thunk_nod"
+    "e_array\030\016 \001(\0132\031.TSCE.ASTNodeArrayArchive"
+    "\022k\n\'AST_local_cell_reference_node_refere"
+    "nce\030\017 \001(\0132:.TSCE.ASTNodeArrayArchive.AST"
+    "LocalCellReferenceNodeArchive\022v\n-AST_cro"
+    "ss_table_cell_reference_node_reference\030\020"
+    " \001(\0132\?.TSCE.ASTNodeArrayArchive.ASTCross"
+    "TableCellReferenceNodeArchive\022(\n AST_unk"
+    "nown_function_node_string\030\021 \001(\t\022)\n!AST_u"
+    "nknown_function_node_numArgs\030\022 \001(\r\022\026\n\016AS"
+    "T_whitespace\030\031 \001(\t\022H\n\nAST_column\030\032 \001(\01324"
+    ".TSCE.ASTNodeArrayArchive.ASTColumnCoord"
+    "inateArchive\022B\n\007AST_row\030\033 \001(\01321.TSCE.AST"
+    "NodeArrayArchive.ASTRowCoordinateArchive"
+    "\022n\n$AST_cross_table_reference_extra_info"
+    "\030\034 \001(\0132@.TSCE.ASTNodeArrayArchive.ASTCro"
+    "ssTableReferenceExtraInfoArchive\"\241\006\n\013AST"
+    "NodeType\022\021\n\rADDITION_NODE\020\001\022\024\n\020SUBTRACTI"
+    "ON_NODE\020\002\022\027\n\023MULTIPLICATION_NODE\020\003\022\021\n\rDI"
+    "VISION_NODE\020\004\022\016\n\nPOWER_NODE\020\005\022\026\n\022CONCATE"
+    "NATION_NODE\020\006\022\025\n\021GREATER_THAN_NODE\020\007\022!\n\035"
+    "GREATER_THAN_OR_EQUAL_TO_NODE\020\010\022\022\n\016LESS_"
+    "THAN_NODE\020\t\022\036\n\032LESS_THAN_OR_EQUAL_TO_NOD"
+    "E\020\n\022\021\n\rEQUAL_TO_NODE\020\013\022\025\n\021NOT_EQUAL_TO_N"
+    "ODE\020\014\022\021\n\rNEGATION_NODE\020\r\022\022\n\016PLUS_SIGN_NO"
+    "DE\020\016\022\020\n\014PERCENT_NODE\020\017\022\021\n\rFUNCTION_NODE\020"
+    "\020\022\017\n\013NUMBER_NODE\020\021\022\020\n\014BOOLEAN_NODE\020\022\022\017\n\013"
+    "STRING_NODE\020\023\022\r\n\tDATE_NODE\020\024\022\021\n\rDURATION"
+    "_NODE\020\025\022\027\n\023EMPTY_ARGUMENT_NODE\020\026\022\016\n\nTOKE"
+    "N_NODE\020\027\022\016\n\nARRAY_NODE\020\030\022\r\n\tLIST_NODE\020\031\022"
+    "\016\n\nTHUNK_NODE\020\032\022\035\n\031LOCAL_CELL_REFERENCE_"
+    "NODE\020\033\022#\n\037CROSS_TABLE_CELL_REFERENCE_NOD"
+    "E\020\034\022\016\n\nCOLON_NODE\020\035\022\030\n\024REFERENCE_ERROR_N"
+    "ODE\020\036\022\031\n\025UNKNOWN_FUNCTION_NODE\020\037\022\032\n\026APPE"
+    "ND_WHITESPACE_NODE\020 \022\033\n\027PREPEND_WHITESPA"
+    "CE_NODE\020!\022\024\n\020BEGIN_THUNK_NODE\020\"\022\022\n\016END_T"
+    "HUNK_NODE\020#\022\027\n\023CELL_REFERENCE_NODE\020$\"\205\001\n"
+    "\036FormulaTranslationFlagsArchive\022\'\n\030excel"
+    "_import_translation\030\001 \001(\010:\005false\022:\n+numb"
+    "er_to_date_coercion_removal_translation\030"
+    "\002 \001(\010:\005false\"\370\001\n\016FormulaArchive\0221\n\016AST_n"
+    "ode_array\030\001 \002(\0132\031.TSCE.ASTNodeArrayArchi"
+    "ve\022\023\n\013host_column\030\002 \001(\r\022\020\n\010host_row\030\003 \001("
+    "\r\022&\n\027host_column_is_negative\030\004 \001(\010:\005fals"
+    "e\022#\n\024host_row_is_negative\030\005 \001(\010:\005false\022\?"
+    "\n\021translation_flags\030\006 \001(\0132$.TSCE.Formula"
+    "TranslationFlagsArchive\"\271\003\n\023FormatStruct"
+    "Archive\022\023\n\013format_type\030\001 \002(\r\022\026\n\016decimal_"
+    "places\030\002 \001(\r\022\025\n\rcurrency_code\030\003 \001(\t\022\026\n\016n"
+    "egative_style\030\004 \001(\r\022 \n\030show_thousands_se"
+    "parator\030\005 \001(\010\022\034\n\024use_accounting_style\030\006 "
+    "\001(\010\022\026\n\016duration_style\030\007 \001(\r\022\014\n\004base\030\010 \001("
+    "\r\022\023\n\013base_places\030\t \001(\r\022\033\n\023base_use_minus"
+    "_sign\030\n \001(\010\022\031\n\021fraction_accuracy\030\013 \001(\r\022\034"
+    "\n\024suppress_date_format\030\014 \001(\010\022\034\n\024suppress"
+    "_time_format\030\r \001(\010\022\030\n\020date_time_format\030\016"
+    " \001(\t\022\035\n\025duration_unit_largest\030\017 \001(\r\022\036\n\026d"
+    "uration_unit_smallest\030\020 \001(\r\"~\n\026RangeCoor"
+    "dinateArchive\022\027\n\017top_left_column\030\001 \002(\r\022\024"
+    "\n\014top_left_row\030\002 \002(\r\022\033\n\023bottom_right_col"
+    "umn\030\003 \002(\r\022\030\n\020bottom_right_row\030\004 \002(\r\"\207\004\n\024"
+    "TectonicShiftArchive\022 \n\030grid_coordinate_"
+    "offset_x\030\001 \002(\r\022 \n\030grid_coordinate_offset"
+    "_y\030\002 \002(\r\022,\n$grid_coordinate_offset_x_is_"
+    "negative\030\003 \002(\010\022,\n$grid_coordinate_offset"
+    "_y_is_negative\030\004 \002(\010\0225\n\017range_for_shift\030"
+    "\005 \001(\0132\034.TSCE.RangeCoordinateArchive\0228\n\022r"
+    "ange_for_deletion\030\006 \001(\0132\034.TSCE.RangeCoor"
+    "dinateArchive\0224\n\016inserted_range\030\007 \001(\0132\034."
+    "TSCE.RangeCoordinateArchive\022\031\n\021apply_to_"
+    "absolute\030\010 \002(\010\022\027\n\017inserting_after\030\t \002(\010\022"
+    "\032\n\022ignore_sticky_bits\030\n \002(\010\0221\n\013table_ran"
+    "ge\030\013 \001(\0132\034.TSCE.RangeCoordinateArchive\022%"
+    "\n\010table_id\030\014 \001(\0132\023.TSCE.CFUUIDArchive\"\217\001"
+    "\n\031RewriteSortMappingArchive\022%\n\010table_id\030"
+    "\001 \002(\0132\023.TSCE.CFUUIDArchive\0223\n\017shuffle_ma"
+    "pping\030\002 \002(\0132\032.TSK.ShuffleMappingArchive\022"
+    "\026\n\016explode_ranges\030\003 \002(\010\"\224\002\n\025RangeMovedIn"
+    "foArchive\022%\n\010table_id\030\001 \001(\0132\023.TSCE.CFUUI"
+    "DArchive\0220\n\nfrom_range\030\002 \001(\0132\034.TSCE.Rang"
+    "eCoordinateArchive\022.\n\010to_range\030\003 \001(\0132\034.T"
+    "SCE.RangeCoordinateArchive\0229\n\024from_range"
+    "_reference\030\004 \001(\0132\033.TSCE.RangeReferenceAr"
+    "chive\0227\n\022to_range_reference\030\005 \001(\0132\033.TSCE"
+    ".RangeReferenceArchive\"\254\001\n\027TableResizedI"
+    "nfoArchive\022%\n\010table_id\030\001 \002(\0132\023.TSCE.CFUU"
+    "IDArchive\0224\n\016new_table_size\030\002 \002(\0132\034.TSCE"
+    ".RangeCoordinateArchive\0224\n\016old_table_siz"
+    "e\030\003 \001(\0132\034.TSCE.RangeCoordinateArchive\"q\n"
+    "\024CellMergeInfoArchive\022%\n\010table_id\030\001 \002(\0132"
+    "\023.TSCE.CFUUIDArchive\0222\n\014merged_range\030\002 \002"
+    "(\0132\034.TSCE.RangeCoordinateArchive\"\244\004\n\031For"
+    "mulaRewriteSpecArchive\022A\n\014rewrite_type\030\001"
+    " \002(\0162+.TSCE.FormulaRewriteSpecArchive.Re"
+    "writeType\0222\n\016tectonic_shift\030\002 \001(\0132\032.TSCE"
+    ".TectonicShiftArchive\0225\n\014sort_mapping\030\003 "
+    "\001(\0132\037.TSCE.RewriteSortMappingArchive\0225\n\020"
+    "range_moved_info\030\004 \001(\0132\033.TSCE.RangeMoved"
+    "InfoArchive\022-\n\020deleted_owner_id\030\005 \001(\0132\023."
+    "TSCE.CFUUIDArchive\0229\n\022table_resized_info"
+    "\030\006 \001(\0132\035.TSCE.TableResizedInfoArchive\0223\n"
+    "\017cell_merge_info\030\007 \001(\0132\032.TSCE.CellMergeI"
+    "nfoArchive\"\202\001\n\013RewriteType\022\022\n\016TECTONIC_S"
+    "HIFT\020\001\022\033\n\027REMAP_WITH_SORT_MAPPING\020\002\022\016\n\nM"
+    "OVE_RANGE\020\003\022\020\n\014DELETE_OWNER\020\004\022\020\n\014TABLE_R"
+    "ESIZE\020\005\022\016\n\nCELL_MERGE\020\006\"f\n CellCoordinat"
+    "eFormulaPairArchive\022\016\n\006column\030\001 \002(\r\022\013\n\003r"
+    "ow\030\002 \002(\r\022%\n\007formula\030\003 \001(\0132\024.TSCE.Formula"
+    "Archive\"H\n\025CellCoordinateArchive\022\022\n\npack"
+    "edData\030\001 \001(\007\022\016\n\006column\030\002 \001(\r\022\013\n\003row\030\003 \001("
+    "\r\"S\n\033CellCoordinateVectorArchive\0224\n\017cell"
+    "_coordinate\030\001 \003(\0132\033.TSCE.CellCoordinateA"
+    "rchive\"w\n\037CellCoordinateObjectPairArchiv"
+    "e\0224\n\017cell_coordinate\030\001 \002(\0132\033.TSCE.CellCo"
+    "ordinateArchive\022\036\n\006object\030\002 \002(\0132\016.TSP.Re"
+    "ference\"l\n\036CellCoordinateObjectMapArchiv"
+    "e\022J\n\033cell_coordinate_object_pair\030\001 \003(\0132%"
+    ".TSCE.CellCoordinateObjectPairArchive\"a\n"
+    "\026OwnerFormulaMapArchive\022G\n\027coordinate_fo"
+    "rmula_pair\030\001 \003(\0132&.TSCE.CellCoordinateFo"
+    "rmulaPairArchive\"q\n\034FormulaRewriteComman"
+    "dArchive\022-\n\025table_rewrite_command\030\001 \001(\0132"
+    "\016.TSP.Reference\022\"\n\005super\030\002 \001(\0132\023.TSK.Com"
+    "mandArchive\"^\n!NumberTrackedReferencePai"
+    "rArchive\022\016\n\006number\030\001 \002(\r\022)\n\021tracked_refe"
+    "rence\030\002 \001(\0132\016.TSP.Reference\"t\n\"NumberToT"
+    "rackedReferenceMapArchive\022N\n\035number_trac"
+    "ked_reference_pair\030\001 \003(\0132\'.TSCE.NumberTr"
+    "ackedReferencePairArchive\"\336\002\n&TrackedRef"
+    "erencesRewriteCommandArchive\022U\n\037referenc"
+    "es_in_reference_tracker\030\001 \001(\0132(.TSCE.Num"
+    "berToTrackedReferenceMapArchiveB\002\030\001\022W\n!o"
+    "riginal_tracked_reference_copies\030\002 \001(\0132("
+    ".TSCE.NumberToTrackedReferenceMapArchive"
+    "B\002\030\001\0225\n\014rewrite_spec\030\003 \001(\0132\037.TSCE.Formul"
+    "aRewriteSpecArchive\022)\n\021reference_tracker"
+    "\030\004 \002(\0132\016.TSP.Reference\022\"\n\005super\030\005 \002(\0132\023."
+    "TSK.CommandArchive\"U\n\027TrackedReferenceAr"
+    "chive\022&\n\003ast\030\001 \002(\0132\031.TSCE.ASTNodeArrayAr"
+    "chive\022\022\n\nformula_id\030\002 \002(\r\"\257\001\n\027ReferenceT"
+    "rackerArchive\022!\n\004uuid\030\001 \002(\0132\023.TSCE.CFUUI"
+    "DArchive\022-\n\021tracked_reference\030\002 \003(\0132\016.TS"
+    "P.ReferenceB\002\030\001\022B\n\033contained_tracked_ref"
+    "erence\030\003 \003(\0132\035.TSCE.TrackedReferenceArch"
+    "ive\"(\n\027BooleanCellValueArchive\022\r\n\005value\030"
+    "\001 \002(\010\"q\n\024DateCellValueArchive\022\r\n\005value\030\001"
+    " \002(\001\022(\n\006format\030\002 \002(\0132\030.TSK.FormatStructA"
+    "rchive\022 \n\022format_is_implicit\030\003 \001(\010:\004true"
+    "\"\236\001\n\026NumberCellValueArchive\022\r\n\005value\030\001 \002"
+    "(\001\022\022\n\nunit_index\030\002 \001(\005\022\025\n\rcurrency_code\030"
+    "\005 \001(\t\022(\n\006format\030\003 \002(\0132\030.TSK.FormatStruct"
+    "Archive\022 \n\022format_is_implicit\030\004 \001(\010:\004tru"
+    "e\"s\n\026StringCellValueArchive\022\r\n\005value\030\001 \002"
+    "(\t\022(\n\006format\030\002 \002(\0132\030.TSK.FormatStructArc"
+    "hive\022 \n\022format_is_implicit\030\003 \001(\010:\004true\"\201"
+    "\003\n\020CellValueArchive\022=\n\017cell_value_type\030\001"
+    " \002(\0162$.TSCE.CellValueArchive.CellValueTy"
+    "pe\0224\n\rboolean_value\030\002 \001(\0132\035.TSCE.Boolean"
+    "CellValueArchive\022.\n\ndate_value\030\003 \001(\0132\032.T"
+    "SCE.DateCellValueArchive\0222\n\014number_value"
+    "\030\004 \001(\0132\034.TSCE.NumberCellValueArchive\0222\n\014"
+    "string_value\030\005 \001(\0132\034.TSCE.StringCellValu"
+    "eArchive\"`\n\rCellValueType\022\014\n\010NIL_TYPE\020\001\022"
+    "\020\n\014BOOLEAN_TYPE\020\002\022\r\n\tDATE_TYPE\020\003\022\017\n\013NUMB"
+    "ER_TYPE\020\004\022\017\n\013STRING_TYPE\020\005", 14426);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSCEArchives.proto", &protobuf_RegisterTypes);
   CFUUIDArchive::default_instance_ = new CFUUIDArchive();
@@ -5568,6 +5574,8 @@ const int VolatileDependenciesArchive::kVolatileLocationCellColumnFieldNumber;
 const int VolatileDependenciesArchive::kVolatileLocationCellRowFieldNumber;
 const int VolatileDependenciesArchive::kVolatileCompassCellColumnFieldNumber;
 const int VolatileDependenciesArchive::kVolatileCompassCellRowFieldNumber;
+const int VolatileDependenciesArchive::kVolatileSheetTableNameCellColumnFieldNumber;
+const int VolatileDependenciesArchive::kVolatileSheetTableNameCellRowFieldNumber;
 const int VolatileDependenciesArchive::kCalculatedDependencyCellColumnFieldNumber;
 const int VolatileDependenciesArchive::kCalculatedDependencyCellRowFieldNumber;
 const int VolatileDependenciesArchive::kVolatileGeometryCellReferenceFieldNumber;
@@ -5634,6 +5642,8 @@ void VolatileDependenciesArchive::Clear() {
   volatile_location_cell_row_.Clear();
   volatile_compass_cell_column_.Clear();
   volatile_compass_cell_row_.Clear();
+  volatile_sheet_table_name_cell_column_.Clear();
+  volatile_sheet_table_name_cell_row_.Clear();
   calculated_dependency_cell_column_.Clear();
   calculated_dependency_cell_row_.Clear();
   volatile_geometry_cell_reference_.Clear();
@@ -5938,6 +5948,50 @@ bool VolatileDependenciesArchive::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(128)) goto parse_volatile_locale_cell_row;
+        if (input->ExpectTag(136)) goto parse_volatile_sheet_table_name_cell_column;
+        break;
+      }
+
+      // repeated uint32 volatile_sheet_table_name_cell_column = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_volatile_sheet_table_name_cell_column:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 2, 136, input, this->mutable_volatile_sheet_table_name_cell_column())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_volatile_sheet_table_name_cell_column())));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(136)) goto parse_volatile_sheet_table_name_cell_column;
+        if (input->ExpectTag(144)) goto parse_volatile_sheet_table_name_cell_row;
+        break;
+      }
+
+      // repeated uint32 volatile_sheet_table_name_cell_row = 18;
+      case 18: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_volatile_sheet_table_name_cell_row:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 2, 144, input, this->mutable_volatile_sheet_table_name_cell_row())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_volatile_sheet_table_name_cell_row())));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(144)) goto parse_volatile_sheet_table_name_cell_row;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -6044,6 +6098,18 @@ void VolatileDependenciesArchive::SerializeWithCachedSizes(
       16, this->volatile_locale_cell_row(i), output);
   }
 
+  // repeated uint32 volatile_sheet_table_name_cell_column = 17;
+  for (int i = 0; i < this->volatile_sheet_table_name_cell_column_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
+      17, this->volatile_sheet_table_name_cell_column(i), output);
+  }
+
+  // repeated uint32 volatile_sheet_table_name_cell_row = 18;
+  for (int i = 0; i < this->volatile_sheet_table_name_cell_row_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
+      18, this->volatile_sheet_table_name_cell_row(i), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -6138,6 +6204,18 @@ ::google::protobuf::uint8* VolatileDependenciesArchive::SerializeWithCachedSizes
       WriteUInt32ToArray(16, this->volatile_locale_cell_row(i), target);
   }
 
+  // repeated uint32 volatile_sheet_table_name_cell_column = 17;
+  for (int i = 0; i < this->volatile_sheet_table_name_cell_column_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteUInt32ToArray(17, this->volatile_sheet_table_name_cell_column(i), target);
+  }
+
+  // repeated uint32 volatile_sheet_table_name_cell_row = 18;
+  for (int i = 0; i < this->volatile_sheet_table_name_cell_row_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteUInt32ToArray(18, this->volatile_sheet_table_name_cell_row(i), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -6248,6 +6326,26 @@ int VolatileDependenciesArchive::ByteSize() const {
     total_size += 1 * this->volatile_compass_cell_row_size() + data_size;
   }
 
+  // repeated uint32 volatile_sheet_table_name_cell_column = 17;
+  {
+    int data_size = 0;
+    for (int i = 0; i < this->volatile_sheet_table_name_cell_column_size(); i++) {
+      data_size += ::google::protobuf::internal::WireFormatLite::
+        UInt32Size(this->volatile_sheet_table_name_cell_column(i));
+    }
+    total_size += 2 * this->volatile_sheet_table_name_cell_column_size() + data_size;
+  }
+
+  // repeated uint32 volatile_sheet_table_name_cell_row = 18;
+  {
+    int data_size = 0;
+    for (int i = 0; i < this->volatile_sheet_table_name_cell_row_size(); i++) {
+      data_size += ::google::protobuf::internal::WireFormatLite::
+        UInt32Size(this->volatile_sheet_table_name_cell_row(i));
+    }
+    total_size += 2 * this->volatile_sheet_table_name_cell_row_size() + data_size;
+  }
+
   // repeated uint32 calculated_dependency_cell_column = 9;
   {
     int data_size = 0;
@@ -6319,6 +6417,8 @@ void VolatileDependenciesArchive::MergeFrom(const VolatileDependenciesArchive& f
   volatile_location_cell_row_.MergeFrom(from.volatile_location_cell_row_);
   volatile_compass_cell_column_.MergeFrom(from.volatile_compass_cell_column_);
   volatile_compass_cell_row_.MergeFrom(from.volatile_compass_cell_row_);
+  volatile_sheet_table_name_cell_column_.MergeFrom(from.volatile_sheet_table_name_cell_column_);
+  volatile_sheet_table_name_cell_row_.MergeFrom(from.volatile_sheet_table_name_cell_row_);
   calculated_dependency_cell_column_.MergeFrom(from.calculated_dependency_cell_column_);
   calculated_dependency_cell_row_.MergeFrom(from.calculated_dependency_cell_row_);
   volatile_geometry_cell_reference_.MergeFrom(from.volatile_geometry_cell_reference_);
@@ -6358,6 +6458,8 @@ void VolatileDependenciesArchive::Swap(VolatileDependenciesArchive* other) {
     volatile_location_cell_row_.Swap(&other->volatile_location_cell_row_);
     volatile_compass_cell_column_.Swap(&other->volatile_compass_cell_column_);
     volatile_compass_cell_row_.Swap(&other->volatile_compass_cell_row_);
+    volatile_sheet_table_name_cell_column_.Swap(&other->volatile_sheet_table_name_cell_column_);
+    volatile_sheet_table_name_cell_row_.Swap(&other->volatile_sheet_table_name_cell_row_);
     calculated_dependency_cell_column_.Swap(&other->calculated_dependency_cell_column_);
     calculated_dependency_cell_row_.Swap(&other->calculated_dependency_cell_row_);
     volatile_geometry_cell_reference_.Swap(&other->volatile_geometry_cell_reference_);
@@ -10863,7 +10965,7 @@ bool DependencyTrackerArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
+      // repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -10892,7 +10994,7 @@ bool DependencyTrackerArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
+      // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -10931,7 +11033,7 @@ void DependencyTrackerArchive::SerializeWithCachedSizes(
       1, this->formula_owner_info(i), output);
   }
 
-  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
+  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
   for (int i = 0; i < this->dirty_leaf_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       2, this->dirty_leaf(i), output);
@@ -10943,7 +11045,7 @@ void DependencyTrackerArchive::SerializeWithCachedSizes(
       3, this->owner_id_map(), output);
   }
 
-  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
+  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
   for (int i = 0; i < this->internal_dirty_leaf_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, this->internal_dirty_leaf(i), output);
@@ -10964,7 +11066,7 @@ ::google::protobuf::uint8* DependencyTrackerArchive::SerializeWithCachedSizesToA
         1, this->formula_owner_info(i), target);
   }
 
-  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
+  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
   for (int i = 0; i < this->dirty_leaf_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -10978,7 +11080,7 @@ ::google::protobuf::uint8* DependencyTrackerArchive::SerializeWithCachedSizesToA
         3, this->owner_id_map(), target);
   }
 
-  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
+  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
   for (int i = 0; i < this->internal_dirty_leaf_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -11012,7 +11114,7 @@ int DependencyTrackerArchive::ByteSize() const {
         this->formula_owner_info(i));
   }
 
-  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
+  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
   total_size += 1 * this->dirty_leaf_size();
   for (int i = 0; i < this->dirty_leaf_size(); i++) {
     total_size +=
@@ -11020,7 +11122,7 @@ int DependencyTrackerArchive::ByteSize() const {
         this->dirty_leaf(i));
   }
 
-  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
+  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
   total_size += 1 * this->internal_dirty_leaf_size();
   for (int i = 0; i < this->internal_dirty_leaf_size(); i++) {
     total_size +=
@@ -23970,7 +24072,8 @@ ::google::protobuf::Metadata DateCellValueArchive::GetMetadata() const {
 
 #ifndef _MSC_VER
 const int NumberCellValueArchive::kValueFieldNumber;
-const int NumberCellValueArchive::kUnitFieldNumber;
+const int NumberCellValueArchive::kUnitIndexFieldNumber;
+const int NumberCellValueArchive::kCurrencyCodeFieldNumber;
 const int NumberCellValueArchive::kFormatFieldNumber;
 const int NumberCellValueArchive::kFormatIsImplicitFieldNumber;
 #endif  // !_MSC_VER
@@ -23993,7 +24096,8 @@ NumberCellValueArchive::NumberCellValueArchive(const NumberCellValueArchive& fro
 void NumberCellValueArchive::SharedCtor() {
   _cached_size_ = 0;
   value_ = 0;
-  unit_ = 0;
+  unit_index_ = 0;
+  currency_code_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   format_ = NULL;
   format_is_implicit_ = true;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -24004,6 +24108,9 @@ NumberCellValueArchive::~NumberCellValueArchive() {
 }
 
 void NumberCellValueArchive::SharedDtor() {
+  if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
+    delete currency_code_;
+  }
   if (this != default_instance_) {
     delete format_;
   }
@@ -24033,7 +24140,12 @@ NumberCellValueArchive* NumberCellValueArchive::New() const {
 void NumberCellValueArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     value_ = 0;
-    unit_ = 0;
+    unit_index_ = 0;
+    if (has_currency_code()) {
+      if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
+        currency_code_->clear();
+      }
+    }
     if (has_format()) {
       if (format_ != NULL) format_->::TSK::FormatStructArchive::Clear();
     }
@@ -24060,19 +24172,19 @@ bool NumberCellValueArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_unit;
+        if (input->ExpectTag(16)) goto parse_unit_index;
         break;
       }
 
-      // required int32 unit = 2;
+      // optional int32 unit_index = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_unit:
+         parse_unit_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &unit_)));
-          set_has_unit();
+                 input, &unit_index_)));
+          set_has_unit_index();
         } else {
           goto handle_uninterpreted;
         }
@@ -24106,6 +24218,23 @@ bool NumberCellValueArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(42)) goto parse_currency_code;
+        break;
+      }
+
+      // optional string currency_code = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_currency_code:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_currency_code()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->currency_code().data(), this->currency_code().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -24133,9 +24262,9 @@ void NumberCellValueArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->value(), output);
   }
 
-  // required int32 unit = 2;
-  if (has_unit()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->unit(), output);
+  // optional int32 unit_index = 2;
+  if (has_unit_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->unit_index(), output);
   }
 
   // required .TSK.FormatStructArchive format = 3;
@@ -24149,6 +24278,15 @@ void NumberCellValueArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->format_is_implicit(), output);
   }
 
+  // optional string currency_code = 5;
+  if (has_currency_code()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->currency_code().data(), this->currency_code().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      5, this->currency_code(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -24162,9 +24300,9 @@ ::google::protobuf::uint8* NumberCellValueArchive::SerializeWithCachedSizesToArr
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->value(), target);
   }
 
-  // required int32 unit = 2;
-  if (has_unit()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->unit(), target);
+  // optional int32 unit_index = 2;
+  if (has_unit_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->unit_index(), target);
   }
 
   // required .TSK.FormatStructArchive format = 3;
@@ -24179,6 +24317,16 @@ ::google::protobuf::uint8* NumberCellValueArchive::SerializeWithCachedSizesToArr
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->format_is_implicit(), target);
   }
 
+  // optional string currency_code = 5;
+  if (has_currency_code()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->currency_code().data(), this->currency_code().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        5, this->currency_code(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -24195,11 +24343,18 @@ int NumberCellValueArchive::ByteSize() const {
       total_size += 1 + 8;
     }
 
-    // required int32 unit = 2;
-    if (has_unit()) {
+    // optional int32 unit_index = 2;
+    if (has_unit_index()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->unit());
+          this->unit_index());
+    }
+
+    // optional string currency_code = 5;
+    if (has_currency_code()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->currency_code());
     }
 
     // required .TSK.FormatStructArchive format = 3;
@@ -24244,8 +24399,11 @@ void NumberCellValueArchive::MergeFrom(const NumberCellValueArchive& from) {
     if (from.has_value()) {
       set_value(from.value());
     }
-    if (from.has_unit()) {
-      set_unit(from.unit());
+    if (from.has_unit_index()) {
+      set_unit_index(from.unit_index());
+    }
+    if (from.has_currency_code()) {
+      set_currency_code(from.currency_code());
     }
     if (from.has_format()) {
       mutable_format()->::TSK::FormatStructArchive::MergeFrom(from.format());
@@ -24270,7 +24428,7 @@ void NumberCellValueArchive::CopyFrom(const NumberCellValueArchive& from) {
 }
 
 bool NumberCellValueArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+  if ((_has_bits_[0] & 0x00000009) != 0x00000009) return false;
 
   if (has_format()) {
     if (!this->format().IsInitialized()) return false;
@@ -24281,7 +24439,8 @@ bool NumberCellValueArchive::IsInitialized() const {
 void NumberCellValueArchive::Swap(NumberCellValueArchive* other) {
   if (other != this) {
     std::swap(value_, other->value_);
-    std::swap(unit_, other->unit_);
+    std::swap(unit_index_, other->unit_index_);
+    std::swap(currency_code_, other->currency_code_);
     std::swap(format_, other->format_);
     std::swap(format_is_implicit_, other->format_is_implicit_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.h
index bd7264d..7a90503 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCEArchives.pb.h
@@ -1617,6 +1617,30 @@ class VolatileDependenciesArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
       mutable_volatile_compass_cell_row();
 
+  // repeated uint32 volatile_sheet_table_name_cell_column = 17;
+  inline int volatile_sheet_table_name_cell_column_size() const;
+  inline void clear_volatile_sheet_table_name_cell_column();
+  static const int kVolatileSheetTableNameCellColumnFieldNumber = 17;
+  inline ::google::protobuf::uint32 volatile_sheet_table_name_cell_column(int index) const;
+  inline void set_volatile_sheet_table_name_cell_column(int index, ::google::protobuf::uint32 value);
+  inline void add_volatile_sheet_table_name_cell_column(::google::protobuf::uint32 value);
+  inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+      volatile_sheet_table_name_cell_column() const;
+  inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+      mutable_volatile_sheet_table_name_cell_column();
+
+  // repeated uint32 volatile_sheet_table_name_cell_row = 18;
+  inline int volatile_sheet_table_name_cell_row_size() const;
+  inline void clear_volatile_sheet_table_name_cell_row();
+  static const int kVolatileSheetTableNameCellRowFieldNumber = 18;
+  inline ::google::protobuf::uint32 volatile_sheet_table_name_cell_row(int index) const;
+  inline void set_volatile_sheet_table_name_cell_row(int index, ::google::protobuf::uint32 value);
+  inline void add_volatile_sheet_table_name_cell_row(::google::protobuf::uint32 value);
+  inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+      volatile_sheet_table_name_cell_row() const;
+  inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+      mutable_volatile_sheet_table_name_cell_row();
+
   // repeated uint32 calculated_dependency_cell_column = 9;
   inline int calculated_dependency_cell_column_size() const;
   inline void clear_calculated_dependency_cell_column();
@@ -1680,13 +1704,15 @@ class VolatileDependenciesArchive : public ::google::protobuf::Message {
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > volatile_location_cell_row_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > volatile_compass_cell_column_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > volatile_compass_cell_row_;
+  ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > volatile_sheet_table_name_cell_column_;
+  ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > volatile_sheet_table_name_cell_row_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > calculated_dependency_cell_column_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > calculated_dependency_cell_row_;
   ::google::protobuf::RepeatedPtrField< ::TSCE::CellReferenceArchive > volatile_geometry_cell_reference_;
   ::google::protobuf::RepeatedPtrField< ::TSCE::CellCoordinateArchive > volatile_geometry_cell_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(14 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(16 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCEArchives_2eproto();
   friend void protobuf_AssignDesc_TSCEArchives_2eproto();
@@ -3298,29 +3324,29 @@ class DependencyTrackerArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::TSCE::FormulaOwnerInfoArchive >*
       mutable_formula_owner_info();
 
-  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
-  inline int dirty_leaf_size() const;
-  inline void clear_dirty_leaf();
+  // repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
+  inline int dirty_leaf_size() const PROTOBUF_DEPRECATED;
+  inline void clear_dirty_leaf() PROTOBUF_DEPRECATED;
   static const int kDirtyLeafFieldNumber = 2;
-  inline const ::TSCE::CellReferenceArchive& dirty_leaf(int index) const;
-  inline ::TSCE::CellReferenceArchive* mutable_dirty_leaf(int index);
-  inline ::TSCE::CellReferenceArchive* add_dirty_leaf();
+  inline const ::TSCE::CellReferenceArchive& dirty_leaf(int index) const PROTOBUF_DEPRECATED;
+  inline ::TSCE::CellReferenceArchive* mutable_dirty_leaf(int index) PROTOBUF_DEPRECATED;
+  inline ::TSCE::CellReferenceArchive* add_dirty_leaf() PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedPtrField< ::TSCE::CellReferenceArchive >&
-      dirty_leaf() const;
+      dirty_leaf() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedPtrField< ::TSCE::CellReferenceArchive >*
-      mutable_dirty_leaf();
+      mutable_dirty_leaf() PROTOBUF_DEPRECATED;
 
-  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
-  inline int internal_dirty_leaf_size() const;
-  inline void clear_internal_dirty_leaf();
+  // repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
+  inline int internal_dirty_leaf_size() const PROTOBUF_DEPRECATED;
+  inline void clear_internal_dirty_leaf() PROTOBUF_DEPRECATED;
   static const int kInternalDirtyLeafFieldNumber = 4;
-  inline const ::TSCE::InternalCellReferenceArchive& internal_dirty_leaf(int index) const;
-  inline ::TSCE::InternalCellReferenceArchive* mutable_internal_dirty_leaf(int index);
-  inline ::TSCE::InternalCellReferenceArchive* add_internal_dirty_leaf();
+  inline const ::TSCE::InternalCellReferenceArchive& internal_dirty_leaf(int index) const PROTOBUF_DEPRECATED;
+  inline ::TSCE::InternalCellReferenceArchive* mutable_internal_dirty_leaf(int index) PROTOBUF_DEPRECATED;
+  inline ::TSCE::InternalCellReferenceArchive* add_internal_dirty_leaf() PROTOBUF_DEPRECATED;
   inline const ::google::protobuf::RepeatedPtrField< ::TSCE::InternalCellReferenceArchive >&
-      internal_dirty_leaf() const;
+      internal_dirty_leaf() const PROTOBUF_DEPRECATED;
   inline ::google::protobuf::RepeatedPtrField< ::TSCE::InternalCellReferenceArchive >*
-      mutable_internal_dirty_leaf();
+      mutable_internal_dirty_leaf() PROTOBUF_DEPRECATED;
 
   // optional .TSCE.OwnerIDMapArchive owner_id_map = 3;
   inline bool has_owner_id_map() const;
@@ -7805,12 +7831,24 @@ class NumberCellValueArchive : public ::google::protobuf::Message {
   inline double value() const;
   inline void set_value(double value);
 
-  // required int32 unit = 2;
-  inline bool has_unit() const;
-  inline void clear_unit();
-  static const int kUnitFieldNumber = 2;
-  inline ::google::protobuf::int32 unit() const;
-  inline void set_unit(::google::protobuf::int32 value);
+  // optional int32 unit_index = 2;
+  inline bool has_unit_index() const;
+  inline void clear_unit_index();
+  static const int kUnitIndexFieldNumber = 2;
+  inline ::google::protobuf::int32 unit_index() const;
+  inline void set_unit_index(::google::protobuf::int32 value);
+
+  // optional string currency_code = 5;
+  inline bool has_currency_code() const;
+  inline void clear_currency_code();
+  static const int kCurrencyCodeFieldNumber = 5;
+  inline const ::std::string& currency_code() const;
+  inline void set_currency_code(const ::std::string& value);
+  inline void set_currency_code(const char* value);
+  inline void set_currency_code(const char* value, size_t size);
+  inline ::std::string* mutable_currency_code();
+  inline ::std::string* release_currency_code();
+  inline void set_allocated_currency_code(::std::string* currency_code);
 
   // required .TSK.FormatStructArchive format = 3;
   inline bool has_format() const;
@@ -7832,8 +7870,10 @@ class NumberCellValueArchive : public ::google::protobuf::Message {
  private:
   inline void set_has_value();
   inline void clear_has_value();
-  inline void set_has_unit();
-  inline void clear_has_unit();
+  inline void set_has_unit_index();
+  inline void clear_has_unit_index();
+  inline void set_has_currency_code();
+  inline void clear_has_currency_code();
   inline void set_has_format();
   inline void clear_has_format();
   inline void set_has_format_is_implicit();
@@ -7842,12 +7882,13 @@ class NumberCellValueArchive : public ::google::protobuf::Message {
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   double value_;
-  ::TSK::FormatStructArchive* format_;
-  ::google::protobuf::int32 unit_;
+  ::std::string* currency_code_;
+  ::google::protobuf::int32 unit_index_;
   bool format_is_implicit_;
+  ::TSK::FormatStructArchive* format_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCEArchives_2eproto();
   friend void protobuf_AssignDesc_TSCEArchives_2eproto();
@@ -9494,6 +9535,56 @@ VolatileDependenciesArchive::mutable_volatile_compass_cell_row() {
   return &volatile_compass_cell_row_;
 }
 
+// repeated uint32 volatile_sheet_table_name_cell_column = 17;
+inline int VolatileDependenciesArchive::volatile_sheet_table_name_cell_column_size() const {
+  return volatile_sheet_table_name_cell_column_.size();
+}
+inline void VolatileDependenciesArchive::clear_volatile_sheet_table_name_cell_column() {
+  volatile_sheet_table_name_cell_column_.Clear();
+}
+inline ::google::protobuf::uint32 VolatileDependenciesArchive::volatile_sheet_table_name_cell_column(int index) const {
+  return volatile_sheet_table_name_cell_column_.Get(index);
+}
+inline void VolatileDependenciesArchive::set_volatile_sheet_table_name_cell_column(int index, ::google::protobuf::uint32 value) {
+  volatile_sheet_table_name_cell_column_.Set(index, value);
+}
+inline void VolatileDependenciesArchive::add_volatile_sheet_table_name_cell_column(::google::protobuf::uint32 value) {
+  volatile_sheet_table_name_cell_column_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+VolatileDependenciesArchive::volatile_sheet_table_name_cell_column() const {
+  return volatile_sheet_table_name_cell_column_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+VolatileDependenciesArchive::mutable_volatile_sheet_table_name_cell_column() {
+  return &volatile_sheet_table_name_cell_column_;
+}
+
+// repeated uint32 volatile_sheet_table_name_cell_row = 18;
+inline int VolatileDependenciesArchive::volatile_sheet_table_name_cell_row_size() const {
+  return volatile_sheet_table_name_cell_row_.size();
+}
+inline void VolatileDependenciesArchive::clear_volatile_sheet_table_name_cell_row() {
+  volatile_sheet_table_name_cell_row_.Clear();
+}
+inline ::google::protobuf::uint32 VolatileDependenciesArchive::volatile_sheet_table_name_cell_row(int index) const {
+  return volatile_sheet_table_name_cell_row_.Get(index);
+}
+inline void VolatileDependenciesArchive::set_volatile_sheet_table_name_cell_row(int index, ::google::protobuf::uint32 value) {
+  volatile_sheet_table_name_cell_row_.Set(index, value);
+}
+inline void VolatileDependenciesArchive::add_volatile_sheet_table_name_cell_row(::google::protobuf::uint32 value) {
+  volatile_sheet_table_name_cell_row_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+VolatileDependenciesArchive::volatile_sheet_table_name_cell_row() const {
+  return volatile_sheet_table_name_cell_row_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+VolatileDependenciesArchive::mutable_volatile_sheet_table_name_cell_row() {
+  return &volatile_sheet_table_name_cell_row_;
+}
+
 // repeated uint32 calculated_dependency_cell_column = 9;
 inline int VolatileDependenciesArchive::calculated_dependency_cell_column_size() const {
   return calculated_dependency_cell_column_.size();
@@ -11077,7 +11168,7 @@ DependencyTrackerArchive::mutable_formula_owner_info() {
   return &formula_owner_info_;
 }
 
-// repeated .TSCE.CellReferenceArchive dirty_leaf = 2;
+// repeated .TSCE.CellReferenceArchive dirty_leaf = 2 [deprecated = true];
 inline int DependencyTrackerArchive::dirty_leaf_size() const {
   return dirty_leaf_.size();
 }
@@ -11102,7 +11193,7 @@ DependencyTrackerArchive::mutable_dirty_leaf() {
   return &dirty_leaf_;
 }
 
-// repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4;
+// repeated .TSCE.InternalCellReferenceArchive internal_dirty_leaf = 4 [deprecated = true];
 inline int DependencyTrackerArchive::internal_dirty_leaf_size() const {
   return internal_dirty_leaf_.size();
 }
@@ -16349,37 +16440,107 @@ inline void NumberCellValueArchive::set_value(double value) {
   value_ = value;
 }
 
-// required int32 unit = 2;
-inline bool NumberCellValueArchive::has_unit() const {
+// optional int32 unit_index = 2;
+inline bool NumberCellValueArchive::has_unit_index() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void NumberCellValueArchive::set_has_unit() {
+inline void NumberCellValueArchive::set_has_unit_index() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void NumberCellValueArchive::clear_has_unit() {
+inline void NumberCellValueArchive::clear_has_unit_index() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void NumberCellValueArchive::clear_unit() {
-  unit_ = 0;
-  clear_has_unit();
+inline void NumberCellValueArchive::clear_unit_index() {
+  unit_index_ = 0;
+  clear_has_unit_index();
 }
-inline ::google::protobuf::int32 NumberCellValueArchive::unit() const {
-  return unit_;
+inline ::google::protobuf::int32 NumberCellValueArchive::unit_index() const {
+  return unit_index_;
 }
-inline void NumberCellValueArchive::set_unit(::google::protobuf::int32 value) {
-  set_has_unit();
-  unit_ = value;
+inline void NumberCellValueArchive::set_unit_index(::google::protobuf::int32 value) {
+  set_has_unit_index();
+  unit_index_ = value;
+}
+
+// optional string currency_code = 5;
+inline bool NumberCellValueArchive::has_currency_code() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void NumberCellValueArchive::set_has_currency_code() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void NumberCellValueArchive::clear_has_currency_code() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void NumberCellValueArchive::clear_currency_code() {
+  if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
+    currency_code_->clear();
+  }
+  clear_has_currency_code();
+}
+inline const ::std::string& NumberCellValueArchive::currency_code() const {
+  return *currency_code_;
+}
+inline void NumberCellValueArchive::set_currency_code(const ::std::string& value) {
+  set_has_currency_code();
+  if (currency_code_ == &::google::protobuf::internal::kEmptyString) {
+    currency_code_ = new ::std::string;
+  }
+  currency_code_->assign(value);
+}
+inline void NumberCellValueArchive::set_currency_code(const char* value) {
+  set_has_currency_code();
+  if (currency_code_ == &::google::protobuf::internal::kEmptyString) {
+    currency_code_ = new ::std::string;
+  }
+  currency_code_->assign(value);
+}
+inline void NumberCellValueArchive::set_currency_code(const char* value, size_t size) {
+  set_has_currency_code();
+  if (currency_code_ == &::google::protobuf::internal::kEmptyString) {
+    currency_code_ = new ::std::string;
+  }
+  currency_code_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* NumberCellValueArchive::mutable_currency_code() {
+  set_has_currency_code();
+  if (currency_code_ == &::google::protobuf::internal::kEmptyString) {
+    currency_code_ = new ::std::string;
+  }
+  return currency_code_;
+}
+inline ::std::string* NumberCellValueArchive::release_currency_code() {
+  clear_has_currency_code();
+  if (currency_code_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = currency_code_;
+    currency_code_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void NumberCellValueArchive::set_allocated_currency_code(::std::string* currency_code) {
+  if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
+    delete currency_code_;
+  }
+  if (currency_code) {
+    set_has_currency_code();
+    currency_code_ = currency_code;
+  } else {
+    clear_has_currency_code();
+    currency_code_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
 
 // required .TSK.FormatStructArchive format = 3;
 inline bool NumberCellValueArchive::has_format() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
 inline void NumberCellValueArchive::set_has_format() {
-  _has_bits_[0] |= 0x00000004u;
+  _has_bits_[0] |= 0x00000008u;
 }
 inline void NumberCellValueArchive::clear_has_format() {
-  _has_bits_[0] &= ~0x00000004u;
+  _has_bits_[0] &= ~0x00000008u;
 }
 inline void NumberCellValueArchive::clear_format() {
   if (format_ != NULL) format_->::TSK::FormatStructArchive::Clear();
@@ -16411,13 +16572,13 @@ inline void NumberCellValueArchive::set_allocated_format(::TSK::FormatStructArch
 
 // optional bool format_is_implicit = 4 [default = true];
 inline bool NumberCellValueArchive::has_format_is_implicit() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
 inline void NumberCellValueArchive::set_has_format_is_implicit() {
-  _has_bits_[0] |= 0x00000008u;
+  _has_bits_[0] |= 0x00000010u;
 }
 inline void NumberCellValueArchive::clear_has_format_is_implicit() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline void NumberCellValueArchive::clear_format_is_implicit() {
   format_is_implicit_ = true;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.cc
index a57dbbe..2c30a68 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.cc
@@ -45,6 +45,18 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ChartSeriesNonStyleArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ChartSeriesNonStyleArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ChartGenericPropertyMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ChartGenericPropertyMapArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* LegendGenericPropertyMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  LegendGenericPropertyMapArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ChartAxisGenericPropertyMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ChartAxisGenericPropertyMapArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ChartSeriesGenericPropertyMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ChartSeriesGenericPropertyMapArchive_reflection_ = NULL;
 
 }  // namespace
 
@@ -211,9 +223,13 @@ void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartAxisStyleArchive));
   ChartAxisNonStyleArchive_descriptor_ = file->message_type(5);
-  static const int ChartAxisNonStyleArchive_offsets_[19] = {
+  static const int ChartAxisNonStyleArchive_offsets_[23] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefault3dlabelposition_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefault1_0numberformat_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefaultnumberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefault1_0dateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefaultdurationformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefaultdateformat_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisdefaultnumberformattype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisvaluenumberofdecades_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisNonStyleArchive, tschchartaxisvaluenumberofmajorgridlines_),
@@ -355,7 +371,7 @@ void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartSeriesStyleArchive));
   ChartSeriesNonStyleArchive_descriptor_ = file->message_type(7);
-  static const int ChartSeriesNonStyleArchive_offsets_[68] = {
+  static const int ChartSeriesNonStyleArchive_offsets_[75] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesbubbleadjustmentscale_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaulterrorbarcustomnegativedata_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaulterrorbarcustomnegativedatascatterx_),
@@ -376,7 +392,12 @@ void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartserieslinelinetype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesmixedlinelinetype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesscatterlinetype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefault1_0numberformat_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaultnumberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefault1_0dateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaultdurationformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaultdateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriespie1_0numberformat_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriespienumberformat_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaultnumberformattype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriespienumberformattype_),
@@ -424,6 +445,8 @@ void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesbubblevaluelabelsaxis_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesscattershowserieslabels_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesscattervaluelabelsaxis_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesdefaultshowlabelsinfront_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesNonStyleArchive, tschchartseriesbubbleshowlabelsinfront_),
   };
   ChartSeriesNonStyleArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -436,6 +459,208 @@ void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartSeriesNonStyleArchive));
+  ChartGenericPropertyMapArchive_descriptor_ = file->message_type(8);
+  static const int ChartGenericPropertyMapArchive_offsets_[29] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dbarshape_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dbeveledges_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dintersetdepthgap_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3drotation_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dscale_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dviewport_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfopiestartangle_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfoshowlegend_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfoshowtitle_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfoskiphiddendata_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfotitle_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfodatasetnamelocation_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfomultidatacontroltype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dchartopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfo3dlightingpackage_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfobackgroundfill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfobackgroundstroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfoborderopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfobordershadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfoborderstroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfocombinelayers_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfogridbackgroundfill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfogridbackgroundopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfointerbargap_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfointersetgap_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfoshowborder_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfotitlecolor_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfotitleparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, tschchartinfodatasetnameparagraphstyleindex_),
+  };
+  ChartGenericPropertyMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ChartGenericPropertyMapArchive_descriptor_,
+      ChartGenericPropertyMapArchive::default_instance_,
+      ChartGenericPropertyMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGenericPropertyMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ChartGenericPropertyMapArchive));
+  LegendGenericPropertyMapArchive_descriptor_ = file->message_type(9);
+  static const int LegendGenericPropertyMapArchive_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, tschlegendmodelfill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, tschlegendmodellabelparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, tschlegendmodelopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, tschlegendmodelshadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, tschlegendmodelstroke_),
+  };
+  LegendGenericPropertyMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      LegendGenericPropertyMapArchive_descriptor_,
+      LegendGenericPropertyMapArchive::default_instance_,
+      LegendGenericPropertyMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LegendGenericPropertyMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(LegendGenericPropertyMapArchive));
+  ChartAxisGenericPropertyMapArchive_descriptor_ = file->message_type(10);
+  static const int ChartAxisGenericPropertyMapArchive_offsets_[39] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxis3dlabelposition_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxis1_0numberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisnumberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxis1_0dateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisdurationformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisdateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisnumberformattype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisnumberofdecades_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisnumberofmajorgridlines_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisnumberofminorgridlines_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisplottoedges_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisscale_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowlabels_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowserieslabels_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowtitle_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxistitle_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisusermax_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisusermin_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxis3dgridlineopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxis3dgridlinestroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxishorizontalspacing_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxislabelparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxislabelsorientation_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxismajorgridlineopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxismajorgridlineshadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxismajorgridlinestroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisminorgridlineopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisminorgridlineshadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisminorgridlinestroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowaxis_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowlastlabel_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowmajorgridlines_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowmajortickmarks_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowminimumlabel_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowminorgridlines_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisshowminortickmarks_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxistickmarklocation_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxistitleparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, tschchartaxisverticalspacing_),
+  };
+  ChartAxisGenericPropertyMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ChartAxisGenericPropertyMapArchive_descriptor_,
+      ChartAxisGenericPropertyMapArchive::default_instance_,
+      ChartAxisGenericPropertyMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartAxisGenericPropertyMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ChartAxisGenericPropertyMapArchive));
+  ChartSeriesGenericPropertyMapArchive_descriptor_ = file->message_type(11);
+  static const int ChartSeriesGenericPropertyMapArchive_offsets_[73] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesadjustmentscale_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarcustomnegativedata_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarcustomnegativedatascatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarcustompositivedata_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarcustompositivedatascatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarfixedvalue_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarfixedvaluescatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarpercentvalue_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarpercentvaluescatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarsetting_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarsettingscatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarstddevvalue_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarstddevvaluescatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbartype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbartypescatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieslabelexplosion_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieslinetype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseries1_0numberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesnumberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseries1_0dateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesdurationformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesdateformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesnumberformattype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriespercentnumberformat_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesseriestype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowerrorbar_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowerrorbarscatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowline_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshownegativedata_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowserieslabels_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowsymbol_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowtrendline_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowvaluelabels_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessizedimension_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessymboltype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineequationoffsetx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineequationoffsety_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinelabelstring_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineorder_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineperiod_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinersquaredoffsetx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinersquaredoffsety_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineshowequation_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineshowlabel_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineshowr2value_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinetype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieswedgeexplosion_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesyaxisordinal_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesvaluelabelsaxis_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarlineend_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarlineendscatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarshadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarstroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieserrorbarstrokescatterx_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesfill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartserieslabelparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesoutsidelabelparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesstroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessymbolfill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessymbolfilluseseriesfill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessymbolfilluseseriesstroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessymbolsize_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriessymbolstroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineequationopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineequationparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinersquaredopacity_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinersquaredparagraphstyleindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlineshadow_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriestrendlinestroke_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesvaluelabelposition_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, tschchartseriesshowlabelsinfront_),
+  };
+  ChartSeriesGenericPropertyMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ChartSeriesGenericPropertyMapArchive_descriptor_,
+      ChartSeriesGenericPropertyMapArchive::default_instance_,
+      ChartSeriesGenericPropertyMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartSeriesGenericPropertyMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ChartSeriesGenericPropertyMapArchive));
 }
 
 namespace {
@@ -464,6 +689,14 @@ void protobuf_RegisterTypes(const ::std::string&) {
     ChartSeriesStyleArchive_descriptor_, &ChartSeriesStyleArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ChartSeriesNonStyleArchive_descriptor_, &ChartSeriesNonStyleArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ChartGenericPropertyMapArchive_descriptor_, &ChartGenericPropertyMapArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    LegendGenericPropertyMapArchive_descriptor_, &LegendGenericPropertyMapArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ChartAxisGenericPropertyMapArchive_descriptor_, &ChartAxisGenericPropertyMapArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ChartSeriesGenericPropertyMapArchive_descriptor_, &ChartSeriesGenericPropertyMapArchive::default_instance());
 }
 
 }  // namespace
@@ -485,6 +718,14 @@ void protobuf_ShutdownFile_TSCHArchives_2eGEN_2eproto() {
   delete ChartSeriesStyleArchive_reflection_;
   delete ChartSeriesNonStyleArchive::default_instance_;
   delete ChartSeriesNonStyleArchive_reflection_;
+  delete ChartGenericPropertyMapArchive::default_instance_;
+  delete ChartGenericPropertyMapArchive_reflection_;
+  delete LegendGenericPropertyMapArchive::default_instance_;
+  delete LegendGenericPropertyMapArchive_reflection_;
+  delete ChartAxisGenericPropertyMapArchive::default_instance_;
+  delete ChartAxisGenericPropertyMapArchive_reflection_;
+  delete ChartSeriesGenericPropertyMapArchive::default_instance_;
+  delete ChartSeriesGenericPropertyMapArchive_reflection_;
 }
 
 void protobuf_AddDesc_TSCHArchives_2eGEN_2eproto() {
@@ -633,262 +874,459 @@ void protobuf_AddDesc_TSCHArchives_2eGEN_2eproto() {
     "ndex\030( \001(\005\022,\n$tschchartaxiscategoryverti"
     "calspacing\030) \001(\0052T\n\007current\022\033.TSCH.Chart"
     "AxisStyleArchive\030\220N \001(\0132%.TSCH.Generated"
-    ".ChartAxisStyleArchive\"\347\007\n\030ChartAxisNonS"
+    ".ChartAxisStyleArchive\"\373\t\n\030ChartAxisNonS"
     "tyleArchive\022+\n#tschchartaxisdefault3dlab"
-    "elposition\030\001 \001(\005\022B\n tschchartaxisdefault"
-    "numberformat\030\002 \001(\0132\030.TSK.FormatStructArc"
-    "hive\022,\n$tschchartaxisdefaultnumberformat"
-    "type\030\003 \001(\005\022)\n!tschchartaxisvaluenumberof"
-    "decades\030\004 \001(\005\0220\n(tschchartaxisvaluenumbe"
-    "rofmajorgridlines\030\005 \001(\005\0220\n(tschchartaxis"
-    "valuenumberofminorgridlines\030\006 \001(\005\022(\n tsc"
-    "hchartaxiscategoryplottoedges\030\007 \001(\010\022\037\n\027t"
-    "schchartaxisvaluescale\030\010 \001(\005\022\'\n\037tschchar"
-    "taxiscategoryshowlabels\030\t \001(\010\022&\n\036tschcha"
-    "rtaxisdefaultshowlabels\030\n \001(\010\022$\n\034tschcha"
-    "rtaxisvalueshowlabels\030\013 \001(\010\022-\n%tschchart"
-    "axiscategoryshowserieslabels\030\014 \001(\010\022.\n&ts"
-    "chchartaxismultidatashowserieslabels\030\023 \001"
-    "(\010\022&\n\036tschchartaxiscategoryshowtitle\030\r \001"
-    "(\010\022#\n\033tschchartaxisvalueshowtitle\030\016 \001(\010\022"
-    "\"\n\032tschchartaxiscategorytitle\030\017 \001(\t\022\037\n\027t"
-    "schchartaxisvaluetitle\030\020 \001(\t\022F\n\033tschchar"
-    "taxisdefaultusermax\030\021 \001(\0132!.TSCH.ChartsN"
-    "SNumberDoubleArchive\022F\n\033tschchartaxisdef"
-    "aultusermin\030\022 \001(\0132!.TSCH.ChartsNSNumberD"
-    "oubleArchive2Z\n\007current\022\036.TSCH.ChartAxis"
-    "NonStyleArchive\030\220N \001(\0132(.TSCH.Generated."
-    "ChartAxisNonStyleArchive\"\307+\n\027ChartSeries"
-    "StyleArchive\022B\n%tschchartseriesdefaulter"
-    "rorbarlineend\030\001 \001(\0132\023.TSD.LineEndArchive"
-    "\022J\n-tschchartseriesdefaulterrorbarlineen"
-    "dscatterx\030\002 \001(\0132\023.TSD.LineEndArchive\022@\n$"
-    "tschchartseriesdefaulterrorbarshadow\030\003 \001"
-    "(\0132\022.TSD.ShadowArchive\022@\n$tschchartserie"
-    "sdefaulterrorbarstroke\030\004 \001(\0132\022.TSD.Strok"
-    "eArchive\022H\n,tschchartseriesdefaulterrorb"
-    "arstrokescatterx\030\005 \001(\0132\022.TSD.StrokeArchi"
-    "ve\0223\n\031tschchartseries3dareafill\030\006 \001(\0132\020."
-    "TSD.FillArchive\0222\n\030tschchartseries3dbarf"
-    "ill\030\007 \001(\0132\020.TSD.FillArchive\0225\n\033tschchart"
-    "series3dcolumnfill\030\010 \001(\0132\020.TSD.FillArchi"
-    "ve\0223\n\031tschchartseries3dlinefill\030\t \001(\0132\020."
-    "TSD.FillArchive\0222\n\030tschchartseries3dpief"
-    "ill\030\n \001(\0132\020.TSD.FillArchive\0221\n\027tschchart"
-    "seriesareafill\030\013 \001(\0132\020.TSD.FillArchive\0220"
-    "\n\026tschchartseriesbarfill\030\014 \001(\0132\020.TSD.Fil"
-    "lArchive\0223\n\031tschchartseriescolumnfill\030\r "
-    "\001(\0132\020.TSD.FillArchive\0224\n\032tschchartseries"
-    "defaultfill\030\016 \001(\0132\020.TSD.FillArchive\0226\n\034t"
-    "schchartseriesmixedareafill\030\017 \001(\0132\020.TSD."
-    "FillArchive\0228\n\036tschchartseriesmixedcolum"
-    "nfill\030\020 \001(\0132\020.TSD.FillArchive\0220\n\026tschcha"
-    "rtseriespiefill\030\021 \001(\0132\020.TSD.FillArchive\022"
-    "3\n+tschchartseriesarealabelparagraphstyl"
-    "eindex\030\022 \001(\005\0222\n*tschchartseriesbarlabelp"
-    "aragraphstyleindex\030\023 \001(\005\0226\n.tschchartser"
-    "iesdefaultlabelparagraphstyleindex\030\024 \001(\005"
-    "\0223\n+tschchartserieslinelabelparagraphsty"
-    "leindex\030\025 \001(\005\0224\n,tschchartseriesmixedlab"
-    "elparagraphstyleindex\030\026 \001(\005\0222\n*tschchart"
-    "seriespielabelparagraphstyleindex\030\027 \001(\005\022"
-    "%\n\035tschchartseriesdefaultopacity\030\030 \001(\002\022:"
-    "\n2tschchartseriesareaoutsidelabelparagra"
-    "phstyleindex\030\031 \001(\005\0229\n1tschchartseriesbar"
-    "outsidelabelparagraphstyleindex\030\032 \001(\005\022=\n"
-    "5tschchartseriesdefaultoutsidelabelparag"
-    "raphstyleindex\030\033 \001(\005\022;\n3tschchartseriesm"
-    "ixedoutsidelabelparagraphstyleindex\030\034 \001("
-    "\005\0229\n1tschchartseriespieoutsidelabelparag"
-    "raphstyleindex\030\035 \001(\005\0227\n\033tschchartseries3"
-    "dareashadow\030\036 \001(\0132\022.TSD.ShadowArchive\0226\n"
-    "\032tschchartseries3dbarshadow\030\037 \001(\0132\022.TSD."
-    "ShadowArchive\0229\n\035tschchartseries3dcolumn"
-    "shadow\030  \001(\0132\022.TSD.ShadowArchive\0227\n\033tsch"
-    "chartseries3dlineshadow\030! \001(\0132\022.TSD.Shad"
-    "owArchive\0226\n\032tschchartseries3dpieshadow\030"
-    "\" \001(\0132\022.TSD.ShadowArchive\0225\n\031tschchartse"
-    "riesareashadow\030# \001(\0132\022.TSD.ShadowArchive"
-    "\0224\n\030tschchartseriesbarshadow\030$ \001(\0132\022.TSD"
-    ".ShadowArchive\0227\n\033tschchartseriesbubbles"
-    "hadow\030% \001(\0132\022.TSD.ShadowArchive\0228\n\034tschc"
-    "hartseriesdefaultshadow\030& \001(\0132\022.TSD.Shad"
-    "owArchive\0225\n\031tschchartserieslineshadow\030\'"
-    " \001(\0132\022.TSD.ShadowArchive\022:\n\036tschchartser"
-    "iesmixedareashadow\030( \001(\0132\022.TSD.ShadowArc"
-    "hive\022<\n tschchartseriesmixedcolumnshadow"
-    "\030) \001(\0132\022.TSD.ShadowArchive\022:\n\036tschcharts"
-    "eriesmixedlineshadow\030* \001(\0132\022.TSD.ShadowA"
-    "rchive\0224\n\030tschchartseriespieshadow\030+ \001(\013"
-    "2\022.TSD.ShadowArchive\0228\n\034tschchartseriess"
-    "cattershadow\030, \001(\0132\022.TSD.ShadowArchive\0225"
-    "\n\031tschchartseriesareastroke\030- \001(\0132\022.TSD."
-    "StrokeArchive\0224\n\030tschchartseriesbarstrok"
-    "e\030. \001(\0132\022.TSD.StrokeArchive\0227\n\033tschchart"
-    "seriesbubblestroke\030/ \001(\0132\022.TSD.StrokeArc"
-    "hive\0225\n\031tschchartserieslinestroke\0300 \001(\0132"
-    "\022.TSD.StrokeArchive\022:\n\036tschchartseriesmi"
-    "xedareastroke\0301 \001(\0132\022.TSD.StrokeArchive\022"
-    "<\n tschchartseriesmixedcolumnstroke\0302 \001("
-    "\0132\022.TSD.StrokeArchive\022:\n\036tschchartseries"
-    "mixedlinestroke\0303 \001(\0132\022.TSD.StrokeArchiv"
-    "e\0224\n\030tschchartseriespiestroke\0304 \001(\0132\022.TS"
-    "D.StrokeArchive\0228\n\034tschchartseriesscatte"
-    "rstroke\0305 \001(\0132\022.TSD.StrokeArchive\0227\n\035tsc"
-    "hchartseriesareasymbolfill\0306 \001(\0132\020.TSD.F"
-    "illArchive\0229\n\037tschchartseriesbubblesymbo"
-    "lfill\0307 \001(\0132\020.TSD.FillArchive\0227\n\035tschcha"
-    "rtserieslinesymbolfill\0308 \001(\0132\020.TSD.FillA"
-    "rchive\022<\n\"tschchartseriesmixedareasymbol"
-    "fill\0309 \001(\0132\020.TSD.FillArchive\022<\n\"tschchar"
-    "tseriesmixedlinesymbolfill\030: \001(\0132\020.TSD.F"
-    "illArchive\022:\n tschchartseriesscattersymb"
-    "olfill\030; \001(\0132\020.TSD.FillArchive\0222\n*tschch"
-    "artseriesareasymbolfilluseseriesfill\030< \001"
-    "(\010\0222\n*tschchartserieslinesymbolfillusese"
-    "riesfill\030= \001(\010\0227\n/tschchartseriesmixedar"
-    "easymbolfilluseseriesfill\030> \001(\010\0227\n/tschc"
-    "hartseriesmixedlinesymbolfilluseseriesfi"
-    "ll\030\? \001(\010\0224\n,tschchartseriesareasymbolfil"
-    "luseseriesstroke\030@ \001(\010\0226\n.tschchartserie"
-    "sbubblesymbolfilluseseriesstroke\030A \001(\010\0224"
-    "\n,tschchartserieslinesymbolfilluseseries"
-    "stroke\030B \001(\010\0229\n1tschchartseriesmixedarea"
-    "symbolfilluseseriesstroke\030C \001(\010\0229\n1tschc"
-    "hartseriesmixedlinesymbolfilluseseriesst"
-    "roke\030D \001(\010\0227\n/tschchartseriesscattersymb"
-    "olfilluseseriesstroke\030E \001(\010\022%\n\035tschchart"
-    "seriesareasymbolsize\030F \001(\002\022%\n\035tschcharts"
-    "erieslinesymbolsize\030G \001(\002\022*\n\"tschchartse"
-    "riesmixedareasymbolsize\030H \001(\002\022*\n\"tschcha"
-    "rtseriesmixedlinesymbolsize\030I \001(\002\022(\n tsc"
-    "hchartseriesscattersymbolsize\030J \001(\002\022;\n\037t"
-    "schchartseriesareasymbolstroke\030K \001(\0132\022.T"
-    "SD.StrokeArchive\022=\n!tschchartseriesbubbl"
-    "esymbolstroke\030L \001(\0132\022.TSD.StrokeArchive\022"
-    ";\n\037tschchartserieslinesymbolstroke\030M \001(\013"
-    "2\022.TSD.StrokeArchive\022@\n$tschchartseriesm"
-    "ixedareasymbolstroke\030N \001(\0132\022.TSD.StrokeA"
-    "rchive\022@\n$tschchartseriesmixedlinesymbol"
-    "stroke\030O \001(\0132\022.TSD.StrokeArchive\022>\n\"tsch"
-    "chartseriesscattersymbolstroke\030P \001(\0132\022.T"
-    "SD.StrokeArchive\0226\n.tschchartseriesdefau"
-    "lttrendlineequationopacity\030Q \001(\002\022B\n:tsch"
-    "chartseriesdefaulttrendlineequationparag"
-    "raphstyleindex\030R \001(\005\0226\n.tschchartseriesd"
-    "efaulttrendlinersquaredopacity\030S \001(\002\022B\n:"
-    "tschchartseriesdefaulttrendlinersquaredp"
-    "aragraphstyleindex\030T \001(\005\022A\n%tschchartser"
-    "iesdefaulttrendlineshadow\030U \001(\0132\022.TSD.Sh"
-    "adowArchive\022A\n%tschchartseriesdefaulttre"
-    "ndlinestroke\030V \001(\0132\022.TSD.StrokeArchive\022-"
-    "\n%tschchartseriesareavaluelabelposition\030"
-    "W \001(\005\022,\n$tschchartseriesbarvaluelabelpos"
-    "ition\030X \001(\005\022/\n\'tschchartseriesbubblevalu"
-    "elabelposition\030Y \001(\005\0220\n(tschchartseriesd"
-    "efaultvaluelabelposition\030Z \001(\005\022-\n%tschch"
-    "artserieslinevaluelabelposition\030[ \001(\005\0222\n"
-    "*tschchartseriesmixedareavaluelabelposit"
-    "ion\030\\ \001(\005\0224\n,tschchartseriesmixedcolumnv"
-    "aluelabelposition\030] \001(\005\0222\n*tschchartseri"
-    "esmixedlinevaluelabelposition\030^ \001(\005\0220\n(t"
-    "schchartseriesscattervaluelabelposition\030"
-    "_ \001(\005\0224\n,tschchartseriesstackedareavalue"
-    "labelposition\030` \001(\005\0223\n+tschchartseriesst"
-    "ackedbarvaluelabelposition\030a \001(\0052X\n\007curr"
-    "ent\022\035.TSCH.ChartSeriesStyleArchive\030\220N \001("
-    "\0132\'.TSCH.Generated.ChartSeriesStyleArchi"
-    "ve\"\223\034\n\032ChartSeriesNonStyleArchive\022,\n$tsc"
-    "hchartseriesbubbleadjustmentscale\030\001 \001(\002\022"
-    "d\n0tschchartseriesdefaulterrorbarcustomn"
+    "elposition\030\001 \001(\005\022E\n#tschchartaxisdefault"
+    "1_0numberformat\030\002 \001(\0132\030.TSK.FormatStruct"
+    "Archive\022B\n tschchartaxisdefaultnumberfor"
+    "mat\030* \001(\0132\030.TSK.FormatStructArchive\022C\n!t"
+    "schchartaxisdefault1_0dateformat\030\024 \001(\0132\030"
+    ".TSK.FormatStructArchive\022D\n\"tschchartaxi"
+    "sdefaultdurationformat\030\025 \001(\0132\030.TSK.Forma"
+    "tStructArchive\022@\n\036tschchartaxisdefaultda"
+    "teformat\030\026 \001(\0132\030.TSK.FormatStructArchive"
+    "\022,\n$tschchartaxisdefaultnumberformattype"
+    "\030\003 \001(\005\022)\n!tschchartaxisvaluenumberofdeca"
+    "des\030\004 \001(\005\0220\n(tschchartaxisvaluenumberofm"
+    "ajorgridlines\030\005 \001(\005\0220\n(tschchartaxisvalu"
+    "enumberofminorgridlines\030\006 \001(\005\022(\n tschcha"
+    "rtaxiscategoryplottoedges\030\007 \001(\010\022\037\n\027tschc"
+    "hartaxisvaluescale\030\010 \001(\005\022\'\n\037tschchartaxi"
+    "scategoryshowlabels\030\t \001(\010\022&\n\036tschchartax"
+    "isdefaultshowlabels\030\n \001(\010\022$\n\034tschchartax"
+    "isvalueshowlabels\030\013 \001(\010\022-\n%tschchartaxis"
+    "categoryshowserieslabels\030\014 \001(\010\022.\n&tschch"
+    "artaxismultidatashowserieslabels\030\023 \001(\010\022&"
+    "\n\036tschchartaxiscategoryshowtitle\030\r \001(\010\022#"
+    "\n\033tschchartaxisvalueshowtitle\030\016 \001(\010\022\"\n\032t"
+    "schchartaxiscategorytitle\030\017 \001(\t\022\037\n\027tschc"
+    "hartaxisvaluetitle\030\020 \001(\t\022F\n\033tschchartaxi"
+    "sdefaultusermax\030\021 \001(\0132!.TSCH.ChartsNSNum"
+    "berDoubleArchive\022F\n\033tschchartaxisdefault"
+    "usermin\030\022 \001(\0132!.TSCH.ChartsNSNumberDoubl"
+    "eArchive2Z\n\007current\022\036.TSCH.ChartAxisNonS"
+    "tyleArchive\030\220N \001(\0132(.TSCH.Generated.Char"
+    "tAxisNonStyleArchive\"\307+\n\027ChartSeriesStyl"
+    "eArchive\022B\n%tschchartseriesdefaulterrorb"
+    "arlineend\030\001 \001(\0132\023.TSD.LineEndArchive\022J\n-"
+    "tschchartseriesdefaulterrorbarlineendsca"
+    "tterx\030\002 \001(\0132\023.TSD.LineEndArchive\022@\n$tsch"
+    "chartseriesdefaulterrorbarshadow\030\003 \001(\0132\022"
+    ".TSD.ShadowArchive\022@\n$tschchartseriesdef"
+    "aulterrorbarstroke\030\004 \001(\0132\022.TSD.StrokeArc"
+    "hive\022H\n,tschchartseriesdefaulterrorbarst"
+    "rokescatterx\030\005 \001(\0132\022.TSD.StrokeArchive\0223"
+    "\n\031tschchartseries3dareafill\030\006 \001(\0132\020.TSD."
+    "FillArchive\0222\n\030tschchartseries3dbarfill\030"
+    "\007 \001(\0132\020.TSD.FillArchive\0225\n\033tschchartseri"
+    "es3dcolumnfill\030\010 \001(\0132\020.TSD.FillArchive\0223"
+    "\n\031tschchartseries3dlinefill\030\t \001(\0132\020.TSD."
+    "FillArchive\0222\n\030tschchartseries3dpiefill\030"
+    "\n \001(\0132\020.TSD.FillArchive\0221\n\027tschchartseri"
+    "esareafill\030\013 \001(\0132\020.TSD.FillArchive\0220\n\026ts"
+    "chchartseriesbarfill\030\014 \001(\0132\020.TSD.FillArc"
+    "hive\0223\n\031tschchartseriescolumnfill\030\r \001(\0132"
+    "\020.TSD.FillArchive\0224\n\032tschchartseriesdefa"
+    "ultfill\030\016 \001(\0132\020.TSD.FillArchive\0226\n\034tschc"
+    "hartseriesmixedareafill\030\017 \001(\0132\020.TSD.Fill"
+    "Archive\0228\n\036tschchartseriesmixedcolumnfil"
+    "l\030\020 \001(\0132\020.TSD.FillArchive\0220\n\026tschchartse"
+    "riespiefill\030\021 \001(\0132\020.TSD.FillArchive\0223\n+t"
+    "schchartseriesarealabelparagraphstyleind"
+    "ex\030\022 \001(\005\0222\n*tschchartseriesbarlabelparag"
+    "raphstyleindex\030\023 \001(\005\0226\n.tschchartseriesd"
+    "efaultlabelparagraphstyleindex\030\024 \001(\005\0223\n+"
+    "tschchartserieslinelabelparagraphstylein"
+    "dex\030\025 \001(\005\0224\n,tschchartseriesmixedlabelpa"
+    "ragraphstyleindex\030\026 \001(\005\0222\n*tschchartseri"
+    "espielabelparagraphstyleindex\030\027 \001(\005\022%\n\035t"
+    "schchartseriesdefaultopacity\030\030 \001(\002\022:\n2ts"
+    "chchartseriesareaoutsidelabelparagraphst"
+    "yleindex\030\031 \001(\005\0229\n1tschchartseriesbarouts"
+    "idelabelparagraphstyleindex\030\032 \001(\005\022=\n5tsc"
+    "hchartseriesdefaultoutsidelabelparagraph"
+    "styleindex\030\033 \001(\005\022;\n3tschchartseriesmixed"
+    "outsidelabelparagraphstyleindex\030\034 \001(\005\0229\n"
+    "1tschchartseriespieoutsidelabelparagraph"
+    "styleindex\030\035 \001(\005\0227\n\033tschchartseries3dare"
+    "ashadow\030\036 \001(\0132\022.TSD.ShadowArchive\0226\n\032tsc"
+    "hchartseries3dbarshadow\030\037 \001(\0132\022.TSD.Shad"
+    "owArchive\0229\n\035tschchartseries3dcolumnshad"
+    "ow\030  \001(\0132\022.TSD.ShadowArchive\0227\n\033tschchar"
+    "tseries3dlineshadow\030! \001(\0132\022.TSD.ShadowAr"
+    "chive\0226\n\032tschchartseries3dpieshadow\030\" \001("
+    "\0132\022.TSD.ShadowArchive\0225\n\031tschchartseries"
+    "areashadow\030# \001(\0132\022.TSD.ShadowArchive\0224\n\030"
+    "tschchartseriesbarshadow\030$ \001(\0132\022.TSD.Sha"
+    "dowArchive\0227\n\033tschchartseriesbubbleshado"
+    "w\030% \001(\0132\022.TSD.ShadowArchive\0228\n\034tschchart"
+    "seriesdefaultshadow\030& \001(\0132\022.TSD.ShadowAr"
+    "chive\0225\n\031tschchartserieslineshadow\030\' \001(\013"
+    "2\022.TSD.ShadowArchive\022:\n\036tschchartseriesm"
+    "ixedareashadow\030( \001(\0132\022.TSD.ShadowArchive"
+    "\022<\n tschchartseriesmixedcolumnshadow\030) \001"
+    "(\0132\022.TSD.ShadowArchive\022:\n\036tschchartserie"
+    "smixedlineshadow\030* \001(\0132\022.TSD.ShadowArchi"
+    "ve\0224\n\030tschchartseriespieshadow\030+ \001(\0132\022.T"
+    "SD.ShadowArchive\0228\n\034tschchartseriesscatt"
+    "ershadow\030, \001(\0132\022.TSD.ShadowArchive\0225\n\031ts"
+    "chchartseriesareastroke\030- \001(\0132\022.TSD.Stro"
+    "keArchive\0224\n\030tschchartseriesbarstroke\030. "
+    "\001(\0132\022.TSD.StrokeArchive\0227\n\033tschchartseri"
+    "esbubblestroke\030/ \001(\0132\022.TSD.StrokeArchive"
+    "\0225\n\031tschchartserieslinestroke\0300 \001(\0132\022.TS"
+    "D.StrokeArchive\022:\n\036tschchartseriesmixeda"
+    "reastroke\0301 \001(\0132\022.TSD.StrokeArchive\022<\n t"
+    "schchartseriesmixedcolumnstroke\0302 \001(\0132\022."
+    "TSD.StrokeArchive\022:\n\036tschchartseriesmixe"
+    "dlinestroke\0303 \001(\0132\022.TSD.StrokeArchive\0224\n"
+    "\030tschchartseriespiestroke\0304 \001(\0132\022.TSD.St"
+    "rokeArchive\0228\n\034tschchartseriesscatterstr"
+    "oke\0305 \001(\0132\022.TSD.StrokeArchive\0227\n\035tschcha"
+    "rtseriesareasymbolfill\0306 \001(\0132\020.TSD.FillA"
+    "rchive\0229\n\037tschchartseriesbubblesymbolfil"
+    "l\0307 \001(\0132\020.TSD.FillArchive\0227\n\035tschchartse"
+    "rieslinesymbolfill\0308 \001(\0132\020.TSD.FillArchi"
+    "ve\022<\n\"tschchartseriesmixedareasymbolfill"
+    "\0309 \001(\0132\020.TSD.FillArchive\022<\n\"tschchartser"
+    "iesmixedlinesymbolfill\030: \001(\0132\020.TSD.FillA"
+    "rchive\022:\n tschchartseriesscattersymbolfi"
+    "ll\030; \001(\0132\020.TSD.FillArchive\0222\n*tschcharts"
+    "eriesareasymbolfilluseseriesfill\030< \001(\010\0222"
+    "\n*tschchartserieslinesymbolfilluseseries"
+    "fill\030= \001(\010\0227\n/tschchartseriesmixedareasy"
+    "mbolfilluseseriesfill\030> \001(\010\0227\n/tschchart"
+    "seriesmixedlinesymbolfilluseseriesfill\030\?"
+    " \001(\010\0224\n,tschchartseriesareasymbolfilluse"
+    "seriesstroke\030@ \001(\010\0226\n.tschchartseriesbub"
+    "blesymbolfilluseseriesstroke\030A \001(\010\0224\n,ts"
+    "chchartserieslinesymbolfilluseseriesstro"
+    "ke\030B \001(\010\0229\n1tschchartseriesmixedareasymb"
+    "olfilluseseriesstroke\030C \001(\010\0229\n1tschchart"
+    "seriesmixedlinesymbolfilluseseriesstroke"
+    "\030D \001(\010\0227\n/tschchartseriesscattersymbolfi"
+    "lluseseriesstroke\030E \001(\010\022%\n\035tschchartseri"
+    "esareasymbolsize\030F \001(\002\022%\n\035tschchartserie"
+    "slinesymbolsize\030G \001(\002\022*\n\"tschchartseries"
+    "mixedareasymbolsize\030H \001(\002\022*\n\"tschchartse"
+    "riesmixedlinesymbolsize\030I \001(\002\022(\n tschcha"
+    "rtseriesscattersymbolsize\030J \001(\002\022;\n\037tschc"
+    "hartseriesareasymbolstroke\030K \001(\0132\022.TSD.S"
+    "trokeArchive\022=\n!tschchartseriesbubblesym"
+    "bolstroke\030L \001(\0132\022.TSD.StrokeArchive\022;\n\037t"
+    "schchartserieslinesymbolstroke\030M \001(\0132\022.T"
+    "SD.StrokeArchive\022@\n$tschchartseriesmixed"
+    "areasymbolstroke\030N \001(\0132\022.TSD.StrokeArchi"
+    "ve\022@\n$tschchartseriesmixedlinesymbolstro"
+    "ke\030O \001(\0132\022.TSD.StrokeArchive\022>\n\"tschchar"
+    "tseriesscattersymbolstroke\030P \001(\0132\022.TSD.S"
+    "trokeArchive\0226\n.tschchartseriesdefaulttr"
+    "endlineequationopacity\030Q \001(\002\022B\n:tschchar"
+    "tseriesdefaulttrendlineequationparagraph"
+    "styleindex\030R \001(\005\0226\n.tschchartseriesdefau"
+    "lttrendlinersquaredopacity\030S \001(\002\022B\n:tsch"
+    "chartseriesdefaulttrendlinersquaredparag"
+    "raphstyleindex\030T \001(\005\022A\n%tschchartseriesd"
+    "efaulttrendlineshadow\030U \001(\0132\022.TSD.Shadow"
+    "Archive\022A\n%tschchartseriesdefaulttrendli"
+    "nestroke\030V \001(\0132\022.TSD.StrokeArchive\022-\n%ts"
+    "chchartseriesareavaluelabelposition\030W \001("
+    "\005\022,\n$tschchartseriesbarvaluelabelpositio"
+    "n\030X \001(\005\022/\n\'tschchartseriesbubblevaluelab"
+    "elposition\030Y \001(\005\0220\n(tschchartseriesdefau"
+    "ltvaluelabelposition\030Z \001(\005\022-\n%tschcharts"
+    "erieslinevaluelabelposition\030[ \001(\005\0222\n*tsc"
+    "hchartseriesmixedareavaluelabelposition\030"
+    "\\ \001(\005\0224\n,tschchartseriesmixedcolumnvalue"
+    "labelposition\030] \001(\005\0222\n*tschchartseriesmi"
+    "xedlinevaluelabelposition\030^ \001(\005\0220\n(tschc"
+    "hartseriesscattervaluelabelposition\030_ \001("
+    "\005\0224\n,tschchartseriesstackedareavaluelabe"
+    "lposition\030` \001(\005\0223\n+tschchartseriesstacke"
+    "dbarvaluelabelposition\030a \001(\0052X\n\007current\022"
+    "\035.TSCH.ChartSeriesStyleArchive\030\220N \001(\0132\'."
+    "TSCH.Generated.ChartSeriesStyleArchive\"\325"
+    "\037\n\032ChartSeriesNonStyleArchive\022,\n$tschcha"
+    "rtseriesbubbleadjustmentscale\030\001 \001(\002\022d\n0t"
+    "schchartseriesdefaulterrorbarcustomnegat"
+    "ivedata\030\002 \001(\0132*.TSCH.ChartsNSArrayOfNSNu"
+    "mberDoubleArchive\022l\n8tschchartseriesdefa"
+    "ulterrorbarcustomnegativedatascatterx\030\003 "
+    "\001(\0132*.TSCH.ChartsNSArrayOfNSNumberDouble"
+    "Archive\022d\n0tschchartseriesdefaulterrorba"
+    "rcustompositivedata\030\004 \001(\0132*.TSCH.ChartsN"
+    "SArrayOfNSNumberDoubleArchive\022l\n8tschcha"
+    "rtseriesdefaulterrorbarcustompositivedat"
+    "ascatterx\030\005 \001(\0132*.TSCH.ChartsNSArrayOfNS"
+    "NumberDoubleArchive\0220\n(tschchartseriesde"
+    "faulterrorbarfixedvalue\030\006 \001(\002\0228\n0tschcha"
+    "rtseriesdefaulterrorbarfixedvaluescatter"
+    "x\030\007 \001(\002\0222\n*tschchartseriesdefaulterrorba"
+    "rpercentvalue\030\010 \001(\002\022:\n2tschchartseriesde"
+    "faulterrorbarpercentvaluescatterx\030\t \001(\002\022"
+    "-\n%tschchartseriesdefaulterrorbarsetting"
+    "\030\n \001(\005\0225\n-tschchartseriesdefaulterrorbar"
+    "settingscatterx\030\013 \001(\005\0221\n)tschchartseries"
+    "defaulterrorbarstddevvalue\030\014 \001(\002\0229\n1tsch"
+    "chartseriesdefaulterrorbarstddevvaluesca"
+    "tterx\030\r \001(\002\022*\n\"tschchartseriesdefaulterr"
+    "orbartype\030\016 \001(\005\0222\n*tschchartseriesdefaul"
+    "terrorbartypescatterx\030\017 \001(\005\022(\n tschchart"
+    "seriespielabelexplosion\030\020 \001(\002\022%\n\035tschcha"
+    "rtseriesbubblelinetype\030\021 \001(\005\022#\n\033tschchar"
+    "tserieslinelinetype\030\022 \001(\005\022(\n tschchartse"
+    "riesmixedlinelinetype\030\023 \001(\005\022&\n\036tschchart"
+    "seriesscatterlinetype\030\024 \001(\005\022G\n%tschchart"
+    "seriesdefault1_0numberformat\030\025 \001(\0132\030.TSK"
+    ".FormatStructArchive\022D\n\"tschchartseriesd"
+    "efaultnumberformat\030b \001(\0132\030.TSK.FormatStr"
+    "uctArchive\022E\n#tschchartseriesdefault1_0d"
+    "ateformat\030E \001(\0132\030.TSK.FormatStructArchiv"
+    "e\022F\n$tschchartseriesdefaultdurationforma"
+    "t\030F \001(\0132\030.TSK.FormatStructArchive\022B\n tsc"
+    "hchartseriesdefaultdateformat\030G \001(\0132\030.TS"
+    "K.FormatStructArchive\022C\n!tschchartseries"
+    "pie1_0numberformat\030\026 \001(\0132\030.TSK.FormatStr"
+    "uctArchive\022@\n\036tschchartseriespienumberfo"
+    "rmat\030c \001(\0132\030.TSK.FormatStructArchive\022.\n&"
+    "tschchartseriesdefaultnumberformattype\030\027"
+    " \001(\005\022*\n\"tschchartseriespienumberformatty"
+    "pe\030\030 \001(\005\022K\n)tschchartseriesstackedpercen"
+    "tnumberformat\030\031 \001(\0132\030.TSK.FormatStructAr"
+    "chive\022(\n tschchartseriesdefaultseriestyp"
+    "e\030\032 \001(\005\022*\n\"tschchartseriesdefaultshowerr"
+    "orbar\030\033 \001(\010\0222\n*tschchartseriesdefaultsho"
+    "werrorbarscatterx\030\034 \001(\010\022&\n\036tschchartseri"
+    "esscattershowline\030\035 \001(\010\022-\n%tschchartseri"
+    "esbubbleshownegativedata\030\036 \001(\010\022*\n\"tschch"
+    "artseriespieshowserieslabels\030\037 \001(\010\022%\n\035ts"
+    "chchartseriesareashowsymbol\030  \001(\010\022%\n\035tsc"
+    "hchartserieslineshowsymbol\030! \001(\010\022*\n\"tsch"
+    "chartseriesmixedareashowsymbol\030\" \001(\010\022*\n\""
+    "tschchartseriesmixedlineshowsymbol\030# \001(\010"
+    "\022(\n tschchartseriesscattershowsymbol\030$ \001"
+    "(\010\022+\n#tschchartseriesdefaultshowtrendlin"
+    "e\030% \001(\010\022*\n\"tschchartseriesareashowvaluel"
+    "abels\030& \001(\010\022)\n!tschchartseriesbarshowval"
+    "uelabels\030\' \001(\010\022,\n$tschchartseriesbubbles"
+    "howvaluelabels\030( \001(\010\022-\n%tschchartseriesd"
+    "efaultshowvaluelabels\030) \001(\010\022*\n\"tschchart"
+    "serieslineshowvaluelabels\030* \001(\010\022+\n#tschc"
+    "hartseriesmixedshowvaluelabels\030+ \001(\010\022)\n!"
+    "tschchartseriespieshowvaluelabels\030, \001(\010\022"
+    "-\n%tschchartseriesscattershowvaluelabels"
+    "\030- \001(\010\022*\n\"tschchartseriesbubblesizedimen"
+    "sion\030. \001(\005\022%\n\035tschchartseriesareasymbolt"
+    "ype\030/ \001(\005\022%\n\035tschchartserieslinesymbolty"
+    "pe\0300 \001(\005\022*\n\"tschchartseriesmixedareasymb"
+    "oltype\0301 \001(\005\022*\n\"tschchartseriesmixedline"
+    "symboltype\0302 \001(\005\022(\n tschchartseriesscatt"
+    "ersymboltype\0303 \001(\005\0226\n.tschchartseriesdef"
+    "aulttrendlineequationoffsetx\0304 \001(\002\0226\n.ts"
+    "chchartseriesdefaulttrendlineequationoff"
+    "sety\0305 \001(\002\0222\n*tschchartseriesdefaulttren"
+    "dlinelabelstring\0306 \001(\t\022,\n$tschchartserie"
+    "sdefaulttrendlineorder\0307 \001(\005\022-\n%tschchar"
+    "tseriesdefaulttrendlineperiod\0308 \001(\005\0226\n.t"
+    "schchartseriesdefaulttrendlinersquaredof"
+    "fsetx\0309 \001(\002\0226\n.tschchartseriesdefaulttre"
+    "ndlinersquaredoffsety\030: \001(\002\0223\n+tschchart"
+    "seriesdefaulttrendlineshowequation\030; \001(\010"
+    "\0220\n(tschchartseriesdefaulttrendlineshowl"
+    "abel\030< \001(\010\0222\n*tschchartseriesdefaulttren"
+    "dlineshowr2value\030= \001(\010\022+\n#tschchartserie"
+    "sdefaulttrendlinetype\030> \001(\005\022(\n tschchart"
+    "seriespiewedgeexplosion\030\? \001(\002\022*\n\"tschcha"
+    "rtseriesdefaultyaxisordinal\030@ \001(\005\022-\n%tsc"
+    "hchartseriesbubbleshowserieslabels\030A \001(\010"
+    "\022,\n$tschchartseriesbubblevaluelabelsaxis"
+    "\030B \001(\005\022.\n&tschchartseriesscattershowseri"
+    "eslabels\030C \001(\010\022-\n%tschchartseriesscatter"
+    "valuelabelsaxis\030D \001(\005\022/\n\'tschchartseries"
+    "defaultshowlabelsinfront\030d \001(\010\022.\n&tschch"
+    "artseriesbubbleshowlabelsinfront\030e \001(\0102^"
+    "\n\007current\022 .TSCH.ChartSeriesNonStyleArch"
+    "ive\030\220N \001(\0132*.TSCH.Generated.ChartSeriesN"
+    "onStyleArchive\"\263\n\n\036ChartGenericPropertyM"
+    "apArchive\022\037\n\027tschchartinfo3dbarshape\030\001 \001"
+    "(\005\022!\n\031tschchartinfo3dbeveledges\030\002 \001(\010\022\'\n"
+    "\037tschchartinfo3dintersetdepthgap\030\003 \001(\002\022;"
+    "\n\027tschchartinfo3drotation\030\004 \001(\0132\032.TSCH.C"
+    "hart3DVectorArchive\0228\n\024tschchartinfo3dsc"
+    "ale\030\005 \001(\0132\032.TSCH.Chart3DVectorArchive\022;\n"
+    "\027tschchartinfo3dviewport\030\006 \001(\0132\032.TSCH.Ch"
+    "art3DVectorArchive\022\"\n\032tschchartinfopiest"
+    "artangle\030\007 \001(\002\022\037\n\027tschchartinfoshowlegen"
+    "d\030\010 \001(\010\022\036\n\026tschchartinfoshowtitle\030\t \001(\010\022"
+    "#\n\033tschchartinfoskiphiddendata\030\n \001(\010\022\032\n\022"
+    "tschchartinfotitle\030\013 \001(\t\022(\n tschchartinf"
+    "odatasetnamelocation\030\014 \001(\005\022)\n!tschcharti"
+    "nfomultidatacontroltype\030\r \001(\005\022#\n\033tschcha"
+    "rtinfo3dchartopacity\030\016 \001(\002\022K\n\036tschcharti"
+    "nfo3dlightingpackage\030\017 \001(\0132#.TSCH.Chart3"
+    "DLightingPackageArchive\0225\n\033tschchartinfo"
+    "backgroundfill\030\020 \001(\0132\020.TSD.FillArchive\0229"
+    "\n\035tschchartinfobackgroundstroke\030\021 \001(\0132\022."
+    "TSD.StrokeArchive\022\"\n\032tschchartinfoborder"
+    "opacity\030\022 \001(\002\0225\n\031tschchartinfobordershad"
+    "ow\030\023 \001(\0132\022.TSD.ShadowArchive\0225\n\031tschchar"
+    "tinfoborderstroke\030\024 \001(\0132\022.TSD.StrokeArch"
+    "ive\022\"\n\032tschchartinfocombinelayers\030\025 \001(\010\022"
+    "9\n\037tschchartinfogridbackgroundfill\030\026 \001(\013"
+    "2\020.TSD.FillArchive\022*\n\"tschchartinfogridb"
+    "ackgroundopacity\030\027 \001(\002\022 \n\030tschchartinfoi"
+    "nterbargap\030\030 \001(\002\022 \n\030tschchartinfointerse"
+    "tgap\030\031 \001(\002\022\037\n\027tschchartinfoshowborder\030\032 "
+    "\001(\010\022+\n\027tschchartinfotitlecolor\030\033 \001(\0132\n.T"
+    "SP.Color\022-\n%tschchartinfotitleparagraphs"
+    "tyleindex\030\034 \001(\005\0223\n+tschchartinfodatasetn"
+    "ameparagraphstyleindex\030\035 \001(\005\"\207\002\n\037LegendG"
+    "enericPropertyMapArchive\022-\n\023tschlegendmo"
+    "delfill\030\001 \001(\0132\020.TSD.FillArchive\022/\n\'tschl"
+    "egendmodellabelparagraphstyleindex\030\002 \001(\005"
+    "\022\036\n\026tschlegendmodelopacity\030\003 \001(\002\0221\n\025tsch"
+    "legendmodelshadow\030\004 \001(\0132\022.TSD.ShadowArch"
+    "ive\0221\n\025tschlegendmodelstroke\030\005 \001(\0132\022.TSD"
+    ".StrokeArchive\"\244\016\n\"ChartAxisGenericPrope"
+    "rtyMapArchive\022$\n\034tschchartaxis3dlabelpos"
+    "ition\030\001 \001(\005\022>\n\034tschchartaxis1_0numberfor"
+    "mat\030\002 \001(\0132\030.TSK.FormatStructArchive\022;\n\031t"
+    "schchartaxisnumberformat\030\003 \001(\0132\030.TSK.For"
+    "matStructArchive\022<\n\032tschchartaxis1_0date"
+    "format\030\004 \001(\0132\030.TSK.FormatStructArchive\022="
+    "\n\033tschchartaxisdurationformat\030\005 \001(\0132\030.TS"
+    "K.FormatStructArchive\0229\n\027tschchartaxisda"
+    "teformat\030\006 \001(\0132\030.TSK.FormatStructArchive"
+    "\022%\n\035tschchartaxisnumberformattype\030\007 \001(\005\022"
+    "$\n\034tschchartaxisnumberofdecades\030\010 \001(\005\022+\n"
+    "#tschchartaxisnumberofmajorgridlines\030\t \001"
+    "(\005\022+\n#tschchartaxisnumberofminorgridline"
+    "s\030\n \001(\005\022 \n\030tschchartaxisplottoedges\030\013 \001("
+    "\010\022\032\n\022tschchartaxisscale\030\014 \001(\005\022\037\n\027tschcha"
+    "rtaxisshowlabels\030\r \001(\010\022%\n\035tschchartaxiss"
+    "howserieslabels\030\016 \001(\010\022\036\n\026tschchartaxissh"
+    "owtitle\030\017 \001(\010\022\032\n\022tschchartaxistitle\030\020 \001("
+    "\t\022\?\n\024tschchartaxisusermax\030\021 \001(\0132!.TSCH.C"
+    "hartsNSNumberDoubleArchive\022\?\n\024tschcharta"
+    "xisusermin\030\022 \001(\0132!.TSCH.ChartsNSNumberDo"
+    "ubleArchive\022&\n\036tschchartaxis3dgridlineop"
+    "acity\030\023 \001(\002\0229\n\035tschchartaxis3dgridlinest"
+    "roke\030\024 \001(\0132\022.TSD.StrokeArchive\022&\n\036tschch"
+    "artaxishorizontalspacing\030\025 \001(\005\022-\n%tschch"
+    "artaxislabelparagraphstyleindex\030\026 \001(\005\022&\n"
+    "\036tschchartaxislabelsorientation\030\027 \001(\002\022)\n"
+    "!tschchartaxismajorgridlineopacity\030\030 \001(\002"
+    "\022<\n tschchartaxismajorgridlineshadow\030\031 \001"
+    "(\0132\022.TSD.ShadowArchive\022<\n tschchartaxism"
+    "ajorgridlinestroke\030\032 \001(\0132\022.TSD.StrokeArc"
+    "hive\022)\n!tschchartaxisminorgridlineopacit"
+    "y\030\033 \001(\002\022<\n tschchartaxisminorgridlinesha"
+    "dow\030\034 \001(\0132\022.TSD.ShadowArchive\022<\n tschcha"
+    "rtaxisminorgridlinestroke\030\035 \001(\0132\022.TSD.St"
+    "rokeArchive\022\035\n\025tschchartaxisshowaxis\030\036 \001"
+    "(\010\022\"\n\032tschchartaxisshowlastlabel\030\037 \001(\010\022\'"
+    "\n\037tschchartaxisshowmajorgridlines\030  \001(\010\022"
+    "\'\n\037tschchartaxisshowmajortickmarks\030! \001(\010"
+    "\022%\n\035tschchartaxisshowminimumlabel\030\" \001(\010\022"
+    "\'\n\037tschchartaxisshowminorgridlines\030# \001(\010"
+    "\022\'\n\037tschchartaxisshowminortickmarks\030$ \001("
+    "\010\022%\n\035tschchartaxistickmarklocation\030% \001(\005"
+    "\022-\n%tschchartaxistitleparagraphstyleinde"
+    "x\030& \001(\005\022$\n\034tschchartaxisverticalspacing\030"
+    "\' \001(\005\"\221\035\n$ChartSeriesGenericPropertyMapA"
+    "rchive\022&\n\036tschchartseriesadjustmentscale"
+    "\030\001 \001(\002\022]\n)tschchartserieserrorbarcustomn"
     "egativedata\030\002 \001(\0132*.TSCH.ChartsNSArrayOf"
-    "NSNumberDoubleArchive\022l\n8tschchartseries"
-    "defaulterrorbarcustomnegativedatascatter"
-    "x\030\003 \001(\0132*.TSCH.ChartsNSArrayOfNSNumberDo"
-    "ubleArchive\022d\n0tschchartseriesdefaulterr"
-    "orbarcustompositivedata\030\004 \001(\0132*.TSCH.Cha"
-    "rtsNSArrayOfNSNumberDoubleArchive\022l\n8tsc"
-    "hchartseriesdefaulterrorbarcustompositiv"
-    "edatascatterx\030\005 \001(\0132*.TSCH.ChartsNSArray"
-    "OfNSNumberDoubleArchive\0220\n(tschchartseri"
-    "esdefaulterrorbarfixedvalue\030\006 \001(\002\0228\n0tsc"
-    "hchartseriesdefaulterrorbarfixedvaluesca"
-    "tterx\030\007 \001(\002\0222\n*tschchartseriesdefaulterr"
-    "orbarpercentvalue\030\010 \001(\002\022:\n2tschchartseri"
-    "esdefaulterrorbarpercentvaluescatterx\030\t "
-    "\001(\002\022-\n%tschchartseriesdefaulterrorbarset"
-    "ting\030\n \001(\005\0225\n-tschchartseriesdefaulterro"
-    "rbarsettingscatterx\030\013 \001(\005\0221\n)tschchartse"
-    "riesdefaulterrorbarstddevvalue\030\014 \001(\002\0229\n1"
-    "tschchartseriesdefaulterrorbarstddevvalu"
-    "escatterx\030\r \001(\002\022*\n\"tschchartseriesdefaul"
-    "terrorbartype\030\016 \001(\005\0222\n*tschchartseriesde"
-    "faulterrorbartypescatterx\030\017 \001(\005\022(\n tschc"
-    "hartseriespielabelexplosion\030\020 \001(\002\022%\n\035tsc"
-    "hchartseriesbubblelinetype\030\021 \001(\005\022#\n\033tsch"
-    "chartserieslinelinetype\030\022 \001(\005\022(\n tschcha"
-    "rtseriesmixedlinelinetype\030\023 \001(\005\022&\n\036tschc"
-    "hartseriesscatterlinetype\030\024 \001(\005\022D\n\"tschc"
-    "hartseriesdefaultnumberformat\030\025 \001(\0132\030.TS"
-    "K.FormatStructArchive\022@\n\036tschchartseries"
-    "pienumberformat\030\026 \001(\0132\030.TSK.FormatStruct"
-    "Archive\022.\n&tschchartseriesdefaultnumberf"
-    "ormattype\030\027 \001(\005\022*\n\"tschchartseriespienum"
-    "berformattype\030\030 \001(\005\022K\n)tschchartseriesst"
-    "ackedpercentnumberformat\030\031 \001(\0132\030.TSK.For"
-    "matStructArchive\022(\n tschchartseriesdefau"
-    "ltseriestype\030\032 \001(\005\022*\n\"tschchartseriesdef"
-    "aultshowerrorbar\030\033 \001(\010\0222\n*tschchartserie"
-    "sdefaultshowerrorbarscatterx\030\034 \001(\010\022&\n\036ts"
-    "chchartseriesscattershowline\030\035 \001(\010\022-\n%ts"
-    "chchartseriesbubbleshownegativedata\030\036 \001("
-    "\010\022*\n\"tschchartseriespieshowserieslabels\030"
-    "\037 \001(\010\022%\n\035tschchartseriesareashowsymbol\030 "
-    " \001(\010\022%\n\035tschchartserieslineshowsymbol\030! "
-    "\001(\010\022*\n\"tschchartseriesmixedareashowsymbo"
-    "l\030\" \001(\010\022*\n\"tschchartseriesmixedlineshows"
-    "ymbol\030# \001(\010\022(\n tschchartseriesscattersho"
-    "wsymbol\030$ \001(\010\022+\n#tschchartseriesdefaults"
-    "howtrendline\030% \001(\010\022*\n\"tschchartseriesare"
-    "ashowvaluelabels\030& \001(\010\022)\n!tschchartserie"
-    "sbarshowvaluelabels\030\' \001(\010\022,\n$tschchartse"
-    "riesbubbleshowvaluelabels\030( \001(\010\022-\n%tschc"
-    "hartseriesdefaultshowvaluelabels\030) \001(\010\022*"
-    "\n\"tschchartserieslineshowvaluelabels\030* \001"
-    "(\010\022+\n#tschchartseriesmixedshowvaluelabel"
-    "s\030+ \001(\010\022)\n!tschchartseriespieshowvaluela"
-    "bels\030, \001(\010\022-\n%tschchartseriesscattershow"
-    "valuelabels\030- \001(\010\022*\n\"tschchartseriesbubb"
-    "lesizedimension\030. \001(\005\022%\n\035tschchartseries"
-    "areasymboltype\030/ \001(\005\022%\n\035tschchartseriesl"
-    "inesymboltype\0300 \001(\005\022*\n\"tschchartseriesmi"
-    "xedareasymboltype\0301 \001(\005\022*\n\"tschchartseri"
-    "esmixedlinesymboltype\0302 \001(\005\022(\n tschchart"
-    "seriesscattersymboltype\0303 \001(\005\0226\n.tschcha"
-    "rtseriesdefaulttrendlineequationoffsetx\030"
-    "4 \001(\002\0226\n.tschchartseriesdefaulttrendline"
-    "equationoffsety\0305 \001(\002\0222\n*tschchartseries"
-    "defaulttrendlinelabelstring\0306 \001(\t\022,\n$tsc"
-    "hchartseriesdefaulttrendlineorder\0307 \001(\005\022"
-    "-\n%tschchartseriesdefaulttrendlineperiod"
-    "\0308 \001(\005\0226\n.tschchartseriesdefaulttrendlin"
-    "ersquaredoffsetx\0309 \001(\002\0226\n.tschchartserie"
-    "sdefaulttrendlinersquaredoffsety\030: \001(\002\0223"
-    "\n+tschchartseriesdefaulttrendlineshowequ"
-    "ation\030; \001(\010\0220\n(tschchartseriesdefaulttre"
-    "ndlineshowlabel\030< \001(\010\0222\n*tschchartseries"
-    "defaulttrendlineshowr2value\030= \001(\010\022+\n#tsc"
-    "hchartseriesdefaulttrendlinetype\030> \001(\005\022("
-    "\n tschchartseriespiewedgeexplosion\030\? \001(\002"
-    "\022*\n\"tschchartseriesdefaultyaxisordinal\030@"
-    " \001(\005\022-\n%tschchartseriesbubbleshowseriesl"
-    "abels\030A \001(\010\022,\n$tschchartseriesbubblevalu"
-    "elabelsaxis\030B \001(\005\022.\n&tschchartseriesscat"
-    "tershowserieslabels\030C \001(\010\022-\n%tschchartse"
-    "riesscattervaluelabelsaxis\030D \001(\0052^\n\007curr"
-    "ent\022 .TSCH.ChartSeriesNonStyleArchive\030\220N"
-    " \001(\0132*.TSCH.Generated.ChartSeriesNonStyl"
-    "eArchive", 15528);
+    "NSNumberDoubleArchive\022e\n1tschchartseries"
+    "errorbarcustomnegativedatascatterx\030\003 \001(\013"
+    "2*.TSCH.ChartsNSArrayOfNSNumberDoubleArc"
+    "hive\022]\n)tschchartserieserrorbarcustompos"
+    "itivedata\030\004 \001(\0132*.TSCH.ChartsNSArrayOfNS"
+    "NumberDoubleArchive\022e\n1tschchartserieser"
+    "rorbarcustompositivedatascatterx\030\005 \001(\0132*"
+    ".TSCH.ChartsNSArrayOfNSNumberDoubleArchi"
+    "ve\022)\n!tschchartserieserrorbarfixedvalue\030"
+    "\006 \001(\002\0221\n)tschchartserieserrorbarfixedval"
+    "uescatterx\030\007 \001(\002\022+\n#tschchartserieserror"
+    "barpercentvalue\030\010 \001(\002\0223\n+tschchartseries"
+    "errorbarpercentvaluescatterx\030\t \001(\002\022&\n\036ts"
+    "chchartserieserrorbarsetting\030\n \001(\005\022.\n&ts"
+    "chchartserieserrorbarsettingscatterx\030\013 \001"
+    "(\005\022*\n\"tschchartserieserrorbarstddevvalue"
+    "\030\014 \001(\002\0222\n*tschchartserieserrorbarstddevv"
+    "aluescatterx\030\r \001(\002\022#\n\033tschchartserieserr"
+    "orbartype\030\016 \001(\005\022+\n#tschchartserieserrorb"
+    "artypescatterx\030\017 \001(\005\022%\n\035tschchartseriesl"
+    "abelexplosion\030\020 \001(\002\022\037\n\027tschchartseriesli"
+    "netype\030\021 \001(\005\022@\n\036tschchartseries1_0number"
+    "format\030\022 \001(\0132\030.TSK.FormatStructArchive\022="
+    "\n\033tschchartseriesnumberformat\030\023 \001(\0132\030.TS"
+    "K.FormatStructArchive\022>\n\034tschchartseries"
+    "1_0dateformat\030\024 \001(\0132\030.TSK.FormatStructAr"
+    "chive\022\?\n\035tschchartseriesdurationformat\030\025"
+    " \001(\0132\030.TSK.FormatStructArchive\022;\n\031tschch"
+    "artseriesdateformat\030\026 \001(\0132\030.TSK.FormatSt"
+    "ructArchive\022\'\n\037tschchartseriesnumberform"
+    "attype\030\027 \001(\005\022D\n\"tschchartseriespercentnu"
+    "mberformat\030\030 \001(\0132\030.TSK.FormatStructArchi"
+    "ve\022!\n\031tschchartseriesseriestype\030\031 \001(\005\022#\n"
+    "\033tschchartseriesshowerrorbar\030\032 \001(\010\022+\n#ts"
+    "chchartseriesshowerrorbarscatterx\030\033 \001(\010\022"
+    "\037\n\027tschchartseriesshowline\030\034 \001(\010\022\'\n\037tsch"
+    "chartseriesshownegativedata\030\035 \001(\010\022\'\n\037tsc"
+    "hchartseriesshowserieslabels\030\036 \001(\010\022!\n\031ts"
+    "chchartseriesshowsymbol\030\037 \001(\010\022$\n\034tschcha"
+    "rtseriesshowtrendline\030  \001(\010\022&\n\036tschchart"
+    "seriesshowvaluelabels\030! \001(\010\022$\n\034tschchart"
+    "seriessizedimension\030\" \001(\005\022!\n\031tschchartse"
+    "riessymboltype\030# \001(\005\022/\n\'tschchartseriest"
+    "rendlineequationoffsetx\030$ \001(\002\022/\n\'tschcha"
+    "rtseriestrendlineequationoffsety\030% \001(\002\022+"
+    "\n#tschchartseriestrendlinelabelstring\030& "
+    "\001(\t\022%\n\035tschchartseriestrendlineorder\030\' \001"
+    "(\005\022&\n\036tschchartseriestrendlineperiod\030( \001"
+    "(\005\022/\n\'tschchartseriestrendlinersquaredof"
+    "fsetx\030) \001(\002\022/\n\'tschchartseriestrendliner"
+    "squaredoffsety\030* \001(\002\022,\n$tschchartseriest"
+    "rendlineshowequation\030+ \001(\010\022)\n!tschcharts"
+    "eriestrendlineshowlabel\030, \001(\010\022+\n#tschcha"
+    "rtseriestrendlineshowr2value\030- \001(\010\022$\n\034ts"
+    "chchartseriestrendlinetype\030. \001(\005\022%\n\035tsch"
+    "chartserieswedgeexplosion\030/ \001(\002\022#\n\033tschc"
+    "hartseriesyaxisordinal\0300 \001(\005\022&\n\036tschchar"
+    "tseriesvaluelabelsaxis\0301 \001(\005\022;\n\036tschchar"
+    "tserieserrorbarlineend\0302 \001(\0132\023.TSD.LineE"
+    "ndArchive\022C\n&tschchartserieserrorbarline"
+    "endscatterx\0303 \001(\0132\023.TSD.LineEndArchive\0229"
+    "\n\035tschchartserieserrorbarshadow\0304 \001(\0132\022."
+    "TSD.ShadowArchive\0229\n\035tschchartserieserro"
+    "rbarstroke\0305 \001(\0132\022.TSD.StrokeArchive\022A\n%"
+    "tschchartserieserrorbarstrokescatterx\0306 "
+    "\001(\0132\022.TSD.StrokeArchive\022-\n\023tschchartseri"
+    "esfill\0307 \001(\0132\020.TSD.FillArchive\022/\n\'tschch"
+    "artserieslabelparagraphstyleindex\0308 \001(\005\022"
+    "\036\n\026tschchartseriesopacity\0309 \001(\002\0226\n.tschc"
+    "hartseriesoutsidelabelparagraphstyleinde"
+    "x\030: \001(\005\0221\n\025tschchartseriesshadow\030; \001(\0132\022"
+    ".TSD.ShadowArchive\0221\n\025tschchartseriesstr"
+    "oke\030< \001(\0132\022.TSD.StrokeArchive\0223\n\031tschcha"
+    "rtseriessymbolfill\030= \001(\0132\020.TSD.FillArchi"
+    "ve\022.\n&tschchartseriessymbolfilluseseries"
+    "fill\030> \001(\010\0220\n(tschchartseriessymbolfillu"
+    "seseriesstroke\030\? \001(\010\022!\n\031tschchartseriess"
+    "ymbolsize\030@ \001(\002\0227\n\033tschchartseriessymbol"
+    "stroke\030A \001(\0132\022.TSD.StrokeArchive\022/\n\'tsch"
+    "chartseriestrendlineequationopacity\030B \001("
+    "\002\022;\n3tschchartseriestrendlineequationpar"
+    "agraphstyleindex\030C \001(\005\022/\n\'tschchartserie"
+    "strendlinersquaredopacity\030D \001(\002\022;\n3tschc"
+    "hartseriestrendlinersquaredparagraphstyl"
+    "eindex\030E \001(\005\022:\n\036tschchartseriestrendline"
+    "shadow\030F \001(\0132\022.TSD.ShadowArchive\022:\n\036tsch"
+    "chartseriestrendlinestroke\030G \001(\0132\022.TSD.S"
+    "trokeArchive\022)\n!tschchartseriesvaluelabe"
+    "lposition\030H \001(\005\022(\n tschchartseriesshowla"
+    "belsinfront\030I \001(\010", 23417);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSCHArchives.GEN.proto", &protobuf_RegisterTypes);
   ChartStyleArchive::default_instance_ = new ChartStyleArchive();
@@ -899,6 +1337,10 @@ void protobuf_AddDesc_TSCHArchives_2eGEN_2eproto() {
   ChartAxisNonStyleArchive::default_instance_ = new ChartAxisNonStyleArchive();
   ChartSeriesStyleArchive::default_instance_ = new ChartSeriesStyleArchive();
   ChartSeriesNonStyleArchive::default_instance_ = new ChartSeriesNonStyleArchive();
+  ChartGenericPropertyMapArchive::default_instance_ = new ChartGenericPropertyMapArchive();
+  LegendGenericPropertyMapArchive::default_instance_ = new LegendGenericPropertyMapArchive();
+  ChartAxisGenericPropertyMapArchive::default_instance_ = new ChartAxisGenericPropertyMapArchive();
+  ChartSeriesGenericPropertyMapArchive::default_instance_ = new ChartSeriesGenericPropertyMapArchive();
   ChartStyleArchive::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::ExtensionSet::RegisterMessageExtension(
     &::TSCH::ChartStyleArchive::default_instance(),
@@ -939,6 +1381,10 @@ void protobuf_AddDesc_TSCHArchives_2eGEN_2eproto() {
     &::TSCH::ChartSeriesNonStyleArchive::default_instance(),
     10000, 11, false, false,
     &::TSCH::Generated::ChartSeriesNonStyleArchive::default_instance());
+  ChartGenericPropertyMapArchive::default_instance_->InitAsDefaultInstance();
+  LegendGenericPropertyMapArchive::default_instance_->InitAsDefaultInstance();
+  ChartAxisGenericPropertyMapArchive::default_instance_->InitAsDefaultInstance();
+  ChartSeriesGenericPropertyMapArchive::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_TSCHArchives_2eGEN_2eproto);
 }
 
@@ -5477,7 +5923,11 @@ ::google::protobuf::Metadata ChartAxisStyleArchive::GetMetadata() const {
 
 #ifndef _MSC_VER
 const int ChartAxisNonStyleArchive::kTschchartaxisdefault3DlabelpositionFieldNumber;
+const int ChartAxisNonStyleArchive::kTschchartaxisdefault10NumberformatFieldNumber;
 const int ChartAxisNonStyleArchive::kTschchartaxisdefaultnumberformatFieldNumber;
+const int ChartAxisNonStyleArchive::kTschchartaxisdefault10DateformatFieldNumber;
+const int ChartAxisNonStyleArchive::kTschchartaxisdefaultdurationformatFieldNumber;
+const int ChartAxisNonStyleArchive::kTschchartaxisdefaultdateformatFieldNumber;
 const int ChartAxisNonStyleArchive::kTschchartaxisdefaultnumberformattypeFieldNumber;
 const int ChartAxisNonStyleArchive::kTschchartaxisvaluenumberofdecadesFieldNumber;
 const int ChartAxisNonStyleArchive::kTschchartaxisvaluenumberofmajorgridlinesFieldNumber;
@@ -5509,7 +5959,11 @@ ChartAxisNonStyleArchive::ChartAxisNonStyleArchive()
 }
 
 void ChartAxisNonStyleArchive::InitAsDefaultInstance() {
+  tschchartaxisdefault1_0numberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
   tschchartaxisdefaultnumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisdefault1_0dateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisdefaultdurationformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisdefaultdateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
   tschchartaxisdefaultusermax_ = const_cast< ::TSCH::ChartsNSNumberDoubleArchive*>(&::TSCH::ChartsNSNumberDoubleArchive::default_instance());
   tschchartaxisdefaultusermin_ = const_cast< ::TSCH::ChartsNSNumberDoubleArchive*>(&::TSCH::ChartsNSNumberDoubleArchive::default_instance());
 }
@@ -5523,7 +5977,11 @@ ChartAxisNonStyleArchive::ChartAxisNonStyleArchive(const ChartAxisNonStyleArchiv
 void ChartAxisNonStyleArchive::SharedCtor() {
   _cached_size_ = 0;
   tschchartaxisdefault3dlabelposition_ = 0;
+  tschchartaxisdefault1_0numberformat_ = NULL;
   tschchartaxisdefaultnumberformat_ = NULL;
+  tschchartaxisdefault1_0dateformat_ = NULL;
+  tschchartaxisdefaultdurationformat_ = NULL;
+  tschchartaxisdefaultdateformat_ = NULL;
   tschchartaxisdefaultnumberformattype_ = 0;
   tschchartaxisvaluenumberofdecades_ = 0;
   tschchartaxisvaluenumberofmajorgridlines_ = 0;
@@ -5556,7 +6014,11 @@ void ChartAxisNonStyleArchive::SharedDtor() {
     delete tschchartaxisvaluetitle_;
   }
   if (this != default_instance_) {
+    delete tschchartaxisdefault1_0numberformat_;
     delete tschchartaxisdefaultnumberformat_;
+    delete tschchartaxisdefault1_0dateformat_;
+    delete tschchartaxisdefaultdurationformat_;
+    delete tschchartaxisdefaultdateformat_;
     delete tschchartaxisdefaultusermax_;
     delete tschchartaxisdefaultusermin_;
   }
@@ -5586,21 +6048,35 @@ ChartAxisNonStyleArchive* ChartAxisNonStyleArchive::New() const {
 void ChartAxisNonStyleArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     tschchartaxisdefault3dlabelposition_ = 0;
+    if (has_tschchartaxisdefault1_0numberformat()) {
+      if (tschchartaxisdefault1_0numberformat_ != NULL) tschchartaxisdefault1_0numberformat_->::TSK::FormatStructArchive::Clear();
+    }
     if (has_tschchartaxisdefaultnumberformat()) {
       if (tschchartaxisdefaultnumberformat_ != NULL) tschchartaxisdefaultnumberformat_->::TSK::FormatStructArchive::Clear();
     }
+    if (has_tschchartaxisdefault1_0dateformat()) {
+      if (tschchartaxisdefault1_0dateformat_ != NULL) tschchartaxisdefault1_0dateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartaxisdefaultdurationformat()) {
+      if (tschchartaxisdefaultdurationformat_ != NULL) tschchartaxisdefaultdurationformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartaxisdefaultdateformat()) {
+      if (tschchartaxisdefaultdateformat_ != NULL) tschchartaxisdefaultdateformat_->::TSK::FormatStructArchive::Clear();
+    }
     tschchartaxisdefaultnumberformattype_ = 0;
     tschchartaxisvaluenumberofdecades_ = 0;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     tschchartaxisvaluenumberofmajorgridlines_ = 0;
     tschchartaxisvaluenumberofminorgridlines_ = 0;
     tschchartaxiscategoryplottoedges_ = false;
     tschchartaxisvaluescale_ = 0;
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     tschchartaxiscategoryshowlabels_ = false;
     tschchartaxisdefaultshowlabels_ = false;
     tschchartaxisvalueshowlabels_ = false;
     tschchartaxiscategoryshowserieslabels_ = false;
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     tschchartaxismultidatashowserieslabels_ = false;
     tschchartaxiscategoryshowtitle_ = false;
     tschchartaxisvalueshowtitle_ = false;
@@ -5609,8 +6085,6 @@ void ChartAxisNonStyleArchive::Clear() {
         tschchartaxiscategorytitle_->clear();
       }
     }
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (has_tschchartaxisvaluetitle()) {
       if (tschchartaxisvaluetitle_ != &::google::protobuf::internal::kEmptyString) {
         tschchartaxisvaluetitle_->clear();
@@ -5644,17 +6118,17 @@ bool ChartAxisNonStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_tschchartaxisdefaultnumberformat;
+        if (input->ExpectTag(18)) goto parse_tschchartaxisdefault1_0numberformat;
         break;
       }
 
-      // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
+      // optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tschchartaxisdefaultnumberformat:
+         parse_tschchartaxisdefault1_0numberformat:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tschchartaxisdefaultnumberformat()));
+               input, mutable_tschchartaxisdefault1_0numberformat()));
         } else {
           goto handle_uninterpreted;
         }
@@ -5928,6 +6402,62 @@ bool ChartAxisNonStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(162)) goto parse_tschchartaxisdefault1_0dateformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisdefault1_0dateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisdefault1_0dateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(170)) goto parse_tschchartaxisdefaultdurationformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+      case 21: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisdefaultdurationformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisdefaultdurationformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(178)) goto parse_tschchartaxisdefaultdateformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
+      case 22: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisdefaultdateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisdefaultdateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(338)) goto parse_tschchartaxisdefaultnumberformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
+      case 42: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisdefaultnumberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisdefaultnumberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -5955,10 +6485,10 @@ void ChartAxisNonStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->tschchartaxisdefault3dlabelposition(), output);
   }
 
-  // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
-  if (has_tschchartaxisdefaultnumberformat()) {
+  // optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
+  if (has_tschchartaxisdefault1_0numberformat()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->tschchartaxisdefaultnumberformat(), output);
+      2, this->tschchartaxisdefault1_0numberformat(), output);
   }
 
   // optional int32 tschchartaxisdefaultnumberformattype = 3;
@@ -6056,6 +6586,30 @@ void ChartAxisNonStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteBool(19, this->tschchartaxismultidatashowserieslabels(), output);
   }
 
+  // optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+  if (has_tschchartaxisdefault1_0dateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->tschchartaxisdefault1_0dateformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+  if (has_tschchartaxisdefaultdurationformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      21, this->tschchartaxisdefaultdurationformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
+  if (has_tschchartaxisdefaultdateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      22, this->tschchartaxisdefaultdateformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
+  if (has_tschchartaxisdefaultnumberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      42, this->tschchartaxisdefaultnumberformat(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -6069,11 +6623,11 @@ ::google::protobuf::uint8* ChartAxisNonStyleArchive::SerializeWithCachedSizesToA
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->tschchartaxisdefault3dlabelposition(), target);
   }
 
-  // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
-  if (has_tschchartaxisdefaultnumberformat()) {
+  // optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
+  if (has_tschchartaxisdefault1_0numberformat()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->tschchartaxisdefaultnumberformat(), target);
+        2, this->tschchartaxisdefault1_0numberformat(), target);
   }
 
   // optional int32 tschchartaxisdefaultnumberformattype = 3;
@@ -6175,6 +6729,34 @@ ::google::protobuf::uint8* ChartAxisNonStyleArchive::SerializeWithCachedSizesToA
     target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(19, this->tschchartaxismultidatashowserieslabels(), target);
   }
 
+  // optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+  if (has_tschchartaxisdefault1_0dateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->tschchartaxisdefault1_0dateformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+  if (has_tschchartaxisdefaultdurationformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        21, this->tschchartaxisdefaultdurationformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
+  if (has_tschchartaxisdefaultdateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        22, this->tschchartaxisdefaultdateformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
+  if (has_tschchartaxisdefaultnumberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        42, this->tschchartaxisdefaultnumberformat(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -6193,13 +6775,41 @@ int ChartAxisNonStyleArchive::ByteSize() const {
           this->tschchartaxisdefault3dlabelposition());
     }
 
-    // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
-    if (has_tschchartaxisdefaultnumberformat()) {
+    // optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
+    if (has_tschchartaxisdefault1_0numberformat()) {
       total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisdefault1_0numberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
+    if (has_tschchartaxisdefaultnumberformat()) {
+      total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->tschchartaxisdefaultnumberformat());
     }
 
+    // optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+    if (has_tschchartaxisdefault1_0dateformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisdefault1_0dateformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+    if (has_tschchartaxisdefaultdurationformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisdefaultdurationformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
+    if (has_tschchartaxisdefaultdateformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisdefaultdateformat());
+    }
+
     // optional int32 tschchartaxisdefaultnumberformattype = 3;
     if (has_tschchartaxisdefaultnumberformattype()) {
       total_size += 1 +
@@ -6214,6 +6824,8 @@ int ChartAxisNonStyleArchive::ByteSize() const {
           this->tschchartaxisvaluenumberofdecades());
     }
 
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     // optional int32 tschchartaxisvaluenumberofmajorgridlines = 5;
     if (has_tschchartaxisvaluenumberofmajorgridlines()) {
       total_size += 1 +
@@ -6240,8 +6852,6 @@ int ChartAxisNonStyleArchive::ByteSize() const {
           this->tschchartaxisvaluescale());
     }
 
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     // optional bool tschchartaxiscategoryshowlabels = 9;
     if (has_tschchartaxiscategoryshowlabels()) {
       total_size += 1 + 1;
@@ -6262,6 +6872,8 @@ int ChartAxisNonStyleArchive::ByteSize() const {
       total_size += 1 + 1;
     }
 
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional bool tschchartaxismultidatashowserieslabels = 19;
     if (has_tschchartaxismultidatashowserieslabels()) {
       total_size += 2 + 1;
@@ -6284,8 +6896,6 @@ int ChartAxisNonStyleArchive::ByteSize() const {
           this->tschchartaxiscategorytitle());
     }
 
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional string tschchartaxisvaluetitle = 16;
     if (has_tschchartaxisvaluetitle()) {
       total_size += 2 +
@@ -6337,15 +6947,29 @@ void ChartAxisNonStyleArchive::MergeFrom(const ChartAxisNonStyleArchive& from) {
     if (from.has_tschchartaxisdefault3dlabelposition()) {
       set_tschchartaxisdefault3dlabelposition(from.tschchartaxisdefault3dlabelposition());
     }
+    if (from.has_tschchartaxisdefault1_0numberformat()) {
+      mutable_tschchartaxisdefault1_0numberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdefault1_0numberformat());
+    }
     if (from.has_tschchartaxisdefaultnumberformat()) {
       mutable_tschchartaxisdefaultnumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdefaultnumberformat());
     }
+    if (from.has_tschchartaxisdefault1_0dateformat()) {
+      mutable_tschchartaxisdefault1_0dateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdefault1_0dateformat());
+    }
+    if (from.has_tschchartaxisdefaultdurationformat()) {
+      mutable_tschchartaxisdefaultdurationformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdefaultdurationformat());
+    }
+    if (from.has_tschchartaxisdefaultdateformat()) {
+      mutable_tschchartaxisdefaultdateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdefaultdateformat());
+    }
     if (from.has_tschchartaxisdefaultnumberformattype()) {
       set_tschchartaxisdefaultnumberformattype(from.tschchartaxisdefaultnumberformattype());
     }
     if (from.has_tschchartaxisvaluenumberofdecades()) {
       set_tschchartaxisvaluenumberofdecades(from.tschchartaxisvaluenumberofdecades());
     }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     if (from.has_tschchartaxisvaluenumberofmajorgridlines()) {
       set_tschchartaxisvaluenumberofmajorgridlines(from.tschchartaxisvaluenumberofmajorgridlines());
     }
@@ -6358,8 +6982,6 @@ void ChartAxisNonStyleArchive::MergeFrom(const ChartAxisNonStyleArchive& from) {
     if (from.has_tschchartaxisvaluescale()) {
       set_tschchartaxisvaluescale(from.tschchartaxisvaluescale());
     }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
     if (from.has_tschchartaxiscategoryshowlabels()) {
       set_tschchartaxiscategoryshowlabels(from.tschchartaxiscategoryshowlabels());
     }
@@ -6372,6 +6994,8 @@ void ChartAxisNonStyleArchive::MergeFrom(const ChartAxisNonStyleArchive& from) {
     if (from.has_tschchartaxiscategoryshowserieslabels()) {
       set_tschchartaxiscategoryshowserieslabels(from.tschchartaxiscategoryshowserieslabels());
     }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_tschchartaxismultidatashowserieslabels()) {
       set_tschchartaxismultidatashowserieslabels(from.tschchartaxismultidatashowserieslabels());
     }
@@ -6384,8 +7008,6 @@ void ChartAxisNonStyleArchive::MergeFrom(const ChartAxisNonStyleArchive& from) {
     if (from.has_tschchartaxiscategorytitle()) {
       set_tschchartaxiscategorytitle(from.tschchartaxiscategorytitle());
     }
-  }
-  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_tschchartaxisvaluetitle()) {
       set_tschchartaxisvaluetitle(from.tschchartaxisvaluetitle());
     }
@@ -6413,16 +7035,32 @@ void ChartAxisNonStyleArchive::CopyFrom(const ChartAxisNonStyleArchive& from) {
 
 bool ChartAxisNonStyleArchive::IsInitialized() const {
 
+  if (has_tschchartaxisdefault1_0numberformat()) {
+    if (!this->tschchartaxisdefault1_0numberformat().IsInitialized()) return false;
+  }
   if (has_tschchartaxisdefaultnumberformat()) {
     if (!this->tschchartaxisdefaultnumberformat().IsInitialized()) return false;
   }
+  if (has_tschchartaxisdefault1_0dateformat()) {
+    if (!this->tschchartaxisdefault1_0dateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisdefaultdurationformat()) {
+    if (!this->tschchartaxisdefaultdurationformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisdefaultdateformat()) {
+    if (!this->tschchartaxisdefaultdateformat().IsInitialized()) return false;
+  }
   return true;
 }
 
 void ChartAxisNonStyleArchive::Swap(ChartAxisNonStyleArchive* other) {
   if (other != this) {
     std::swap(tschchartaxisdefault3dlabelposition_, other->tschchartaxisdefault3dlabelposition_);
+    std::swap(tschchartaxisdefault1_0numberformat_, other->tschchartaxisdefault1_0numberformat_);
     std::swap(tschchartaxisdefaultnumberformat_, other->tschchartaxisdefaultnumberformat_);
+    std::swap(tschchartaxisdefault1_0dateformat_, other->tschchartaxisdefault1_0dateformat_);
+    std::swap(tschchartaxisdefaultdurationformat_, other->tschchartaxisdefaultdurationformat_);
+    std::swap(tschchartaxisdefaultdateformat_, other->tschchartaxisdefaultdateformat_);
     std::swap(tschchartaxisdefaultnumberformattype_, other->tschchartaxisdefaultnumberformattype_);
     std::swap(tschchartaxisvaluenumberofdecades_, other->tschchartaxisvaluenumberofdecades_);
     std::swap(tschchartaxisvaluenumberofmajorgridlines_, other->tschchartaxisvaluenumberofmajorgridlines_);
@@ -11011,7 +11649,12 @@ const int ChartSeriesNonStyleArchive::kTschchartseriesbubblelinetypeFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartserieslinelinetypeFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriesmixedlinelinetypeFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriesscatterlinetypeFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriesdefault10NumberformatFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriesdefaultnumberformatFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriesdefault10DateformatFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriesdefaultdurationformatFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriesdefaultdateformatFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriespie10NumberformatFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriespienumberformatFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriesdefaultnumberformattypeFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriespienumberformattypeFieldNumber;
@@ -11059,6 +11702,8 @@ const int ChartSeriesNonStyleArchive::kTschchartseriesbubbleshowserieslabelsFiel
 const int ChartSeriesNonStyleArchive::kTschchartseriesbubblevaluelabelsaxisFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriesscattershowserieslabelsFieldNumber;
 const int ChartSeriesNonStyleArchive::kTschchartseriesscattervaluelabelsaxisFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriesdefaultshowlabelsinfrontFieldNumber;
+const int ChartSeriesNonStyleArchive::kTschchartseriesbubbleshowlabelsinfrontFieldNumber;
 #endif  // !_MSC_VER
 
 #ifndef _MSC_VER
@@ -11077,7 +11722,12 @@ void ChartSeriesNonStyleArchive::InitAsDefaultInstance() {
   tschchartseriesdefaulterrorbarcustomnegativedatascatterx_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
   tschchartseriesdefaulterrorbarcustompositivedata_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
   tschchartseriesdefaulterrorbarcustompositivedatascatterx_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
+  tschchartseriesdefault1_0numberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
   tschchartseriesdefaultnumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriesdefault1_0dateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriesdefaultdurationformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriesdefaultdateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriespie1_0numberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
   tschchartseriespienumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
   tschchartseriesstackedpercentnumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
 }
@@ -11110,7 +11760,12 @@ void ChartSeriesNonStyleArchive::SharedCtor() {
   tschchartserieslinelinetype_ = 0;
   tschchartseriesmixedlinelinetype_ = 0;
   tschchartseriesscatterlinetype_ = 0;
+  tschchartseriesdefault1_0numberformat_ = NULL;
   tschchartseriesdefaultnumberformat_ = NULL;
+  tschchartseriesdefault1_0dateformat_ = NULL;
+  tschchartseriesdefaultdurationformat_ = NULL;
+  tschchartseriesdefaultdateformat_ = NULL;
+  tschchartseriespie1_0numberformat_ = NULL;
   tschchartseriespienumberformat_ = NULL;
   tschchartseriesdefaultnumberformattype_ = 0;
   tschchartseriespienumberformattype_ = 0;
@@ -11158,6 +11813,8 @@ void ChartSeriesNonStyleArchive::SharedCtor() {
   tschchartseriesbubblevaluelabelsaxis_ = 0;
   tschchartseriesscattershowserieslabels_ = false;
   tschchartseriesscattervaluelabelsaxis_ = 0;
+  tschchartseriesdefaultshowlabelsinfront_ = false;
+  tschchartseriesbubbleshowlabelsinfront_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -11174,7 +11831,12 @@ void ChartSeriesNonStyleArchive::SharedDtor() {
     delete tschchartseriesdefaulterrorbarcustomnegativedatascatterx_;
     delete tschchartseriesdefaulterrorbarcustompositivedata_;
     delete tschchartseriesdefaulterrorbarcustompositivedatascatterx_;
+    delete tschchartseriesdefault1_0numberformat_;
     delete tschchartseriesdefaultnumberformat_;
+    delete tschchartseriesdefault1_0dateformat_;
+    delete tschchartseriesdefaultdurationformat_;
+    delete tschchartseriesdefaultdateformat_;
+    delete tschchartseriespie1_0numberformat_;
     delete tschchartseriespienumberformat_;
     delete tschchartseriesstackedpercentnumberformat_;
   }
@@ -11235,51 +11897,68 @@ void ChartSeriesNonStyleArchive::Clear() {
     tschchartserieslinelinetype_ = 0;
     tschchartseriesmixedlinelinetype_ = 0;
     tschchartseriesscatterlinetype_ = 0;
+    if (has_tschchartseriesdefault1_0numberformat()) {
+      if (tschchartseriesdefault1_0numberformat_ != NULL) tschchartseriesdefault1_0numberformat_->::TSK::FormatStructArchive::Clear();
+    }
     if (has_tschchartseriesdefaultnumberformat()) {
       if (tschchartseriesdefaultnumberformat_ != NULL) tschchartseriesdefaultnumberformat_->::TSK::FormatStructArchive::Clear();
     }
+    if (has_tschchartseriesdefault1_0dateformat()) {
+      if (tschchartseriesdefault1_0dateformat_ != NULL) tschchartseriesdefault1_0dateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartseriesdefaultdurationformat()) {
+      if (tschchartseriesdefaultdurationformat_ != NULL) tschchartseriesdefaultdurationformat_->::TSK::FormatStructArchive::Clear();
+    }
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (has_tschchartseriesdefaultdateformat()) {
+      if (tschchartseriesdefaultdateformat_ != NULL) tschchartseriesdefaultdateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartseriespie1_0numberformat()) {
+      if (tschchartseriespie1_0numberformat_ != NULL) tschchartseriespie1_0numberformat_->::TSK::FormatStructArchive::Clear();
+    }
     if (has_tschchartseriespienumberformat()) {
       if (tschchartseriespienumberformat_ != NULL) tschchartseriespienumberformat_->::TSK::FormatStructArchive::Clear();
     }
     tschchartseriesdefaultnumberformattype_ = 0;
     tschchartseriespienumberformattype_ = 0;
-  }
-  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (has_tschchartseriesstackedpercentnumberformat()) {
       if (tschchartseriesstackedpercentnumberformat_ != NULL) tschchartseriesstackedpercentnumberformat_->::TSK::FormatStructArchive::Clear();
     }
     tschchartseriesdefaultseriestype_ = 0;
     tschchartseriesdefaultshowerrorbar_ = false;
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     tschchartseriesdefaultshowerrorbarscatterx_ = false;
     tschchartseriesscattershowline_ = false;
     tschchartseriesbubbleshownegativedata_ = false;
     tschchartseriespieshowserieslabels_ = false;
     tschchartseriesareashowsymbol_ = false;
-  }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     tschchartserieslineshowsymbol_ = false;
     tschchartseriesmixedareashowsymbol_ = false;
     tschchartseriesmixedlineshowsymbol_ = false;
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     tschchartseriesscattershowsymbol_ = false;
     tschchartseriesdefaultshowtrendline_ = false;
     tschchartseriesareashowvaluelabels_ = false;
     tschchartseriesbarshowvaluelabels_ = false;
     tschchartseriesbubbleshowvaluelabels_ = false;
-  }
-  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     tschchartseriesdefaultshowvaluelabels_ = false;
     tschchartserieslineshowvaluelabels_ = false;
     tschchartseriesmixedshowvaluelabels_ = false;
+  }
+  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     tschchartseriespieshowvaluelabels_ = false;
     tschchartseriesscattershowvaluelabels_ = false;
     tschchartseriesbubblesizedimension_ = 0;
     tschchartseriesareasymboltype_ = 0;
     tschchartserieslinesymboltype_ = 0;
-  }
-  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     tschchartseriesmixedareasymboltype_ = 0;
     tschchartseriesmixedlinesymboltype_ = 0;
     tschchartseriesscattersymboltype_ = 0;
+  }
+  if (_has_bits_[56 / 32] & (0xffu << (56 % 32))) {
     tschchartseriesdefaulttrendlineequationoffsetx_ = 0;
     tschchartseriesdefaulttrendlineequationoffsety_ = 0;
     if (has_tschchartseriesdefaulttrendlinelabelstring()) {
@@ -11289,22 +11968,24 @@ void ChartSeriesNonStyleArchive::Clear() {
     }
     tschchartseriesdefaulttrendlineorder_ = 0;
     tschchartseriesdefaulttrendlineperiod_ = 0;
-  }
-  if (_has_bits_[56 / 32] & (0xffu << (56 % 32))) {
     tschchartseriesdefaulttrendlinersquaredoffsetx_ = 0;
     tschchartseriesdefaulttrendlinersquaredoffsety_ = 0;
     tschchartseriesdefaulttrendlineshowequation_ = false;
+  }
+  if (_has_bits_[64 / 32] & (0xffu << (64 % 32))) {
     tschchartseriesdefaulttrendlineshowlabel_ = false;
     tschchartseriesdefaulttrendlineshowr2value_ = false;
     tschchartseriesdefaulttrendlinetype_ = 0;
     tschchartseriespiewedgeexplosion_ = 0;
     tschchartseriesdefaultyaxisordinal_ = 0;
-  }
-  if (_has_bits_[64 / 32] & (0xffu << (64 % 32))) {
     tschchartseriesbubbleshowserieslabels_ = false;
     tschchartseriesbubblevaluelabelsaxis_ = 0;
     tschchartseriesscattershowserieslabels_ = false;
+  }
+  if (_has_bits_[72 / 32] & (0xffu << (72 % 32))) {
     tschchartseriesscattervaluelabelsaxis_ = 0;
+    tschchartseriesdefaultshowlabelsinfront_ = false;
+    tschchartseriesbubbleshowlabelsinfront_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -11623,31 +12304,31 @@ bool ChartSeriesNonStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(170)) goto parse_tschchartseriesdefaultnumberformat;
+        if (input->ExpectTag(170)) goto parse_tschchartseriesdefault1_0numberformat;
         break;
       }
 
-      // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
+      // optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
       case 21: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tschchartseriesdefaultnumberformat:
+         parse_tschchartseriesdefault1_0numberformat:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tschchartseriesdefaultnumberformat()));
+               input, mutable_tschchartseriesdefault1_0numberformat()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(178)) goto parse_tschchartseriespienumberformat;
+        if (input->ExpectTag(178)) goto parse_tschchartseriespie1_0numberformat;
         break;
       }
 
-      // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
+      // optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
       case 22: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tschchartseriespienumberformat:
+         parse_tschchartseriespie1_0numberformat:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tschchartseriespienumberformat()));
+               input, mutable_tschchartseriespie1_0numberformat()));
         } else {
           goto handle_uninterpreted;
         }
@@ -12386,47 +13067,149 @@ bool ChartSeriesNonStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectTag(554)) goto parse_tschchartseriesdefault1_0dateformat;
         break;
       }
 
-      default: {
-      handle_uninterpreted:
+      // optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+      case 69: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesdefault1_0dateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesdefault1_0dateformat()));
+        } else {
+          goto handle_uninterpreted;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        if (input->ExpectTag(562)) goto parse_tschchartseriesdefaultdurationformat;
         break;
       }
-    }
-  }
-  return true;
-#undef DO_
-}
 
-void ChartSeriesNonStyleArchive::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional float tschchartseriesbubbleadjustmentscale = 1;
-  if (has_tschchartseriesbubbleadjustmentscale()) {
-    ::google::protobuf::internal::WireFormatLite::WriteFloat(1, this->tschchartseriesbubbleadjustmentscale(), output);
-  }
+      // optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+      case 70: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesdefaultdurationformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesdefaultdurationformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(570)) goto parse_tschchartseriesdefaultdateformat;
+        break;
+      }
 
-  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartseriesdefaulterrorbarcustomnegativedata = 2;
-  if (has_tschchartseriesdefaulterrorbarcustomnegativedata()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->tschchartseriesdefaulterrorbarcustomnegativedata(), output);
-  }
+      // optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+      case 71: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesdefaultdateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesdefaultdateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(786)) goto parse_tschchartseriesdefaultnumberformat;
+        break;
+      }
 
-  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartseriesdefaulterrorbarcustomnegativedatascatterx = 3;
-  if (has_tschchartseriesdefaulterrorbarcustomnegativedatascatterx()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->tschchartseriesdefaulterrorbarcustomnegativedatascatterx(), output);
-  }
+      // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
+      case 98: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesdefaultnumberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesdefaultnumberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(794)) goto parse_tschchartseriespienumberformat;
+        break;
+      }
 
-  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartseriesdefaulterrorbarcustompositivedata = 4;
-  if (has_tschchartseriesdefaulterrorbarcustompositivedata()) {
+      // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
+      case 99: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriespienumberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriespienumberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(800)) goto parse_tschchartseriesdefaultshowlabelsinfront;
+        break;
+      }
+
+      // optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+      case 100: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesdefaultshowlabelsinfront:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesdefaultshowlabelsinfront_)));
+          set_has_tschchartseriesdefaultshowlabelsinfront();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(808)) goto parse_tschchartseriesbubbleshowlabelsinfront;
+        break;
+      }
+
+      // optional bool tschchartseriesbubbleshowlabelsinfront = 101;
+      case 101: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesbubbleshowlabelsinfront:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesbubbleshowlabelsinfront_)));
+          set_has_tschchartseriesbubbleshowlabelsinfront();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartSeriesNonStyleArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional float tschchartseriesbubbleadjustmentscale = 1;
+  if (has_tschchartseriesbubbleadjustmentscale()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(1, this->tschchartseriesbubbleadjustmentscale(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartseriesdefaulterrorbarcustomnegativedata = 2;
+  if (has_tschchartseriesdefaulterrorbarcustomnegativedata()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->tschchartseriesdefaulterrorbarcustomnegativedata(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartseriesdefaulterrorbarcustomnegativedatascatterx = 3;
+  if (has_tschchartseriesdefaulterrorbarcustomnegativedatascatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->tschchartseriesdefaulterrorbarcustomnegativedatascatterx(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartseriesdefaulterrorbarcustompositivedata = 4;
+  if (has_tschchartseriesdefaulterrorbarcustompositivedata()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, this->tschchartseriesdefaulterrorbarcustompositivedata(), output);
   }
@@ -12512,16 +13295,16 @@ void ChartSeriesNonStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(20, this->tschchartseriesscatterlinetype(), output);
   }
 
-  // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
-  if (has_tschchartseriesdefaultnumberformat()) {
+  // optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
+  if (has_tschchartseriesdefault1_0numberformat()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      21, this->tschchartseriesdefaultnumberformat(), output);
+      21, this->tschchartseriesdefault1_0numberformat(), output);
   }
 
-  // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
-  if (has_tschchartseriespienumberformat()) {
+  // optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
+  if (has_tschchartseriespie1_0numberformat()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      22, this->tschchartseriespienumberformat(), output);
+      22, this->tschchartseriespie1_0numberformat(), output);
   }
 
   // optional int32 tschchartseriesdefaultnumberformattype = 23;
@@ -12759,6 +13542,46 @@ void ChartSeriesNonStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(68, this->tschchartseriesscattervaluelabelsaxis(), output);
   }
 
+  // optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+  if (has_tschchartseriesdefault1_0dateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      69, this->tschchartseriesdefault1_0dateformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+  if (has_tschchartseriesdefaultdurationformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      70, this->tschchartseriesdefaultdurationformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+  if (has_tschchartseriesdefaultdateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      71, this->tschchartseriesdefaultdateformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
+  if (has_tschchartseriesdefaultnumberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      98, this->tschchartseriesdefaultnumberformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
+  if (has_tschchartseriespienumberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      99, this->tschchartseriespienumberformat(), output);
+  }
+
+  // optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+  if (has_tschchartseriesdefaultshowlabelsinfront()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(100, this->tschchartseriesdefaultshowlabelsinfront(), output);
+  }
+
+  // optional bool tschchartseriesbubbleshowlabelsinfront = 101;
+  if (has_tschchartseriesbubbleshowlabelsinfront()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(101, this->tschchartseriesbubbleshowlabelsinfront(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -12875,18 +13698,18 @@ ::google::protobuf::uint8* ChartSeriesNonStyleArchive::SerializeWithCachedSizesT
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(20, this->tschchartseriesscatterlinetype(), target);
   }
 
-  // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
-  if (has_tschchartseriesdefaultnumberformat()) {
+  // optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
+  if (has_tschchartseriesdefault1_0numberformat()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        21, this->tschchartseriesdefaultnumberformat(), target);
+        21, this->tschchartseriesdefault1_0numberformat(), target);
   }
 
-  // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
-  if (has_tschchartseriespienumberformat()) {
+  // optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
+  if (has_tschchartseriespie1_0numberformat()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        22, this->tschchartseriespienumberformat(), target);
+        22, this->tschchartseriespie1_0numberformat(), target);
   }
 
   // optional int32 tschchartseriesdefaultnumberformattype = 23;
@@ -13126,6 +13949,51 @@ ::google::protobuf::uint8* ChartSeriesNonStyleArchive::SerializeWithCachedSizesT
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(68, this->tschchartseriesscattervaluelabelsaxis(), target);
   }
 
+  // optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+  if (has_tschchartseriesdefault1_0dateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        69, this->tschchartseriesdefault1_0dateformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+  if (has_tschchartseriesdefaultdurationformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        70, this->tschchartseriesdefaultdurationformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+  if (has_tschchartseriesdefaultdateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        71, this->tschchartseriesdefaultdateformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
+  if (has_tschchartseriesdefaultnumberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        98, this->tschchartseriesdefaultnumberformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
+  if (has_tschchartseriespienumberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        99, this->tschchartseriespienumberformat(), target);
+  }
+
+  // optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+  if (has_tschchartseriesdefaultshowlabelsinfront()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(100, this->tschchartseriesdefaultshowlabelsinfront(), target);
+  }
+
+  // optional bool tschchartseriesbubbleshowlabelsinfront = 101;
+  if (has_tschchartseriesbubbleshowlabelsinfront()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(101, this->tschchartseriesbubbleshowlabelsinfront(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -13265,14 +14133,51 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartseriesscatterlinetype());
     }
 
-    // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
+    // optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
+    if (has_tschchartseriesdefault1_0numberformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesdefault1_0numberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
     if (has_tschchartseriesdefaultnumberformat()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->tschchartseriesdefaultnumberformat());
     }
 
-    // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
+    // optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+    if (has_tschchartseriesdefault1_0dateformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesdefault1_0dateformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+    if (has_tschchartseriesdefaultdurationformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesdefaultdurationformat());
+    }
+
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+    if (has_tschchartseriesdefaultdateformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesdefaultdateformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
+    if (has_tschchartseriespie1_0numberformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriespie1_0numberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
     if (has_tschchartseriespienumberformat()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -13293,8 +14198,6 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartseriespienumberformattype());
     }
 
-  }
-  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     // optional .TSK.FormatStructArchive tschchartseriesstackedpercentnumberformat = 25;
     if (has_tschchartseriesstackedpercentnumberformat()) {
       total_size += 2 +
@@ -13314,6 +14217,8 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     // optional bool tschchartseriesdefaultshowerrorbarscatterx = 28;
     if (has_tschchartseriesdefaultshowerrorbarscatterx()) {
       total_size += 2 + 1;
@@ -13339,8 +14244,6 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     // optional bool tschchartserieslineshowsymbol = 33;
     if (has_tschchartserieslineshowsymbol()) {
       total_size += 2 + 1;
@@ -13356,6 +14259,8 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     // optional bool tschchartseriesscattershowsymbol = 36;
     if (has_tschchartseriesscattershowsymbol()) {
       total_size += 2 + 1;
@@ -13381,8 +14286,6 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
-  }
-  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     // optional bool tschchartseriesdefaultshowvaluelabels = 41;
     if (has_tschchartseriesdefaultshowvaluelabels()) {
       total_size += 2 + 1;
@@ -13398,6 +14301,8 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     // optional bool tschchartseriespieshowvaluelabels = 44;
     if (has_tschchartseriespieshowvaluelabels()) {
       total_size += 2 + 1;
@@ -13429,8 +14334,6 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartserieslinesymboltype());
     }
 
-  }
-  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     // optional int32 tschchartseriesmixedareasymboltype = 49;
     if (has_tschchartseriesmixedareasymboltype()) {
       total_size += 2 +
@@ -13452,6 +14355,8 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartseriesscattersymboltype());
     }
 
+  }
+  if (_has_bits_[56 / 32] & (0xffu << (56 % 32))) {
     // optional float tschchartseriesdefaulttrendlineequationoffsetx = 52;
     if (has_tschchartseriesdefaulttrendlineequationoffsetx()) {
       total_size += 2 + 4;
@@ -13483,8 +14388,6 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartseriesdefaulttrendlineperiod());
     }
 
-  }
-  if (_has_bits_[56 / 32] & (0xffu << (56 % 32))) {
     // optional float tschchartseriesdefaulttrendlinersquaredoffsetx = 57;
     if (has_tschchartseriesdefaulttrendlinersquaredoffsetx()) {
       total_size += 2 + 4;
@@ -13500,6 +14403,8 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[64 / 32] & (0xffu << (64 % 32))) {
     // optional bool tschchartseriesdefaulttrendlineshowlabel = 60;
     if (has_tschchartseriesdefaulttrendlineshowlabel()) {
       total_size += 2 + 1;
@@ -13529,8 +14434,6 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartseriesdefaultyaxisordinal());
     }
 
-  }
-  if (_has_bits_[64 / 32] & (0xffu << (64 % 32))) {
     // optional bool tschchartseriesbubbleshowserieslabels = 65;
     if (has_tschchartseriesbubbleshowserieslabels()) {
       total_size += 2 + 1;
@@ -13548,6 +14451,8 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
       total_size += 2 + 1;
     }
 
+  }
+  if (_has_bits_[72 / 32] & (0xffu << (72 % 32))) {
     // optional int32 tschchartseriesscattervaluelabelsaxis = 68;
     if (has_tschchartseriesscattervaluelabelsaxis()) {
       total_size += 2 +
@@ -13555,6 +14460,16 @@ int ChartSeriesNonStyleArchive::ByteSize() const {
           this->tschchartseriesscattervaluelabelsaxis());
     }
 
+    // optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+    if (has_tschchartseriesdefaultshowlabelsinfront()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesbubbleshowlabelsinfront = 101;
+    if (has_tschchartseriesbubbleshowlabelsinfront()) {
+      total_size += 2 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -13646,9 +14561,26 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesscatterlinetype()) {
       set_tschchartseriesscatterlinetype(from.tschchartseriesscatterlinetype());
     }
+    if (from.has_tschchartseriesdefault1_0numberformat()) {
+      mutable_tschchartseriesdefault1_0numberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdefault1_0numberformat());
+    }
     if (from.has_tschchartseriesdefaultnumberformat()) {
       mutable_tschchartseriesdefaultnumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdefaultnumberformat());
     }
+    if (from.has_tschchartseriesdefault1_0dateformat()) {
+      mutable_tschchartseriesdefault1_0dateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdefault1_0dateformat());
+    }
+    if (from.has_tschchartseriesdefaultdurationformat()) {
+      mutable_tschchartseriesdefaultdurationformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdefaultdurationformat());
+    }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (from.has_tschchartseriesdefaultdateformat()) {
+      mutable_tschchartseriesdefaultdateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdefaultdateformat());
+    }
+    if (from.has_tschchartseriespie1_0numberformat()) {
+      mutable_tschchartseriespie1_0numberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriespie1_0numberformat());
+    }
     if (from.has_tschchartseriespienumberformat()) {
       mutable_tschchartseriespienumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriespienumberformat());
     }
@@ -13658,8 +14590,6 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriespienumberformattype()) {
       set_tschchartseriespienumberformattype(from.tschchartseriespienumberformattype());
     }
-  }
-  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
     if (from.has_tschchartseriesstackedpercentnumberformat()) {
       mutable_tschchartseriesstackedpercentnumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesstackedpercentnumberformat());
     }
@@ -13669,6 +14599,8 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesdefaultshowerrorbar()) {
       set_tschchartseriesdefaultshowerrorbar(from.tschchartseriesdefaultshowerrorbar());
     }
+  }
+  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (from.has_tschchartseriesdefaultshowerrorbarscatterx()) {
       set_tschchartseriesdefaultshowerrorbarscatterx(from.tschchartseriesdefaultshowerrorbarscatterx());
     }
@@ -13684,8 +14616,6 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesareashowsymbol()) {
       set_tschchartseriesareashowsymbol(from.tschchartseriesareashowsymbol());
     }
-  }
-  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
     if (from.has_tschchartserieslineshowsymbol()) {
       set_tschchartserieslineshowsymbol(from.tschchartserieslineshowsymbol());
     }
@@ -13695,6 +14625,8 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesmixedlineshowsymbol()) {
       set_tschchartseriesmixedlineshowsymbol(from.tschchartseriesmixedlineshowsymbol());
     }
+  }
+  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     if (from.has_tschchartseriesscattershowsymbol()) {
       set_tschchartseriesscattershowsymbol(from.tschchartseriesscattershowsymbol());
     }
@@ -13710,8 +14642,6 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesbubbleshowvaluelabels()) {
       set_tschchartseriesbubbleshowvaluelabels(from.tschchartseriesbubbleshowvaluelabels());
     }
-  }
-  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
     if (from.has_tschchartseriesdefaultshowvaluelabels()) {
       set_tschchartseriesdefaultshowvaluelabels(from.tschchartseriesdefaultshowvaluelabels());
     }
@@ -13721,6 +14651,8 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesmixedshowvaluelabels()) {
       set_tschchartseriesmixedshowvaluelabels(from.tschchartseriesmixedshowvaluelabels());
     }
+  }
+  if (from._has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     if (from.has_tschchartseriespieshowvaluelabels()) {
       set_tschchartseriespieshowvaluelabels(from.tschchartseriespieshowvaluelabels());
     }
@@ -13736,8 +14668,6 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartserieslinesymboltype()) {
       set_tschchartserieslinesymboltype(from.tschchartserieslinesymboltype());
     }
-  }
-  if (from._has_bits_[48 / 32] & (0xffu << (48 % 32))) {
     if (from.has_tschchartseriesmixedareasymboltype()) {
       set_tschchartseriesmixedareasymboltype(from.tschchartseriesmixedareasymboltype());
     }
@@ -13747,6 +14677,8 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesscattersymboltype()) {
       set_tschchartseriesscattersymboltype(from.tschchartseriesscattersymboltype());
     }
+  }
+  if (from._has_bits_[56 / 32] & (0xffu << (56 % 32))) {
     if (from.has_tschchartseriesdefaulttrendlineequationoffsetx()) {
       set_tschchartseriesdefaulttrendlineequationoffsetx(from.tschchartseriesdefaulttrendlineequationoffsetx());
     }
@@ -13762,8 +14694,6 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesdefaulttrendlineperiod()) {
       set_tschchartseriesdefaulttrendlineperiod(from.tschchartseriesdefaulttrendlineperiod());
     }
-  }
-  if (from._has_bits_[56 / 32] & (0xffu << (56 % 32))) {
     if (from.has_tschchartseriesdefaulttrendlinersquaredoffsetx()) {
       set_tschchartseriesdefaulttrendlinersquaredoffsetx(from.tschchartseriesdefaulttrendlinersquaredoffsetx());
     }
@@ -13773,6 +14703,8 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesdefaulttrendlineshowequation()) {
       set_tschchartseriesdefaulttrendlineshowequation(from.tschchartseriesdefaulttrendlineshowequation());
     }
+  }
+  if (from._has_bits_[64 / 32] & (0xffu << (64 % 32))) {
     if (from.has_tschchartseriesdefaulttrendlineshowlabel()) {
       set_tschchartseriesdefaulttrendlineshowlabel(from.tschchartseriesdefaulttrendlineshowlabel());
     }
@@ -13788,8 +14720,6 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesdefaultyaxisordinal()) {
       set_tschchartseriesdefaultyaxisordinal(from.tschchartseriesdefaultyaxisordinal());
     }
-  }
-  if (from._has_bits_[64 / 32] & (0xffu << (64 % 32))) {
     if (from.has_tschchartseriesbubbleshowserieslabels()) {
       set_tschchartseriesbubbleshowserieslabels(from.tschchartseriesbubbleshowserieslabels());
     }
@@ -13799,9 +14729,17 @@ void ChartSeriesNonStyleArchive::MergeFrom(const ChartSeriesNonStyleArchive& fro
     if (from.has_tschchartseriesscattershowserieslabels()) {
       set_tschchartseriesscattershowserieslabels(from.tschchartseriesscattershowserieslabels());
     }
+  }
+  if (from._has_bits_[72 / 32] & (0xffu << (72 % 32))) {
     if (from.has_tschchartseriesscattervaluelabelsaxis()) {
       set_tschchartseriesscattervaluelabelsaxis(from.tschchartseriesscattervaluelabelsaxis());
     }
+    if (from.has_tschchartseriesdefaultshowlabelsinfront()) {
+      set_tschchartseriesdefaultshowlabelsinfront(from.tschchartseriesdefaultshowlabelsinfront());
+    }
+    if (from.has_tschchartseriesbubbleshowlabelsinfront()) {
+      set_tschchartseriesbubbleshowlabelsinfront(from.tschchartseriesbubbleshowlabelsinfront());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -13820,9 +14758,24 @@ void ChartSeriesNonStyleArchive::CopyFrom(const ChartSeriesNonStyleArchive& from
 
 bool ChartSeriesNonStyleArchive::IsInitialized() const {
 
+  if (has_tschchartseriesdefault1_0numberformat()) {
+    if (!this->tschchartseriesdefault1_0numberformat().IsInitialized()) return false;
+  }
   if (has_tschchartseriesdefaultnumberformat()) {
     if (!this->tschchartseriesdefaultnumberformat().IsInitialized()) return false;
   }
+  if (has_tschchartseriesdefault1_0dateformat()) {
+    if (!this->tschchartseriesdefault1_0dateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesdefaultdurationformat()) {
+    if (!this->tschchartseriesdefaultdurationformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesdefaultdateformat()) {
+    if (!this->tschchartseriesdefaultdateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriespie1_0numberformat()) {
+    if (!this->tschchartseriespie1_0numberformat().IsInitialized()) return false;
+  }
   if (has_tschchartseriespienumberformat()) {
     if (!this->tschchartseriespienumberformat().IsInitialized()) return false;
   }
@@ -13854,7 +14807,12 @@ void ChartSeriesNonStyleArchive::Swap(ChartSeriesNonStyleArchive* other) {
     std::swap(tschchartserieslinelinetype_, other->tschchartserieslinelinetype_);
     std::swap(tschchartseriesmixedlinelinetype_, other->tschchartseriesmixedlinelinetype_);
     std::swap(tschchartseriesscatterlinetype_, other->tschchartseriesscatterlinetype_);
+    std::swap(tschchartseriesdefault1_0numberformat_, other->tschchartseriesdefault1_0numberformat_);
     std::swap(tschchartseriesdefaultnumberformat_, other->tschchartseriesdefaultnumberformat_);
+    std::swap(tschchartseriesdefault1_0dateformat_, other->tschchartseriesdefault1_0dateformat_);
+    std::swap(tschchartseriesdefaultdurationformat_, other->tschchartseriesdefaultdurationformat_);
+    std::swap(tschchartseriesdefaultdateformat_, other->tschchartseriesdefaultdateformat_);
+    std::swap(tschchartseriespie1_0numberformat_, other->tschchartseriespie1_0numberformat_);
     std::swap(tschchartseriespienumberformat_, other->tschchartseriespienumberformat_);
     std::swap(tschchartseriesdefaultnumberformattype_, other->tschchartseriesdefaultnumberformattype_);
     std::swap(tschchartseriespienumberformattype_, other->tschchartseriespienumberformattype_);
@@ -13902,6 +14860,8 @@ void ChartSeriesNonStyleArchive::Swap(ChartSeriesNonStyleArchive* other) {
     std::swap(tschchartseriesbubblevaluelabelsaxis_, other->tschchartseriesbubblevaluelabelsaxis_);
     std::swap(tschchartseriesscattershowserieslabels_, other->tschchartseriesscattershowserieslabels_);
     std::swap(tschchartseriesscattervaluelabelsaxis_, other->tschchartseriesscattervaluelabelsaxis_);
+    std::swap(tschchartseriesdefaultshowlabelsinfront_, other->tschchartseriesdefaultshowlabelsinfront_);
+    std::swap(tschchartseriesbubbleshowlabelsinfront_, other->tschchartseriesbubbleshowlabelsinfront_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     std::swap(_has_bits_[1], other->_has_bits_[1]);
     std::swap(_has_bits_[2], other->_has_bits_[2]);
@@ -13919,6 +14879,6906 @@ ::google::protobuf::Metadata ChartSeriesNonStyleArchive::GetMetadata() const {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DbarshapeFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DbeveledgesFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DintersetdepthgapFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DrotationFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DscaleFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DviewportFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfopiestartangleFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfoshowlegendFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfoshowtitleFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfoskiphiddendataFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfotitleFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfodatasetnamelocationFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfomultidatacontroltypeFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DchartopacityFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfo3DlightingpackageFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfobackgroundfillFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfobackgroundstrokeFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfoborderopacityFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfobordershadowFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfoborderstrokeFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfocombinelayersFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfogridbackgroundfillFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfogridbackgroundopacityFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfointerbargapFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfointersetgapFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfoshowborderFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfotitlecolorFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfotitleparagraphstyleindexFieldNumber;
+const int ChartGenericPropertyMapArchive::kTschchartinfodatasetnameparagraphstyleindexFieldNumber;
+#endif  // !_MSC_VER
+
+ChartGenericPropertyMapArchive::ChartGenericPropertyMapArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ChartGenericPropertyMapArchive::InitAsDefaultInstance() {
+  tschchartinfo3drotation_ = const_cast< ::TSCH::Chart3DVectorArchive*>(&::TSCH::Chart3DVectorArchive::default_instance());
+  tschchartinfo3dscale_ = const_cast< ::TSCH::Chart3DVectorArchive*>(&::TSCH::Chart3DVectorArchive::default_instance());
+  tschchartinfo3dviewport_ = const_cast< ::TSCH::Chart3DVectorArchive*>(&::TSCH::Chart3DVectorArchive::default_instance());
+  tschchartinfo3dlightingpackage_ = const_cast< ::TSCH::Chart3DLightingPackageArchive*>(&::TSCH::Chart3DLightingPackageArchive::default_instance());
+  tschchartinfobackgroundfill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  tschchartinfobackgroundstroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartinfobordershadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschchartinfoborderstroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartinfogridbackgroundfill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  tschchartinfotitlecolor_ = const_cast< ::TSP::Color*>(&::TSP::Color::default_instance());
+}
+
+ChartGenericPropertyMapArchive::ChartGenericPropertyMapArchive(const ChartGenericPropertyMapArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ChartGenericPropertyMapArchive::SharedCtor() {
+  _cached_size_ = 0;
+  tschchartinfo3dbarshape_ = 0;
+  tschchartinfo3dbeveledges_ = false;
+  tschchartinfo3dintersetdepthgap_ = 0;
+  tschchartinfo3drotation_ = NULL;
+  tschchartinfo3dscale_ = NULL;
+  tschchartinfo3dviewport_ = NULL;
+  tschchartinfopiestartangle_ = 0;
+  tschchartinfoshowlegend_ = false;
+  tschchartinfoshowtitle_ = false;
+  tschchartinfoskiphiddendata_ = false;
+  tschchartinfotitle_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  tschchartinfodatasetnamelocation_ = 0;
+  tschchartinfomultidatacontroltype_ = 0;
+  tschchartinfo3dchartopacity_ = 0;
+  tschchartinfo3dlightingpackage_ = NULL;
+  tschchartinfobackgroundfill_ = NULL;
+  tschchartinfobackgroundstroke_ = NULL;
+  tschchartinfoborderopacity_ = 0;
+  tschchartinfobordershadow_ = NULL;
+  tschchartinfoborderstroke_ = NULL;
+  tschchartinfocombinelayers_ = false;
+  tschchartinfogridbackgroundfill_ = NULL;
+  tschchartinfogridbackgroundopacity_ = 0;
+  tschchartinfointerbargap_ = 0;
+  tschchartinfointersetgap_ = 0;
+  tschchartinfoshowborder_ = false;
+  tschchartinfotitlecolor_ = NULL;
+  tschchartinfotitleparagraphstyleindex_ = 0;
+  tschchartinfodatasetnameparagraphstyleindex_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ChartGenericPropertyMapArchive::~ChartGenericPropertyMapArchive() {
+  SharedDtor();
+}
+
+void ChartGenericPropertyMapArchive::SharedDtor() {
+  if (tschchartinfotitle_ != &::google::protobuf::internal::kEmptyString) {
+    delete tschchartinfotitle_;
+  }
+  if (this != default_instance_) {
+    delete tschchartinfo3drotation_;
+    delete tschchartinfo3dscale_;
+    delete tschchartinfo3dviewport_;
+    delete tschchartinfo3dlightingpackage_;
+    delete tschchartinfobackgroundfill_;
+    delete tschchartinfobackgroundstroke_;
+    delete tschchartinfobordershadow_;
+    delete tschchartinfoborderstroke_;
+    delete tschchartinfogridbackgroundfill_;
+    delete tschchartinfotitlecolor_;
+  }
+}
+
+void ChartGenericPropertyMapArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ChartGenericPropertyMapArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ChartGenericPropertyMapArchive_descriptor_;
+}
+
+const ChartGenericPropertyMapArchive& ChartGenericPropertyMapArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  return *default_instance_;
+}
+
+ChartGenericPropertyMapArchive* ChartGenericPropertyMapArchive::default_instance_ = NULL;
+
+ChartGenericPropertyMapArchive* ChartGenericPropertyMapArchive::New() const {
+  return new ChartGenericPropertyMapArchive;
+}
+
+void ChartGenericPropertyMapArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    tschchartinfo3dbarshape_ = 0;
+    tschchartinfo3dbeveledges_ = false;
+    tschchartinfo3dintersetdepthgap_ = 0;
+    if (has_tschchartinfo3drotation()) {
+      if (tschchartinfo3drotation_ != NULL) tschchartinfo3drotation_->::TSCH::Chart3DVectorArchive::Clear();
+    }
+    if (has_tschchartinfo3dscale()) {
+      if (tschchartinfo3dscale_ != NULL) tschchartinfo3dscale_->::TSCH::Chart3DVectorArchive::Clear();
+    }
+    if (has_tschchartinfo3dviewport()) {
+      if (tschchartinfo3dviewport_ != NULL) tschchartinfo3dviewport_->::TSCH::Chart3DVectorArchive::Clear();
+    }
+    tschchartinfopiestartangle_ = 0;
+    tschchartinfoshowlegend_ = false;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    tschchartinfoshowtitle_ = false;
+    tschchartinfoskiphiddendata_ = false;
+    if (has_tschchartinfotitle()) {
+      if (tschchartinfotitle_ != &::google::protobuf::internal::kEmptyString) {
+        tschchartinfotitle_->clear();
+      }
+    }
+    tschchartinfodatasetnamelocation_ = 0;
+    tschchartinfomultidatacontroltype_ = 0;
+    tschchartinfo3dchartopacity_ = 0;
+    if (has_tschchartinfo3dlightingpackage()) {
+      if (tschchartinfo3dlightingpackage_ != NULL) tschchartinfo3dlightingpackage_->::TSCH::Chart3DLightingPackageArchive::Clear();
+    }
+    if (has_tschchartinfobackgroundfill()) {
+      if (tschchartinfobackgroundfill_ != NULL) tschchartinfobackgroundfill_->::TSD::FillArchive::Clear();
+    }
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (has_tschchartinfobackgroundstroke()) {
+      if (tschchartinfobackgroundstroke_ != NULL) tschchartinfobackgroundstroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartinfoborderopacity_ = 0;
+    if (has_tschchartinfobordershadow()) {
+      if (tschchartinfobordershadow_ != NULL) tschchartinfobordershadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschchartinfoborderstroke()) {
+      if (tschchartinfoborderstroke_ != NULL) tschchartinfoborderstroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartinfocombinelayers_ = false;
+    if (has_tschchartinfogridbackgroundfill()) {
+      if (tschchartinfogridbackgroundfill_ != NULL) tschchartinfogridbackgroundfill_->::TSD::FillArchive::Clear();
+    }
+    tschchartinfogridbackgroundopacity_ = 0;
+    tschchartinfointerbargap_ = 0;
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    tschchartinfointersetgap_ = 0;
+    tschchartinfoshowborder_ = false;
+    if (has_tschchartinfotitlecolor()) {
+      if (tschchartinfotitlecolor_ != NULL) tschchartinfotitlecolor_->::TSP::Color::Clear();
+    }
+    tschchartinfotitleparagraphstyleindex_ = 0;
+    tschchartinfodatasetnameparagraphstyleindex_ = 0;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ChartGenericPropertyMapArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional int32 tschchartinfo3dbarshape = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartinfo3dbarshape_)));
+          set_has_tschchartinfo3dbarshape();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_tschchartinfo3dbeveledges;
+        break;
+      }
+
+      // optional bool tschchartinfo3dbeveledges = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfo3dbeveledges:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartinfo3dbeveledges_)));
+          set_has_tschchartinfo3dbeveledges();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(29)) goto parse_tschchartinfo3dintersetdepthgap;
+        break;
+      }
+
+      // optional float tschchartinfo3dintersetdepthgap = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfo3dintersetdepthgap:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfo3dintersetdepthgap_)));
+          set_has_tschchartinfo3dintersetdepthgap();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_tschchartinfo3drotation;
+        break;
+      }
+
+      // optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfo3drotation:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfo3drotation()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_tschchartinfo3dscale;
+        break;
+      }
+
+      // optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfo3dscale:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfo3dscale()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_tschchartinfo3dviewport;
+        break;
+      }
+
+      // optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfo3dviewport:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfo3dviewport()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(61)) goto parse_tschchartinfopiestartangle;
+        break;
+      }
+
+      // optional float tschchartinfopiestartangle = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfopiestartangle:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfopiestartangle_)));
+          set_has_tschchartinfopiestartangle();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_tschchartinfoshowlegend;
+        break;
+      }
+
+      // optional bool tschchartinfoshowlegend = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfoshowlegend:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartinfoshowlegend_)));
+          set_has_tschchartinfoshowlegend();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_tschchartinfoshowtitle;
+        break;
+      }
+
+      // optional bool tschchartinfoshowtitle = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfoshowtitle:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartinfoshowtitle_)));
+          set_has_tschchartinfoshowtitle();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_tschchartinfoskiphiddendata;
+        break;
+      }
+
+      // optional bool tschchartinfoskiphiddendata = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfoskiphiddendata:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartinfoskiphiddendata_)));
+          set_has_tschchartinfoskiphiddendata();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(90)) goto parse_tschchartinfotitle;
+        break;
+      }
+
+      // optional string tschchartinfotitle = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfotitle:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_tschchartinfotitle()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->tschchartinfotitle().data(), this->tschchartinfotitle().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(96)) goto parse_tschchartinfodatasetnamelocation;
+        break;
+      }
+
+      // optional int32 tschchartinfodatasetnamelocation = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfodatasetnamelocation:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartinfodatasetnamelocation_)));
+          set_has_tschchartinfodatasetnamelocation();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(104)) goto parse_tschchartinfomultidatacontroltype;
+        break;
+      }
+
+      // optional int32 tschchartinfomultidatacontroltype = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfomultidatacontroltype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartinfomultidatacontroltype_)));
+          set_has_tschchartinfomultidatacontroltype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(117)) goto parse_tschchartinfo3dchartopacity;
+        break;
+      }
+
+      // optional float tschchartinfo3dchartopacity = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfo3dchartopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfo3dchartopacity_)));
+          set_has_tschchartinfo3dchartopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(122)) goto parse_tschchartinfo3dlightingpackage;
+        break;
+      }
+
+      // optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfo3dlightingpackage:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfo3dlightingpackage()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(130)) goto parse_tschchartinfobackgroundfill;
+        break;
+      }
+
+      // optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+      case 16: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfobackgroundfill:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfobackgroundfill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(138)) goto parse_tschchartinfobackgroundstroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfobackgroundstroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfobackgroundstroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(149)) goto parse_tschchartinfoborderopacity;
+        break;
+      }
+
+      // optional float tschchartinfoborderopacity = 18;
+      case 18: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfoborderopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfoborderopacity_)));
+          set_has_tschchartinfoborderopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(154)) goto parse_tschchartinfobordershadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+      case 19: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfobordershadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfobordershadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(162)) goto parse_tschchartinfoborderstroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfoborderstroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfoborderstroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(168)) goto parse_tschchartinfocombinelayers;
+        break;
+      }
+
+      // optional bool tschchartinfocombinelayers = 21;
+      case 21: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfocombinelayers:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartinfocombinelayers_)));
+          set_has_tschchartinfocombinelayers();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(178)) goto parse_tschchartinfogridbackgroundfill;
+        break;
+      }
+
+      // optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+      case 22: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfogridbackgroundfill:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfogridbackgroundfill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(189)) goto parse_tschchartinfogridbackgroundopacity;
+        break;
+      }
+
+      // optional float tschchartinfogridbackgroundopacity = 23;
+      case 23: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfogridbackgroundopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfogridbackgroundopacity_)));
+          set_has_tschchartinfogridbackgroundopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(197)) goto parse_tschchartinfointerbargap;
+        break;
+      }
+
+      // optional float tschchartinfointerbargap = 24;
+      case 24: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfointerbargap:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfointerbargap_)));
+          set_has_tschchartinfointerbargap();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(205)) goto parse_tschchartinfointersetgap;
+        break;
+      }
+
+      // optional float tschchartinfointersetgap = 25;
+      case 25: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartinfointersetgap:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartinfointersetgap_)));
+          set_has_tschchartinfointersetgap();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(208)) goto parse_tschchartinfoshowborder;
+        break;
+      }
+
+      // optional bool tschchartinfoshowborder = 26;
+      case 26: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfoshowborder:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartinfoshowborder_)));
+          set_has_tschchartinfoshowborder();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(218)) goto parse_tschchartinfotitlecolor;
+        break;
+      }
+
+      // optional .TSP.Color tschchartinfotitlecolor = 27;
+      case 27: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartinfotitlecolor:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartinfotitlecolor()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(224)) goto parse_tschchartinfotitleparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartinfotitleparagraphstyleindex = 28;
+      case 28: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfotitleparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartinfotitleparagraphstyleindex_)));
+          set_has_tschchartinfotitleparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(232)) goto parse_tschchartinfodatasetnameparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+      case 29: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartinfodatasetnameparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartinfodatasetnameparagraphstyleindex_)));
+          set_has_tschchartinfodatasetnameparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartGenericPropertyMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional int32 tschchartinfo3dbarshape = 1;
+  if (has_tschchartinfo3dbarshape()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->tschchartinfo3dbarshape(), output);
+  }
+
+  // optional bool tschchartinfo3dbeveledges = 2;
+  if (has_tschchartinfo3dbeveledges()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->tschchartinfo3dbeveledges(), output);
+  }
+
+  // optional float tschchartinfo3dintersetdepthgap = 3;
+  if (has_tschchartinfo3dintersetdepthgap()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(3, this->tschchartinfo3dintersetdepthgap(), output);
+  }
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+  if (has_tschchartinfo3drotation()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->tschchartinfo3drotation(), output);
+  }
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+  if (has_tschchartinfo3dscale()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->tschchartinfo3dscale(), output);
+  }
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+  if (has_tschchartinfo3dviewport()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->tschchartinfo3dviewport(), output);
+  }
+
+  // optional float tschchartinfopiestartangle = 7;
+  if (has_tschchartinfopiestartangle()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(7, this->tschchartinfopiestartangle(), output);
+  }
+
+  // optional bool tschchartinfoshowlegend = 8;
+  if (has_tschchartinfoshowlegend()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->tschchartinfoshowlegend(), output);
+  }
+
+  // optional bool tschchartinfoshowtitle = 9;
+  if (has_tschchartinfoshowtitle()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(9, this->tschchartinfoshowtitle(), output);
+  }
+
+  // optional bool tschchartinfoskiphiddendata = 10;
+  if (has_tschchartinfoskiphiddendata()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->tschchartinfoskiphiddendata(), output);
+  }
+
+  // optional string tschchartinfotitle = 11;
+  if (has_tschchartinfotitle()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->tschchartinfotitle().data(), this->tschchartinfotitle().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      11, this->tschchartinfotitle(), output);
+  }
+
+  // optional int32 tschchartinfodatasetnamelocation = 12;
+  if (has_tschchartinfodatasetnamelocation()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(12, this->tschchartinfodatasetnamelocation(), output);
+  }
+
+  // optional int32 tschchartinfomultidatacontroltype = 13;
+  if (has_tschchartinfomultidatacontroltype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(13, this->tschchartinfomultidatacontroltype(), output);
+  }
+
+  // optional float tschchartinfo3dchartopacity = 14;
+  if (has_tschchartinfo3dchartopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(14, this->tschchartinfo3dchartopacity(), output);
+  }
+
+  // optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+  if (has_tschchartinfo3dlightingpackage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      15, this->tschchartinfo3dlightingpackage(), output);
+  }
+
+  // optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+  if (has_tschchartinfobackgroundfill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      16, this->tschchartinfobackgroundfill(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+  if (has_tschchartinfobackgroundstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      17, this->tschchartinfobackgroundstroke(), output);
+  }
+
+  // optional float tschchartinfoborderopacity = 18;
+  if (has_tschchartinfoborderopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(18, this->tschchartinfoborderopacity(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+  if (has_tschchartinfobordershadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      19, this->tschchartinfobordershadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+  if (has_tschchartinfoborderstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->tschchartinfoborderstroke(), output);
+  }
+
+  // optional bool tschchartinfocombinelayers = 21;
+  if (has_tschchartinfocombinelayers()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(21, this->tschchartinfocombinelayers(), output);
+  }
+
+  // optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+  if (has_tschchartinfogridbackgroundfill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      22, this->tschchartinfogridbackgroundfill(), output);
+  }
+
+  // optional float tschchartinfogridbackgroundopacity = 23;
+  if (has_tschchartinfogridbackgroundopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(23, this->tschchartinfogridbackgroundopacity(), output);
+  }
+
+  // optional float tschchartinfointerbargap = 24;
+  if (has_tschchartinfointerbargap()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(24, this->tschchartinfointerbargap(), output);
+  }
+
+  // optional float tschchartinfointersetgap = 25;
+  if (has_tschchartinfointersetgap()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(25, this->tschchartinfointersetgap(), output);
+  }
+
+  // optional bool tschchartinfoshowborder = 26;
+  if (has_tschchartinfoshowborder()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(26, this->tschchartinfoshowborder(), output);
+  }
+
+  // optional .TSP.Color tschchartinfotitlecolor = 27;
+  if (has_tschchartinfotitlecolor()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      27, this->tschchartinfotitlecolor(), output);
+  }
+
+  // optional int32 tschchartinfotitleparagraphstyleindex = 28;
+  if (has_tschchartinfotitleparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(28, this->tschchartinfotitleparagraphstyleindex(), output);
+  }
+
+  // optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+  if (has_tschchartinfodatasetnameparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(29, this->tschchartinfodatasetnameparagraphstyleindex(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ChartGenericPropertyMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional int32 tschchartinfo3dbarshape = 1;
+  if (has_tschchartinfo3dbarshape()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->tschchartinfo3dbarshape(), target);
+  }
+
+  // optional bool tschchartinfo3dbeveledges = 2;
+  if (has_tschchartinfo3dbeveledges()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->tschchartinfo3dbeveledges(), target);
+  }
+
+  // optional float tschchartinfo3dintersetdepthgap = 3;
+  if (has_tschchartinfo3dintersetdepthgap()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(3, this->tschchartinfo3dintersetdepthgap(), target);
+  }
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+  if (has_tschchartinfo3drotation()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->tschchartinfo3drotation(), target);
+  }
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+  if (has_tschchartinfo3dscale()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->tschchartinfo3dscale(), target);
+  }
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+  if (has_tschchartinfo3dviewport()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->tschchartinfo3dviewport(), target);
+  }
+
+  // optional float tschchartinfopiestartangle = 7;
+  if (has_tschchartinfopiestartangle()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(7, this->tschchartinfopiestartangle(), target);
+  }
+
+  // optional bool tschchartinfoshowlegend = 8;
+  if (has_tschchartinfoshowlegend()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->tschchartinfoshowlegend(), target);
+  }
+
+  // optional bool tschchartinfoshowtitle = 9;
+  if (has_tschchartinfoshowtitle()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(9, this->tschchartinfoshowtitle(), target);
+  }
+
+  // optional bool tschchartinfoskiphiddendata = 10;
+  if (has_tschchartinfoskiphiddendata()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->tschchartinfoskiphiddendata(), target);
+  }
+
+  // optional string tschchartinfotitle = 11;
+  if (has_tschchartinfotitle()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->tschchartinfotitle().data(), this->tschchartinfotitle().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        11, this->tschchartinfotitle(), target);
+  }
+
+  // optional int32 tschchartinfodatasetnamelocation = 12;
+  if (has_tschchartinfodatasetnamelocation()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(12, this->tschchartinfodatasetnamelocation(), target);
+  }
+
+  // optional int32 tschchartinfomultidatacontroltype = 13;
+  if (has_tschchartinfomultidatacontroltype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(13, this->tschchartinfomultidatacontroltype(), target);
+  }
+
+  // optional float tschchartinfo3dchartopacity = 14;
+  if (has_tschchartinfo3dchartopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(14, this->tschchartinfo3dchartopacity(), target);
+  }
+
+  // optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+  if (has_tschchartinfo3dlightingpackage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        15, this->tschchartinfo3dlightingpackage(), target);
+  }
+
+  // optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+  if (has_tschchartinfobackgroundfill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        16, this->tschchartinfobackgroundfill(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+  if (has_tschchartinfobackgroundstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        17, this->tschchartinfobackgroundstroke(), target);
+  }
+
+  // optional float tschchartinfoborderopacity = 18;
+  if (has_tschchartinfoborderopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(18, this->tschchartinfoborderopacity(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+  if (has_tschchartinfobordershadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        19, this->tschchartinfobordershadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+  if (has_tschchartinfoborderstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->tschchartinfoborderstroke(), target);
+  }
+
+  // optional bool tschchartinfocombinelayers = 21;
+  if (has_tschchartinfocombinelayers()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(21, this->tschchartinfocombinelayers(), target);
+  }
+
+  // optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+  if (has_tschchartinfogridbackgroundfill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        22, this->tschchartinfogridbackgroundfill(), target);
+  }
+
+  // optional float tschchartinfogridbackgroundopacity = 23;
+  if (has_tschchartinfogridbackgroundopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(23, this->tschchartinfogridbackgroundopacity(), target);
+  }
+
+  // optional float tschchartinfointerbargap = 24;
+  if (has_tschchartinfointerbargap()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(24, this->tschchartinfointerbargap(), target);
+  }
+
+  // optional float tschchartinfointersetgap = 25;
+  if (has_tschchartinfointersetgap()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(25, this->tschchartinfointersetgap(), target);
+  }
+
+  // optional bool tschchartinfoshowborder = 26;
+  if (has_tschchartinfoshowborder()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(26, this->tschchartinfoshowborder(), target);
+  }
+
+  // optional .TSP.Color tschchartinfotitlecolor = 27;
+  if (has_tschchartinfotitlecolor()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        27, this->tschchartinfotitlecolor(), target);
+  }
+
+  // optional int32 tschchartinfotitleparagraphstyleindex = 28;
+  if (has_tschchartinfotitleparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(28, this->tschchartinfotitleparagraphstyleindex(), target);
+  }
+
+  // optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+  if (has_tschchartinfodatasetnameparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(29, this->tschchartinfodatasetnameparagraphstyleindex(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ChartGenericPropertyMapArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional int32 tschchartinfo3dbarshape = 1;
+    if (has_tschchartinfo3dbarshape()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartinfo3dbarshape());
+    }
+
+    // optional bool tschchartinfo3dbeveledges = 2;
+    if (has_tschchartinfo3dbeveledges()) {
+      total_size += 1 + 1;
+    }
+
+    // optional float tschchartinfo3dintersetdepthgap = 3;
+    if (has_tschchartinfo3dintersetdepthgap()) {
+      total_size += 1 + 4;
+    }
+
+    // optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+    if (has_tschchartinfo3drotation()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfo3drotation());
+    }
+
+    // optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+    if (has_tschchartinfo3dscale()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfo3dscale());
+    }
+
+    // optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+    if (has_tschchartinfo3dviewport()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfo3dviewport());
+    }
+
+    // optional float tschchartinfopiestartangle = 7;
+    if (has_tschchartinfopiestartangle()) {
+      total_size += 1 + 4;
+    }
+
+    // optional bool tschchartinfoshowlegend = 8;
+    if (has_tschchartinfoshowlegend()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional bool tschchartinfoshowtitle = 9;
+    if (has_tschchartinfoshowtitle()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool tschchartinfoskiphiddendata = 10;
+    if (has_tschchartinfoskiphiddendata()) {
+      total_size += 1 + 1;
+    }
+
+    // optional string tschchartinfotitle = 11;
+    if (has_tschchartinfotitle()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->tschchartinfotitle());
+    }
+
+    // optional int32 tschchartinfodatasetnamelocation = 12;
+    if (has_tschchartinfodatasetnamelocation()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartinfodatasetnamelocation());
+    }
+
+    // optional int32 tschchartinfomultidatacontroltype = 13;
+    if (has_tschchartinfomultidatacontroltype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartinfomultidatacontroltype());
+    }
+
+    // optional float tschchartinfo3dchartopacity = 14;
+    if (has_tschchartinfo3dchartopacity()) {
+      total_size += 1 + 4;
+    }
+
+    // optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+    if (has_tschchartinfo3dlightingpackage()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfo3dlightingpackage());
+    }
+
+    // optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+    if (has_tschchartinfobackgroundfill()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfobackgroundfill());
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+    if (has_tschchartinfobackgroundstroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfobackgroundstroke());
+    }
+
+    // optional float tschchartinfoborderopacity = 18;
+    if (has_tschchartinfoborderopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+    if (has_tschchartinfobordershadow()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfobordershadow());
+    }
+
+    // optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+    if (has_tschchartinfoborderstroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfoborderstroke());
+    }
+
+    // optional bool tschchartinfocombinelayers = 21;
+    if (has_tschchartinfocombinelayers()) {
+      total_size += 2 + 1;
+    }
+
+    // optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+    if (has_tschchartinfogridbackgroundfill()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfogridbackgroundfill());
+    }
+
+    // optional float tschchartinfogridbackgroundopacity = 23;
+    if (has_tschchartinfogridbackgroundopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional float tschchartinfointerbargap = 24;
+    if (has_tschchartinfointerbargap()) {
+      total_size += 2 + 4;
+    }
+
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional float tschchartinfointersetgap = 25;
+    if (has_tschchartinfointersetgap()) {
+      total_size += 2 + 4;
+    }
+
+    // optional bool tschchartinfoshowborder = 26;
+    if (has_tschchartinfoshowborder()) {
+      total_size += 2 + 1;
+    }
+
+    // optional .TSP.Color tschchartinfotitlecolor = 27;
+    if (has_tschchartinfotitlecolor()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartinfotitlecolor());
+    }
+
+    // optional int32 tschchartinfotitleparagraphstyleindex = 28;
+    if (has_tschchartinfotitleparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartinfotitleparagraphstyleindex());
+    }
+
+    // optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+    if (has_tschchartinfodatasetnameparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartinfodatasetnameparagraphstyleindex());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ChartGenericPropertyMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ChartGenericPropertyMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ChartGenericPropertyMapArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ChartGenericPropertyMapArchive::MergeFrom(const ChartGenericPropertyMapArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_tschchartinfo3dbarshape()) {
+      set_tschchartinfo3dbarshape(from.tschchartinfo3dbarshape());
+    }
+    if (from.has_tschchartinfo3dbeveledges()) {
+      set_tschchartinfo3dbeveledges(from.tschchartinfo3dbeveledges());
+    }
+    if (from.has_tschchartinfo3dintersetdepthgap()) {
+      set_tschchartinfo3dintersetdepthgap(from.tschchartinfo3dintersetdepthgap());
+    }
+    if (from.has_tschchartinfo3drotation()) {
+      mutable_tschchartinfo3drotation()->::TSCH::Chart3DVectorArchive::MergeFrom(from.tschchartinfo3drotation());
+    }
+    if (from.has_tschchartinfo3dscale()) {
+      mutable_tschchartinfo3dscale()->::TSCH::Chart3DVectorArchive::MergeFrom(from.tschchartinfo3dscale());
+    }
+    if (from.has_tschchartinfo3dviewport()) {
+      mutable_tschchartinfo3dviewport()->::TSCH::Chart3DVectorArchive::MergeFrom(from.tschchartinfo3dviewport());
+    }
+    if (from.has_tschchartinfopiestartangle()) {
+      set_tschchartinfopiestartangle(from.tschchartinfopiestartangle());
+    }
+    if (from.has_tschchartinfoshowlegend()) {
+      set_tschchartinfoshowlegend(from.tschchartinfoshowlegend());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_tschchartinfoshowtitle()) {
+      set_tschchartinfoshowtitle(from.tschchartinfoshowtitle());
+    }
+    if (from.has_tschchartinfoskiphiddendata()) {
+      set_tschchartinfoskiphiddendata(from.tschchartinfoskiphiddendata());
+    }
+    if (from.has_tschchartinfotitle()) {
+      set_tschchartinfotitle(from.tschchartinfotitle());
+    }
+    if (from.has_tschchartinfodatasetnamelocation()) {
+      set_tschchartinfodatasetnamelocation(from.tschchartinfodatasetnamelocation());
+    }
+    if (from.has_tschchartinfomultidatacontroltype()) {
+      set_tschchartinfomultidatacontroltype(from.tschchartinfomultidatacontroltype());
+    }
+    if (from.has_tschchartinfo3dchartopacity()) {
+      set_tschchartinfo3dchartopacity(from.tschchartinfo3dchartopacity());
+    }
+    if (from.has_tschchartinfo3dlightingpackage()) {
+      mutable_tschchartinfo3dlightingpackage()->::TSCH::Chart3DLightingPackageArchive::MergeFrom(from.tschchartinfo3dlightingpackage());
+    }
+    if (from.has_tschchartinfobackgroundfill()) {
+      mutable_tschchartinfobackgroundfill()->::TSD::FillArchive::MergeFrom(from.tschchartinfobackgroundfill());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_tschchartinfobackgroundstroke()) {
+      mutable_tschchartinfobackgroundstroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartinfobackgroundstroke());
+    }
+    if (from.has_tschchartinfoborderopacity()) {
+      set_tschchartinfoborderopacity(from.tschchartinfoborderopacity());
+    }
+    if (from.has_tschchartinfobordershadow()) {
+      mutable_tschchartinfobordershadow()->::TSD::ShadowArchive::MergeFrom(from.tschchartinfobordershadow());
+    }
+    if (from.has_tschchartinfoborderstroke()) {
+      mutable_tschchartinfoborderstroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartinfoborderstroke());
+    }
+    if (from.has_tschchartinfocombinelayers()) {
+      set_tschchartinfocombinelayers(from.tschchartinfocombinelayers());
+    }
+    if (from.has_tschchartinfogridbackgroundfill()) {
+      mutable_tschchartinfogridbackgroundfill()->::TSD::FillArchive::MergeFrom(from.tschchartinfogridbackgroundfill());
+    }
+    if (from.has_tschchartinfogridbackgroundopacity()) {
+      set_tschchartinfogridbackgroundopacity(from.tschchartinfogridbackgroundopacity());
+    }
+    if (from.has_tschchartinfointerbargap()) {
+      set_tschchartinfointerbargap(from.tschchartinfointerbargap());
+    }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (from.has_tschchartinfointersetgap()) {
+      set_tschchartinfointersetgap(from.tschchartinfointersetgap());
+    }
+    if (from.has_tschchartinfoshowborder()) {
+      set_tschchartinfoshowborder(from.tschchartinfoshowborder());
+    }
+    if (from.has_tschchartinfotitlecolor()) {
+      mutable_tschchartinfotitlecolor()->::TSP::Color::MergeFrom(from.tschchartinfotitlecolor());
+    }
+    if (from.has_tschchartinfotitleparagraphstyleindex()) {
+      set_tschchartinfotitleparagraphstyleindex(from.tschchartinfotitleparagraphstyleindex());
+    }
+    if (from.has_tschchartinfodatasetnameparagraphstyleindex()) {
+      set_tschchartinfodatasetnameparagraphstyleindex(from.tschchartinfodatasetnameparagraphstyleindex());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ChartGenericPropertyMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ChartGenericPropertyMapArchive::CopyFrom(const ChartGenericPropertyMapArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ChartGenericPropertyMapArchive::IsInitialized() const {
+
+  if (has_tschchartinfo3drotation()) {
+    if (!this->tschchartinfo3drotation().IsInitialized()) return false;
+  }
+  if (has_tschchartinfo3dscale()) {
+    if (!this->tschchartinfo3dscale().IsInitialized()) return false;
+  }
+  if (has_tschchartinfo3dviewport()) {
+    if (!this->tschchartinfo3dviewport().IsInitialized()) return false;
+  }
+  if (has_tschchartinfo3dlightingpackage()) {
+    if (!this->tschchartinfo3dlightingpackage().IsInitialized()) return false;
+  }
+  if (has_tschchartinfobackgroundfill()) {
+    if (!this->tschchartinfobackgroundfill().IsInitialized()) return false;
+  }
+  if (has_tschchartinfobackgroundstroke()) {
+    if (!this->tschchartinfobackgroundstroke().IsInitialized()) return false;
+  }
+  if (has_tschchartinfobordershadow()) {
+    if (!this->tschchartinfobordershadow().IsInitialized()) return false;
+  }
+  if (has_tschchartinfoborderstroke()) {
+    if (!this->tschchartinfoborderstroke().IsInitialized()) return false;
+  }
+  if (has_tschchartinfogridbackgroundfill()) {
+    if (!this->tschchartinfogridbackgroundfill().IsInitialized()) return false;
+  }
+  if (has_tschchartinfotitlecolor()) {
+    if (!this->tschchartinfotitlecolor().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ChartGenericPropertyMapArchive::Swap(ChartGenericPropertyMapArchive* other) {
+  if (other != this) {
+    std::swap(tschchartinfo3dbarshape_, other->tschchartinfo3dbarshape_);
+    std::swap(tschchartinfo3dbeveledges_, other->tschchartinfo3dbeveledges_);
+    std::swap(tschchartinfo3dintersetdepthgap_, other->tschchartinfo3dintersetdepthgap_);
+    std::swap(tschchartinfo3drotation_, other->tschchartinfo3drotation_);
+    std::swap(tschchartinfo3dscale_, other->tschchartinfo3dscale_);
+    std::swap(tschchartinfo3dviewport_, other->tschchartinfo3dviewport_);
+    std::swap(tschchartinfopiestartangle_, other->tschchartinfopiestartangle_);
+    std::swap(tschchartinfoshowlegend_, other->tschchartinfoshowlegend_);
+    std::swap(tschchartinfoshowtitle_, other->tschchartinfoshowtitle_);
+    std::swap(tschchartinfoskiphiddendata_, other->tschchartinfoskiphiddendata_);
+    std::swap(tschchartinfotitle_, other->tschchartinfotitle_);
+    std::swap(tschchartinfodatasetnamelocation_, other->tschchartinfodatasetnamelocation_);
+    std::swap(tschchartinfomultidatacontroltype_, other->tschchartinfomultidatacontroltype_);
+    std::swap(tschchartinfo3dchartopacity_, other->tschchartinfo3dchartopacity_);
+    std::swap(tschchartinfo3dlightingpackage_, other->tschchartinfo3dlightingpackage_);
+    std::swap(tschchartinfobackgroundfill_, other->tschchartinfobackgroundfill_);
+    std::swap(tschchartinfobackgroundstroke_, other->tschchartinfobackgroundstroke_);
+    std::swap(tschchartinfoborderopacity_, other->tschchartinfoborderopacity_);
+    std::swap(tschchartinfobordershadow_, other->tschchartinfobordershadow_);
+    std::swap(tschchartinfoborderstroke_, other->tschchartinfoborderstroke_);
+    std::swap(tschchartinfocombinelayers_, other->tschchartinfocombinelayers_);
+    std::swap(tschchartinfogridbackgroundfill_, other->tschchartinfogridbackgroundfill_);
+    std::swap(tschchartinfogridbackgroundopacity_, other->tschchartinfogridbackgroundopacity_);
+    std::swap(tschchartinfointerbargap_, other->tschchartinfointerbargap_);
+    std::swap(tschchartinfointersetgap_, other->tschchartinfointersetgap_);
+    std::swap(tschchartinfoshowborder_, other->tschchartinfoshowborder_);
+    std::swap(tschchartinfotitlecolor_, other->tschchartinfotitlecolor_);
+    std::swap(tschchartinfotitleparagraphstyleindex_, other->tschchartinfotitleparagraphstyleindex_);
+    std::swap(tschchartinfodatasetnameparagraphstyleindex_, other->tschchartinfodatasetnameparagraphstyleindex_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ChartGenericPropertyMapArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ChartGenericPropertyMapArchive_descriptor_;
+  metadata.reflection = ChartGenericPropertyMapArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int LegendGenericPropertyMapArchive::kTschlegendmodelfillFieldNumber;
+const int LegendGenericPropertyMapArchive::kTschlegendmodellabelparagraphstyleindexFieldNumber;
+const int LegendGenericPropertyMapArchive::kTschlegendmodelopacityFieldNumber;
+const int LegendGenericPropertyMapArchive::kTschlegendmodelshadowFieldNumber;
+const int LegendGenericPropertyMapArchive::kTschlegendmodelstrokeFieldNumber;
+#endif  // !_MSC_VER
+
+LegendGenericPropertyMapArchive::LegendGenericPropertyMapArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void LegendGenericPropertyMapArchive::InitAsDefaultInstance() {
+  tschlegendmodelfill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  tschlegendmodelshadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschlegendmodelstroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+}
+
+LegendGenericPropertyMapArchive::LegendGenericPropertyMapArchive(const LegendGenericPropertyMapArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void LegendGenericPropertyMapArchive::SharedCtor() {
+  _cached_size_ = 0;
+  tschlegendmodelfill_ = NULL;
+  tschlegendmodellabelparagraphstyleindex_ = 0;
+  tschlegendmodelopacity_ = 0;
+  tschlegendmodelshadow_ = NULL;
+  tschlegendmodelstroke_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+LegendGenericPropertyMapArchive::~LegendGenericPropertyMapArchive() {
+  SharedDtor();
+}
+
+void LegendGenericPropertyMapArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete tschlegendmodelfill_;
+    delete tschlegendmodelshadow_;
+    delete tschlegendmodelstroke_;
+  }
+}
+
+void LegendGenericPropertyMapArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* LegendGenericPropertyMapArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return LegendGenericPropertyMapArchive_descriptor_;
+}
+
+const LegendGenericPropertyMapArchive& LegendGenericPropertyMapArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  return *default_instance_;
+}
+
+LegendGenericPropertyMapArchive* LegendGenericPropertyMapArchive::default_instance_ = NULL;
+
+LegendGenericPropertyMapArchive* LegendGenericPropertyMapArchive::New() const {
+  return new LegendGenericPropertyMapArchive;
+}
+
+void LegendGenericPropertyMapArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_tschlegendmodelfill()) {
+      if (tschlegendmodelfill_ != NULL) tschlegendmodelfill_->::TSD::FillArchive::Clear();
+    }
+    tschlegendmodellabelparagraphstyleindex_ = 0;
+    tschlegendmodelopacity_ = 0;
+    if (has_tschlegendmodelshadow()) {
+      if (tschlegendmodelshadow_ != NULL) tschlegendmodelshadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschlegendmodelstroke()) {
+      if (tschlegendmodelstroke_ != NULL) tschlegendmodelstroke_->::TSD::StrokeArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool LegendGenericPropertyMapArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .TSD.FillArchive tschlegendmodelfill = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschlegendmodelfill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_tschlegendmodellabelparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschlegendmodellabelparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschlegendmodellabelparagraphstyleindex_)));
+          set_has_tschlegendmodellabelparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(29)) goto parse_tschlegendmodelopacity;
+        break;
+      }
+
+      // optional float tschlegendmodelopacity = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschlegendmodelopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschlegendmodelopacity_)));
+          set_has_tschlegendmodelopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_tschlegendmodelshadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschlegendmodelshadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschlegendmodelshadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_tschlegendmodelstroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschlegendmodelstroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschlegendmodelstroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void LegendGenericPropertyMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .TSD.FillArchive tschlegendmodelfill = 1;
+  if (has_tschlegendmodelfill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->tschlegendmodelfill(), output);
+  }
+
+  // optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+  if (has_tschlegendmodellabelparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->tschlegendmodellabelparagraphstyleindex(), output);
+  }
+
+  // optional float tschlegendmodelopacity = 3;
+  if (has_tschlegendmodelopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(3, this->tschlegendmodelopacity(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+  if (has_tschlegendmodelshadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->tschlegendmodelshadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+  if (has_tschlegendmodelstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->tschlegendmodelstroke(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* LegendGenericPropertyMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .TSD.FillArchive tschlegendmodelfill = 1;
+  if (has_tschlegendmodelfill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->tschlegendmodelfill(), target);
+  }
+
+  // optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+  if (has_tschlegendmodellabelparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->tschlegendmodellabelparagraphstyleindex(), target);
+  }
+
+  // optional float tschlegendmodelopacity = 3;
+  if (has_tschlegendmodelopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(3, this->tschlegendmodelopacity(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+  if (has_tschlegendmodelshadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->tschlegendmodelshadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+  if (has_tschlegendmodelstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->tschlegendmodelstroke(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int LegendGenericPropertyMapArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .TSD.FillArchive tschlegendmodelfill = 1;
+    if (has_tschlegendmodelfill()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschlegendmodelfill());
+    }
+
+    // optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+    if (has_tschlegendmodellabelparagraphstyleindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschlegendmodellabelparagraphstyleindex());
+    }
+
+    // optional float tschlegendmodelopacity = 3;
+    if (has_tschlegendmodelopacity()) {
+      total_size += 1 + 4;
+    }
+
+    // optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+    if (has_tschlegendmodelshadow()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschlegendmodelshadow());
+    }
+
+    // optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+    if (has_tschlegendmodelstroke()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschlegendmodelstroke());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void LegendGenericPropertyMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const LegendGenericPropertyMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const LegendGenericPropertyMapArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void LegendGenericPropertyMapArchive::MergeFrom(const LegendGenericPropertyMapArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_tschlegendmodelfill()) {
+      mutable_tschlegendmodelfill()->::TSD::FillArchive::MergeFrom(from.tschlegendmodelfill());
+    }
+    if (from.has_tschlegendmodellabelparagraphstyleindex()) {
+      set_tschlegendmodellabelparagraphstyleindex(from.tschlegendmodellabelparagraphstyleindex());
+    }
+    if (from.has_tschlegendmodelopacity()) {
+      set_tschlegendmodelopacity(from.tschlegendmodelopacity());
+    }
+    if (from.has_tschlegendmodelshadow()) {
+      mutable_tschlegendmodelshadow()->::TSD::ShadowArchive::MergeFrom(from.tschlegendmodelshadow());
+    }
+    if (from.has_tschlegendmodelstroke()) {
+      mutable_tschlegendmodelstroke()->::TSD::StrokeArchive::MergeFrom(from.tschlegendmodelstroke());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void LegendGenericPropertyMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void LegendGenericPropertyMapArchive::CopyFrom(const LegendGenericPropertyMapArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool LegendGenericPropertyMapArchive::IsInitialized() const {
+
+  if (has_tschlegendmodelfill()) {
+    if (!this->tschlegendmodelfill().IsInitialized()) return false;
+  }
+  if (has_tschlegendmodelshadow()) {
+    if (!this->tschlegendmodelshadow().IsInitialized()) return false;
+  }
+  if (has_tschlegendmodelstroke()) {
+    if (!this->tschlegendmodelstroke().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void LegendGenericPropertyMapArchive::Swap(LegendGenericPropertyMapArchive* other) {
+  if (other != this) {
+    std::swap(tschlegendmodelfill_, other->tschlegendmodelfill_);
+    std::swap(tschlegendmodellabelparagraphstyleindex_, other->tschlegendmodellabelparagraphstyleindex_);
+    std::swap(tschlegendmodelopacity_, other->tschlegendmodelopacity_);
+    std::swap(tschlegendmodelshadow_, other->tschlegendmodelshadow_);
+    std::swap(tschlegendmodelstroke_, other->tschlegendmodelstroke_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata LegendGenericPropertyMapArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = LegendGenericPropertyMapArchive_descriptor_;
+  metadata.reflection = LegendGenericPropertyMapArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxis3DlabelpositionFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxis10NumberformatFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisnumberformatFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxis10DateformatFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisdurationformatFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisdateformatFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisnumberformattypeFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisnumberofdecadesFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisnumberofmajorgridlinesFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisnumberofminorgridlinesFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisplottoedgesFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisscaleFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowlabelsFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowserieslabelsFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowtitleFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxistitleFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisusermaxFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisuserminFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxis3DgridlineopacityFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxis3DgridlinestrokeFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxishorizontalspacingFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxislabelparagraphstyleindexFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxislabelsorientationFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxismajorgridlineopacityFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxismajorgridlineshadowFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxismajorgridlinestrokeFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisminorgridlineopacityFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisminorgridlineshadowFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisminorgridlinestrokeFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowaxisFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowlastlabelFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowmajorgridlinesFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowmajortickmarksFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowminimumlabelFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowminorgridlinesFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisshowminortickmarksFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxistickmarklocationFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxistitleparagraphstyleindexFieldNumber;
+const int ChartAxisGenericPropertyMapArchive::kTschchartaxisverticalspacingFieldNumber;
+#endif  // !_MSC_VER
+
+ChartAxisGenericPropertyMapArchive::ChartAxisGenericPropertyMapArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ChartAxisGenericPropertyMapArchive::InitAsDefaultInstance() {
+  tschchartaxis1_0numberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisnumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxis1_0dateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisdurationformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisdateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartaxisusermax_ = const_cast< ::TSCH::ChartsNSNumberDoubleArchive*>(&::TSCH::ChartsNSNumberDoubleArchive::default_instance());
+  tschchartaxisusermin_ = const_cast< ::TSCH::ChartsNSNumberDoubleArchive*>(&::TSCH::ChartsNSNumberDoubleArchive::default_instance());
+  tschchartaxis3dgridlinestroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartaxismajorgridlineshadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschchartaxismajorgridlinestroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartaxisminorgridlineshadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschchartaxisminorgridlinestroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+}
+
+ChartAxisGenericPropertyMapArchive::ChartAxisGenericPropertyMapArchive(const ChartAxisGenericPropertyMapArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ChartAxisGenericPropertyMapArchive::SharedCtor() {
+  _cached_size_ = 0;
+  tschchartaxis3dlabelposition_ = 0;
+  tschchartaxis1_0numberformat_ = NULL;
+  tschchartaxisnumberformat_ = NULL;
+  tschchartaxis1_0dateformat_ = NULL;
+  tschchartaxisdurationformat_ = NULL;
+  tschchartaxisdateformat_ = NULL;
+  tschchartaxisnumberformattype_ = 0;
+  tschchartaxisnumberofdecades_ = 0;
+  tschchartaxisnumberofmajorgridlines_ = 0;
+  tschchartaxisnumberofminorgridlines_ = 0;
+  tschchartaxisplottoedges_ = false;
+  tschchartaxisscale_ = 0;
+  tschchartaxisshowlabels_ = false;
+  tschchartaxisshowserieslabels_ = false;
+  tschchartaxisshowtitle_ = false;
+  tschchartaxistitle_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  tschchartaxisusermax_ = NULL;
+  tschchartaxisusermin_ = NULL;
+  tschchartaxis3dgridlineopacity_ = 0;
+  tschchartaxis3dgridlinestroke_ = NULL;
+  tschchartaxishorizontalspacing_ = 0;
+  tschchartaxislabelparagraphstyleindex_ = 0;
+  tschchartaxislabelsorientation_ = 0;
+  tschchartaxismajorgridlineopacity_ = 0;
+  tschchartaxismajorgridlineshadow_ = NULL;
+  tschchartaxismajorgridlinestroke_ = NULL;
+  tschchartaxisminorgridlineopacity_ = 0;
+  tschchartaxisminorgridlineshadow_ = NULL;
+  tschchartaxisminorgridlinestroke_ = NULL;
+  tschchartaxisshowaxis_ = false;
+  tschchartaxisshowlastlabel_ = false;
+  tschchartaxisshowmajorgridlines_ = false;
+  tschchartaxisshowmajortickmarks_ = false;
+  tschchartaxisshowminimumlabel_ = false;
+  tschchartaxisshowminorgridlines_ = false;
+  tschchartaxisshowminortickmarks_ = false;
+  tschchartaxistickmarklocation_ = 0;
+  tschchartaxistitleparagraphstyleindex_ = 0;
+  tschchartaxisverticalspacing_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ChartAxisGenericPropertyMapArchive::~ChartAxisGenericPropertyMapArchive() {
+  SharedDtor();
+}
+
+void ChartAxisGenericPropertyMapArchive::SharedDtor() {
+  if (tschchartaxistitle_ != &::google::protobuf::internal::kEmptyString) {
+    delete tschchartaxistitle_;
+  }
+  if (this != default_instance_) {
+    delete tschchartaxis1_0numberformat_;
+    delete tschchartaxisnumberformat_;
+    delete tschchartaxis1_0dateformat_;
+    delete tschchartaxisdurationformat_;
+    delete tschchartaxisdateformat_;
+    delete tschchartaxisusermax_;
+    delete tschchartaxisusermin_;
+    delete tschchartaxis3dgridlinestroke_;
+    delete tschchartaxismajorgridlineshadow_;
+    delete tschchartaxismajorgridlinestroke_;
+    delete tschchartaxisminorgridlineshadow_;
+    delete tschchartaxisminorgridlinestroke_;
+  }
+}
+
+void ChartAxisGenericPropertyMapArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ChartAxisGenericPropertyMapArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ChartAxisGenericPropertyMapArchive_descriptor_;
+}
+
+const ChartAxisGenericPropertyMapArchive& ChartAxisGenericPropertyMapArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  return *default_instance_;
+}
+
+ChartAxisGenericPropertyMapArchive* ChartAxisGenericPropertyMapArchive::default_instance_ = NULL;
+
+ChartAxisGenericPropertyMapArchive* ChartAxisGenericPropertyMapArchive::New() const {
+  return new ChartAxisGenericPropertyMapArchive;
+}
+
+void ChartAxisGenericPropertyMapArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    tschchartaxis3dlabelposition_ = 0;
+    if (has_tschchartaxis1_0numberformat()) {
+      if (tschchartaxis1_0numberformat_ != NULL) tschchartaxis1_0numberformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartaxisnumberformat()) {
+      if (tschchartaxisnumberformat_ != NULL) tschchartaxisnumberformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartaxis1_0dateformat()) {
+      if (tschchartaxis1_0dateformat_ != NULL) tschchartaxis1_0dateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartaxisdurationformat()) {
+      if (tschchartaxisdurationformat_ != NULL) tschchartaxisdurationformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartaxisdateformat()) {
+      if (tschchartaxisdateformat_ != NULL) tschchartaxisdateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    tschchartaxisnumberformattype_ = 0;
+    tschchartaxisnumberofdecades_ = 0;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    tschchartaxisnumberofmajorgridlines_ = 0;
+    tschchartaxisnumberofminorgridlines_ = 0;
+    tschchartaxisplottoedges_ = false;
+    tschchartaxisscale_ = 0;
+    tschchartaxisshowlabels_ = false;
+    tschchartaxisshowserieslabels_ = false;
+    tschchartaxisshowtitle_ = false;
+    if (has_tschchartaxistitle()) {
+      if (tschchartaxistitle_ != &::google::protobuf::internal::kEmptyString) {
+        tschchartaxistitle_->clear();
+      }
+    }
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (has_tschchartaxisusermax()) {
+      if (tschchartaxisusermax_ != NULL) tschchartaxisusermax_->::TSCH::ChartsNSNumberDoubleArchive::Clear();
+    }
+    if (has_tschchartaxisusermin()) {
+      if (tschchartaxisusermin_ != NULL) tschchartaxisusermin_->::TSCH::ChartsNSNumberDoubleArchive::Clear();
+    }
+    tschchartaxis3dgridlineopacity_ = 0;
+    if (has_tschchartaxis3dgridlinestroke()) {
+      if (tschchartaxis3dgridlinestroke_ != NULL) tschchartaxis3dgridlinestroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartaxishorizontalspacing_ = 0;
+    tschchartaxislabelparagraphstyleindex_ = 0;
+    tschchartaxislabelsorientation_ = 0;
+    tschchartaxismajorgridlineopacity_ = 0;
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (has_tschchartaxismajorgridlineshadow()) {
+      if (tschchartaxismajorgridlineshadow_ != NULL) tschchartaxismajorgridlineshadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschchartaxismajorgridlinestroke()) {
+      if (tschchartaxismajorgridlinestroke_ != NULL) tschchartaxismajorgridlinestroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartaxisminorgridlineopacity_ = 0;
+    if (has_tschchartaxisminorgridlineshadow()) {
+      if (tschchartaxisminorgridlineshadow_ != NULL) tschchartaxisminorgridlineshadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschchartaxisminorgridlinestroke()) {
+      if (tschchartaxisminorgridlinestroke_ != NULL) tschchartaxisminorgridlinestroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartaxisshowaxis_ = false;
+    tschchartaxisshowlastlabel_ = false;
+    tschchartaxisshowmajorgridlines_ = false;
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    tschchartaxisshowmajortickmarks_ = false;
+    tschchartaxisshowminimumlabel_ = false;
+    tschchartaxisshowminorgridlines_ = false;
+    tschchartaxisshowminortickmarks_ = false;
+    tschchartaxistickmarklocation_ = 0;
+    tschchartaxistitleparagraphstyleindex_ = 0;
+    tschchartaxisverticalspacing_ = 0;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ChartAxisGenericPropertyMapArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional int32 tschchartaxis3dlabelposition = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxis3dlabelposition_)));
+          set_has_tschchartaxis3dlabelposition();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_tschchartaxis1_0numberformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxis1_0numberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxis1_0numberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_tschchartaxisnumberformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisnumberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisnumberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_tschchartaxis1_0dateformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxis1_0dateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxis1_0dateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_tschchartaxisdurationformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisdurationformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisdurationformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_tschchartaxisdateformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisdateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisdateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_tschchartaxisnumberformattype;
+        break;
+      }
+
+      // optional int32 tschchartaxisnumberformattype = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisnumberformattype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxisnumberformattype_)));
+          set_has_tschchartaxisnumberformattype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_tschchartaxisnumberofdecades;
+        break;
+      }
+
+      // optional int32 tschchartaxisnumberofdecades = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisnumberofdecades:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxisnumberofdecades_)));
+          set_has_tschchartaxisnumberofdecades();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_tschchartaxisnumberofmajorgridlines;
+        break;
+      }
+
+      // optional int32 tschchartaxisnumberofmajorgridlines = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisnumberofmajorgridlines:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxisnumberofmajorgridlines_)));
+          set_has_tschchartaxisnumberofmajorgridlines();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_tschchartaxisnumberofminorgridlines;
+        break;
+      }
+
+      // optional int32 tschchartaxisnumberofminorgridlines = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisnumberofminorgridlines:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxisnumberofminorgridlines_)));
+          set_has_tschchartaxisnumberofminorgridlines();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_tschchartaxisplottoedges;
+        break;
+      }
+
+      // optional bool tschchartaxisplottoedges = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisplottoedges:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisplottoedges_)));
+          set_has_tschchartaxisplottoedges();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(96)) goto parse_tschchartaxisscale;
+        break;
+      }
+
+      // optional int32 tschchartaxisscale = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisscale:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxisscale_)));
+          set_has_tschchartaxisscale();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(104)) goto parse_tschchartaxisshowlabels;
+        break;
+      }
+
+      // optional bool tschchartaxisshowlabels = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowlabels:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowlabels_)));
+          set_has_tschchartaxisshowlabels();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(112)) goto parse_tschchartaxisshowserieslabels;
+        break;
+      }
+
+      // optional bool tschchartaxisshowserieslabels = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowserieslabels:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowserieslabels_)));
+          set_has_tschchartaxisshowserieslabels();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(120)) goto parse_tschchartaxisshowtitle;
+        break;
+      }
+
+      // optional bool tschchartaxisshowtitle = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowtitle:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowtitle_)));
+          set_has_tschchartaxisshowtitle();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(130)) goto parse_tschchartaxistitle;
+        break;
+      }
+
+      // optional string tschchartaxistitle = 16;
+      case 16: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxistitle:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_tschchartaxistitle()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->tschchartaxistitle().data(), this->tschchartaxistitle().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(138)) goto parse_tschchartaxisusermax;
+        break;
+      }
+
+      // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisusermax:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisusermax()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(146)) goto parse_tschchartaxisusermin;
+        break;
+      }
+
+      // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+      case 18: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisusermin:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisusermin()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(157)) goto parse_tschchartaxis3dgridlineopacity;
+        break;
+      }
+
+      // optional float tschchartaxis3dgridlineopacity = 19;
+      case 19: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartaxis3dgridlineopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartaxis3dgridlineopacity_)));
+          set_has_tschchartaxis3dgridlineopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(162)) goto parse_tschchartaxis3dgridlinestroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxis3dgridlinestroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxis3dgridlinestroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(168)) goto parse_tschchartaxishorizontalspacing;
+        break;
+      }
+
+      // optional int32 tschchartaxishorizontalspacing = 21;
+      case 21: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxishorizontalspacing:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxishorizontalspacing_)));
+          set_has_tschchartaxishorizontalspacing();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(176)) goto parse_tschchartaxislabelparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartaxislabelparagraphstyleindex = 22;
+      case 22: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxislabelparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxislabelparagraphstyleindex_)));
+          set_has_tschchartaxislabelparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(189)) goto parse_tschchartaxislabelsorientation;
+        break;
+      }
+
+      // optional float tschchartaxislabelsorientation = 23;
+      case 23: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartaxislabelsorientation:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartaxislabelsorientation_)));
+          set_has_tschchartaxislabelsorientation();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(197)) goto parse_tschchartaxismajorgridlineopacity;
+        break;
+      }
+
+      // optional float tschchartaxismajorgridlineopacity = 24;
+      case 24: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartaxismajorgridlineopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartaxismajorgridlineopacity_)));
+          set_has_tschchartaxismajorgridlineopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(202)) goto parse_tschchartaxismajorgridlineshadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+      case 25: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxismajorgridlineshadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxismajorgridlineshadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(210)) goto parse_tschchartaxismajorgridlinestroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+      case 26: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxismajorgridlinestroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxismajorgridlinestroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(221)) goto parse_tschchartaxisminorgridlineopacity;
+        break;
+      }
+
+      // optional float tschchartaxisminorgridlineopacity = 27;
+      case 27: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartaxisminorgridlineopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartaxisminorgridlineopacity_)));
+          set_has_tschchartaxisminorgridlineopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(226)) goto parse_tschchartaxisminorgridlineshadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+      case 28: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisminorgridlineshadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisminorgridlineshadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(234)) goto parse_tschchartaxisminorgridlinestroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+      case 29: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartaxisminorgridlinestroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartaxisminorgridlinestroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(240)) goto parse_tschchartaxisshowaxis;
+        break;
+      }
+
+      // optional bool tschchartaxisshowaxis = 30;
+      case 30: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowaxis:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowaxis_)));
+          set_has_tschchartaxisshowaxis();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(248)) goto parse_tschchartaxisshowlastlabel;
+        break;
+      }
+
+      // optional bool tschchartaxisshowlastlabel = 31;
+      case 31: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowlastlabel:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowlastlabel_)));
+          set_has_tschchartaxisshowlastlabel();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(256)) goto parse_tschchartaxisshowmajorgridlines;
+        break;
+      }
+
+      // optional bool tschchartaxisshowmajorgridlines = 32;
+      case 32: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowmajorgridlines:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowmajorgridlines_)));
+          set_has_tschchartaxisshowmajorgridlines();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(264)) goto parse_tschchartaxisshowmajortickmarks;
+        break;
+      }
+
+      // optional bool tschchartaxisshowmajortickmarks = 33;
+      case 33: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowmajortickmarks:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowmajortickmarks_)));
+          set_has_tschchartaxisshowmajortickmarks();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(272)) goto parse_tschchartaxisshowminimumlabel;
+        break;
+      }
+
+      // optional bool tschchartaxisshowminimumlabel = 34;
+      case 34: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowminimumlabel:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowminimumlabel_)));
+          set_has_tschchartaxisshowminimumlabel();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(280)) goto parse_tschchartaxisshowminorgridlines;
+        break;
+      }
+
+      // optional bool tschchartaxisshowminorgridlines = 35;
+      case 35: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowminorgridlines:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowminorgridlines_)));
+          set_has_tschchartaxisshowminorgridlines();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(288)) goto parse_tschchartaxisshowminortickmarks;
+        break;
+      }
+
+      // optional bool tschchartaxisshowminortickmarks = 36;
+      case 36: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisshowminortickmarks:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartaxisshowminortickmarks_)));
+          set_has_tschchartaxisshowminortickmarks();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(296)) goto parse_tschchartaxistickmarklocation;
+        break;
+      }
+
+      // optional int32 tschchartaxistickmarklocation = 37;
+      case 37: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxistickmarklocation:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxistickmarklocation_)));
+          set_has_tschchartaxistickmarklocation();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(304)) goto parse_tschchartaxistitleparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartaxistitleparagraphstyleindex = 38;
+      case 38: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxistitleparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxistitleparagraphstyleindex_)));
+          set_has_tschchartaxistitleparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(312)) goto parse_tschchartaxisverticalspacing;
+        break;
+      }
+
+      // optional int32 tschchartaxisverticalspacing = 39;
+      case 39: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartaxisverticalspacing:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartaxisverticalspacing_)));
+          set_has_tschchartaxisverticalspacing();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartAxisGenericPropertyMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional int32 tschchartaxis3dlabelposition = 1;
+  if (has_tschchartaxis3dlabelposition()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->tschchartaxis3dlabelposition(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+  if (has_tschchartaxis1_0numberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->tschchartaxis1_0numberformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+  if (has_tschchartaxisnumberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->tschchartaxisnumberformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+  if (has_tschchartaxis1_0dateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->tschchartaxis1_0dateformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+  if (has_tschchartaxisdurationformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->tschchartaxisdurationformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+  if (has_tschchartaxisdateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->tschchartaxisdateformat(), output);
+  }
+
+  // optional int32 tschchartaxisnumberformattype = 7;
+  if (has_tschchartaxisnumberformattype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(7, this->tschchartaxisnumberformattype(), output);
+  }
+
+  // optional int32 tschchartaxisnumberofdecades = 8;
+  if (has_tschchartaxisnumberofdecades()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(8, this->tschchartaxisnumberofdecades(), output);
+  }
+
+  // optional int32 tschchartaxisnumberofmajorgridlines = 9;
+  if (has_tschchartaxisnumberofmajorgridlines()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(9, this->tschchartaxisnumberofmajorgridlines(), output);
+  }
+
+  // optional int32 tschchartaxisnumberofminorgridlines = 10;
+  if (has_tschchartaxisnumberofminorgridlines()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(10, this->tschchartaxisnumberofminorgridlines(), output);
+  }
+
+  // optional bool tschchartaxisplottoedges = 11;
+  if (has_tschchartaxisplottoedges()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->tschchartaxisplottoedges(), output);
+  }
+
+  // optional int32 tschchartaxisscale = 12;
+  if (has_tschchartaxisscale()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(12, this->tschchartaxisscale(), output);
+  }
+
+  // optional bool tschchartaxisshowlabels = 13;
+  if (has_tschchartaxisshowlabels()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(13, this->tschchartaxisshowlabels(), output);
+  }
+
+  // optional bool tschchartaxisshowserieslabels = 14;
+  if (has_tschchartaxisshowserieslabels()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(14, this->tschchartaxisshowserieslabels(), output);
+  }
+
+  // optional bool tschchartaxisshowtitle = 15;
+  if (has_tschchartaxisshowtitle()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(15, this->tschchartaxisshowtitle(), output);
+  }
+
+  // optional string tschchartaxistitle = 16;
+  if (has_tschchartaxistitle()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->tschchartaxistitle().data(), this->tschchartaxistitle().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      16, this->tschchartaxistitle(), output);
+  }
+
+  // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+  if (has_tschchartaxisusermax()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      17, this->tschchartaxisusermax(), output);
+  }
+
+  // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+  if (has_tschchartaxisusermin()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      18, this->tschchartaxisusermin(), output);
+  }
+
+  // optional float tschchartaxis3dgridlineopacity = 19;
+  if (has_tschchartaxis3dgridlineopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(19, this->tschchartaxis3dgridlineopacity(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+  if (has_tschchartaxis3dgridlinestroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->tschchartaxis3dgridlinestroke(), output);
+  }
+
+  // optional int32 tschchartaxishorizontalspacing = 21;
+  if (has_tschchartaxishorizontalspacing()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(21, this->tschchartaxishorizontalspacing(), output);
+  }
+
+  // optional int32 tschchartaxislabelparagraphstyleindex = 22;
+  if (has_tschchartaxislabelparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(22, this->tschchartaxislabelparagraphstyleindex(), output);
+  }
+
+  // optional float tschchartaxislabelsorientation = 23;
+  if (has_tschchartaxislabelsorientation()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(23, this->tschchartaxislabelsorientation(), output);
+  }
+
+  // optional float tschchartaxismajorgridlineopacity = 24;
+  if (has_tschchartaxismajorgridlineopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(24, this->tschchartaxismajorgridlineopacity(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+  if (has_tschchartaxismajorgridlineshadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      25, this->tschchartaxismajorgridlineshadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+  if (has_tschchartaxismajorgridlinestroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      26, this->tschchartaxismajorgridlinestroke(), output);
+  }
+
+  // optional float tschchartaxisminorgridlineopacity = 27;
+  if (has_tschchartaxisminorgridlineopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(27, this->tschchartaxisminorgridlineopacity(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+  if (has_tschchartaxisminorgridlineshadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      28, this->tschchartaxisminorgridlineshadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+  if (has_tschchartaxisminorgridlinestroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      29, this->tschchartaxisminorgridlinestroke(), output);
+  }
+
+  // optional bool tschchartaxisshowaxis = 30;
+  if (has_tschchartaxisshowaxis()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(30, this->tschchartaxisshowaxis(), output);
+  }
+
+  // optional bool tschchartaxisshowlastlabel = 31;
+  if (has_tschchartaxisshowlastlabel()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(31, this->tschchartaxisshowlastlabel(), output);
+  }
+
+  // optional bool tschchartaxisshowmajorgridlines = 32;
+  if (has_tschchartaxisshowmajorgridlines()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(32, this->tschchartaxisshowmajorgridlines(), output);
+  }
+
+  // optional bool tschchartaxisshowmajortickmarks = 33;
+  if (has_tschchartaxisshowmajortickmarks()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->tschchartaxisshowmajortickmarks(), output);
+  }
+
+  // optional bool tschchartaxisshowminimumlabel = 34;
+  if (has_tschchartaxisshowminimumlabel()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(34, this->tschchartaxisshowminimumlabel(), output);
+  }
+
+  // optional bool tschchartaxisshowminorgridlines = 35;
+  if (has_tschchartaxisshowminorgridlines()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(35, this->tschchartaxisshowminorgridlines(), output);
+  }
+
+  // optional bool tschchartaxisshowminortickmarks = 36;
+  if (has_tschchartaxisshowminortickmarks()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(36, this->tschchartaxisshowminortickmarks(), output);
+  }
+
+  // optional int32 tschchartaxistickmarklocation = 37;
+  if (has_tschchartaxistickmarklocation()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(37, this->tschchartaxistickmarklocation(), output);
+  }
+
+  // optional int32 tschchartaxistitleparagraphstyleindex = 38;
+  if (has_tschchartaxistitleparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(38, this->tschchartaxistitleparagraphstyleindex(), output);
+  }
+
+  // optional int32 tschchartaxisverticalspacing = 39;
+  if (has_tschchartaxisverticalspacing()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(39, this->tschchartaxisverticalspacing(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ChartAxisGenericPropertyMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional int32 tschchartaxis3dlabelposition = 1;
+  if (has_tschchartaxis3dlabelposition()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->tschchartaxis3dlabelposition(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+  if (has_tschchartaxis1_0numberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->tschchartaxis1_0numberformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+  if (has_tschchartaxisnumberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->tschchartaxisnumberformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+  if (has_tschchartaxis1_0dateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->tschchartaxis1_0dateformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+  if (has_tschchartaxisdurationformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->tschchartaxisdurationformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+  if (has_tschchartaxisdateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->tschchartaxisdateformat(), target);
+  }
+
+  // optional int32 tschchartaxisnumberformattype = 7;
+  if (has_tschchartaxisnumberformattype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(7, this->tschchartaxisnumberformattype(), target);
+  }
+
+  // optional int32 tschchartaxisnumberofdecades = 8;
+  if (has_tschchartaxisnumberofdecades()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(8, this->tschchartaxisnumberofdecades(), target);
+  }
+
+  // optional int32 tschchartaxisnumberofmajorgridlines = 9;
+  if (has_tschchartaxisnumberofmajorgridlines()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(9, this->tschchartaxisnumberofmajorgridlines(), target);
+  }
+
+  // optional int32 tschchartaxisnumberofminorgridlines = 10;
+  if (has_tschchartaxisnumberofminorgridlines()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(10, this->tschchartaxisnumberofminorgridlines(), target);
+  }
+
+  // optional bool tschchartaxisplottoedges = 11;
+  if (has_tschchartaxisplottoedges()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->tschchartaxisplottoedges(), target);
+  }
+
+  // optional int32 tschchartaxisscale = 12;
+  if (has_tschchartaxisscale()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(12, this->tschchartaxisscale(), target);
+  }
+
+  // optional bool tschchartaxisshowlabels = 13;
+  if (has_tschchartaxisshowlabels()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(13, this->tschchartaxisshowlabels(), target);
+  }
+
+  // optional bool tschchartaxisshowserieslabels = 14;
+  if (has_tschchartaxisshowserieslabels()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(14, this->tschchartaxisshowserieslabels(), target);
+  }
+
+  // optional bool tschchartaxisshowtitle = 15;
+  if (has_tschchartaxisshowtitle()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(15, this->tschchartaxisshowtitle(), target);
+  }
+
+  // optional string tschchartaxistitle = 16;
+  if (has_tschchartaxistitle()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->tschchartaxistitle().data(), this->tschchartaxistitle().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        16, this->tschchartaxistitle(), target);
+  }
+
+  // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+  if (has_tschchartaxisusermax()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        17, this->tschchartaxisusermax(), target);
+  }
+
+  // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+  if (has_tschchartaxisusermin()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        18, this->tschchartaxisusermin(), target);
+  }
+
+  // optional float tschchartaxis3dgridlineopacity = 19;
+  if (has_tschchartaxis3dgridlineopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(19, this->tschchartaxis3dgridlineopacity(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+  if (has_tschchartaxis3dgridlinestroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->tschchartaxis3dgridlinestroke(), target);
+  }
+
+  // optional int32 tschchartaxishorizontalspacing = 21;
+  if (has_tschchartaxishorizontalspacing()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(21, this->tschchartaxishorizontalspacing(), target);
+  }
+
+  // optional int32 tschchartaxislabelparagraphstyleindex = 22;
+  if (has_tschchartaxislabelparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(22, this->tschchartaxislabelparagraphstyleindex(), target);
+  }
+
+  // optional float tschchartaxislabelsorientation = 23;
+  if (has_tschchartaxislabelsorientation()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(23, this->tschchartaxislabelsorientation(), target);
+  }
+
+  // optional float tschchartaxismajorgridlineopacity = 24;
+  if (has_tschchartaxismajorgridlineopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(24, this->tschchartaxismajorgridlineopacity(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+  if (has_tschchartaxismajorgridlineshadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        25, this->tschchartaxismajorgridlineshadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+  if (has_tschchartaxismajorgridlinestroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        26, this->tschchartaxismajorgridlinestroke(), target);
+  }
+
+  // optional float tschchartaxisminorgridlineopacity = 27;
+  if (has_tschchartaxisminorgridlineopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(27, this->tschchartaxisminorgridlineopacity(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+  if (has_tschchartaxisminorgridlineshadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        28, this->tschchartaxisminorgridlineshadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+  if (has_tschchartaxisminorgridlinestroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        29, this->tschchartaxisminorgridlinestroke(), target);
+  }
+
+  // optional bool tschchartaxisshowaxis = 30;
+  if (has_tschchartaxisshowaxis()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(30, this->tschchartaxisshowaxis(), target);
+  }
+
+  // optional bool tschchartaxisshowlastlabel = 31;
+  if (has_tschchartaxisshowlastlabel()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(31, this->tschchartaxisshowlastlabel(), target);
+  }
+
+  // optional bool tschchartaxisshowmajorgridlines = 32;
+  if (has_tschchartaxisshowmajorgridlines()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(32, this->tschchartaxisshowmajorgridlines(), target);
+  }
+
+  // optional bool tschchartaxisshowmajortickmarks = 33;
+  if (has_tschchartaxisshowmajortickmarks()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->tschchartaxisshowmajortickmarks(), target);
+  }
+
+  // optional bool tschchartaxisshowminimumlabel = 34;
+  if (has_tschchartaxisshowminimumlabel()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(34, this->tschchartaxisshowminimumlabel(), target);
+  }
+
+  // optional bool tschchartaxisshowminorgridlines = 35;
+  if (has_tschchartaxisshowminorgridlines()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(35, this->tschchartaxisshowminorgridlines(), target);
+  }
+
+  // optional bool tschchartaxisshowminortickmarks = 36;
+  if (has_tschchartaxisshowminortickmarks()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(36, this->tschchartaxisshowminortickmarks(), target);
+  }
+
+  // optional int32 tschchartaxistickmarklocation = 37;
+  if (has_tschchartaxistickmarklocation()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(37, this->tschchartaxistickmarklocation(), target);
+  }
+
+  // optional int32 tschchartaxistitleparagraphstyleindex = 38;
+  if (has_tschchartaxistitleparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(38, this->tschchartaxistitleparagraphstyleindex(), target);
+  }
+
+  // optional int32 tschchartaxisverticalspacing = 39;
+  if (has_tschchartaxisverticalspacing()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(39, this->tschchartaxisverticalspacing(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ChartAxisGenericPropertyMapArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional int32 tschchartaxis3dlabelposition = 1;
+    if (has_tschchartaxis3dlabelposition()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxis3dlabelposition());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+    if (has_tschchartaxis1_0numberformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxis1_0numberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+    if (has_tschchartaxisnumberformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisnumberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+    if (has_tschchartaxis1_0dateformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxis1_0dateformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+    if (has_tschchartaxisdurationformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisdurationformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+    if (has_tschchartaxisdateformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisdateformat());
+    }
+
+    // optional int32 tschchartaxisnumberformattype = 7;
+    if (has_tschchartaxisnumberformattype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxisnumberformattype());
+    }
+
+    // optional int32 tschchartaxisnumberofdecades = 8;
+    if (has_tschchartaxisnumberofdecades()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxisnumberofdecades());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional int32 tschchartaxisnumberofmajorgridlines = 9;
+    if (has_tschchartaxisnumberofmajorgridlines()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxisnumberofmajorgridlines());
+    }
+
+    // optional int32 tschchartaxisnumberofminorgridlines = 10;
+    if (has_tschchartaxisnumberofminorgridlines()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxisnumberofminorgridlines());
+    }
+
+    // optional bool tschchartaxisplottoedges = 11;
+    if (has_tschchartaxisplottoedges()) {
+      total_size += 1 + 1;
+    }
+
+    // optional int32 tschchartaxisscale = 12;
+    if (has_tschchartaxisscale()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxisscale());
+    }
+
+    // optional bool tschchartaxisshowlabels = 13;
+    if (has_tschchartaxisshowlabels()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool tschchartaxisshowserieslabels = 14;
+    if (has_tschchartaxisshowserieslabels()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool tschchartaxisshowtitle = 15;
+    if (has_tschchartaxisshowtitle()) {
+      total_size += 1 + 1;
+    }
+
+    // optional string tschchartaxistitle = 16;
+    if (has_tschchartaxistitle()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->tschchartaxistitle());
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+    if (has_tschchartaxisusermax()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisusermax());
+    }
+
+    // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+    if (has_tschchartaxisusermin()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisusermin());
+    }
+
+    // optional float tschchartaxis3dgridlineopacity = 19;
+    if (has_tschchartaxis3dgridlineopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+    if (has_tschchartaxis3dgridlinestroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxis3dgridlinestroke());
+    }
+
+    // optional int32 tschchartaxishorizontalspacing = 21;
+    if (has_tschchartaxishorizontalspacing()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxishorizontalspacing());
+    }
+
+    // optional int32 tschchartaxislabelparagraphstyleindex = 22;
+    if (has_tschchartaxislabelparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxislabelparagraphstyleindex());
+    }
+
+    // optional float tschchartaxislabelsorientation = 23;
+    if (has_tschchartaxislabelsorientation()) {
+      total_size += 2 + 4;
+    }
+
+    // optional float tschchartaxismajorgridlineopacity = 24;
+    if (has_tschchartaxismajorgridlineopacity()) {
+      total_size += 2 + 4;
+    }
+
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+    if (has_tschchartaxismajorgridlineshadow()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxismajorgridlineshadow());
+    }
+
+    // optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+    if (has_tschchartaxismajorgridlinestroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxismajorgridlinestroke());
+    }
+
+    // optional float tschchartaxisminorgridlineopacity = 27;
+    if (has_tschchartaxisminorgridlineopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+    if (has_tschchartaxisminorgridlineshadow()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisminorgridlineshadow());
+    }
+
+    // optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+    if (has_tschchartaxisminorgridlinestroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartaxisminorgridlinestroke());
+    }
+
+    // optional bool tschchartaxisshowaxis = 30;
+    if (has_tschchartaxisshowaxis()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartaxisshowlastlabel = 31;
+    if (has_tschchartaxisshowlastlabel()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartaxisshowmajorgridlines = 32;
+    if (has_tschchartaxisshowmajorgridlines()) {
+      total_size += 2 + 1;
+    }
+
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    // optional bool tschchartaxisshowmajortickmarks = 33;
+    if (has_tschchartaxisshowmajortickmarks()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartaxisshowminimumlabel = 34;
+    if (has_tschchartaxisshowminimumlabel()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartaxisshowminorgridlines = 35;
+    if (has_tschchartaxisshowminorgridlines()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartaxisshowminortickmarks = 36;
+    if (has_tschchartaxisshowminortickmarks()) {
+      total_size += 2 + 1;
+    }
+
+    // optional int32 tschchartaxistickmarklocation = 37;
+    if (has_tschchartaxistickmarklocation()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxistickmarklocation());
+    }
+
+    // optional int32 tschchartaxistitleparagraphstyleindex = 38;
+    if (has_tschchartaxistitleparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxistitleparagraphstyleindex());
+    }
+
+    // optional int32 tschchartaxisverticalspacing = 39;
+    if (has_tschchartaxisverticalspacing()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartaxisverticalspacing());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ChartAxisGenericPropertyMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ChartAxisGenericPropertyMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ChartAxisGenericPropertyMapArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ChartAxisGenericPropertyMapArchive::MergeFrom(const ChartAxisGenericPropertyMapArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_tschchartaxis3dlabelposition()) {
+      set_tschchartaxis3dlabelposition(from.tschchartaxis3dlabelposition());
+    }
+    if (from.has_tschchartaxis1_0numberformat()) {
+      mutable_tschchartaxis1_0numberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxis1_0numberformat());
+    }
+    if (from.has_tschchartaxisnumberformat()) {
+      mutable_tschchartaxisnumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisnumberformat());
+    }
+    if (from.has_tschchartaxis1_0dateformat()) {
+      mutable_tschchartaxis1_0dateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxis1_0dateformat());
+    }
+    if (from.has_tschchartaxisdurationformat()) {
+      mutable_tschchartaxisdurationformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdurationformat());
+    }
+    if (from.has_tschchartaxisdateformat()) {
+      mutable_tschchartaxisdateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartaxisdateformat());
+    }
+    if (from.has_tschchartaxisnumberformattype()) {
+      set_tschchartaxisnumberformattype(from.tschchartaxisnumberformattype());
+    }
+    if (from.has_tschchartaxisnumberofdecades()) {
+      set_tschchartaxisnumberofdecades(from.tschchartaxisnumberofdecades());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_tschchartaxisnumberofmajorgridlines()) {
+      set_tschchartaxisnumberofmajorgridlines(from.tschchartaxisnumberofmajorgridlines());
+    }
+    if (from.has_tschchartaxisnumberofminorgridlines()) {
+      set_tschchartaxisnumberofminorgridlines(from.tschchartaxisnumberofminorgridlines());
+    }
+    if (from.has_tschchartaxisplottoedges()) {
+      set_tschchartaxisplottoedges(from.tschchartaxisplottoedges());
+    }
+    if (from.has_tschchartaxisscale()) {
+      set_tschchartaxisscale(from.tschchartaxisscale());
+    }
+    if (from.has_tschchartaxisshowlabels()) {
+      set_tschchartaxisshowlabels(from.tschchartaxisshowlabels());
+    }
+    if (from.has_tschchartaxisshowserieslabels()) {
+      set_tschchartaxisshowserieslabels(from.tschchartaxisshowserieslabels());
+    }
+    if (from.has_tschchartaxisshowtitle()) {
+      set_tschchartaxisshowtitle(from.tschchartaxisshowtitle());
+    }
+    if (from.has_tschchartaxistitle()) {
+      set_tschchartaxistitle(from.tschchartaxistitle());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_tschchartaxisusermax()) {
+      mutable_tschchartaxisusermax()->::TSCH::ChartsNSNumberDoubleArchive::MergeFrom(from.tschchartaxisusermax());
+    }
+    if (from.has_tschchartaxisusermin()) {
+      mutable_tschchartaxisusermin()->::TSCH::ChartsNSNumberDoubleArchive::MergeFrom(from.tschchartaxisusermin());
+    }
+    if (from.has_tschchartaxis3dgridlineopacity()) {
+      set_tschchartaxis3dgridlineopacity(from.tschchartaxis3dgridlineopacity());
+    }
+    if (from.has_tschchartaxis3dgridlinestroke()) {
+      mutable_tschchartaxis3dgridlinestroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartaxis3dgridlinestroke());
+    }
+    if (from.has_tschchartaxishorizontalspacing()) {
+      set_tschchartaxishorizontalspacing(from.tschchartaxishorizontalspacing());
+    }
+    if (from.has_tschchartaxislabelparagraphstyleindex()) {
+      set_tschchartaxislabelparagraphstyleindex(from.tschchartaxislabelparagraphstyleindex());
+    }
+    if (from.has_tschchartaxislabelsorientation()) {
+      set_tschchartaxislabelsorientation(from.tschchartaxislabelsorientation());
+    }
+    if (from.has_tschchartaxismajorgridlineopacity()) {
+      set_tschchartaxismajorgridlineopacity(from.tschchartaxismajorgridlineopacity());
+    }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (from.has_tschchartaxismajorgridlineshadow()) {
+      mutable_tschchartaxismajorgridlineshadow()->::TSD::ShadowArchive::MergeFrom(from.tschchartaxismajorgridlineshadow());
+    }
+    if (from.has_tschchartaxismajorgridlinestroke()) {
+      mutable_tschchartaxismajorgridlinestroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartaxismajorgridlinestroke());
+    }
+    if (from.has_tschchartaxisminorgridlineopacity()) {
+      set_tschchartaxisminorgridlineopacity(from.tschchartaxisminorgridlineopacity());
+    }
+    if (from.has_tschchartaxisminorgridlineshadow()) {
+      mutable_tschchartaxisminorgridlineshadow()->::TSD::ShadowArchive::MergeFrom(from.tschchartaxisminorgridlineshadow());
+    }
+    if (from.has_tschchartaxisminorgridlinestroke()) {
+      mutable_tschchartaxisminorgridlinestroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartaxisminorgridlinestroke());
+    }
+    if (from.has_tschchartaxisshowaxis()) {
+      set_tschchartaxisshowaxis(from.tschchartaxisshowaxis());
+    }
+    if (from.has_tschchartaxisshowlastlabel()) {
+      set_tschchartaxisshowlastlabel(from.tschchartaxisshowlastlabel());
+    }
+    if (from.has_tschchartaxisshowmajorgridlines()) {
+      set_tschchartaxisshowmajorgridlines(from.tschchartaxisshowmajorgridlines());
+    }
+  }
+  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    if (from.has_tschchartaxisshowmajortickmarks()) {
+      set_tschchartaxisshowmajortickmarks(from.tschchartaxisshowmajortickmarks());
+    }
+    if (from.has_tschchartaxisshowminimumlabel()) {
+      set_tschchartaxisshowminimumlabel(from.tschchartaxisshowminimumlabel());
+    }
+    if (from.has_tschchartaxisshowminorgridlines()) {
+      set_tschchartaxisshowminorgridlines(from.tschchartaxisshowminorgridlines());
+    }
+    if (from.has_tschchartaxisshowminortickmarks()) {
+      set_tschchartaxisshowminortickmarks(from.tschchartaxisshowminortickmarks());
+    }
+    if (from.has_tschchartaxistickmarklocation()) {
+      set_tschchartaxistickmarklocation(from.tschchartaxistickmarklocation());
+    }
+    if (from.has_tschchartaxistitleparagraphstyleindex()) {
+      set_tschchartaxistitleparagraphstyleindex(from.tschchartaxistitleparagraphstyleindex());
+    }
+    if (from.has_tschchartaxisverticalspacing()) {
+      set_tschchartaxisverticalspacing(from.tschchartaxisverticalspacing());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ChartAxisGenericPropertyMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ChartAxisGenericPropertyMapArchive::CopyFrom(const ChartAxisGenericPropertyMapArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ChartAxisGenericPropertyMapArchive::IsInitialized() const {
+
+  if (has_tschchartaxis1_0numberformat()) {
+    if (!this->tschchartaxis1_0numberformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisnumberformat()) {
+    if (!this->tschchartaxisnumberformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxis1_0dateformat()) {
+    if (!this->tschchartaxis1_0dateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisdurationformat()) {
+    if (!this->tschchartaxisdurationformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisdateformat()) {
+    if (!this->tschchartaxisdateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartaxis3dgridlinestroke()) {
+    if (!this->tschchartaxis3dgridlinestroke().IsInitialized()) return false;
+  }
+  if (has_tschchartaxismajorgridlineshadow()) {
+    if (!this->tschchartaxismajorgridlineshadow().IsInitialized()) return false;
+  }
+  if (has_tschchartaxismajorgridlinestroke()) {
+    if (!this->tschchartaxismajorgridlinestroke().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisminorgridlineshadow()) {
+    if (!this->tschchartaxisminorgridlineshadow().IsInitialized()) return false;
+  }
+  if (has_tschchartaxisminorgridlinestroke()) {
+    if (!this->tschchartaxisminorgridlinestroke().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ChartAxisGenericPropertyMapArchive::Swap(ChartAxisGenericPropertyMapArchive* other) {
+  if (other != this) {
+    std::swap(tschchartaxis3dlabelposition_, other->tschchartaxis3dlabelposition_);
+    std::swap(tschchartaxis1_0numberformat_, other->tschchartaxis1_0numberformat_);
+    std::swap(tschchartaxisnumberformat_, other->tschchartaxisnumberformat_);
+    std::swap(tschchartaxis1_0dateformat_, other->tschchartaxis1_0dateformat_);
+    std::swap(tschchartaxisdurationformat_, other->tschchartaxisdurationformat_);
+    std::swap(tschchartaxisdateformat_, other->tschchartaxisdateformat_);
+    std::swap(tschchartaxisnumberformattype_, other->tschchartaxisnumberformattype_);
+    std::swap(tschchartaxisnumberofdecades_, other->tschchartaxisnumberofdecades_);
+    std::swap(tschchartaxisnumberofmajorgridlines_, other->tschchartaxisnumberofmajorgridlines_);
+    std::swap(tschchartaxisnumberofminorgridlines_, other->tschchartaxisnumberofminorgridlines_);
+    std::swap(tschchartaxisplottoedges_, other->tschchartaxisplottoedges_);
+    std::swap(tschchartaxisscale_, other->tschchartaxisscale_);
+    std::swap(tschchartaxisshowlabels_, other->tschchartaxisshowlabels_);
+    std::swap(tschchartaxisshowserieslabels_, other->tschchartaxisshowserieslabels_);
+    std::swap(tschchartaxisshowtitle_, other->tschchartaxisshowtitle_);
+    std::swap(tschchartaxistitle_, other->tschchartaxistitle_);
+    std::swap(tschchartaxisusermax_, other->tschchartaxisusermax_);
+    std::swap(tschchartaxisusermin_, other->tschchartaxisusermin_);
+    std::swap(tschchartaxis3dgridlineopacity_, other->tschchartaxis3dgridlineopacity_);
+    std::swap(tschchartaxis3dgridlinestroke_, other->tschchartaxis3dgridlinestroke_);
+    std::swap(tschchartaxishorizontalspacing_, other->tschchartaxishorizontalspacing_);
+    std::swap(tschchartaxislabelparagraphstyleindex_, other->tschchartaxislabelparagraphstyleindex_);
+    std::swap(tschchartaxislabelsorientation_, other->tschchartaxislabelsorientation_);
+    std::swap(tschchartaxismajorgridlineopacity_, other->tschchartaxismajorgridlineopacity_);
+    std::swap(tschchartaxismajorgridlineshadow_, other->tschchartaxismajorgridlineshadow_);
+    std::swap(tschchartaxismajorgridlinestroke_, other->tschchartaxismajorgridlinestroke_);
+    std::swap(tschchartaxisminorgridlineopacity_, other->tschchartaxisminorgridlineopacity_);
+    std::swap(tschchartaxisminorgridlineshadow_, other->tschchartaxisminorgridlineshadow_);
+    std::swap(tschchartaxisminorgridlinestroke_, other->tschchartaxisminorgridlinestroke_);
+    std::swap(tschchartaxisshowaxis_, other->tschchartaxisshowaxis_);
+    std::swap(tschchartaxisshowlastlabel_, other->tschchartaxisshowlastlabel_);
+    std::swap(tschchartaxisshowmajorgridlines_, other->tschchartaxisshowmajorgridlines_);
+    std::swap(tschchartaxisshowmajortickmarks_, other->tschchartaxisshowmajortickmarks_);
+    std::swap(tschchartaxisshowminimumlabel_, other->tschchartaxisshowminimumlabel_);
+    std::swap(tschchartaxisshowminorgridlines_, other->tschchartaxisshowminorgridlines_);
+    std::swap(tschchartaxisshowminortickmarks_, other->tschchartaxisshowminortickmarks_);
+    std::swap(tschchartaxistickmarklocation_, other->tschchartaxistickmarklocation_);
+    std::swap(tschchartaxistitleparagraphstyleindex_, other->tschchartaxistitleparagraphstyleindex_);
+    std::swap(tschchartaxisverticalspacing_, other->tschchartaxisverticalspacing_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    std::swap(_has_bits_[1], other->_has_bits_[1]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ChartAxisGenericPropertyMapArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ChartAxisGenericPropertyMapArchive_descriptor_;
+  metadata.reflection = ChartAxisGenericPropertyMapArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesadjustmentscaleFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarcustomnegativedataFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarcustomnegativedatascatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarcustompositivedataFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarcustompositivedatascatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarfixedvalueFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarfixedvaluescatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarpercentvalueFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarpercentvaluescatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarsettingFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarsettingscatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarstddevvalueFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarstddevvaluescatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbartypeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbartypescatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieslabelexplosionFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieslinetypeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseries10NumberformatFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesnumberformatFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseries10DateformatFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesdurationformatFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesdateformatFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesnumberformattypeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriespercentnumberformatFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesseriestypeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowerrorbarFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowerrorbarscatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowlineFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshownegativedataFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowserieslabelsFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowsymbolFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowtrendlineFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowvaluelabelsFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessizedimensionFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessymboltypeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineequationoffsetxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineequationoffsetyFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinelabelstringFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineorderFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineperiodFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinersquaredoffsetxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinersquaredoffsetyFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineshowequationFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineshowlabelFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineshowr2ValueFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinetypeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieswedgeexplosionFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesyaxisordinalFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesvaluelabelsaxisFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarlineendFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarlineendscatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarshadowFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarstrokeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieserrorbarstrokescatterxFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesfillFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartserieslabelparagraphstyleindexFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesopacityFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesoutsidelabelparagraphstyleindexFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshadowFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesstrokeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessymbolfillFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessymbolfilluseseriesfillFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessymbolfilluseseriesstrokeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessymbolsizeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriessymbolstrokeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineequationopacityFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineequationparagraphstyleindexFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinersquaredopacityFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinersquaredparagraphstyleindexFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlineshadowFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriestrendlinestrokeFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesvaluelabelpositionFieldNumber;
+const int ChartSeriesGenericPropertyMapArchive::kTschchartseriesshowlabelsinfrontFieldNumber;
+#endif  // !_MSC_VER
+
+ChartSeriesGenericPropertyMapArchive::ChartSeriesGenericPropertyMapArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ChartSeriesGenericPropertyMapArchive::InitAsDefaultInstance() {
+  tschchartserieserrorbarcustomnegativedata_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
+  tschchartserieserrorbarcustomnegativedatascatterx_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
+  tschchartserieserrorbarcustompositivedata_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
+  tschchartserieserrorbarcustompositivedatascatterx_ = const_cast< ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive*>(&::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::default_instance());
+  tschchartseries1_0numberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriesnumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseries1_0dateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriesdurationformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriesdateformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartseriespercentnumberformat_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  tschchartserieserrorbarlineend_ = const_cast< ::TSD::LineEndArchive*>(&::TSD::LineEndArchive::default_instance());
+  tschchartserieserrorbarlineendscatterx_ = const_cast< ::TSD::LineEndArchive*>(&::TSD::LineEndArchive::default_instance());
+  tschchartserieserrorbarshadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschchartserieserrorbarstroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartserieserrorbarstrokescatterx_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartseriesfill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  tschchartseriesshadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschchartseriesstroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartseriessymbolfill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  tschchartseriessymbolstroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+  tschchartseriestrendlineshadow_ = const_cast< ::TSD::ShadowArchive*>(&::TSD::ShadowArchive::default_instance());
+  tschchartseriestrendlinestroke_ = const_cast< ::TSD::StrokeArchive*>(&::TSD::StrokeArchive::default_instance());
+}
+
+ChartSeriesGenericPropertyMapArchive::ChartSeriesGenericPropertyMapArchive(const ChartSeriesGenericPropertyMapArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ChartSeriesGenericPropertyMapArchive::SharedCtor() {
+  _cached_size_ = 0;
+  tschchartseriesadjustmentscale_ = 0;
+  tschchartserieserrorbarcustomnegativedata_ = NULL;
+  tschchartserieserrorbarcustomnegativedatascatterx_ = NULL;
+  tschchartserieserrorbarcustompositivedata_ = NULL;
+  tschchartserieserrorbarcustompositivedatascatterx_ = NULL;
+  tschchartserieserrorbarfixedvalue_ = 0;
+  tschchartserieserrorbarfixedvaluescatterx_ = 0;
+  tschchartserieserrorbarpercentvalue_ = 0;
+  tschchartserieserrorbarpercentvaluescatterx_ = 0;
+  tschchartserieserrorbarsetting_ = 0;
+  tschchartserieserrorbarsettingscatterx_ = 0;
+  tschchartserieserrorbarstddevvalue_ = 0;
+  tschchartserieserrorbarstddevvaluescatterx_ = 0;
+  tschchartserieserrorbartype_ = 0;
+  tschchartserieserrorbartypescatterx_ = 0;
+  tschchartserieslabelexplosion_ = 0;
+  tschchartserieslinetype_ = 0;
+  tschchartseries1_0numberformat_ = NULL;
+  tschchartseriesnumberformat_ = NULL;
+  tschchartseries1_0dateformat_ = NULL;
+  tschchartseriesdurationformat_ = NULL;
+  tschchartseriesdateformat_ = NULL;
+  tschchartseriesnumberformattype_ = 0;
+  tschchartseriespercentnumberformat_ = NULL;
+  tschchartseriesseriestype_ = 0;
+  tschchartseriesshowerrorbar_ = false;
+  tschchartseriesshowerrorbarscatterx_ = false;
+  tschchartseriesshowline_ = false;
+  tschchartseriesshownegativedata_ = false;
+  tschchartseriesshowserieslabels_ = false;
+  tschchartseriesshowsymbol_ = false;
+  tschchartseriesshowtrendline_ = false;
+  tschchartseriesshowvaluelabels_ = false;
+  tschchartseriessizedimension_ = 0;
+  tschchartseriessymboltype_ = 0;
+  tschchartseriestrendlineequationoffsetx_ = 0;
+  tschchartseriestrendlineequationoffsety_ = 0;
+  tschchartseriestrendlinelabelstring_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  tschchartseriestrendlineorder_ = 0;
+  tschchartseriestrendlineperiod_ = 0;
+  tschchartseriestrendlinersquaredoffsetx_ = 0;
+  tschchartseriestrendlinersquaredoffsety_ = 0;
+  tschchartseriestrendlineshowequation_ = false;
+  tschchartseriestrendlineshowlabel_ = false;
+  tschchartseriestrendlineshowr2value_ = false;
+  tschchartseriestrendlinetype_ = 0;
+  tschchartserieswedgeexplosion_ = 0;
+  tschchartseriesyaxisordinal_ = 0;
+  tschchartseriesvaluelabelsaxis_ = 0;
+  tschchartserieserrorbarlineend_ = NULL;
+  tschchartserieserrorbarlineendscatterx_ = NULL;
+  tschchartserieserrorbarshadow_ = NULL;
+  tschchartserieserrorbarstroke_ = NULL;
+  tschchartserieserrorbarstrokescatterx_ = NULL;
+  tschchartseriesfill_ = NULL;
+  tschchartserieslabelparagraphstyleindex_ = 0;
+  tschchartseriesopacity_ = 0;
+  tschchartseriesoutsidelabelparagraphstyleindex_ = 0;
+  tschchartseriesshadow_ = NULL;
+  tschchartseriesstroke_ = NULL;
+  tschchartseriessymbolfill_ = NULL;
+  tschchartseriessymbolfilluseseriesfill_ = false;
+  tschchartseriessymbolfilluseseriesstroke_ = false;
+  tschchartseriessymbolsize_ = 0;
+  tschchartseriessymbolstroke_ = NULL;
+  tschchartseriestrendlineequationopacity_ = 0;
+  tschchartseriestrendlineequationparagraphstyleindex_ = 0;
+  tschchartseriestrendlinersquaredopacity_ = 0;
+  tschchartseriestrendlinersquaredparagraphstyleindex_ = 0;
+  tschchartseriestrendlineshadow_ = NULL;
+  tschchartseriestrendlinestroke_ = NULL;
+  tschchartseriesvaluelabelposition_ = 0;
+  tschchartseriesshowlabelsinfront_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ChartSeriesGenericPropertyMapArchive::~ChartSeriesGenericPropertyMapArchive() {
+  SharedDtor();
+}
+
+void ChartSeriesGenericPropertyMapArchive::SharedDtor() {
+  if (tschchartseriestrendlinelabelstring_ != &::google::protobuf::internal::kEmptyString) {
+    delete tschchartseriestrendlinelabelstring_;
+  }
+  if (this != default_instance_) {
+    delete tschchartserieserrorbarcustomnegativedata_;
+    delete tschchartserieserrorbarcustomnegativedatascatterx_;
+    delete tschchartserieserrorbarcustompositivedata_;
+    delete tschchartserieserrorbarcustompositivedatascatterx_;
+    delete tschchartseries1_0numberformat_;
+    delete tschchartseriesnumberformat_;
+    delete tschchartseries1_0dateformat_;
+    delete tschchartseriesdurationformat_;
+    delete tschchartseriesdateformat_;
+    delete tschchartseriespercentnumberformat_;
+    delete tschchartserieserrorbarlineend_;
+    delete tschchartserieserrorbarlineendscatterx_;
+    delete tschchartserieserrorbarshadow_;
+    delete tschchartserieserrorbarstroke_;
+    delete tschchartserieserrorbarstrokescatterx_;
+    delete tschchartseriesfill_;
+    delete tschchartseriesshadow_;
+    delete tschchartseriesstroke_;
+    delete tschchartseriessymbolfill_;
+    delete tschchartseriessymbolstroke_;
+    delete tschchartseriestrendlineshadow_;
+    delete tschchartseriestrendlinestroke_;
+  }
+}
+
+void ChartSeriesGenericPropertyMapArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ChartSeriesGenericPropertyMapArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ChartSeriesGenericPropertyMapArchive_descriptor_;
+}
+
+const ChartSeriesGenericPropertyMapArchive& ChartSeriesGenericPropertyMapArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  return *default_instance_;
+}
+
+ChartSeriesGenericPropertyMapArchive* ChartSeriesGenericPropertyMapArchive::default_instance_ = NULL;
+
+ChartSeriesGenericPropertyMapArchive* ChartSeriesGenericPropertyMapArchive::New() const {
+  return new ChartSeriesGenericPropertyMapArchive;
+}
+
+void ChartSeriesGenericPropertyMapArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    tschchartseriesadjustmentscale_ = 0;
+    if (has_tschchartserieserrorbarcustomnegativedata()) {
+      if (tschchartserieserrorbarcustomnegativedata_ != NULL) tschchartserieserrorbarcustomnegativedata_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarcustomnegativedatascatterx()) {
+      if (tschchartserieserrorbarcustomnegativedatascatterx_ != NULL) tschchartserieserrorbarcustomnegativedatascatterx_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarcustompositivedata()) {
+      if (tschchartserieserrorbarcustompositivedata_ != NULL) tschchartserieserrorbarcustompositivedata_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarcustompositivedatascatterx()) {
+      if (tschchartserieserrorbarcustompositivedatascatterx_ != NULL) tschchartserieserrorbarcustompositivedatascatterx_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+    }
+    tschchartserieserrorbarfixedvalue_ = 0;
+    tschchartserieserrorbarfixedvaluescatterx_ = 0;
+    tschchartserieserrorbarpercentvalue_ = 0;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    tschchartserieserrorbarpercentvaluescatterx_ = 0;
+    tschchartserieserrorbarsetting_ = 0;
+    tschchartserieserrorbarsettingscatterx_ = 0;
+    tschchartserieserrorbarstddevvalue_ = 0;
+    tschchartserieserrorbarstddevvaluescatterx_ = 0;
+    tschchartserieserrorbartype_ = 0;
+    tschchartserieserrorbartypescatterx_ = 0;
+    tschchartserieslabelexplosion_ = 0;
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    tschchartserieslinetype_ = 0;
+    if (has_tschchartseries1_0numberformat()) {
+      if (tschchartseries1_0numberformat_ != NULL) tschchartseries1_0numberformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartseriesnumberformat()) {
+      if (tschchartseriesnumberformat_ != NULL) tschchartseriesnumberformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartseries1_0dateformat()) {
+      if (tschchartseries1_0dateformat_ != NULL) tschchartseries1_0dateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartseriesdurationformat()) {
+      if (tschchartseriesdurationformat_ != NULL) tschchartseriesdurationformat_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_tschchartseriesdateformat()) {
+      if (tschchartseriesdateformat_ != NULL) tschchartseriesdateformat_->::TSK::FormatStructArchive::Clear();
+    }
+    tschchartseriesnumberformattype_ = 0;
+    if (has_tschchartseriespercentnumberformat()) {
+      if (tschchartseriespercentnumberformat_ != NULL) tschchartseriespercentnumberformat_->::TSK::FormatStructArchive::Clear();
+    }
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    tschchartseriesseriestype_ = 0;
+    tschchartseriesshowerrorbar_ = false;
+    tschchartseriesshowerrorbarscatterx_ = false;
+    tschchartseriesshowline_ = false;
+    tschchartseriesshownegativedata_ = false;
+    tschchartseriesshowserieslabels_ = false;
+    tschchartseriesshowsymbol_ = false;
+    tschchartseriesshowtrendline_ = false;
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    tschchartseriesshowvaluelabels_ = false;
+    tschchartseriessizedimension_ = 0;
+    tschchartseriessymboltype_ = 0;
+    tschchartseriestrendlineequationoffsetx_ = 0;
+    tschchartseriestrendlineequationoffsety_ = 0;
+    if (has_tschchartseriestrendlinelabelstring()) {
+      if (tschchartseriestrendlinelabelstring_ != &::google::protobuf::internal::kEmptyString) {
+        tschchartseriestrendlinelabelstring_->clear();
+      }
+    }
+    tschchartseriestrendlineorder_ = 0;
+    tschchartseriestrendlineperiod_ = 0;
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
+    tschchartseriestrendlinersquaredoffsetx_ = 0;
+    tschchartseriestrendlinersquaredoffsety_ = 0;
+    tschchartseriestrendlineshowequation_ = false;
+    tschchartseriestrendlineshowlabel_ = false;
+    tschchartseriestrendlineshowr2value_ = false;
+    tschchartseriestrendlinetype_ = 0;
+    tschchartserieswedgeexplosion_ = 0;
+    tschchartseriesyaxisordinal_ = 0;
+  }
+  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
+    tschchartseriesvaluelabelsaxis_ = 0;
+    if (has_tschchartserieserrorbarlineend()) {
+      if (tschchartserieserrorbarlineend_ != NULL) tschchartserieserrorbarlineend_->::TSD::LineEndArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarlineendscatterx()) {
+      if (tschchartserieserrorbarlineendscatterx_ != NULL) tschchartserieserrorbarlineendscatterx_->::TSD::LineEndArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarshadow()) {
+      if (tschchartserieserrorbarshadow_ != NULL) tschchartserieserrorbarshadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarstroke()) {
+      if (tschchartserieserrorbarstroke_ != NULL) tschchartserieserrorbarstroke_->::TSD::StrokeArchive::Clear();
+    }
+    if (has_tschchartserieserrorbarstrokescatterx()) {
+      if (tschchartserieserrorbarstrokescatterx_ != NULL) tschchartserieserrorbarstrokescatterx_->::TSD::StrokeArchive::Clear();
+    }
+    if (has_tschchartseriesfill()) {
+      if (tschchartseriesfill_ != NULL) tschchartseriesfill_->::TSD::FillArchive::Clear();
+    }
+    tschchartserieslabelparagraphstyleindex_ = 0;
+  }
+  if (_has_bits_[56 / 32] & (0xffu << (56 % 32))) {
+    tschchartseriesopacity_ = 0;
+    tschchartseriesoutsidelabelparagraphstyleindex_ = 0;
+    if (has_tschchartseriesshadow()) {
+      if (tschchartseriesshadow_ != NULL) tschchartseriesshadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschchartseriesstroke()) {
+      if (tschchartseriesstroke_ != NULL) tschchartseriesstroke_->::TSD::StrokeArchive::Clear();
+    }
+    if (has_tschchartseriessymbolfill()) {
+      if (tschchartseriessymbolfill_ != NULL) tschchartseriessymbolfill_->::TSD::FillArchive::Clear();
+    }
+    tschchartseriessymbolfilluseseriesfill_ = false;
+    tschchartseriessymbolfilluseseriesstroke_ = false;
+    tschchartseriessymbolsize_ = 0;
+  }
+  if (_has_bits_[64 / 32] & (0xffu << (64 % 32))) {
+    if (has_tschchartseriessymbolstroke()) {
+      if (tschchartseriessymbolstroke_ != NULL) tschchartseriessymbolstroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartseriestrendlineequationopacity_ = 0;
+    tschchartseriestrendlineequationparagraphstyleindex_ = 0;
+    tschchartseriestrendlinersquaredopacity_ = 0;
+    tschchartseriestrendlinersquaredparagraphstyleindex_ = 0;
+    if (has_tschchartseriestrendlineshadow()) {
+      if (tschchartseriestrendlineshadow_ != NULL) tschchartseriestrendlineshadow_->::TSD::ShadowArchive::Clear();
+    }
+    if (has_tschchartseriestrendlinestroke()) {
+      if (tschchartseriestrendlinestroke_ != NULL) tschchartseriestrendlinestroke_->::TSD::StrokeArchive::Clear();
+    }
+    tschchartseriesvaluelabelposition_ = 0;
+  }
+  if (_has_bits_[72 / 32] & (0xffu << (72 % 32))) {
+    tschchartseriesshowlabelsinfront_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ChartSeriesGenericPropertyMapArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional float tschchartseriesadjustmentscale = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriesadjustmentscale_)));
+          set_has_tschchartseriesadjustmentscale();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_tschchartserieserrorbarcustomnegativedata;
+        break;
+      }
+
+      // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarcustomnegativedata:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarcustomnegativedata()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_tschchartserieserrorbarcustomnegativedatascatterx;
+        break;
+      }
+
+      // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarcustomnegativedatascatterx:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarcustomnegativedatascatterx()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_tschchartserieserrorbarcustompositivedata;
+        break;
+      }
+
+      // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarcustompositivedata:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarcustompositivedata()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_tschchartserieserrorbarcustompositivedatascatterx;
+        break;
+      }
+
+      // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarcustompositivedatascatterx:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarcustompositivedatascatterx()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(53)) goto parse_tschchartserieserrorbarfixedvalue;
+        break;
+      }
+
+      // optional float tschchartserieserrorbarfixedvalue = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieserrorbarfixedvalue:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieserrorbarfixedvalue_)));
+          set_has_tschchartserieserrorbarfixedvalue();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(61)) goto parse_tschchartserieserrorbarfixedvaluescatterx;
+        break;
+      }
+
+      // optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieserrorbarfixedvaluescatterx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieserrorbarfixedvaluescatterx_)));
+          set_has_tschchartserieserrorbarfixedvaluescatterx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(69)) goto parse_tschchartserieserrorbarpercentvalue;
+        break;
+      }
+
+      // optional float tschchartserieserrorbarpercentvalue = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieserrorbarpercentvalue:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieserrorbarpercentvalue_)));
+          set_has_tschchartserieserrorbarpercentvalue();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(77)) goto parse_tschchartserieserrorbarpercentvaluescatterx;
+        break;
+      }
+
+      // optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieserrorbarpercentvaluescatterx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieserrorbarpercentvaluescatterx_)));
+          set_has_tschchartserieserrorbarpercentvaluescatterx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_tschchartserieserrorbarsetting;
+        break;
+      }
+
+      // optional int32 tschchartserieserrorbarsetting = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartserieserrorbarsetting:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartserieserrorbarsetting_)));
+          set_has_tschchartserieserrorbarsetting();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_tschchartserieserrorbarsettingscatterx;
+        break;
+      }
+
+      // optional int32 tschchartserieserrorbarsettingscatterx = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartserieserrorbarsettingscatterx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartserieserrorbarsettingscatterx_)));
+          set_has_tschchartserieserrorbarsettingscatterx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(101)) goto parse_tschchartserieserrorbarstddevvalue;
+        break;
+      }
+
+      // optional float tschchartserieserrorbarstddevvalue = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieserrorbarstddevvalue:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieserrorbarstddevvalue_)));
+          set_has_tschchartserieserrorbarstddevvalue();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(109)) goto parse_tschchartserieserrorbarstddevvaluescatterx;
+        break;
+      }
+
+      // optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieserrorbarstddevvaluescatterx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieserrorbarstddevvaluescatterx_)));
+          set_has_tschchartserieserrorbarstddevvaluescatterx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(112)) goto parse_tschchartserieserrorbartype;
+        break;
+      }
+
+      // optional int32 tschchartserieserrorbartype = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartserieserrorbartype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartserieserrorbartype_)));
+          set_has_tschchartserieserrorbartype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(120)) goto parse_tschchartserieserrorbartypescatterx;
+        break;
+      }
+
+      // optional int32 tschchartserieserrorbartypescatterx = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartserieserrorbartypescatterx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartserieserrorbartypescatterx_)));
+          set_has_tschchartserieserrorbartypescatterx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(133)) goto parse_tschchartserieslabelexplosion;
+        break;
+      }
+
+      // optional float tschchartserieslabelexplosion = 16;
+      case 16: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieslabelexplosion:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieslabelexplosion_)));
+          set_has_tschchartserieslabelexplosion();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(136)) goto parse_tschchartserieslinetype;
+        break;
+      }
+
+      // optional int32 tschchartserieslinetype = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartserieslinetype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartserieslinetype_)));
+          set_has_tschchartserieslinetype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(146)) goto parse_tschchartseries1_0numberformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+      case 18: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseries1_0numberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseries1_0numberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(154)) goto parse_tschchartseriesnumberformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+      case 19: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesnumberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesnumberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(162)) goto parse_tschchartseries1_0dateformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseries1_0dateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseries1_0dateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(170)) goto parse_tschchartseriesdurationformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+      case 21: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesdurationformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesdurationformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(178)) goto parse_tschchartseriesdateformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+      case 22: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesdateformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesdateformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(184)) goto parse_tschchartseriesnumberformattype;
+        break;
+      }
+
+      // optional int32 tschchartseriesnumberformattype = 23;
+      case 23: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesnumberformattype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriesnumberformattype_)));
+          set_has_tschchartseriesnumberformattype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(194)) goto parse_tschchartseriespercentnumberformat;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+      case 24: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriespercentnumberformat:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriespercentnumberformat()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(200)) goto parse_tschchartseriesseriestype;
+        break;
+      }
+
+      // optional int32 tschchartseriesseriestype = 25;
+      case 25: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesseriestype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriesseriestype_)));
+          set_has_tschchartseriesseriestype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(208)) goto parse_tschchartseriesshowerrorbar;
+        break;
+      }
+
+      // optional bool tschchartseriesshowerrorbar = 26;
+      case 26: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowerrorbar:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowerrorbar_)));
+          set_has_tschchartseriesshowerrorbar();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(216)) goto parse_tschchartseriesshowerrorbarscatterx;
+        break;
+      }
+
+      // optional bool tschchartseriesshowerrorbarscatterx = 27;
+      case 27: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowerrorbarscatterx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowerrorbarscatterx_)));
+          set_has_tschchartseriesshowerrorbarscatterx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(224)) goto parse_tschchartseriesshowline;
+        break;
+      }
+
+      // optional bool tschchartseriesshowline = 28;
+      case 28: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowline:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowline_)));
+          set_has_tschchartseriesshowline();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(232)) goto parse_tschchartseriesshownegativedata;
+        break;
+      }
+
+      // optional bool tschchartseriesshownegativedata = 29;
+      case 29: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshownegativedata:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshownegativedata_)));
+          set_has_tschchartseriesshownegativedata();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(240)) goto parse_tschchartseriesshowserieslabels;
+        break;
+      }
+
+      // optional bool tschchartseriesshowserieslabels = 30;
+      case 30: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowserieslabels:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowserieslabels_)));
+          set_has_tschchartseriesshowserieslabels();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(248)) goto parse_tschchartseriesshowsymbol;
+        break;
+      }
+
+      // optional bool tschchartseriesshowsymbol = 31;
+      case 31: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowsymbol:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowsymbol_)));
+          set_has_tschchartseriesshowsymbol();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(256)) goto parse_tschchartseriesshowtrendline;
+        break;
+      }
+
+      // optional bool tschchartseriesshowtrendline = 32;
+      case 32: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowtrendline:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowtrendline_)));
+          set_has_tschchartseriesshowtrendline();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(264)) goto parse_tschchartseriesshowvaluelabels;
+        break;
+      }
+
+      // optional bool tschchartseriesshowvaluelabels = 33;
+      case 33: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowvaluelabels:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowvaluelabels_)));
+          set_has_tschchartseriesshowvaluelabels();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(272)) goto parse_tschchartseriessizedimension;
+        break;
+      }
+
+      // optional int32 tschchartseriessizedimension = 34;
+      case 34: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriessizedimension:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriessizedimension_)));
+          set_has_tschchartseriessizedimension();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(280)) goto parse_tschchartseriessymboltype;
+        break;
+      }
+
+      // optional int32 tschchartseriessymboltype = 35;
+      case 35: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriessymboltype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriessymboltype_)));
+          set_has_tschchartseriessymboltype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(293)) goto parse_tschchartseriestrendlineequationoffsetx;
+        break;
+      }
+
+      // optional float tschchartseriestrendlineequationoffsetx = 36;
+      case 36: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriestrendlineequationoffsetx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriestrendlineequationoffsetx_)));
+          set_has_tschchartseriestrendlineequationoffsetx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(301)) goto parse_tschchartseriestrendlineequationoffsety;
+        break;
+      }
+
+      // optional float tschchartseriestrendlineequationoffsety = 37;
+      case 37: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriestrendlineequationoffsety:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriestrendlineequationoffsety_)));
+          set_has_tschchartseriestrendlineequationoffsety();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(306)) goto parse_tschchartseriestrendlinelabelstring;
+        break;
+      }
+
+      // optional string tschchartseriestrendlinelabelstring = 38;
+      case 38: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriestrendlinelabelstring:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_tschchartseriestrendlinelabelstring()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->tschchartseriestrendlinelabelstring().data(), this->tschchartseriestrendlinelabelstring().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(312)) goto parse_tschchartseriestrendlineorder;
+        break;
+      }
+
+      // optional int32 tschchartseriestrendlineorder = 39;
+      case 39: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlineorder:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriestrendlineorder_)));
+          set_has_tschchartseriestrendlineorder();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(320)) goto parse_tschchartseriestrendlineperiod;
+        break;
+      }
+
+      // optional int32 tschchartseriestrendlineperiod = 40;
+      case 40: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlineperiod:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriestrendlineperiod_)));
+          set_has_tschchartseriestrendlineperiod();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(333)) goto parse_tschchartseriestrendlinersquaredoffsetx;
+        break;
+      }
+
+      // optional float tschchartseriestrendlinersquaredoffsetx = 41;
+      case 41: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriestrendlinersquaredoffsetx:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriestrendlinersquaredoffsetx_)));
+          set_has_tschchartseriestrendlinersquaredoffsetx();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(341)) goto parse_tschchartseriestrendlinersquaredoffsety;
+        break;
+      }
+
+      // optional float tschchartseriestrendlinersquaredoffsety = 42;
+      case 42: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriestrendlinersquaredoffsety:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriestrendlinersquaredoffsety_)));
+          set_has_tschchartseriestrendlinersquaredoffsety();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(344)) goto parse_tschchartseriestrendlineshowequation;
+        break;
+      }
+
+      // optional bool tschchartseriestrendlineshowequation = 43;
+      case 43: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlineshowequation:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriestrendlineshowequation_)));
+          set_has_tschchartseriestrendlineshowequation();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(352)) goto parse_tschchartseriestrendlineshowlabel;
+        break;
+      }
+
+      // optional bool tschchartseriestrendlineshowlabel = 44;
+      case 44: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlineshowlabel:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriestrendlineshowlabel_)));
+          set_has_tschchartseriestrendlineshowlabel();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(360)) goto parse_tschchartseriestrendlineshowr2value;
+        break;
+      }
+
+      // optional bool tschchartseriestrendlineshowr2value = 45;
+      case 45: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlineshowr2value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriestrendlineshowr2value_)));
+          set_has_tschchartseriestrendlineshowr2value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(368)) goto parse_tschchartseriestrendlinetype;
+        break;
+      }
+
+      // optional int32 tschchartseriestrendlinetype = 46;
+      case 46: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlinetype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriestrendlinetype_)));
+          set_has_tschchartseriestrendlinetype();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(381)) goto parse_tschchartserieswedgeexplosion;
+        break;
+      }
+
+      // optional float tschchartserieswedgeexplosion = 47;
+      case 47: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartserieswedgeexplosion:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartserieswedgeexplosion_)));
+          set_has_tschchartserieswedgeexplosion();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(384)) goto parse_tschchartseriesyaxisordinal;
+        break;
+      }
+
+      // optional int32 tschchartseriesyaxisordinal = 48;
+      case 48: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesyaxisordinal:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriesyaxisordinal_)));
+          set_has_tschchartseriesyaxisordinal();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(392)) goto parse_tschchartseriesvaluelabelsaxis;
+        break;
+      }
+
+      // optional int32 tschchartseriesvaluelabelsaxis = 49;
+      case 49: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesvaluelabelsaxis:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriesvaluelabelsaxis_)));
+          set_has_tschchartseriesvaluelabelsaxis();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(402)) goto parse_tschchartserieserrorbarlineend;
+        break;
+      }
+
+      // optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+      case 50: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarlineend:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarlineend()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(410)) goto parse_tschchartserieserrorbarlineendscatterx;
+        break;
+      }
+
+      // optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+      case 51: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarlineendscatterx:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarlineendscatterx()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(418)) goto parse_tschchartserieserrorbarshadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+      case 52: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarshadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarshadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(426)) goto parse_tschchartserieserrorbarstroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+      case 53: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarstroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarstroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(434)) goto parse_tschchartserieserrorbarstrokescatterx;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+      case 54: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartserieserrorbarstrokescatterx:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartserieserrorbarstrokescatterx()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(442)) goto parse_tschchartseriesfill;
+        break;
+      }
+
+      // optional .TSD.FillArchive tschchartseriesfill = 55;
+      case 55: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesfill:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesfill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(448)) goto parse_tschchartserieslabelparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartserieslabelparagraphstyleindex = 56;
+      case 56: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartserieslabelparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartserieslabelparagraphstyleindex_)));
+          set_has_tschchartserieslabelparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(461)) goto parse_tschchartseriesopacity;
+        break;
+      }
+
+      // optional float tschchartseriesopacity = 57;
+      case 57: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriesopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriesopacity_)));
+          set_has_tschchartseriesopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(464)) goto parse_tschchartseriesoutsidelabelparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+      case 58: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesoutsidelabelparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriesoutsidelabelparagraphstyleindex_)));
+          set_has_tschchartseriesoutsidelabelparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(474)) goto parse_tschchartseriesshadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+      case 59: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesshadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesshadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(482)) goto parse_tschchartseriesstroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+      case 60: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriesstroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriesstroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(490)) goto parse_tschchartseriessymbolfill;
+        break;
+      }
+
+      // optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+      case 61: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriessymbolfill:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriessymbolfill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(496)) goto parse_tschchartseriessymbolfilluseseriesfill;
+        break;
+      }
+
+      // optional bool tschchartseriessymbolfilluseseriesfill = 62;
+      case 62: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriessymbolfilluseseriesfill:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriessymbolfilluseseriesfill_)));
+          set_has_tschchartseriessymbolfilluseseriesfill();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(504)) goto parse_tschchartseriessymbolfilluseseriesstroke;
+        break;
+      }
+
+      // optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+      case 63: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriessymbolfilluseseriesstroke:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriessymbolfilluseseriesstroke_)));
+          set_has_tschchartseriessymbolfilluseseriesstroke();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(517)) goto parse_tschchartseriessymbolsize;
+        break;
+      }
+
+      // optional float tschchartseriessymbolsize = 64;
+      case 64: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriessymbolsize:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriessymbolsize_)));
+          set_has_tschchartseriessymbolsize();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(522)) goto parse_tschchartseriessymbolstroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+      case 65: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriessymbolstroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriessymbolstroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(533)) goto parse_tschchartseriestrendlineequationopacity;
+        break;
+      }
+
+      // optional float tschchartseriestrendlineequationopacity = 66;
+      case 66: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriestrendlineequationopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriestrendlineequationopacity_)));
+          set_has_tschchartseriestrendlineequationopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(536)) goto parse_tschchartseriestrendlineequationparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+      case 67: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlineequationparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriestrendlineequationparagraphstyleindex_)));
+          set_has_tschchartseriestrendlineequationparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(549)) goto parse_tschchartseriestrendlinersquaredopacity;
+        break;
+      }
+
+      // optional float tschchartseriestrendlinersquaredopacity = 68;
+      case 68: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_tschchartseriestrendlinersquaredopacity:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &tschchartseriestrendlinersquaredopacity_)));
+          set_has_tschchartseriestrendlinersquaredopacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(552)) goto parse_tschchartseriestrendlinersquaredparagraphstyleindex;
+        break;
+      }
+
+      // optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+      case 69: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriestrendlinersquaredparagraphstyleindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriestrendlinersquaredparagraphstyleindex_)));
+          set_has_tschchartseriestrendlinersquaredparagraphstyleindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(562)) goto parse_tschchartseriestrendlineshadow;
+        break;
+      }
+
+      // optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+      case 70: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriestrendlineshadow:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriestrendlineshadow()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(570)) goto parse_tschchartseriestrendlinestroke;
+        break;
+      }
+
+      // optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+      case 71: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tschchartseriestrendlinestroke:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tschchartseriestrendlinestroke()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(576)) goto parse_tschchartseriesvaluelabelposition;
+        break;
+      }
+
+      // optional int32 tschchartseriesvaluelabelposition = 72;
+      case 72: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesvaluelabelposition:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &tschchartseriesvaluelabelposition_)));
+          set_has_tschchartseriesvaluelabelposition();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(584)) goto parse_tschchartseriesshowlabelsinfront;
+        break;
+      }
+
+      // optional bool tschchartseriesshowlabelsinfront = 73;
+      case 73: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tschchartseriesshowlabelsinfront:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tschchartseriesshowlabelsinfront_)));
+          set_has_tschchartseriesshowlabelsinfront();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartSeriesGenericPropertyMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional float tschchartseriesadjustmentscale = 1;
+  if (has_tschchartseriesadjustmentscale()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(1, this->tschchartseriesadjustmentscale(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+  if (has_tschchartserieserrorbarcustomnegativedata()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->tschchartserieserrorbarcustomnegativedata(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+  if (has_tschchartserieserrorbarcustomnegativedatascatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->tschchartserieserrorbarcustomnegativedatascatterx(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+  if (has_tschchartserieserrorbarcustompositivedata()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->tschchartserieserrorbarcustompositivedata(), output);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+  if (has_tschchartserieserrorbarcustompositivedatascatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->tschchartserieserrorbarcustompositivedatascatterx(), output);
+  }
+
+  // optional float tschchartserieserrorbarfixedvalue = 6;
+  if (has_tschchartserieserrorbarfixedvalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(6, this->tschchartserieserrorbarfixedvalue(), output);
+  }
+
+  // optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+  if (has_tschchartserieserrorbarfixedvaluescatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(7, this->tschchartserieserrorbarfixedvaluescatterx(), output);
+  }
+
+  // optional float tschchartserieserrorbarpercentvalue = 8;
+  if (has_tschchartserieserrorbarpercentvalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(8, this->tschchartserieserrorbarpercentvalue(), output);
+  }
+
+  // optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+  if (has_tschchartserieserrorbarpercentvaluescatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(9, this->tschchartserieserrorbarpercentvaluescatterx(), output);
+  }
+
+  // optional int32 tschchartserieserrorbarsetting = 10;
+  if (has_tschchartserieserrorbarsetting()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(10, this->tschchartserieserrorbarsetting(), output);
+  }
+
+  // optional int32 tschchartserieserrorbarsettingscatterx = 11;
+  if (has_tschchartserieserrorbarsettingscatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(11, this->tschchartserieserrorbarsettingscatterx(), output);
+  }
+
+  // optional float tschchartserieserrorbarstddevvalue = 12;
+  if (has_tschchartserieserrorbarstddevvalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(12, this->tschchartserieserrorbarstddevvalue(), output);
+  }
+
+  // optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+  if (has_tschchartserieserrorbarstddevvaluescatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(13, this->tschchartserieserrorbarstddevvaluescatterx(), output);
+  }
+
+  // optional int32 tschchartserieserrorbartype = 14;
+  if (has_tschchartserieserrorbartype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(14, this->tschchartserieserrorbartype(), output);
+  }
+
+  // optional int32 tschchartserieserrorbartypescatterx = 15;
+  if (has_tschchartserieserrorbartypescatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(15, this->tschchartserieserrorbartypescatterx(), output);
+  }
+
+  // optional float tschchartserieslabelexplosion = 16;
+  if (has_tschchartserieslabelexplosion()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(16, this->tschchartserieslabelexplosion(), output);
+  }
+
+  // optional int32 tschchartserieslinetype = 17;
+  if (has_tschchartserieslinetype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(17, this->tschchartserieslinetype(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+  if (has_tschchartseries1_0numberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      18, this->tschchartseries1_0numberformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+  if (has_tschchartseriesnumberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      19, this->tschchartseriesnumberformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+  if (has_tschchartseries1_0dateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->tschchartseries1_0dateformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+  if (has_tschchartseriesdurationformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      21, this->tschchartseriesdurationformat(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+  if (has_tschchartseriesdateformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      22, this->tschchartseriesdateformat(), output);
+  }
+
+  // optional int32 tschchartseriesnumberformattype = 23;
+  if (has_tschchartseriesnumberformattype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(23, this->tschchartseriesnumberformattype(), output);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+  if (has_tschchartseriespercentnumberformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      24, this->tschchartseriespercentnumberformat(), output);
+  }
+
+  // optional int32 tschchartseriesseriestype = 25;
+  if (has_tschchartseriesseriestype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(25, this->tschchartseriesseriestype(), output);
+  }
+
+  // optional bool tschchartseriesshowerrorbar = 26;
+  if (has_tschchartseriesshowerrorbar()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(26, this->tschchartseriesshowerrorbar(), output);
+  }
+
+  // optional bool tschchartseriesshowerrorbarscatterx = 27;
+  if (has_tschchartseriesshowerrorbarscatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(27, this->tschchartseriesshowerrorbarscatterx(), output);
+  }
+
+  // optional bool tschchartseriesshowline = 28;
+  if (has_tschchartseriesshowline()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(28, this->tschchartseriesshowline(), output);
+  }
+
+  // optional bool tschchartseriesshownegativedata = 29;
+  if (has_tschchartseriesshownegativedata()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(29, this->tschchartseriesshownegativedata(), output);
+  }
+
+  // optional bool tschchartseriesshowserieslabels = 30;
+  if (has_tschchartseriesshowserieslabels()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(30, this->tschchartseriesshowserieslabels(), output);
+  }
+
+  // optional bool tschchartseriesshowsymbol = 31;
+  if (has_tschchartseriesshowsymbol()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(31, this->tschchartseriesshowsymbol(), output);
+  }
+
+  // optional bool tschchartseriesshowtrendline = 32;
+  if (has_tschchartseriesshowtrendline()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(32, this->tschchartseriesshowtrendline(), output);
+  }
+
+  // optional bool tschchartseriesshowvaluelabels = 33;
+  if (has_tschchartseriesshowvaluelabels()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(33, this->tschchartseriesshowvaluelabels(), output);
+  }
+
+  // optional int32 tschchartseriessizedimension = 34;
+  if (has_tschchartseriessizedimension()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(34, this->tschchartseriessizedimension(), output);
+  }
+
+  // optional int32 tschchartseriessymboltype = 35;
+  if (has_tschchartseriessymboltype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(35, this->tschchartseriessymboltype(), output);
+  }
+
+  // optional float tschchartseriestrendlineequationoffsetx = 36;
+  if (has_tschchartseriestrendlineequationoffsetx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(36, this->tschchartseriestrendlineequationoffsetx(), output);
+  }
+
+  // optional float tschchartseriestrendlineequationoffsety = 37;
+  if (has_tschchartseriestrendlineequationoffsety()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(37, this->tschchartseriestrendlineequationoffsety(), output);
+  }
+
+  // optional string tschchartseriestrendlinelabelstring = 38;
+  if (has_tschchartseriestrendlinelabelstring()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->tschchartseriestrendlinelabelstring().data(), this->tschchartseriestrendlinelabelstring().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      38, this->tschchartseriestrendlinelabelstring(), output);
+  }
+
+  // optional int32 tschchartseriestrendlineorder = 39;
+  if (has_tschchartseriestrendlineorder()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(39, this->tschchartseriestrendlineorder(), output);
+  }
+
+  // optional int32 tschchartseriestrendlineperiod = 40;
+  if (has_tschchartseriestrendlineperiod()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(40, this->tschchartseriestrendlineperiod(), output);
+  }
+
+  // optional float tschchartseriestrendlinersquaredoffsetx = 41;
+  if (has_tschchartseriestrendlinersquaredoffsetx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(41, this->tschchartseriestrendlinersquaredoffsetx(), output);
+  }
+
+  // optional float tschchartseriestrendlinersquaredoffsety = 42;
+  if (has_tschchartseriestrendlinersquaredoffsety()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(42, this->tschchartseriestrendlinersquaredoffsety(), output);
+  }
+
+  // optional bool tschchartseriestrendlineshowequation = 43;
+  if (has_tschchartseriestrendlineshowequation()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(43, this->tschchartseriestrendlineshowequation(), output);
+  }
+
+  // optional bool tschchartseriestrendlineshowlabel = 44;
+  if (has_tschchartseriestrendlineshowlabel()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(44, this->tschchartseriestrendlineshowlabel(), output);
+  }
+
+  // optional bool tschchartseriestrendlineshowr2value = 45;
+  if (has_tschchartseriestrendlineshowr2value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(45, this->tschchartseriestrendlineshowr2value(), output);
+  }
+
+  // optional int32 tschchartseriestrendlinetype = 46;
+  if (has_tschchartseriestrendlinetype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(46, this->tschchartseriestrendlinetype(), output);
+  }
+
+  // optional float tschchartserieswedgeexplosion = 47;
+  if (has_tschchartserieswedgeexplosion()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(47, this->tschchartserieswedgeexplosion(), output);
+  }
+
+  // optional int32 tschchartseriesyaxisordinal = 48;
+  if (has_tschchartseriesyaxisordinal()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(48, this->tschchartseriesyaxisordinal(), output);
+  }
+
+  // optional int32 tschchartseriesvaluelabelsaxis = 49;
+  if (has_tschchartseriesvaluelabelsaxis()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(49, this->tschchartseriesvaluelabelsaxis(), output);
+  }
+
+  // optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+  if (has_tschchartserieserrorbarlineend()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      50, this->tschchartserieserrorbarlineend(), output);
+  }
+
+  // optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+  if (has_tschchartserieserrorbarlineendscatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      51, this->tschchartserieserrorbarlineendscatterx(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+  if (has_tschchartserieserrorbarshadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      52, this->tschchartserieserrorbarshadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+  if (has_tschchartserieserrorbarstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      53, this->tschchartserieserrorbarstroke(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+  if (has_tschchartserieserrorbarstrokescatterx()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      54, this->tschchartserieserrorbarstrokescatterx(), output);
+  }
+
+  // optional .TSD.FillArchive tschchartseriesfill = 55;
+  if (has_tschchartseriesfill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      55, this->tschchartseriesfill(), output);
+  }
+
+  // optional int32 tschchartserieslabelparagraphstyleindex = 56;
+  if (has_tschchartserieslabelparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(56, this->tschchartserieslabelparagraphstyleindex(), output);
+  }
+
+  // optional float tschchartseriesopacity = 57;
+  if (has_tschchartseriesopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(57, this->tschchartseriesopacity(), output);
+  }
+
+  // optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+  if (has_tschchartseriesoutsidelabelparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(58, this->tschchartseriesoutsidelabelparagraphstyleindex(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+  if (has_tschchartseriesshadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      59, this->tschchartseriesshadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+  if (has_tschchartseriesstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      60, this->tschchartseriesstroke(), output);
+  }
+
+  // optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+  if (has_tschchartseriessymbolfill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      61, this->tschchartseriessymbolfill(), output);
+  }
+
+  // optional bool tschchartseriessymbolfilluseseriesfill = 62;
+  if (has_tschchartseriessymbolfilluseseriesfill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(62, this->tschchartseriessymbolfilluseseriesfill(), output);
+  }
+
+  // optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+  if (has_tschchartseriessymbolfilluseseriesstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(63, this->tschchartseriessymbolfilluseseriesstroke(), output);
+  }
+
+  // optional float tschchartseriessymbolsize = 64;
+  if (has_tschchartseriessymbolsize()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(64, this->tschchartseriessymbolsize(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+  if (has_tschchartseriessymbolstroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      65, this->tschchartseriessymbolstroke(), output);
+  }
+
+  // optional float tschchartseriestrendlineequationopacity = 66;
+  if (has_tschchartseriestrendlineequationopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(66, this->tschchartseriestrendlineequationopacity(), output);
+  }
+
+  // optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+  if (has_tschchartseriestrendlineequationparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(67, this->tschchartseriestrendlineequationparagraphstyleindex(), output);
+  }
+
+  // optional float tschchartseriestrendlinersquaredopacity = 68;
+  if (has_tschchartseriestrendlinersquaredopacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(68, this->tschchartseriestrendlinersquaredopacity(), output);
+  }
+
+  // optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+  if (has_tschchartseriestrendlinersquaredparagraphstyleindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(69, this->tschchartseriestrendlinersquaredparagraphstyleindex(), output);
+  }
+
+  // optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+  if (has_tschchartseriestrendlineshadow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      70, this->tschchartseriestrendlineshadow(), output);
+  }
+
+  // optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+  if (has_tschchartseriestrendlinestroke()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      71, this->tschchartseriestrendlinestroke(), output);
+  }
+
+  // optional int32 tschchartseriesvaluelabelposition = 72;
+  if (has_tschchartseriesvaluelabelposition()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(72, this->tschchartseriesvaluelabelposition(), output);
+  }
+
+  // optional bool tschchartseriesshowlabelsinfront = 73;
+  if (has_tschchartseriesshowlabelsinfront()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(73, this->tschchartseriesshowlabelsinfront(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ChartSeriesGenericPropertyMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional float tschchartseriesadjustmentscale = 1;
+  if (has_tschchartseriesadjustmentscale()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(1, this->tschchartseriesadjustmentscale(), target);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+  if (has_tschchartserieserrorbarcustomnegativedata()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->tschchartserieserrorbarcustomnegativedata(), target);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+  if (has_tschchartserieserrorbarcustomnegativedatascatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->tschchartserieserrorbarcustomnegativedatascatterx(), target);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+  if (has_tschchartserieserrorbarcustompositivedata()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->tschchartserieserrorbarcustompositivedata(), target);
+  }
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+  if (has_tschchartserieserrorbarcustompositivedatascatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->tschchartserieserrorbarcustompositivedatascatterx(), target);
+  }
+
+  // optional float tschchartserieserrorbarfixedvalue = 6;
+  if (has_tschchartserieserrorbarfixedvalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(6, this->tschchartserieserrorbarfixedvalue(), target);
+  }
+
+  // optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+  if (has_tschchartserieserrorbarfixedvaluescatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(7, this->tschchartserieserrorbarfixedvaluescatterx(), target);
+  }
+
+  // optional float tschchartserieserrorbarpercentvalue = 8;
+  if (has_tschchartserieserrorbarpercentvalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(8, this->tschchartserieserrorbarpercentvalue(), target);
+  }
+
+  // optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+  if (has_tschchartserieserrorbarpercentvaluescatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(9, this->tschchartserieserrorbarpercentvaluescatterx(), target);
+  }
+
+  // optional int32 tschchartserieserrorbarsetting = 10;
+  if (has_tschchartserieserrorbarsetting()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(10, this->tschchartserieserrorbarsetting(), target);
+  }
+
+  // optional int32 tschchartserieserrorbarsettingscatterx = 11;
+  if (has_tschchartserieserrorbarsettingscatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(11, this->tschchartserieserrorbarsettingscatterx(), target);
+  }
+
+  // optional float tschchartserieserrorbarstddevvalue = 12;
+  if (has_tschchartserieserrorbarstddevvalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(12, this->tschchartserieserrorbarstddevvalue(), target);
+  }
+
+  // optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+  if (has_tschchartserieserrorbarstddevvaluescatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(13, this->tschchartserieserrorbarstddevvaluescatterx(), target);
+  }
+
+  // optional int32 tschchartserieserrorbartype = 14;
+  if (has_tschchartserieserrorbartype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(14, this->tschchartserieserrorbartype(), target);
+  }
+
+  // optional int32 tschchartserieserrorbartypescatterx = 15;
+  if (has_tschchartserieserrorbartypescatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(15, this->tschchartserieserrorbartypescatterx(), target);
+  }
+
+  // optional float tschchartserieslabelexplosion = 16;
+  if (has_tschchartserieslabelexplosion()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(16, this->tschchartserieslabelexplosion(), target);
+  }
+
+  // optional int32 tschchartserieslinetype = 17;
+  if (has_tschchartserieslinetype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(17, this->tschchartserieslinetype(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+  if (has_tschchartseries1_0numberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        18, this->tschchartseries1_0numberformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+  if (has_tschchartseriesnumberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        19, this->tschchartseriesnumberformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+  if (has_tschchartseries1_0dateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->tschchartseries1_0dateformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+  if (has_tschchartseriesdurationformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        21, this->tschchartseriesdurationformat(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+  if (has_tschchartseriesdateformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        22, this->tschchartseriesdateformat(), target);
+  }
+
+  // optional int32 tschchartseriesnumberformattype = 23;
+  if (has_tschchartseriesnumberformattype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(23, this->tschchartseriesnumberformattype(), target);
+  }
+
+  // optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+  if (has_tschchartseriespercentnumberformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        24, this->tschchartseriespercentnumberformat(), target);
+  }
+
+  // optional int32 tschchartseriesseriestype = 25;
+  if (has_tschchartseriesseriestype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(25, this->tschchartseriesseriestype(), target);
+  }
+
+  // optional bool tschchartseriesshowerrorbar = 26;
+  if (has_tschchartseriesshowerrorbar()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(26, this->tschchartseriesshowerrorbar(), target);
+  }
+
+  // optional bool tschchartseriesshowerrorbarscatterx = 27;
+  if (has_tschchartseriesshowerrorbarscatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(27, this->tschchartseriesshowerrorbarscatterx(), target);
+  }
+
+  // optional bool tschchartseriesshowline = 28;
+  if (has_tschchartseriesshowline()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(28, this->tschchartseriesshowline(), target);
+  }
+
+  // optional bool tschchartseriesshownegativedata = 29;
+  if (has_tschchartseriesshownegativedata()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(29, this->tschchartseriesshownegativedata(), target);
+  }
+
+  // optional bool tschchartseriesshowserieslabels = 30;
+  if (has_tschchartseriesshowserieslabels()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(30, this->tschchartseriesshowserieslabels(), target);
+  }
+
+  // optional bool tschchartseriesshowsymbol = 31;
+  if (has_tschchartseriesshowsymbol()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(31, this->tschchartseriesshowsymbol(), target);
+  }
+
+  // optional bool tschchartseriesshowtrendline = 32;
+  if (has_tschchartseriesshowtrendline()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(32, this->tschchartseriesshowtrendline(), target);
+  }
+
+  // optional bool tschchartseriesshowvaluelabels = 33;
+  if (has_tschchartseriesshowvaluelabels()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(33, this->tschchartseriesshowvaluelabels(), target);
+  }
+
+  // optional int32 tschchartseriessizedimension = 34;
+  if (has_tschchartseriessizedimension()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(34, this->tschchartseriessizedimension(), target);
+  }
+
+  // optional int32 tschchartseriessymboltype = 35;
+  if (has_tschchartseriessymboltype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(35, this->tschchartseriessymboltype(), target);
+  }
+
+  // optional float tschchartseriestrendlineequationoffsetx = 36;
+  if (has_tschchartseriestrendlineequationoffsetx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(36, this->tschchartseriestrendlineequationoffsetx(), target);
+  }
+
+  // optional float tschchartseriestrendlineequationoffsety = 37;
+  if (has_tschchartseriestrendlineequationoffsety()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(37, this->tschchartseriestrendlineequationoffsety(), target);
+  }
+
+  // optional string tschchartseriestrendlinelabelstring = 38;
+  if (has_tschchartseriestrendlinelabelstring()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->tschchartseriestrendlinelabelstring().data(), this->tschchartseriestrendlinelabelstring().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        38, this->tschchartseriestrendlinelabelstring(), target);
+  }
+
+  // optional int32 tschchartseriestrendlineorder = 39;
+  if (has_tschchartseriestrendlineorder()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(39, this->tschchartseriestrendlineorder(), target);
+  }
+
+  // optional int32 tschchartseriestrendlineperiod = 40;
+  if (has_tschchartseriestrendlineperiod()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(40, this->tschchartseriestrendlineperiod(), target);
+  }
+
+  // optional float tschchartseriestrendlinersquaredoffsetx = 41;
+  if (has_tschchartseriestrendlinersquaredoffsetx()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(41, this->tschchartseriestrendlinersquaredoffsetx(), target);
+  }
+
+  // optional float tschchartseriestrendlinersquaredoffsety = 42;
+  if (has_tschchartseriestrendlinersquaredoffsety()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(42, this->tschchartseriestrendlinersquaredoffsety(), target);
+  }
+
+  // optional bool tschchartseriestrendlineshowequation = 43;
+  if (has_tschchartseriestrendlineshowequation()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(43, this->tschchartseriestrendlineshowequation(), target);
+  }
+
+  // optional bool tschchartseriestrendlineshowlabel = 44;
+  if (has_tschchartseriestrendlineshowlabel()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(44, this->tschchartseriestrendlineshowlabel(), target);
+  }
+
+  // optional bool tschchartseriestrendlineshowr2value = 45;
+  if (has_tschchartseriestrendlineshowr2value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(45, this->tschchartseriestrendlineshowr2value(), target);
+  }
+
+  // optional int32 tschchartseriestrendlinetype = 46;
+  if (has_tschchartseriestrendlinetype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(46, this->tschchartseriestrendlinetype(), target);
+  }
+
+  // optional float tschchartserieswedgeexplosion = 47;
+  if (has_tschchartserieswedgeexplosion()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(47, this->tschchartserieswedgeexplosion(), target);
+  }
+
+  // optional int32 tschchartseriesyaxisordinal = 48;
+  if (has_tschchartseriesyaxisordinal()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(48, this->tschchartseriesyaxisordinal(), target);
+  }
+
+  // optional int32 tschchartseriesvaluelabelsaxis = 49;
+  if (has_tschchartseriesvaluelabelsaxis()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(49, this->tschchartseriesvaluelabelsaxis(), target);
+  }
+
+  // optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+  if (has_tschchartserieserrorbarlineend()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        50, this->tschchartserieserrorbarlineend(), target);
+  }
+
+  // optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+  if (has_tschchartserieserrorbarlineendscatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        51, this->tschchartserieserrorbarlineendscatterx(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+  if (has_tschchartserieserrorbarshadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        52, this->tschchartserieserrorbarshadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+  if (has_tschchartserieserrorbarstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        53, this->tschchartserieserrorbarstroke(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+  if (has_tschchartserieserrorbarstrokescatterx()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        54, this->tschchartserieserrorbarstrokescatterx(), target);
+  }
+
+  // optional .TSD.FillArchive tschchartseriesfill = 55;
+  if (has_tschchartseriesfill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        55, this->tschchartseriesfill(), target);
+  }
+
+  // optional int32 tschchartserieslabelparagraphstyleindex = 56;
+  if (has_tschchartserieslabelparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(56, this->tschchartserieslabelparagraphstyleindex(), target);
+  }
+
+  // optional float tschchartseriesopacity = 57;
+  if (has_tschchartseriesopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(57, this->tschchartseriesopacity(), target);
+  }
+
+  // optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+  if (has_tschchartseriesoutsidelabelparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(58, this->tschchartseriesoutsidelabelparagraphstyleindex(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+  if (has_tschchartseriesshadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        59, this->tschchartseriesshadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+  if (has_tschchartseriesstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        60, this->tschchartseriesstroke(), target);
+  }
+
+  // optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+  if (has_tschchartseriessymbolfill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        61, this->tschchartseriessymbolfill(), target);
+  }
+
+  // optional bool tschchartseriessymbolfilluseseriesfill = 62;
+  if (has_tschchartseriessymbolfilluseseriesfill()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(62, this->tschchartseriessymbolfilluseseriesfill(), target);
+  }
+
+  // optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+  if (has_tschchartseriessymbolfilluseseriesstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(63, this->tschchartseriessymbolfilluseseriesstroke(), target);
+  }
+
+  // optional float tschchartseriessymbolsize = 64;
+  if (has_tschchartseriessymbolsize()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(64, this->tschchartseriessymbolsize(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+  if (has_tschchartseriessymbolstroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        65, this->tschchartseriessymbolstroke(), target);
+  }
+
+  // optional float tschchartseriestrendlineequationopacity = 66;
+  if (has_tschchartseriestrendlineequationopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(66, this->tschchartseriestrendlineequationopacity(), target);
+  }
+
+  // optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+  if (has_tschchartseriestrendlineequationparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(67, this->tschchartseriestrendlineequationparagraphstyleindex(), target);
+  }
+
+  // optional float tschchartseriestrendlinersquaredopacity = 68;
+  if (has_tschchartseriestrendlinersquaredopacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(68, this->tschchartseriestrendlinersquaredopacity(), target);
+  }
+
+  // optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+  if (has_tschchartseriestrendlinersquaredparagraphstyleindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(69, this->tschchartseriestrendlinersquaredparagraphstyleindex(), target);
+  }
+
+  // optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+  if (has_tschchartseriestrendlineshadow()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        70, this->tschchartseriestrendlineshadow(), target);
+  }
+
+  // optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+  if (has_tschchartseriestrendlinestroke()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        71, this->tschchartseriestrendlinestroke(), target);
+  }
+
+  // optional int32 tschchartseriesvaluelabelposition = 72;
+  if (has_tschchartseriesvaluelabelposition()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(72, this->tschchartseriesvaluelabelposition(), target);
+  }
+
+  // optional bool tschchartseriesshowlabelsinfront = 73;
+  if (has_tschchartseriesshowlabelsinfront()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(73, this->tschchartseriesshowlabelsinfront(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ChartSeriesGenericPropertyMapArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional float tschchartseriesadjustmentscale = 1;
+    if (has_tschchartseriesadjustmentscale()) {
+      total_size += 1 + 4;
+    }
+
+    // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+    if (has_tschchartserieserrorbarcustomnegativedata()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarcustomnegativedata());
+    }
+
+    // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+    if (has_tschchartserieserrorbarcustomnegativedatascatterx()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarcustomnegativedatascatterx());
+    }
+
+    // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+    if (has_tschchartserieserrorbarcustompositivedata()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarcustompositivedata());
+    }
+
+    // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+    if (has_tschchartserieserrorbarcustompositivedatascatterx()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarcustompositivedatascatterx());
+    }
+
+    // optional float tschchartserieserrorbarfixedvalue = 6;
+    if (has_tschchartserieserrorbarfixedvalue()) {
+      total_size += 1 + 4;
+    }
+
+    // optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+    if (has_tschchartserieserrorbarfixedvaluescatterx()) {
+      total_size += 1 + 4;
+    }
+
+    // optional float tschchartserieserrorbarpercentvalue = 8;
+    if (has_tschchartserieserrorbarpercentvalue()) {
+      total_size += 1 + 4;
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+    if (has_tschchartserieserrorbarpercentvaluescatterx()) {
+      total_size += 1 + 4;
+    }
+
+    // optional int32 tschchartserieserrorbarsetting = 10;
+    if (has_tschchartserieserrorbarsetting()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartserieserrorbarsetting());
+    }
+
+    // optional int32 tschchartserieserrorbarsettingscatterx = 11;
+    if (has_tschchartserieserrorbarsettingscatterx()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartserieserrorbarsettingscatterx());
+    }
+
+    // optional float tschchartserieserrorbarstddevvalue = 12;
+    if (has_tschchartserieserrorbarstddevvalue()) {
+      total_size += 1 + 4;
+    }
+
+    // optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+    if (has_tschchartserieserrorbarstddevvaluescatterx()) {
+      total_size += 1 + 4;
+    }
+
+    // optional int32 tschchartserieserrorbartype = 14;
+    if (has_tschchartserieserrorbartype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartserieserrorbartype());
+    }
+
+    // optional int32 tschchartserieserrorbartypescatterx = 15;
+    if (has_tschchartserieserrorbartypescatterx()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartserieserrorbartypescatterx());
+    }
+
+    // optional float tschchartserieslabelexplosion = 16;
+    if (has_tschchartserieslabelexplosion()) {
+      total_size += 2 + 4;
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional int32 tschchartserieslinetype = 17;
+    if (has_tschchartserieslinetype()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartserieslinetype());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+    if (has_tschchartseries1_0numberformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseries1_0numberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+    if (has_tschchartseriesnumberformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesnumberformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+    if (has_tschchartseries1_0dateformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseries1_0dateformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+    if (has_tschchartseriesdurationformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesdurationformat());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+    if (has_tschchartseriesdateformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesdateformat());
+    }
+
+    // optional int32 tschchartseriesnumberformattype = 23;
+    if (has_tschchartseriesnumberformattype()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriesnumberformattype());
+    }
+
+    // optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+    if (has_tschchartseriespercentnumberformat()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriespercentnumberformat());
+    }
+
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional int32 tschchartseriesseriestype = 25;
+    if (has_tschchartseriesseriestype()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriesseriestype());
+    }
+
+    // optional bool tschchartseriesshowerrorbar = 26;
+    if (has_tschchartseriesshowerrorbar()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesshowerrorbarscatterx = 27;
+    if (has_tschchartseriesshowerrorbarscatterx()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesshowline = 28;
+    if (has_tschchartseriesshowline()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesshownegativedata = 29;
+    if (has_tschchartseriesshownegativedata()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesshowserieslabels = 30;
+    if (has_tschchartseriesshowserieslabels()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesshowsymbol = 31;
+    if (has_tschchartseriesshowsymbol()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriesshowtrendline = 32;
+    if (has_tschchartseriesshowtrendline()) {
+      total_size += 2 + 1;
+    }
+
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    // optional bool tschchartseriesshowvaluelabels = 33;
+    if (has_tschchartseriesshowvaluelabels()) {
+      total_size += 2 + 1;
+    }
+
+    // optional int32 tschchartseriessizedimension = 34;
+    if (has_tschchartseriessizedimension()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriessizedimension());
+    }
+
+    // optional int32 tschchartseriessymboltype = 35;
+    if (has_tschchartseriessymboltype()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriessymboltype());
+    }
+
+    // optional float tschchartseriestrendlineequationoffsetx = 36;
+    if (has_tschchartseriestrendlineequationoffsetx()) {
+      total_size += 2 + 4;
+    }
+
+    // optional float tschchartseriestrendlineequationoffsety = 37;
+    if (has_tschchartseriestrendlineequationoffsety()) {
+      total_size += 2 + 4;
+    }
+
+    // optional string tschchartseriestrendlinelabelstring = 38;
+    if (has_tschchartseriestrendlinelabelstring()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->tschchartseriestrendlinelabelstring());
+    }
+
+    // optional int32 tschchartseriestrendlineorder = 39;
+    if (has_tschchartseriestrendlineorder()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriestrendlineorder());
+    }
+
+    // optional int32 tschchartseriestrendlineperiod = 40;
+    if (has_tschchartseriestrendlineperiod()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriestrendlineperiod());
+    }
+
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
+    // optional float tschchartseriestrendlinersquaredoffsetx = 41;
+    if (has_tschchartseriestrendlinersquaredoffsetx()) {
+      total_size += 2 + 4;
+    }
+
+    // optional float tschchartseriestrendlinersquaredoffsety = 42;
+    if (has_tschchartseriestrendlinersquaredoffsety()) {
+      total_size += 2 + 4;
+    }
+
+    // optional bool tschchartseriestrendlineshowequation = 43;
+    if (has_tschchartseriestrendlineshowequation()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriestrendlineshowlabel = 44;
+    if (has_tschchartseriestrendlineshowlabel()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriestrendlineshowr2value = 45;
+    if (has_tschchartseriestrendlineshowr2value()) {
+      total_size += 2 + 1;
+    }
+
+    // optional int32 tschchartseriestrendlinetype = 46;
+    if (has_tschchartseriestrendlinetype()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriestrendlinetype());
+    }
+
+    // optional float tschchartserieswedgeexplosion = 47;
+    if (has_tschchartserieswedgeexplosion()) {
+      total_size += 2 + 4;
+    }
+
+    // optional int32 tschchartseriesyaxisordinal = 48;
+    if (has_tschchartseriesyaxisordinal()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriesyaxisordinal());
+    }
+
+  }
+  if (_has_bits_[48 / 32] & (0xffu << (48 % 32))) {
+    // optional int32 tschchartseriesvaluelabelsaxis = 49;
+    if (has_tschchartseriesvaluelabelsaxis()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriesvaluelabelsaxis());
+    }
+
+    // optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+    if (has_tschchartserieserrorbarlineend()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarlineend());
+    }
+
+    // optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+    if (has_tschchartserieserrorbarlineendscatterx()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarlineendscatterx());
+    }
+
+    // optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+    if (has_tschchartserieserrorbarshadow()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarshadow());
+    }
+
+    // optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+    if (has_tschchartserieserrorbarstroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarstroke());
+    }
+
+    // optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+    if (has_tschchartserieserrorbarstrokescatterx()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartserieserrorbarstrokescatterx());
+    }
+
+    // optional .TSD.FillArchive tschchartseriesfill = 55;
+    if (has_tschchartseriesfill()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesfill());
+    }
+
+    // optional int32 tschchartserieslabelparagraphstyleindex = 56;
+    if (has_tschchartserieslabelparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartserieslabelparagraphstyleindex());
+    }
+
+  }
+  if (_has_bits_[56 / 32] & (0xffu << (56 % 32))) {
+    // optional float tschchartseriesopacity = 57;
+    if (has_tschchartseriesopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+    if (has_tschchartseriesoutsidelabelparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriesoutsidelabelparagraphstyleindex());
+    }
+
+    // optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+    if (has_tschchartseriesshadow()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesshadow());
+    }
+
+    // optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+    if (has_tschchartseriesstroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriesstroke());
+    }
+
+    // optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+    if (has_tschchartseriessymbolfill()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriessymbolfill());
+    }
+
+    // optional bool tschchartseriessymbolfilluseseriesfill = 62;
+    if (has_tschchartseriessymbolfilluseseriesfill()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+    if (has_tschchartseriessymbolfilluseseriesstroke()) {
+      total_size += 2 + 1;
+    }
+
+    // optional float tschchartseriessymbolsize = 64;
+    if (has_tschchartseriessymbolsize()) {
+      total_size += 2 + 4;
+    }
+
+  }
+  if (_has_bits_[64 / 32] & (0xffu << (64 % 32))) {
+    // optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+    if (has_tschchartseriessymbolstroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriessymbolstroke());
+    }
+
+    // optional float tschchartseriestrendlineequationopacity = 66;
+    if (has_tschchartseriestrendlineequationopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+    if (has_tschchartseriestrendlineequationparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriestrendlineequationparagraphstyleindex());
+    }
+
+    // optional float tschchartseriestrendlinersquaredopacity = 68;
+    if (has_tschchartseriestrendlinersquaredopacity()) {
+      total_size += 2 + 4;
+    }
+
+    // optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+    if (has_tschchartseriestrendlinersquaredparagraphstyleindex()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriestrendlinersquaredparagraphstyleindex());
+    }
+
+    // optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+    if (has_tschchartseriestrendlineshadow()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriestrendlineshadow());
+    }
+
+    // optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+    if (has_tschchartseriestrendlinestroke()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tschchartseriestrendlinestroke());
+    }
+
+    // optional int32 tschchartseriesvaluelabelposition = 72;
+    if (has_tschchartseriesvaluelabelposition()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->tschchartseriesvaluelabelposition());
+    }
+
+  }
+  if (_has_bits_[72 / 32] & (0xffu << (72 % 32))) {
+    // optional bool tschchartseriesshowlabelsinfront = 73;
+    if (has_tschchartseriesshowlabelsinfront()) {
+      total_size += 2 + 1;
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ChartSeriesGenericPropertyMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ChartSeriesGenericPropertyMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ChartSeriesGenericPropertyMapArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ChartSeriesGenericPropertyMapArchive::MergeFrom(const ChartSeriesGenericPropertyMapArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_tschchartseriesadjustmentscale()) {
+      set_tschchartseriesadjustmentscale(from.tschchartseriesadjustmentscale());
+    }
+    if (from.has_tschchartserieserrorbarcustomnegativedata()) {
+      mutable_tschchartserieserrorbarcustomnegativedata()->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::MergeFrom(from.tschchartserieserrorbarcustomnegativedata());
+    }
+    if (from.has_tschchartserieserrorbarcustomnegativedatascatterx()) {
+      mutable_tschchartserieserrorbarcustomnegativedatascatterx()->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::MergeFrom(from.tschchartserieserrorbarcustomnegativedatascatterx());
+    }
+    if (from.has_tschchartserieserrorbarcustompositivedata()) {
+      mutable_tschchartserieserrorbarcustompositivedata()->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::MergeFrom(from.tschchartserieserrorbarcustompositivedata());
+    }
+    if (from.has_tschchartserieserrorbarcustompositivedatascatterx()) {
+      mutable_tschchartserieserrorbarcustompositivedatascatterx()->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::MergeFrom(from.tschchartserieserrorbarcustompositivedatascatterx());
+    }
+    if (from.has_tschchartserieserrorbarfixedvalue()) {
+      set_tschchartserieserrorbarfixedvalue(from.tschchartserieserrorbarfixedvalue());
+    }
+    if (from.has_tschchartserieserrorbarfixedvaluescatterx()) {
+      set_tschchartserieserrorbarfixedvaluescatterx(from.tschchartserieserrorbarfixedvaluescatterx());
+    }
+    if (from.has_tschchartserieserrorbarpercentvalue()) {
+      set_tschchartserieserrorbarpercentvalue(from.tschchartserieserrorbarpercentvalue());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_tschchartserieserrorbarpercentvaluescatterx()) {
+      set_tschchartserieserrorbarpercentvaluescatterx(from.tschchartserieserrorbarpercentvaluescatterx());
+    }
+    if (from.has_tschchartserieserrorbarsetting()) {
+      set_tschchartserieserrorbarsetting(from.tschchartserieserrorbarsetting());
+    }
+    if (from.has_tschchartserieserrorbarsettingscatterx()) {
+      set_tschchartserieserrorbarsettingscatterx(from.tschchartserieserrorbarsettingscatterx());
+    }
+    if (from.has_tschchartserieserrorbarstddevvalue()) {
+      set_tschchartserieserrorbarstddevvalue(from.tschchartserieserrorbarstddevvalue());
+    }
+    if (from.has_tschchartserieserrorbarstddevvaluescatterx()) {
+      set_tschchartserieserrorbarstddevvaluescatterx(from.tschchartserieserrorbarstddevvaluescatterx());
+    }
+    if (from.has_tschchartserieserrorbartype()) {
+      set_tschchartserieserrorbartype(from.tschchartserieserrorbartype());
+    }
+    if (from.has_tschchartserieserrorbartypescatterx()) {
+      set_tschchartserieserrorbartypescatterx(from.tschchartserieserrorbartypescatterx());
+    }
+    if (from.has_tschchartserieslabelexplosion()) {
+      set_tschchartserieslabelexplosion(from.tschchartserieslabelexplosion());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_tschchartserieslinetype()) {
+      set_tschchartserieslinetype(from.tschchartserieslinetype());
+    }
+    if (from.has_tschchartseries1_0numberformat()) {
+      mutable_tschchartseries1_0numberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseries1_0numberformat());
+    }
+    if (from.has_tschchartseriesnumberformat()) {
+      mutable_tschchartseriesnumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesnumberformat());
+    }
+    if (from.has_tschchartseries1_0dateformat()) {
+      mutable_tschchartseries1_0dateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseries1_0dateformat());
+    }
+    if (from.has_tschchartseriesdurationformat()) {
+      mutable_tschchartseriesdurationformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdurationformat());
+    }
+    if (from.has_tschchartseriesdateformat()) {
+      mutable_tschchartseriesdateformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriesdateformat());
+    }
+    if (from.has_tschchartseriesnumberformattype()) {
+      set_tschchartseriesnumberformattype(from.tschchartseriesnumberformattype());
+    }
+    if (from.has_tschchartseriespercentnumberformat()) {
+      mutable_tschchartseriespercentnumberformat()->::TSK::FormatStructArchive::MergeFrom(from.tschchartseriespercentnumberformat());
+    }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (from.has_tschchartseriesseriestype()) {
+      set_tschchartseriesseriestype(from.tschchartseriesseriestype());
+    }
+    if (from.has_tschchartseriesshowerrorbar()) {
+      set_tschchartseriesshowerrorbar(from.tschchartseriesshowerrorbar());
+    }
+    if (from.has_tschchartseriesshowerrorbarscatterx()) {
+      set_tschchartseriesshowerrorbarscatterx(from.tschchartseriesshowerrorbarscatterx());
+    }
+    if (from.has_tschchartseriesshowline()) {
+      set_tschchartseriesshowline(from.tschchartseriesshowline());
+    }
+    if (from.has_tschchartseriesshownegativedata()) {
+      set_tschchartseriesshownegativedata(from.tschchartseriesshownegativedata());
+    }
+    if (from.has_tschchartseriesshowserieslabels()) {
+      set_tschchartseriesshowserieslabels(from.tschchartseriesshowserieslabels());
+    }
+    if (from.has_tschchartseriesshowsymbol()) {
+      set_tschchartseriesshowsymbol(from.tschchartseriesshowsymbol());
+    }
+    if (from.has_tschchartseriesshowtrendline()) {
+      set_tschchartseriesshowtrendline(from.tschchartseriesshowtrendline());
+    }
+  }
+  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    if (from.has_tschchartseriesshowvaluelabels()) {
+      set_tschchartseriesshowvaluelabels(from.tschchartseriesshowvaluelabels());
+    }
+    if (from.has_tschchartseriessizedimension()) {
+      set_tschchartseriessizedimension(from.tschchartseriessizedimension());
+    }
+    if (from.has_tschchartseriessymboltype()) {
+      set_tschchartseriessymboltype(from.tschchartseriessymboltype());
+    }
+    if (from.has_tschchartseriestrendlineequationoffsetx()) {
+      set_tschchartseriestrendlineequationoffsetx(from.tschchartseriestrendlineequationoffsetx());
+    }
+    if (from.has_tschchartseriestrendlineequationoffsety()) {
+      set_tschchartseriestrendlineequationoffsety(from.tschchartseriestrendlineequationoffsety());
+    }
+    if (from.has_tschchartseriestrendlinelabelstring()) {
+      set_tschchartseriestrendlinelabelstring(from.tschchartseriestrendlinelabelstring());
+    }
+    if (from.has_tschchartseriestrendlineorder()) {
+      set_tschchartseriestrendlineorder(from.tschchartseriestrendlineorder());
+    }
+    if (from.has_tschchartseriestrendlineperiod()) {
+      set_tschchartseriestrendlineperiod(from.tschchartseriestrendlineperiod());
+    }
+  }
+  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
+    if (from.has_tschchartseriestrendlinersquaredoffsetx()) {
+      set_tschchartseriestrendlinersquaredoffsetx(from.tschchartseriestrendlinersquaredoffsetx());
+    }
+    if (from.has_tschchartseriestrendlinersquaredoffsety()) {
+      set_tschchartseriestrendlinersquaredoffsety(from.tschchartseriestrendlinersquaredoffsety());
+    }
+    if (from.has_tschchartseriestrendlineshowequation()) {
+      set_tschchartseriestrendlineshowequation(from.tschchartseriestrendlineshowequation());
+    }
+    if (from.has_tschchartseriestrendlineshowlabel()) {
+      set_tschchartseriestrendlineshowlabel(from.tschchartseriestrendlineshowlabel());
+    }
+    if (from.has_tschchartseriestrendlineshowr2value()) {
+      set_tschchartseriestrendlineshowr2value(from.tschchartseriestrendlineshowr2value());
+    }
+    if (from.has_tschchartseriestrendlinetype()) {
+      set_tschchartseriestrendlinetype(from.tschchartseriestrendlinetype());
+    }
+    if (from.has_tschchartserieswedgeexplosion()) {
+      set_tschchartserieswedgeexplosion(from.tschchartserieswedgeexplosion());
+    }
+    if (from.has_tschchartseriesyaxisordinal()) {
+      set_tschchartseriesyaxisordinal(from.tschchartseriesyaxisordinal());
+    }
+  }
+  if (from._has_bits_[48 / 32] & (0xffu << (48 % 32))) {
+    if (from.has_tschchartseriesvaluelabelsaxis()) {
+      set_tschchartseriesvaluelabelsaxis(from.tschchartseriesvaluelabelsaxis());
+    }
+    if (from.has_tschchartserieserrorbarlineend()) {
+      mutable_tschchartserieserrorbarlineend()->::TSD::LineEndArchive::MergeFrom(from.tschchartserieserrorbarlineend());
+    }
+    if (from.has_tschchartserieserrorbarlineendscatterx()) {
+      mutable_tschchartserieserrorbarlineendscatterx()->::TSD::LineEndArchive::MergeFrom(from.tschchartserieserrorbarlineendscatterx());
+    }
+    if (from.has_tschchartserieserrorbarshadow()) {
+      mutable_tschchartserieserrorbarshadow()->::TSD::ShadowArchive::MergeFrom(from.tschchartserieserrorbarshadow());
+    }
+    if (from.has_tschchartserieserrorbarstroke()) {
+      mutable_tschchartserieserrorbarstroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartserieserrorbarstroke());
+    }
+    if (from.has_tschchartserieserrorbarstrokescatterx()) {
+      mutable_tschchartserieserrorbarstrokescatterx()->::TSD::StrokeArchive::MergeFrom(from.tschchartserieserrorbarstrokescatterx());
+    }
+    if (from.has_tschchartseriesfill()) {
+      mutable_tschchartseriesfill()->::TSD::FillArchive::MergeFrom(from.tschchartseriesfill());
+    }
+    if (from.has_tschchartserieslabelparagraphstyleindex()) {
+      set_tschchartserieslabelparagraphstyleindex(from.tschchartserieslabelparagraphstyleindex());
+    }
+  }
+  if (from._has_bits_[56 / 32] & (0xffu << (56 % 32))) {
+    if (from.has_tschchartseriesopacity()) {
+      set_tschchartseriesopacity(from.tschchartseriesopacity());
+    }
+    if (from.has_tschchartseriesoutsidelabelparagraphstyleindex()) {
+      set_tschchartseriesoutsidelabelparagraphstyleindex(from.tschchartseriesoutsidelabelparagraphstyleindex());
+    }
+    if (from.has_tschchartseriesshadow()) {
+      mutable_tschchartseriesshadow()->::TSD::ShadowArchive::MergeFrom(from.tschchartseriesshadow());
+    }
+    if (from.has_tschchartseriesstroke()) {
+      mutable_tschchartseriesstroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartseriesstroke());
+    }
+    if (from.has_tschchartseriessymbolfill()) {
+      mutable_tschchartseriessymbolfill()->::TSD::FillArchive::MergeFrom(from.tschchartseriessymbolfill());
+    }
+    if (from.has_tschchartseriessymbolfilluseseriesfill()) {
+      set_tschchartseriessymbolfilluseseriesfill(from.tschchartseriessymbolfilluseseriesfill());
+    }
+    if (from.has_tschchartseriessymbolfilluseseriesstroke()) {
+      set_tschchartseriessymbolfilluseseriesstroke(from.tschchartseriessymbolfilluseseriesstroke());
+    }
+    if (from.has_tschchartseriessymbolsize()) {
+      set_tschchartseriessymbolsize(from.tschchartseriessymbolsize());
+    }
+  }
+  if (from._has_bits_[64 / 32] & (0xffu << (64 % 32))) {
+    if (from.has_tschchartseriessymbolstroke()) {
+      mutable_tschchartseriessymbolstroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartseriessymbolstroke());
+    }
+    if (from.has_tschchartseriestrendlineequationopacity()) {
+      set_tschchartseriestrendlineequationopacity(from.tschchartseriestrendlineequationopacity());
+    }
+    if (from.has_tschchartseriestrendlineequationparagraphstyleindex()) {
+      set_tschchartseriestrendlineequationparagraphstyleindex(from.tschchartseriestrendlineequationparagraphstyleindex());
+    }
+    if (from.has_tschchartseriestrendlinersquaredopacity()) {
+      set_tschchartseriestrendlinersquaredopacity(from.tschchartseriestrendlinersquaredopacity());
+    }
+    if (from.has_tschchartseriestrendlinersquaredparagraphstyleindex()) {
+      set_tschchartseriestrendlinersquaredparagraphstyleindex(from.tschchartseriestrendlinersquaredparagraphstyleindex());
+    }
+    if (from.has_tschchartseriestrendlineshadow()) {
+      mutable_tschchartseriestrendlineshadow()->::TSD::ShadowArchive::MergeFrom(from.tschchartseriestrendlineshadow());
+    }
+    if (from.has_tschchartseriestrendlinestroke()) {
+      mutable_tschchartseriestrendlinestroke()->::TSD::StrokeArchive::MergeFrom(from.tschchartseriestrendlinestroke());
+    }
+    if (from.has_tschchartseriesvaluelabelposition()) {
+      set_tschchartseriesvaluelabelposition(from.tschchartseriesvaluelabelposition());
+    }
+  }
+  if (from._has_bits_[72 / 32] & (0xffu << (72 % 32))) {
+    if (from.has_tschchartseriesshowlabelsinfront()) {
+      set_tschchartseriesshowlabelsinfront(from.tschchartseriesshowlabelsinfront());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ChartSeriesGenericPropertyMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ChartSeriesGenericPropertyMapArchive::CopyFrom(const ChartSeriesGenericPropertyMapArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ChartSeriesGenericPropertyMapArchive::IsInitialized() const {
+
+  if (has_tschchartseries1_0numberformat()) {
+    if (!this->tschchartseries1_0numberformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesnumberformat()) {
+    if (!this->tschchartseriesnumberformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseries1_0dateformat()) {
+    if (!this->tschchartseries1_0dateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesdurationformat()) {
+    if (!this->tschchartseriesdurationformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesdateformat()) {
+    if (!this->tschchartseriesdateformat().IsInitialized()) return false;
+  }
+  if (has_tschchartseriespercentnumberformat()) {
+    if (!this->tschchartseriespercentnumberformat().IsInitialized()) return false;
+  }
+  if (has_tschchartserieserrorbarlineend()) {
+    if (!this->tschchartserieserrorbarlineend().IsInitialized()) return false;
+  }
+  if (has_tschchartserieserrorbarlineendscatterx()) {
+    if (!this->tschchartserieserrorbarlineendscatterx().IsInitialized()) return false;
+  }
+  if (has_tschchartserieserrorbarshadow()) {
+    if (!this->tschchartserieserrorbarshadow().IsInitialized()) return false;
+  }
+  if (has_tschchartserieserrorbarstroke()) {
+    if (!this->tschchartserieserrorbarstroke().IsInitialized()) return false;
+  }
+  if (has_tschchartserieserrorbarstrokescatterx()) {
+    if (!this->tschchartserieserrorbarstrokescatterx().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesfill()) {
+    if (!this->tschchartseriesfill().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesshadow()) {
+    if (!this->tschchartseriesshadow().IsInitialized()) return false;
+  }
+  if (has_tschchartseriesstroke()) {
+    if (!this->tschchartseriesstroke().IsInitialized()) return false;
+  }
+  if (has_tschchartseriessymbolfill()) {
+    if (!this->tschchartseriessymbolfill().IsInitialized()) return false;
+  }
+  if (has_tschchartseriessymbolstroke()) {
+    if (!this->tschchartseriessymbolstroke().IsInitialized()) return false;
+  }
+  if (has_tschchartseriestrendlineshadow()) {
+    if (!this->tschchartseriestrendlineshadow().IsInitialized()) return false;
+  }
+  if (has_tschchartseriestrendlinestroke()) {
+    if (!this->tschchartseriestrendlinestroke().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ChartSeriesGenericPropertyMapArchive::Swap(ChartSeriesGenericPropertyMapArchive* other) {
+  if (other != this) {
+    std::swap(tschchartseriesadjustmentscale_, other->tschchartseriesadjustmentscale_);
+    std::swap(tschchartserieserrorbarcustomnegativedata_, other->tschchartserieserrorbarcustomnegativedata_);
+    std::swap(tschchartserieserrorbarcustomnegativedatascatterx_, other->tschchartserieserrorbarcustomnegativedatascatterx_);
+    std::swap(tschchartserieserrorbarcustompositivedata_, other->tschchartserieserrorbarcustompositivedata_);
+    std::swap(tschchartserieserrorbarcustompositivedatascatterx_, other->tschchartserieserrorbarcustompositivedatascatterx_);
+    std::swap(tschchartserieserrorbarfixedvalue_, other->tschchartserieserrorbarfixedvalue_);
+    std::swap(tschchartserieserrorbarfixedvaluescatterx_, other->tschchartserieserrorbarfixedvaluescatterx_);
+    std::swap(tschchartserieserrorbarpercentvalue_, other->tschchartserieserrorbarpercentvalue_);
+    std::swap(tschchartserieserrorbarpercentvaluescatterx_, other->tschchartserieserrorbarpercentvaluescatterx_);
+    std::swap(tschchartserieserrorbarsetting_, other->tschchartserieserrorbarsetting_);
+    std::swap(tschchartserieserrorbarsettingscatterx_, other->tschchartserieserrorbarsettingscatterx_);
+    std::swap(tschchartserieserrorbarstddevvalue_, other->tschchartserieserrorbarstddevvalue_);
+    std::swap(tschchartserieserrorbarstddevvaluescatterx_, other->tschchartserieserrorbarstddevvaluescatterx_);
+    std::swap(tschchartserieserrorbartype_, other->tschchartserieserrorbartype_);
+    std::swap(tschchartserieserrorbartypescatterx_, other->tschchartserieserrorbartypescatterx_);
+    std::swap(tschchartserieslabelexplosion_, other->tschchartserieslabelexplosion_);
+    std::swap(tschchartserieslinetype_, other->tschchartserieslinetype_);
+    std::swap(tschchartseries1_0numberformat_, other->tschchartseries1_0numberformat_);
+    std::swap(tschchartseriesnumberformat_, other->tschchartseriesnumberformat_);
+    std::swap(tschchartseries1_0dateformat_, other->tschchartseries1_0dateformat_);
+    std::swap(tschchartseriesdurationformat_, other->tschchartseriesdurationformat_);
+    std::swap(tschchartseriesdateformat_, other->tschchartseriesdateformat_);
+    std::swap(tschchartseriesnumberformattype_, other->tschchartseriesnumberformattype_);
+    std::swap(tschchartseriespercentnumberformat_, other->tschchartseriespercentnumberformat_);
+    std::swap(tschchartseriesseriestype_, other->tschchartseriesseriestype_);
+    std::swap(tschchartseriesshowerrorbar_, other->tschchartseriesshowerrorbar_);
+    std::swap(tschchartseriesshowerrorbarscatterx_, other->tschchartseriesshowerrorbarscatterx_);
+    std::swap(tschchartseriesshowline_, other->tschchartseriesshowline_);
+    std::swap(tschchartseriesshownegativedata_, other->tschchartseriesshownegativedata_);
+    std::swap(tschchartseriesshowserieslabels_, other->tschchartseriesshowserieslabels_);
+    std::swap(tschchartseriesshowsymbol_, other->tschchartseriesshowsymbol_);
+    std::swap(tschchartseriesshowtrendline_, other->tschchartseriesshowtrendline_);
+    std::swap(tschchartseriesshowvaluelabels_, other->tschchartseriesshowvaluelabels_);
+    std::swap(tschchartseriessizedimension_, other->tschchartseriessizedimension_);
+    std::swap(tschchartseriessymboltype_, other->tschchartseriessymboltype_);
+    std::swap(tschchartseriestrendlineequationoffsetx_, other->tschchartseriestrendlineequationoffsetx_);
+    std::swap(tschchartseriestrendlineequationoffsety_, other->tschchartseriestrendlineequationoffsety_);
+    std::swap(tschchartseriestrendlinelabelstring_, other->tschchartseriestrendlinelabelstring_);
+    std::swap(tschchartseriestrendlineorder_, other->tschchartseriestrendlineorder_);
+    std::swap(tschchartseriestrendlineperiod_, other->tschchartseriestrendlineperiod_);
+    std::swap(tschchartseriestrendlinersquaredoffsetx_, other->tschchartseriestrendlinersquaredoffsetx_);
+    std::swap(tschchartseriestrendlinersquaredoffsety_, other->tschchartseriestrendlinersquaredoffsety_);
+    std::swap(tschchartseriestrendlineshowequation_, other->tschchartseriestrendlineshowequation_);
+    std::swap(tschchartseriestrendlineshowlabel_, other->tschchartseriestrendlineshowlabel_);
+    std::swap(tschchartseriestrendlineshowr2value_, other->tschchartseriestrendlineshowr2value_);
+    std::swap(tschchartseriestrendlinetype_, other->tschchartseriestrendlinetype_);
+    std::swap(tschchartserieswedgeexplosion_, other->tschchartserieswedgeexplosion_);
+    std::swap(tschchartseriesyaxisordinal_, other->tschchartseriesyaxisordinal_);
+    std::swap(tschchartseriesvaluelabelsaxis_, other->tschchartseriesvaluelabelsaxis_);
+    std::swap(tschchartserieserrorbarlineend_, other->tschchartserieserrorbarlineend_);
+    std::swap(tschchartserieserrorbarlineendscatterx_, other->tschchartserieserrorbarlineendscatterx_);
+    std::swap(tschchartserieserrorbarshadow_, other->tschchartserieserrorbarshadow_);
+    std::swap(tschchartserieserrorbarstroke_, other->tschchartserieserrorbarstroke_);
+    std::swap(tschchartserieserrorbarstrokescatterx_, other->tschchartserieserrorbarstrokescatterx_);
+    std::swap(tschchartseriesfill_, other->tschchartseriesfill_);
+    std::swap(tschchartserieslabelparagraphstyleindex_, other->tschchartserieslabelparagraphstyleindex_);
+    std::swap(tschchartseriesopacity_, other->tschchartseriesopacity_);
+    std::swap(tschchartseriesoutsidelabelparagraphstyleindex_, other->tschchartseriesoutsidelabelparagraphstyleindex_);
+    std::swap(tschchartseriesshadow_, other->tschchartseriesshadow_);
+    std::swap(tschchartseriesstroke_, other->tschchartseriesstroke_);
+    std::swap(tschchartseriessymbolfill_, other->tschchartseriessymbolfill_);
+    std::swap(tschchartseriessymbolfilluseseriesfill_, other->tschchartseriessymbolfilluseseriesfill_);
+    std::swap(tschchartseriessymbolfilluseseriesstroke_, other->tschchartseriessymbolfilluseseriesstroke_);
+    std::swap(tschchartseriessymbolsize_, other->tschchartseriessymbolsize_);
+    std::swap(tschchartseriessymbolstroke_, other->tschchartseriessymbolstroke_);
+    std::swap(tschchartseriestrendlineequationopacity_, other->tschchartseriestrendlineequationopacity_);
+    std::swap(tschchartseriestrendlineequationparagraphstyleindex_, other->tschchartseriestrendlineequationparagraphstyleindex_);
+    std::swap(tschchartseriestrendlinersquaredopacity_, other->tschchartseriestrendlinersquaredopacity_);
+    std::swap(tschchartseriestrendlinersquaredparagraphstyleindex_, other->tschchartseriestrendlinersquaredparagraphstyleindex_);
+    std::swap(tschchartseriestrendlineshadow_, other->tschchartseriestrendlineshadow_);
+    std::swap(tschchartseriestrendlinestroke_, other->tschchartseriestrendlinestroke_);
+    std::swap(tschchartseriesvaluelabelposition_, other->tschchartseriesvaluelabelposition_);
+    std::swap(tschchartseriesshowlabelsinfront_, other->tschchartseriesshowlabelsinfront_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    std::swap(_has_bits_[1], other->_has_bits_[1]);
+    std::swap(_has_bits_[2], other->_has_bits_[2]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ChartSeriesGenericPropertyMapArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ChartSeriesGenericPropertyMapArchive_descriptor_;
+  metadata.reflection = ChartSeriesGenericPropertyMapArchive_reflection_;
+  return metadata;
+}
+
+
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace Generated
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.h
index 6696bdd..57e1715 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.GEN.pb.h
@@ -48,6 +48,10 @@ class ChartAxisStyleArchive;
 class ChartAxisNonStyleArchive;
 class ChartSeriesStyleArchive;
 class ChartSeriesNonStyleArchive;
+class ChartGenericPropertyMapArchive;
+class LegendGenericPropertyMapArchive;
+class ChartAxisGenericPropertyMapArchive;
+class ChartSeriesGenericPropertyMapArchive;
 
 // ===================================================================
 
@@ -1413,15 +1417,51 @@ class ChartAxisNonStyleArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::int32 tschchartaxisdefault3dlabelposition() const;
   inline void set_tschchartaxisdefault3dlabelposition(::google::protobuf::int32 value);
 
-  // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
+  // optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
+  inline bool has_tschchartaxisdefault1_0numberformat() const;
+  inline void clear_tschchartaxisdefault1_0numberformat();
+  static const int kTschchartaxisdefault10NumberformatFieldNumber = 2;
+  inline const ::TSK::FormatStructArchive& tschchartaxisdefault1_0numberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisdefault1_0numberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisdefault1_0numberformat();
+  inline void set_allocated_tschchartaxisdefault1_0numberformat(::TSK::FormatStructArchive* tschchartaxisdefault1_0numberformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
   inline bool has_tschchartaxisdefaultnumberformat() const;
   inline void clear_tschchartaxisdefaultnumberformat();
-  static const int kTschchartaxisdefaultnumberformatFieldNumber = 2;
+  static const int kTschchartaxisdefaultnumberformatFieldNumber = 42;
   inline const ::TSK::FormatStructArchive& tschchartaxisdefaultnumberformat() const;
   inline ::TSK::FormatStructArchive* mutable_tschchartaxisdefaultnumberformat();
   inline ::TSK::FormatStructArchive* release_tschchartaxisdefaultnumberformat();
   inline void set_allocated_tschchartaxisdefaultnumberformat(::TSK::FormatStructArchive* tschchartaxisdefaultnumberformat);
 
+  // optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+  inline bool has_tschchartaxisdefault1_0dateformat() const;
+  inline void clear_tschchartaxisdefault1_0dateformat();
+  static const int kTschchartaxisdefault10DateformatFieldNumber = 20;
+  inline const ::TSK::FormatStructArchive& tschchartaxisdefault1_0dateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisdefault1_0dateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisdefault1_0dateformat();
+  inline void set_allocated_tschchartaxisdefault1_0dateformat(::TSK::FormatStructArchive* tschchartaxisdefault1_0dateformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+  inline bool has_tschchartaxisdefaultdurationformat() const;
+  inline void clear_tschchartaxisdefaultdurationformat();
+  static const int kTschchartaxisdefaultdurationformatFieldNumber = 21;
+  inline const ::TSK::FormatStructArchive& tschchartaxisdefaultdurationformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisdefaultdurationformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisdefaultdurationformat();
+  inline void set_allocated_tschchartaxisdefaultdurationformat(::TSK::FormatStructArchive* tschchartaxisdefaultdurationformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
+  inline bool has_tschchartaxisdefaultdateformat() const;
+  inline void clear_tschchartaxisdefaultdateformat();
+  static const int kTschchartaxisdefaultdateformatFieldNumber = 22;
+  inline const ::TSK::FormatStructArchive& tschchartaxisdefaultdateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisdefaultdateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisdefaultdateformat();
+  inline void set_allocated_tschchartaxisdefaultdateformat(::TSK::FormatStructArchive* tschchartaxisdefaultdateformat);
+
   // optional int32 tschchartaxisdefaultnumberformattype = 3;
   inline bool has_tschchartaxisdefaultnumberformattype() const;
   inline void clear_tschchartaxisdefaultnumberformattype();
@@ -1563,8 +1603,16 @@ class ChartAxisNonStyleArchive : public ::google::protobuf::Message {
  private:
   inline void set_has_tschchartaxisdefault3dlabelposition();
   inline void clear_has_tschchartaxisdefault3dlabelposition();
+  inline void set_has_tschchartaxisdefault1_0numberformat();
+  inline void clear_has_tschchartaxisdefault1_0numberformat();
   inline void set_has_tschchartaxisdefaultnumberformat();
   inline void clear_has_tschchartaxisdefaultnumberformat();
+  inline void set_has_tschchartaxisdefault1_0dateformat();
+  inline void clear_has_tschchartaxisdefault1_0dateformat();
+  inline void set_has_tschchartaxisdefaultdurationformat();
+  inline void clear_has_tschchartaxisdefaultdurationformat();
+  inline void set_has_tschchartaxisdefaultdateformat();
+  inline void clear_has_tschchartaxisdefaultdateformat();
   inline void set_has_tschchartaxisdefaultnumberformattype();
   inline void clear_has_tschchartaxisdefaultnumberformattype();
   inline void set_has_tschchartaxisvaluenumberofdecades();
@@ -1602,9 +1650,13 @@ class ChartAxisNonStyleArchive : public ::google::protobuf::Message {
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
+  ::TSK::FormatStructArchive* tschchartaxisdefault1_0numberformat_;
   ::TSK::FormatStructArchive* tschchartaxisdefaultnumberformat_;
+  ::TSK::FormatStructArchive* tschchartaxisdefault1_0dateformat_;
   ::google::protobuf::int32 tschchartaxisdefault3dlabelposition_;
   ::google::protobuf::int32 tschchartaxisdefaultnumberformattype_;
+  ::TSK::FormatStructArchive* tschchartaxisdefaultdurationformat_;
+  ::TSK::FormatStructArchive* tschchartaxisdefaultdateformat_;
   ::google::protobuf::int32 tschchartaxisvaluenumberofdecades_;
   ::google::protobuf::int32 tschchartaxisvaluenumberofmajorgridlines_;
   ::google::protobuf::int32 tschchartaxisvaluenumberofminorgridlines_;
@@ -1623,7 +1675,7 @@ class ChartAxisNonStyleArchive : public ::google::protobuf::Message {
   ::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisdefaultusermin_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(19 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(23 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
   friend void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto();
@@ -2992,19 +3044,64 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::int32 tschchartseriesscatterlinetype() const;
   inline void set_tschchartseriesscatterlinetype(::google::protobuf::int32 value);
 
-  // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
+  // optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
+  inline bool has_tschchartseriesdefault1_0numberformat() const;
+  inline void clear_tschchartseriesdefault1_0numberformat();
+  static const int kTschchartseriesdefault10NumberformatFieldNumber = 21;
+  inline const ::TSK::FormatStructArchive& tschchartseriesdefault1_0numberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesdefault1_0numberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesdefault1_0numberformat();
+  inline void set_allocated_tschchartseriesdefault1_0numberformat(::TSK::FormatStructArchive* tschchartseriesdefault1_0numberformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
   inline bool has_tschchartseriesdefaultnumberformat() const;
   inline void clear_tschchartseriesdefaultnumberformat();
-  static const int kTschchartseriesdefaultnumberformatFieldNumber = 21;
+  static const int kTschchartseriesdefaultnumberformatFieldNumber = 98;
   inline const ::TSK::FormatStructArchive& tschchartseriesdefaultnumberformat() const;
   inline ::TSK::FormatStructArchive* mutable_tschchartseriesdefaultnumberformat();
   inline ::TSK::FormatStructArchive* release_tschchartseriesdefaultnumberformat();
   inline void set_allocated_tschchartseriesdefaultnumberformat(::TSK::FormatStructArchive* tschchartseriesdefaultnumberformat);
 
-  // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
+  // optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+  inline bool has_tschchartseriesdefault1_0dateformat() const;
+  inline void clear_tschchartseriesdefault1_0dateformat();
+  static const int kTschchartseriesdefault10DateformatFieldNumber = 69;
+  inline const ::TSK::FormatStructArchive& tschchartseriesdefault1_0dateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesdefault1_0dateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesdefault1_0dateformat();
+  inline void set_allocated_tschchartseriesdefault1_0dateformat(::TSK::FormatStructArchive* tschchartseriesdefault1_0dateformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+  inline bool has_tschchartseriesdefaultdurationformat() const;
+  inline void clear_tschchartseriesdefaultdurationformat();
+  static const int kTschchartseriesdefaultdurationformatFieldNumber = 70;
+  inline const ::TSK::FormatStructArchive& tschchartseriesdefaultdurationformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesdefaultdurationformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesdefaultdurationformat();
+  inline void set_allocated_tschchartseriesdefaultdurationformat(::TSK::FormatStructArchive* tschchartseriesdefaultdurationformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+  inline bool has_tschchartseriesdefaultdateformat() const;
+  inline void clear_tschchartseriesdefaultdateformat();
+  static const int kTschchartseriesdefaultdateformatFieldNumber = 71;
+  inline const ::TSK::FormatStructArchive& tschchartseriesdefaultdateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesdefaultdateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesdefaultdateformat();
+  inline void set_allocated_tschchartseriesdefaultdateformat(::TSK::FormatStructArchive* tschchartseriesdefaultdateformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
+  inline bool has_tschchartseriespie1_0numberformat() const;
+  inline void clear_tschchartseriespie1_0numberformat();
+  static const int kTschchartseriespie10NumberformatFieldNumber = 22;
+  inline const ::TSK::FormatStructArchive& tschchartseriespie1_0numberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriespie1_0numberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriespie1_0numberformat();
+  inline void set_allocated_tschchartseriespie1_0numberformat(::TSK::FormatStructArchive* tschchartseriespie1_0numberformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
   inline bool has_tschchartseriespienumberformat() const;
   inline void clear_tschchartseriespienumberformat();
-  static const int kTschchartseriespienumberformatFieldNumber = 22;
+  static const int kTschchartseriespienumberformatFieldNumber = 99;
   inline const ::TSK::FormatStructArchive& tschchartseriespienumberformat() const;
   inline ::TSK::FormatStructArchive* mutable_tschchartseriespienumberformat();
   inline ::TSK::FormatStructArchive* release_tschchartseriespienumberformat();
@@ -3339,6 +3436,20 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::int32 tschchartseriesscattervaluelabelsaxis() const;
   inline void set_tschchartseriesscattervaluelabelsaxis(::google::protobuf::int32 value);
 
+  // optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+  inline bool has_tschchartseriesdefaultshowlabelsinfront() const;
+  inline void clear_tschchartseriesdefaultshowlabelsinfront();
+  static const int kTschchartseriesdefaultshowlabelsinfrontFieldNumber = 100;
+  inline bool tschchartseriesdefaultshowlabelsinfront() const;
+  inline void set_tschchartseriesdefaultshowlabelsinfront(bool value);
+
+  // optional bool tschchartseriesbubbleshowlabelsinfront = 101;
+  inline bool has_tschchartseriesbubbleshowlabelsinfront() const;
+  inline void clear_tschchartseriesbubbleshowlabelsinfront();
+  static const int kTschchartseriesbubbleshowlabelsinfrontFieldNumber = 101;
+  inline bool tschchartseriesbubbleshowlabelsinfront() const;
+  inline void set_tschchartseriesbubbleshowlabelsinfront(bool value);
+
   static const int kCurrentFieldNumber = 10000;
   static ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartSeriesNonStyleArchive,
       ::google::protobuf::internal::MessageTypeTraits< ::TSCH::Generated::ChartSeriesNonStyleArchive >, 11, false >
@@ -3385,8 +3496,18 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   inline void clear_has_tschchartseriesmixedlinelinetype();
   inline void set_has_tschchartseriesscatterlinetype();
   inline void clear_has_tschchartseriesscatterlinetype();
+  inline void set_has_tschchartseriesdefault1_0numberformat();
+  inline void clear_has_tschchartseriesdefault1_0numberformat();
   inline void set_has_tschchartseriesdefaultnumberformat();
   inline void clear_has_tschchartseriesdefaultnumberformat();
+  inline void set_has_tschchartseriesdefault1_0dateformat();
+  inline void clear_has_tschchartseriesdefault1_0dateformat();
+  inline void set_has_tschchartseriesdefaultdurationformat();
+  inline void clear_has_tschchartseriesdefaultdurationformat();
+  inline void set_has_tschchartseriesdefaultdateformat();
+  inline void clear_has_tschchartseriesdefaultdateformat();
+  inline void set_has_tschchartseriespie1_0numberformat();
+  inline void clear_has_tschchartseriespie1_0numberformat();
   inline void set_has_tschchartseriespienumberformat();
   inline void clear_has_tschchartseriespienumberformat();
   inline void set_has_tschchartseriesdefaultnumberformattype();
@@ -3481,6 +3602,10 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   inline void clear_has_tschchartseriesscattershowserieslabels();
   inline void set_has_tschchartseriesscattervaluelabelsaxis();
   inline void clear_has_tschchartseriesscattervaluelabelsaxis();
+  inline void set_has_tschchartseriesdefaultshowlabelsinfront();
+  inline void clear_has_tschchartseriesdefaultshowlabelsinfront();
+  inline void set_has_tschchartseriesbubbleshowlabelsinfront();
+  inline void clear_has_tschchartseriesbubbleshowlabelsinfront();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -3504,7 +3629,12 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   ::google::protobuf::int32 tschchartserieslinelinetype_;
   ::google::protobuf::int32 tschchartseriesmixedlinelinetype_;
   ::google::protobuf::int32 tschchartseriesscatterlinetype_;
+  ::TSK::FormatStructArchive* tschchartseriesdefault1_0numberformat_;
   ::TSK::FormatStructArchive* tschchartseriesdefaultnumberformat_;
+  ::TSK::FormatStructArchive* tschchartseriesdefault1_0dateformat_;
+  ::TSK::FormatStructArchive* tschchartseriesdefaultdurationformat_;
+  ::TSK::FormatStructArchive* tschchartseriesdefaultdateformat_;
+  ::TSK::FormatStructArchive* tschchartseriespie1_0numberformat_;
   ::TSK::FormatStructArchive* tschchartseriespienumberformat_;
   ::google::protobuf::int32 tschchartseriesdefaultnumberformattype_;
   ::google::protobuf::int32 tschchartseriespienumberformattype_;
@@ -3552,9 +3682,11 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   ::google::protobuf::int32 tschchartseriesdefaultyaxisordinal_;
   ::google::protobuf::int32 tschchartseriesbubblevaluelabelsaxis_;
   ::google::protobuf::int32 tschchartseriesscattervaluelabelsaxis_;
+  bool tschchartseriesdefaultshowlabelsinfront_;
+  bool tschchartseriesbubbleshowlabelsinfront_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(68 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(75 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
   friend void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto();
@@ -3563,6 +3695,1863 @@ class ChartSeriesNonStyleArchive : public ::google::protobuf::Message {
   void InitAsDefaultInstance();
   static ChartSeriesNonStyleArchive* default_instance_;
 };
+// -------------------------------------------------------------------
+
+class ChartGenericPropertyMapArchive : public ::google::protobuf::Message {
+ public:
+  ChartGenericPropertyMapArchive();
+  virtual ~ChartGenericPropertyMapArchive();
+
+  ChartGenericPropertyMapArchive(const ChartGenericPropertyMapArchive& from);
+
+  inline ChartGenericPropertyMapArchive& operator=(const ChartGenericPropertyMapArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ChartGenericPropertyMapArchive& default_instance();
+
+  void Swap(ChartGenericPropertyMapArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ChartGenericPropertyMapArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ChartGenericPropertyMapArchive& from);
+  void MergeFrom(const ChartGenericPropertyMapArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional int32 tschchartinfo3dbarshape = 1;
+  inline bool has_tschchartinfo3dbarshape() const;
+  inline void clear_tschchartinfo3dbarshape();
+  static const int kTschchartinfo3DbarshapeFieldNumber = 1;
+  inline ::google::protobuf::int32 tschchartinfo3dbarshape() const;
+  inline void set_tschchartinfo3dbarshape(::google::protobuf::int32 value);
+
+  // optional bool tschchartinfo3dbeveledges = 2;
+  inline bool has_tschchartinfo3dbeveledges() const;
+  inline void clear_tschchartinfo3dbeveledges();
+  static const int kTschchartinfo3DbeveledgesFieldNumber = 2;
+  inline bool tschchartinfo3dbeveledges() const;
+  inline void set_tschchartinfo3dbeveledges(bool value);
+
+  // optional float tschchartinfo3dintersetdepthgap = 3;
+  inline bool has_tschchartinfo3dintersetdepthgap() const;
+  inline void clear_tschchartinfo3dintersetdepthgap();
+  static const int kTschchartinfo3DintersetdepthgapFieldNumber = 3;
+  inline float tschchartinfo3dintersetdepthgap() const;
+  inline void set_tschchartinfo3dintersetdepthgap(float value);
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+  inline bool has_tschchartinfo3drotation() const;
+  inline void clear_tschchartinfo3drotation();
+  static const int kTschchartinfo3DrotationFieldNumber = 4;
+  inline const ::TSCH::Chart3DVectorArchive& tschchartinfo3drotation() const;
+  inline ::TSCH::Chart3DVectorArchive* mutable_tschchartinfo3drotation();
+  inline ::TSCH::Chart3DVectorArchive* release_tschchartinfo3drotation();
+  inline void set_allocated_tschchartinfo3drotation(::TSCH::Chart3DVectorArchive* tschchartinfo3drotation);
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+  inline bool has_tschchartinfo3dscale() const;
+  inline void clear_tschchartinfo3dscale();
+  static const int kTschchartinfo3DscaleFieldNumber = 5;
+  inline const ::TSCH::Chart3DVectorArchive& tschchartinfo3dscale() const;
+  inline ::TSCH::Chart3DVectorArchive* mutable_tschchartinfo3dscale();
+  inline ::TSCH::Chart3DVectorArchive* release_tschchartinfo3dscale();
+  inline void set_allocated_tschchartinfo3dscale(::TSCH::Chart3DVectorArchive* tschchartinfo3dscale);
+
+  // optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+  inline bool has_tschchartinfo3dviewport() const;
+  inline void clear_tschchartinfo3dviewport();
+  static const int kTschchartinfo3DviewportFieldNumber = 6;
+  inline const ::TSCH::Chart3DVectorArchive& tschchartinfo3dviewport() const;
+  inline ::TSCH::Chart3DVectorArchive* mutable_tschchartinfo3dviewport();
+  inline ::TSCH::Chart3DVectorArchive* release_tschchartinfo3dviewport();
+  inline void set_allocated_tschchartinfo3dviewport(::TSCH::Chart3DVectorArchive* tschchartinfo3dviewport);
+
+  // optional float tschchartinfopiestartangle = 7;
+  inline bool has_tschchartinfopiestartangle() const;
+  inline void clear_tschchartinfopiestartangle();
+  static const int kTschchartinfopiestartangleFieldNumber = 7;
+  inline float tschchartinfopiestartangle() const;
+  inline void set_tschchartinfopiestartangle(float value);
+
+  // optional bool tschchartinfoshowlegend = 8;
+  inline bool has_tschchartinfoshowlegend() const;
+  inline void clear_tschchartinfoshowlegend();
+  static const int kTschchartinfoshowlegendFieldNumber = 8;
+  inline bool tschchartinfoshowlegend() const;
+  inline void set_tschchartinfoshowlegend(bool value);
+
+  // optional bool tschchartinfoshowtitle = 9;
+  inline bool has_tschchartinfoshowtitle() const;
+  inline void clear_tschchartinfoshowtitle();
+  static const int kTschchartinfoshowtitleFieldNumber = 9;
+  inline bool tschchartinfoshowtitle() const;
+  inline void set_tschchartinfoshowtitle(bool value);
+
+  // optional bool tschchartinfoskiphiddendata = 10;
+  inline bool has_tschchartinfoskiphiddendata() const;
+  inline void clear_tschchartinfoskiphiddendata();
+  static const int kTschchartinfoskiphiddendataFieldNumber = 10;
+  inline bool tschchartinfoskiphiddendata() const;
+  inline void set_tschchartinfoskiphiddendata(bool value);
+
+  // optional string tschchartinfotitle = 11;
+  inline bool has_tschchartinfotitle() const;
+  inline void clear_tschchartinfotitle();
+  static const int kTschchartinfotitleFieldNumber = 11;
+  inline const ::std::string& tschchartinfotitle() const;
+  inline void set_tschchartinfotitle(const ::std::string& value);
+  inline void set_tschchartinfotitle(const char* value);
+  inline void set_tschchartinfotitle(const char* value, size_t size);
+  inline ::std::string* mutable_tschchartinfotitle();
+  inline ::std::string* release_tschchartinfotitle();
+  inline void set_allocated_tschchartinfotitle(::std::string* tschchartinfotitle);
+
+  // optional int32 tschchartinfodatasetnamelocation = 12;
+  inline bool has_tschchartinfodatasetnamelocation() const;
+  inline void clear_tschchartinfodatasetnamelocation();
+  static const int kTschchartinfodatasetnamelocationFieldNumber = 12;
+  inline ::google::protobuf::int32 tschchartinfodatasetnamelocation() const;
+  inline void set_tschchartinfodatasetnamelocation(::google::protobuf::int32 value);
+
+  // optional int32 tschchartinfomultidatacontroltype = 13;
+  inline bool has_tschchartinfomultidatacontroltype() const;
+  inline void clear_tschchartinfomultidatacontroltype();
+  static const int kTschchartinfomultidatacontroltypeFieldNumber = 13;
+  inline ::google::protobuf::int32 tschchartinfomultidatacontroltype() const;
+  inline void set_tschchartinfomultidatacontroltype(::google::protobuf::int32 value);
+
+  // optional float tschchartinfo3dchartopacity = 14;
+  inline bool has_tschchartinfo3dchartopacity() const;
+  inline void clear_tschchartinfo3dchartopacity();
+  static const int kTschchartinfo3DchartopacityFieldNumber = 14;
+  inline float tschchartinfo3dchartopacity() const;
+  inline void set_tschchartinfo3dchartopacity(float value);
+
+  // optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+  inline bool has_tschchartinfo3dlightingpackage() const;
+  inline void clear_tschchartinfo3dlightingpackage();
+  static const int kTschchartinfo3DlightingpackageFieldNumber = 15;
+  inline const ::TSCH::Chart3DLightingPackageArchive& tschchartinfo3dlightingpackage() const;
+  inline ::TSCH::Chart3DLightingPackageArchive* mutable_tschchartinfo3dlightingpackage();
+  inline ::TSCH::Chart3DLightingPackageArchive* release_tschchartinfo3dlightingpackage();
+  inline void set_allocated_tschchartinfo3dlightingpackage(::TSCH::Chart3DLightingPackageArchive* tschchartinfo3dlightingpackage);
+
+  // optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+  inline bool has_tschchartinfobackgroundfill() const;
+  inline void clear_tschchartinfobackgroundfill();
+  static const int kTschchartinfobackgroundfillFieldNumber = 16;
+  inline const ::TSD::FillArchive& tschchartinfobackgroundfill() const;
+  inline ::TSD::FillArchive* mutable_tschchartinfobackgroundfill();
+  inline ::TSD::FillArchive* release_tschchartinfobackgroundfill();
+  inline void set_allocated_tschchartinfobackgroundfill(::TSD::FillArchive* tschchartinfobackgroundfill);
+
+  // optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+  inline bool has_tschchartinfobackgroundstroke() const;
+  inline void clear_tschchartinfobackgroundstroke();
+  static const int kTschchartinfobackgroundstrokeFieldNumber = 17;
+  inline const ::TSD::StrokeArchive& tschchartinfobackgroundstroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartinfobackgroundstroke();
+  inline ::TSD::StrokeArchive* release_tschchartinfobackgroundstroke();
+  inline void set_allocated_tschchartinfobackgroundstroke(::TSD::StrokeArchive* tschchartinfobackgroundstroke);
+
+  // optional float tschchartinfoborderopacity = 18;
+  inline bool has_tschchartinfoborderopacity() const;
+  inline void clear_tschchartinfoborderopacity();
+  static const int kTschchartinfoborderopacityFieldNumber = 18;
+  inline float tschchartinfoborderopacity() const;
+  inline void set_tschchartinfoborderopacity(float value);
+
+  // optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+  inline bool has_tschchartinfobordershadow() const;
+  inline void clear_tschchartinfobordershadow();
+  static const int kTschchartinfobordershadowFieldNumber = 19;
+  inline const ::TSD::ShadowArchive& tschchartinfobordershadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschchartinfobordershadow();
+  inline ::TSD::ShadowArchive* release_tschchartinfobordershadow();
+  inline void set_allocated_tschchartinfobordershadow(::TSD::ShadowArchive* tschchartinfobordershadow);
+
+  // optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+  inline bool has_tschchartinfoborderstroke() const;
+  inline void clear_tschchartinfoborderstroke();
+  static const int kTschchartinfoborderstrokeFieldNumber = 20;
+  inline const ::TSD::StrokeArchive& tschchartinfoborderstroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartinfoborderstroke();
+  inline ::TSD::StrokeArchive* release_tschchartinfoborderstroke();
+  inline void set_allocated_tschchartinfoborderstroke(::TSD::StrokeArchive* tschchartinfoborderstroke);
+
+  // optional bool tschchartinfocombinelayers = 21;
+  inline bool has_tschchartinfocombinelayers() const;
+  inline void clear_tschchartinfocombinelayers();
+  static const int kTschchartinfocombinelayersFieldNumber = 21;
+  inline bool tschchartinfocombinelayers() const;
+  inline void set_tschchartinfocombinelayers(bool value);
+
+  // optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+  inline bool has_tschchartinfogridbackgroundfill() const;
+  inline void clear_tschchartinfogridbackgroundfill();
+  static const int kTschchartinfogridbackgroundfillFieldNumber = 22;
+  inline const ::TSD::FillArchive& tschchartinfogridbackgroundfill() const;
+  inline ::TSD::FillArchive* mutable_tschchartinfogridbackgroundfill();
+  inline ::TSD::FillArchive* release_tschchartinfogridbackgroundfill();
+  inline void set_allocated_tschchartinfogridbackgroundfill(::TSD::FillArchive* tschchartinfogridbackgroundfill);
+
+  // optional float tschchartinfogridbackgroundopacity = 23;
+  inline bool has_tschchartinfogridbackgroundopacity() const;
+  inline void clear_tschchartinfogridbackgroundopacity();
+  static const int kTschchartinfogridbackgroundopacityFieldNumber = 23;
+  inline float tschchartinfogridbackgroundopacity() const;
+  inline void set_tschchartinfogridbackgroundopacity(float value);
+
+  // optional float tschchartinfointerbargap = 24;
+  inline bool has_tschchartinfointerbargap() const;
+  inline void clear_tschchartinfointerbargap();
+  static const int kTschchartinfointerbargapFieldNumber = 24;
+  inline float tschchartinfointerbargap() const;
+  inline void set_tschchartinfointerbargap(float value);
+
+  // optional float tschchartinfointersetgap = 25;
+  inline bool has_tschchartinfointersetgap() const;
+  inline void clear_tschchartinfointersetgap();
+  static const int kTschchartinfointersetgapFieldNumber = 25;
+  inline float tschchartinfointersetgap() const;
+  inline void set_tschchartinfointersetgap(float value);
+
+  // optional bool tschchartinfoshowborder = 26;
+  inline bool has_tschchartinfoshowborder() const;
+  inline void clear_tschchartinfoshowborder();
+  static const int kTschchartinfoshowborderFieldNumber = 26;
+  inline bool tschchartinfoshowborder() const;
+  inline void set_tschchartinfoshowborder(bool value);
+
+  // optional .TSP.Color tschchartinfotitlecolor = 27;
+  inline bool has_tschchartinfotitlecolor() const;
+  inline void clear_tschchartinfotitlecolor();
+  static const int kTschchartinfotitlecolorFieldNumber = 27;
+  inline const ::TSP::Color& tschchartinfotitlecolor() const;
+  inline ::TSP::Color* mutable_tschchartinfotitlecolor();
+  inline ::TSP::Color* release_tschchartinfotitlecolor();
+  inline void set_allocated_tschchartinfotitlecolor(::TSP::Color* tschchartinfotitlecolor);
+
+  // optional int32 tschchartinfotitleparagraphstyleindex = 28;
+  inline bool has_tschchartinfotitleparagraphstyleindex() const;
+  inline void clear_tschchartinfotitleparagraphstyleindex();
+  static const int kTschchartinfotitleparagraphstyleindexFieldNumber = 28;
+  inline ::google::protobuf::int32 tschchartinfotitleparagraphstyleindex() const;
+  inline void set_tschchartinfotitleparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+  inline bool has_tschchartinfodatasetnameparagraphstyleindex() const;
+  inline void clear_tschchartinfodatasetnameparagraphstyleindex();
+  static const int kTschchartinfodatasetnameparagraphstyleindexFieldNumber = 29;
+  inline ::google::protobuf::int32 tschchartinfodatasetnameparagraphstyleindex() const;
+  inline void set_tschchartinfodatasetnameparagraphstyleindex(::google::protobuf::int32 value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.Generated.ChartGenericPropertyMapArchive)
+ private:
+  inline void set_has_tschchartinfo3dbarshape();
+  inline void clear_has_tschchartinfo3dbarshape();
+  inline void set_has_tschchartinfo3dbeveledges();
+  inline void clear_has_tschchartinfo3dbeveledges();
+  inline void set_has_tschchartinfo3dintersetdepthgap();
+  inline void clear_has_tschchartinfo3dintersetdepthgap();
+  inline void set_has_tschchartinfo3drotation();
+  inline void clear_has_tschchartinfo3drotation();
+  inline void set_has_tschchartinfo3dscale();
+  inline void clear_has_tschchartinfo3dscale();
+  inline void set_has_tschchartinfo3dviewport();
+  inline void clear_has_tschchartinfo3dviewport();
+  inline void set_has_tschchartinfopiestartangle();
+  inline void clear_has_tschchartinfopiestartangle();
+  inline void set_has_tschchartinfoshowlegend();
+  inline void clear_has_tschchartinfoshowlegend();
+  inline void set_has_tschchartinfoshowtitle();
+  inline void clear_has_tschchartinfoshowtitle();
+  inline void set_has_tschchartinfoskiphiddendata();
+  inline void clear_has_tschchartinfoskiphiddendata();
+  inline void set_has_tschchartinfotitle();
+  inline void clear_has_tschchartinfotitle();
+  inline void set_has_tschchartinfodatasetnamelocation();
+  inline void clear_has_tschchartinfodatasetnamelocation();
+  inline void set_has_tschchartinfomultidatacontroltype();
+  inline void clear_has_tschchartinfomultidatacontroltype();
+  inline void set_has_tschchartinfo3dchartopacity();
+  inline void clear_has_tschchartinfo3dchartopacity();
+  inline void set_has_tschchartinfo3dlightingpackage();
+  inline void clear_has_tschchartinfo3dlightingpackage();
+  inline void set_has_tschchartinfobackgroundfill();
+  inline void clear_has_tschchartinfobackgroundfill();
+  inline void set_has_tschchartinfobackgroundstroke();
+  inline void clear_has_tschchartinfobackgroundstroke();
+  inline void set_has_tschchartinfoborderopacity();
+  inline void clear_has_tschchartinfoborderopacity();
+  inline void set_has_tschchartinfobordershadow();
+  inline void clear_has_tschchartinfobordershadow();
+  inline void set_has_tschchartinfoborderstroke();
+  inline void clear_has_tschchartinfoborderstroke();
+  inline void set_has_tschchartinfocombinelayers();
+  inline void clear_has_tschchartinfocombinelayers();
+  inline void set_has_tschchartinfogridbackgroundfill();
+  inline void clear_has_tschchartinfogridbackgroundfill();
+  inline void set_has_tschchartinfogridbackgroundopacity();
+  inline void clear_has_tschchartinfogridbackgroundopacity();
+  inline void set_has_tschchartinfointerbargap();
+  inline void clear_has_tschchartinfointerbargap();
+  inline void set_has_tschchartinfointersetgap();
+  inline void clear_has_tschchartinfointersetgap();
+  inline void set_has_tschchartinfoshowborder();
+  inline void clear_has_tschchartinfoshowborder();
+  inline void set_has_tschchartinfotitlecolor();
+  inline void clear_has_tschchartinfotitlecolor();
+  inline void set_has_tschchartinfotitleparagraphstyleindex();
+  inline void clear_has_tschchartinfotitleparagraphstyleindex();
+  inline void set_has_tschchartinfodatasetnameparagraphstyleindex();
+  inline void clear_has_tschchartinfodatasetnameparagraphstyleindex();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::int32 tschchartinfo3dbarshape_;
+  float tschchartinfo3dintersetdepthgap_;
+  ::TSCH::Chart3DVectorArchive* tschchartinfo3drotation_;
+  ::TSCH::Chart3DVectorArchive* tschchartinfo3dscale_;
+  ::TSCH::Chart3DVectorArchive* tschchartinfo3dviewport_;
+  float tschchartinfopiestartangle_;
+  bool tschchartinfo3dbeveledges_;
+  bool tschchartinfoshowlegend_;
+  bool tschchartinfoshowtitle_;
+  bool tschchartinfoskiphiddendata_;
+  ::std::string* tschchartinfotitle_;
+  ::google::protobuf::int32 tschchartinfodatasetnamelocation_;
+  ::google::protobuf::int32 tschchartinfomultidatacontroltype_;
+  ::TSCH::Chart3DLightingPackageArchive* tschchartinfo3dlightingpackage_;
+  float tschchartinfo3dchartopacity_;
+  float tschchartinfoborderopacity_;
+  ::TSD::FillArchive* tschchartinfobackgroundfill_;
+  ::TSD::StrokeArchive* tschchartinfobackgroundstroke_;
+  ::TSD::ShadowArchive* tschchartinfobordershadow_;
+  ::TSD::StrokeArchive* tschchartinfoborderstroke_;
+  ::TSD::FillArchive* tschchartinfogridbackgroundfill_;
+  float tschchartinfogridbackgroundopacity_;
+  bool tschchartinfocombinelayers_;
+  bool tschchartinfoshowborder_;
+  float tschchartinfointerbargap_;
+  float tschchartinfointersetgap_;
+  ::TSP::Color* tschchartinfotitlecolor_;
+  ::google::protobuf::int32 tschchartinfotitleparagraphstyleindex_;
+  ::google::protobuf::int32 tschchartinfodatasetnameparagraphstyleindex_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(29 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_ShutdownFile_TSCHArchives_2eGEN_2eproto();
+
+  void InitAsDefaultInstance();
+  static ChartGenericPropertyMapArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class LegendGenericPropertyMapArchive : public ::google::protobuf::Message {
+ public:
+  LegendGenericPropertyMapArchive();
+  virtual ~LegendGenericPropertyMapArchive();
+
+  LegendGenericPropertyMapArchive(const LegendGenericPropertyMapArchive& from);
+
+  inline LegendGenericPropertyMapArchive& operator=(const LegendGenericPropertyMapArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const LegendGenericPropertyMapArchive& default_instance();
+
+  void Swap(LegendGenericPropertyMapArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  LegendGenericPropertyMapArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const LegendGenericPropertyMapArchive& from);
+  void MergeFrom(const LegendGenericPropertyMapArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .TSD.FillArchive tschlegendmodelfill = 1;
+  inline bool has_tschlegendmodelfill() const;
+  inline void clear_tschlegendmodelfill();
+  static const int kTschlegendmodelfillFieldNumber = 1;
+  inline const ::TSD::FillArchive& tschlegendmodelfill() const;
+  inline ::TSD::FillArchive* mutable_tschlegendmodelfill();
+  inline ::TSD::FillArchive* release_tschlegendmodelfill();
+  inline void set_allocated_tschlegendmodelfill(::TSD::FillArchive* tschlegendmodelfill);
+
+  // optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+  inline bool has_tschlegendmodellabelparagraphstyleindex() const;
+  inline void clear_tschlegendmodellabelparagraphstyleindex();
+  static const int kTschlegendmodellabelparagraphstyleindexFieldNumber = 2;
+  inline ::google::protobuf::int32 tschlegendmodellabelparagraphstyleindex() const;
+  inline void set_tschlegendmodellabelparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional float tschlegendmodelopacity = 3;
+  inline bool has_tschlegendmodelopacity() const;
+  inline void clear_tschlegendmodelopacity();
+  static const int kTschlegendmodelopacityFieldNumber = 3;
+  inline float tschlegendmodelopacity() const;
+  inline void set_tschlegendmodelopacity(float value);
+
+  // optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+  inline bool has_tschlegendmodelshadow() const;
+  inline void clear_tschlegendmodelshadow();
+  static const int kTschlegendmodelshadowFieldNumber = 4;
+  inline const ::TSD::ShadowArchive& tschlegendmodelshadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschlegendmodelshadow();
+  inline ::TSD::ShadowArchive* release_tschlegendmodelshadow();
+  inline void set_allocated_tschlegendmodelshadow(::TSD::ShadowArchive* tschlegendmodelshadow);
+
+  // optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+  inline bool has_tschlegendmodelstroke() const;
+  inline void clear_tschlegendmodelstroke();
+  static const int kTschlegendmodelstrokeFieldNumber = 5;
+  inline const ::TSD::StrokeArchive& tschlegendmodelstroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschlegendmodelstroke();
+  inline ::TSD::StrokeArchive* release_tschlegendmodelstroke();
+  inline void set_allocated_tschlegendmodelstroke(::TSD::StrokeArchive* tschlegendmodelstroke);
+
+  // @@protoc_insertion_point(class_scope:TSCH.Generated.LegendGenericPropertyMapArchive)
+ private:
+  inline void set_has_tschlegendmodelfill();
+  inline void clear_has_tschlegendmodelfill();
+  inline void set_has_tschlegendmodellabelparagraphstyleindex();
+  inline void clear_has_tschlegendmodellabelparagraphstyleindex();
+  inline void set_has_tschlegendmodelopacity();
+  inline void clear_has_tschlegendmodelopacity();
+  inline void set_has_tschlegendmodelshadow();
+  inline void clear_has_tschlegendmodelshadow();
+  inline void set_has_tschlegendmodelstroke();
+  inline void clear_has_tschlegendmodelstroke();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSD::FillArchive* tschlegendmodelfill_;
+  ::google::protobuf::int32 tschlegendmodellabelparagraphstyleindex_;
+  float tschlegendmodelopacity_;
+  ::TSD::ShadowArchive* tschlegendmodelshadow_;
+  ::TSD::StrokeArchive* tschlegendmodelstroke_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_ShutdownFile_TSCHArchives_2eGEN_2eproto();
+
+  void InitAsDefaultInstance();
+  static LegendGenericPropertyMapArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ChartAxisGenericPropertyMapArchive : public ::google::protobuf::Message {
+ public:
+  ChartAxisGenericPropertyMapArchive();
+  virtual ~ChartAxisGenericPropertyMapArchive();
+
+  ChartAxisGenericPropertyMapArchive(const ChartAxisGenericPropertyMapArchive& from);
+
+  inline ChartAxisGenericPropertyMapArchive& operator=(const ChartAxisGenericPropertyMapArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ChartAxisGenericPropertyMapArchive& default_instance();
+
+  void Swap(ChartAxisGenericPropertyMapArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ChartAxisGenericPropertyMapArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ChartAxisGenericPropertyMapArchive& from);
+  void MergeFrom(const ChartAxisGenericPropertyMapArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional int32 tschchartaxis3dlabelposition = 1;
+  inline bool has_tschchartaxis3dlabelposition() const;
+  inline void clear_tschchartaxis3dlabelposition();
+  static const int kTschchartaxis3DlabelpositionFieldNumber = 1;
+  inline ::google::protobuf::int32 tschchartaxis3dlabelposition() const;
+  inline void set_tschchartaxis3dlabelposition(::google::protobuf::int32 value);
+
+  // optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+  inline bool has_tschchartaxis1_0numberformat() const;
+  inline void clear_tschchartaxis1_0numberformat();
+  static const int kTschchartaxis10NumberformatFieldNumber = 2;
+  inline const ::TSK::FormatStructArchive& tschchartaxis1_0numberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxis1_0numberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxis1_0numberformat();
+  inline void set_allocated_tschchartaxis1_0numberformat(::TSK::FormatStructArchive* tschchartaxis1_0numberformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+  inline bool has_tschchartaxisnumberformat() const;
+  inline void clear_tschchartaxisnumberformat();
+  static const int kTschchartaxisnumberformatFieldNumber = 3;
+  inline const ::TSK::FormatStructArchive& tschchartaxisnumberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisnumberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisnumberformat();
+  inline void set_allocated_tschchartaxisnumberformat(::TSK::FormatStructArchive* tschchartaxisnumberformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+  inline bool has_tschchartaxis1_0dateformat() const;
+  inline void clear_tschchartaxis1_0dateformat();
+  static const int kTschchartaxis10DateformatFieldNumber = 4;
+  inline const ::TSK::FormatStructArchive& tschchartaxis1_0dateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxis1_0dateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxis1_0dateformat();
+  inline void set_allocated_tschchartaxis1_0dateformat(::TSK::FormatStructArchive* tschchartaxis1_0dateformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+  inline bool has_tschchartaxisdurationformat() const;
+  inline void clear_tschchartaxisdurationformat();
+  static const int kTschchartaxisdurationformatFieldNumber = 5;
+  inline const ::TSK::FormatStructArchive& tschchartaxisdurationformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisdurationformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisdurationformat();
+  inline void set_allocated_tschchartaxisdurationformat(::TSK::FormatStructArchive* tschchartaxisdurationformat);
+
+  // optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+  inline bool has_tschchartaxisdateformat() const;
+  inline void clear_tschchartaxisdateformat();
+  static const int kTschchartaxisdateformatFieldNumber = 6;
+  inline const ::TSK::FormatStructArchive& tschchartaxisdateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartaxisdateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartaxisdateformat();
+  inline void set_allocated_tschchartaxisdateformat(::TSK::FormatStructArchive* tschchartaxisdateformat);
+
+  // optional int32 tschchartaxisnumberformattype = 7;
+  inline bool has_tschchartaxisnumberformattype() const;
+  inline void clear_tschchartaxisnumberformattype();
+  static const int kTschchartaxisnumberformattypeFieldNumber = 7;
+  inline ::google::protobuf::int32 tschchartaxisnumberformattype() const;
+  inline void set_tschchartaxisnumberformattype(::google::protobuf::int32 value);
+
+  // optional int32 tschchartaxisnumberofdecades = 8;
+  inline bool has_tschchartaxisnumberofdecades() const;
+  inline void clear_tschchartaxisnumberofdecades();
+  static const int kTschchartaxisnumberofdecadesFieldNumber = 8;
+  inline ::google::protobuf::int32 tschchartaxisnumberofdecades() const;
+  inline void set_tschchartaxisnumberofdecades(::google::protobuf::int32 value);
+
+  // optional int32 tschchartaxisnumberofmajorgridlines = 9;
+  inline bool has_tschchartaxisnumberofmajorgridlines() const;
+  inline void clear_tschchartaxisnumberofmajorgridlines();
+  static const int kTschchartaxisnumberofmajorgridlinesFieldNumber = 9;
+  inline ::google::protobuf::int32 tschchartaxisnumberofmajorgridlines() const;
+  inline void set_tschchartaxisnumberofmajorgridlines(::google::protobuf::int32 value);
+
+  // optional int32 tschchartaxisnumberofminorgridlines = 10;
+  inline bool has_tschchartaxisnumberofminorgridlines() const;
+  inline void clear_tschchartaxisnumberofminorgridlines();
+  static const int kTschchartaxisnumberofminorgridlinesFieldNumber = 10;
+  inline ::google::protobuf::int32 tschchartaxisnumberofminorgridlines() const;
+  inline void set_tschchartaxisnumberofminorgridlines(::google::protobuf::int32 value);
+
+  // optional bool tschchartaxisplottoedges = 11;
+  inline bool has_tschchartaxisplottoedges() const;
+  inline void clear_tschchartaxisplottoedges();
+  static const int kTschchartaxisplottoedgesFieldNumber = 11;
+  inline bool tschchartaxisplottoedges() const;
+  inline void set_tschchartaxisplottoedges(bool value);
+
+  // optional int32 tschchartaxisscale = 12;
+  inline bool has_tschchartaxisscale() const;
+  inline void clear_tschchartaxisscale();
+  static const int kTschchartaxisscaleFieldNumber = 12;
+  inline ::google::protobuf::int32 tschchartaxisscale() const;
+  inline void set_tschchartaxisscale(::google::protobuf::int32 value);
+
+  // optional bool tschchartaxisshowlabels = 13;
+  inline bool has_tschchartaxisshowlabels() const;
+  inline void clear_tschchartaxisshowlabels();
+  static const int kTschchartaxisshowlabelsFieldNumber = 13;
+  inline bool tschchartaxisshowlabels() const;
+  inline void set_tschchartaxisshowlabels(bool value);
+
+  // optional bool tschchartaxisshowserieslabels = 14;
+  inline bool has_tschchartaxisshowserieslabels() const;
+  inline void clear_tschchartaxisshowserieslabels();
+  static const int kTschchartaxisshowserieslabelsFieldNumber = 14;
+  inline bool tschchartaxisshowserieslabels() const;
+  inline void set_tschchartaxisshowserieslabels(bool value);
+
+  // optional bool tschchartaxisshowtitle = 15;
+  inline bool has_tschchartaxisshowtitle() const;
+  inline void clear_tschchartaxisshowtitle();
+  static const int kTschchartaxisshowtitleFieldNumber = 15;
+  inline bool tschchartaxisshowtitle() const;
+  inline void set_tschchartaxisshowtitle(bool value);
+
+  // optional string tschchartaxistitle = 16;
+  inline bool has_tschchartaxistitle() const;
+  inline void clear_tschchartaxistitle();
+  static const int kTschchartaxistitleFieldNumber = 16;
+  inline const ::std::string& tschchartaxistitle() const;
+  inline void set_tschchartaxistitle(const ::std::string& value);
+  inline void set_tschchartaxistitle(const char* value);
+  inline void set_tschchartaxistitle(const char* value, size_t size);
+  inline ::std::string* mutable_tschchartaxistitle();
+  inline ::std::string* release_tschchartaxistitle();
+  inline void set_allocated_tschchartaxistitle(::std::string* tschchartaxistitle);
+
+  // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+  inline bool has_tschchartaxisusermax() const;
+  inline void clear_tschchartaxisusermax();
+  static const int kTschchartaxisusermaxFieldNumber = 17;
+  inline const ::TSCH::ChartsNSNumberDoubleArchive& tschchartaxisusermax() const;
+  inline ::TSCH::ChartsNSNumberDoubleArchive* mutable_tschchartaxisusermax();
+  inline ::TSCH::ChartsNSNumberDoubleArchive* release_tschchartaxisusermax();
+  inline void set_allocated_tschchartaxisusermax(::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisusermax);
+
+  // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+  inline bool has_tschchartaxisusermin() const;
+  inline void clear_tschchartaxisusermin();
+  static const int kTschchartaxisuserminFieldNumber = 18;
+  inline const ::TSCH::ChartsNSNumberDoubleArchive& tschchartaxisusermin() const;
+  inline ::TSCH::ChartsNSNumberDoubleArchive* mutable_tschchartaxisusermin();
+  inline ::TSCH::ChartsNSNumberDoubleArchive* release_tschchartaxisusermin();
+  inline void set_allocated_tschchartaxisusermin(::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisusermin);
+
+  // optional float tschchartaxis3dgridlineopacity = 19;
+  inline bool has_tschchartaxis3dgridlineopacity() const;
+  inline void clear_tschchartaxis3dgridlineopacity();
+  static const int kTschchartaxis3DgridlineopacityFieldNumber = 19;
+  inline float tschchartaxis3dgridlineopacity() const;
+  inline void set_tschchartaxis3dgridlineopacity(float value);
+
+  // optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+  inline bool has_tschchartaxis3dgridlinestroke() const;
+  inline void clear_tschchartaxis3dgridlinestroke();
+  static const int kTschchartaxis3DgridlinestrokeFieldNumber = 20;
+  inline const ::TSD::StrokeArchive& tschchartaxis3dgridlinestroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartaxis3dgridlinestroke();
+  inline ::TSD::StrokeArchive* release_tschchartaxis3dgridlinestroke();
+  inline void set_allocated_tschchartaxis3dgridlinestroke(::TSD::StrokeArchive* tschchartaxis3dgridlinestroke);
+
+  // optional int32 tschchartaxishorizontalspacing = 21;
+  inline bool has_tschchartaxishorizontalspacing() const;
+  inline void clear_tschchartaxishorizontalspacing();
+  static const int kTschchartaxishorizontalspacingFieldNumber = 21;
+  inline ::google::protobuf::int32 tschchartaxishorizontalspacing() const;
+  inline void set_tschchartaxishorizontalspacing(::google::protobuf::int32 value);
+
+  // optional int32 tschchartaxislabelparagraphstyleindex = 22;
+  inline bool has_tschchartaxislabelparagraphstyleindex() const;
+  inline void clear_tschchartaxislabelparagraphstyleindex();
+  static const int kTschchartaxislabelparagraphstyleindexFieldNumber = 22;
+  inline ::google::protobuf::int32 tschchartaxislabelparagraphstyleindex() const;
+  inline void set_tschchartaxislabelparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional float tschchartaxislabelsorientation = 23;
+  inline bool has_tschchartaxislabelsorientation() const;
+  inline void clear_tschchartaxislabelsorientation();
+  static const int kTschchartaxislabelsorientationFieldNumber = 23;
+  inline float tschchartaxislabelsorientation() const;
+  inline void set_tschchartaxislabelsorientation(float value);
+
+  // optional float tschchartaxismajorgridlineopacity = 24;
+  inline bool has_tschchartaxismajorgridlineopacity() const;
+  inline void clear_tschchartaxismajorgridlineopacity();
+  static const int kTschchartaxismajorgridlineopacityFieldNumber = 24;
+  inline float tschchartaxismajorgridlineopacity() const;
+  inline void set_tschchartaxismajorgridlineopacity(float value);
+
+  // optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+  inline bool has_tschchartaxismajorgridlineshadow() const;
+  inline void clear_tschchartaxismajorgridlineshadow();
+  static const int kTschchartaxismajorgridlineshadowFieldNumber = 25;
+  inline const ::TSD::ShadowArchive& tschchartaxismajorgridlineshadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschchartaxismajorgridlineshadow();
+  inline ::TSD::ShadowArchive* release_tschchartaxismajorgridlineshadow();
+  inline void set_allocated_tschchartaxismajorgridlineshadow(::TSD::ShadowArchive* tschchartaxismajorgridlineshadow);
+
+  // optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+  inline bool has_tschchartaxismajorgridlinestroke() const;
+  inline void clear_tschchartaxismajorgridlinestroke();
+  static const int kTschchartaxismajorgridlinestrokeFieldNumber = 26;
+  inline const ::TSD::StrokeArchive& tschchartaxismajorgridlinestroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartaxismajorgridlinestroke();
+  inline ::TSD::StrokeArchive* release_tschchartaxismajorgridlinestroke();
+  inline void set_allocated_tschchartaxismajorgridlinestroke(::TSD::StrokeArchive* tschchartaxismajorgridlinestroke);
+
+  // optional float tschchartaxisminorgridlineopacity = 27;
+  inline bool has_tschchartaxisminorgridlineopacity() const;
+  inline void clear_tschchartaxisminorgridlineopacity();
+  static const int kTschchartaxisminorgridlineopacityFieldNumber = 27;
+  inline float tschchartaxisminorgridlineopacity() const;
+  inline void set_tschchartaxisminorgridlineopacity(float value);
+
+  // optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+  inline bool has_tschchartaxisminorgridlineshadow() const;
+  inline void clear_tschchartaxisminorgridlineshadow();
+  static const int kTschchartaxisminorgridlineshadowFieldNumber = 28;
+  inline const ::TSD::ShadowArchive& tschchartaxisminorgridlineshadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschchartaxisminorgridlineshadow();
+  inline ::TSD::ShadowArchive* release_tschchartaxisminorgridlineshadow();
+  inline void set_allocated_tschchartaxisminorgridlineshadow(::TSD::ShadowArchive* tschchartaxisminorgridlineshadow);
+
+  // optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+  inline bool has_tschchartaxisminorgridlinestroke() const;
+  inline void clear_tschchartaxisminorgridlinestroke();
+  static const int kTschchartaxisminorgridlinestrokeFieldNumber = 29;
+  inline const ::TSD::StrokeArchive& tschchartaxisminorgridlinestroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartaxisminorgridlinestroke();
+  inline ::TSD::StrokeArchive* release_tschchartaxisminorgridlinestroke();
+  inline void set_allocated_tschchartaxisminorgridlinestroke(::TSD::StrokeArchive* tschchartaxisminorgridlinestroke);
+
+  // optional bool tschchartaxisshowaxis = 30;
+  inline bool has_tschchartaxisshowaxis() const;
+  inline void clear_tschchartaxisshowaxis();
+  static const int kTschchartaxisshowaxisFieldNumber = 30;
+  inline bool tschchartaxisshowaxis() const;
+  inline void set_tschchartaxisshowaxis(bool value);
+
+  // optional bool tschchartaxisshowlastlabel = 31;
+  inline bool has_tschchartaxisshowlastlabel() const;
+  inline void clear_tschchartaxisshowlastlabel();
+  static const int kTschchartaxisshowlastlabelFieldNumber = 31;
+  inline bool tschchartaxisshowlastlabel() const;
+  inline void set_tschchartaxisshowlastlabel(bool value);
+
+  // optional bool tschchartaxisshowmajorgridlines = 32;
+  inline bool has_tschchartaxisshowmajorgridlines() const;
+  inline void clear_tschchartaxisshowmajorgridlines();
+  static const int kTschchartaxisshowmajorgridlinesFieldNumber = 32;
+  inline bool tschchartaxisshowmajorgridlines() const;
+  inline void set_tschchartaxisshowmajorgridlines(bool value);
+
+  // optional bool tschchartaxisshowmajortickmarks = 33;
+  inline bool has_tschchartaxisshowmajortickmarks() const;
+  inline void clear_tschchartaxisshowmajortickmarks();
+  static const int kTschchartaxisshowmajortickmarksFieldNumber = 33;
+  inline bool tschchartaxisshowmajortickmarks() const;
+  inline void set_tschchartaxisshowmajortickmarks(bool value);
+
+  // optional bool tschchartaxisshowminimumlabel = 34;
+  inline bool has_tschchartaxisshowminimumlabel() const;
+  inline void clear_tschchartaxisshowminimumlabel();
+  static const int kTschchartaxisshowminimumlabelFieldNumber = 34;
+  inline bool tschchartaxisshowminimumlabel() const;
+  inline void set_tschchartaxisshowminimumlabel(bool value);
+
+  // optional bool tschchartaxisshowminorgridlines = 35;
+  inline bool has_tschchartaxisshowminorgridlines() const;
+  inline void clear_tschchartaxisshowminorgridlines();
+  static const int kTschchartaxisshowminorgridlinesFieldNumber = 35;
+  inline bool tschchartaxisshowminorgridlines() const;
+  inline void set_tschchartaxisshowminorgridlines(bool value);
+
+  // optional bool tschchartaxisshowminortickmarks = 36;
+  inline bool has_tschchartaxisshowminortickmarks() const;
+  inline void clear_tschchartaxisshowminortickmarks();
+  static const int kTschchartaxisshowminortickmarksFieldNumber = 36;
+  inline bool tschchartaxisshowminortickmarks() const;
+  inline void set_tschchartaxisshowminortickmarks(bool value);
+
+  // optional int32 tschchartaxistickmarklocation = 37;
+  inline bool has_tschchartaxistickmarklocation() const;
+  inline void clear_tschchartaxistickmarklocation();
+  static const int kTschchartaxistickmarklocationFieldNumber = 37;
+  inline ::google::protobuf::int32 tschchartaxistickmarklocation() const;
+  inline void set_tschchartaxistickmarklocation(::google::protobuf::int32 value);
+
+  // optional int32 tschchartaxistitleparagraphstyleindex = 38;
+  inline bool has_tschchartaxistitleparagraphstyleindex() const;
+  inline void clear_tschchartaxistitleparagraphstyleindex();
+  static const int kTschchartaxistitleparagraphstyleindexFieldNumber = 38;
+  inline ::google::protobuf::int32 tschchartaxistitleparagraphstyleindex() const;
+  inline void set_tschchartaxistitleparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional int32 tschchartaxisverticalspacing = 39;
+  inline bool has_tschchartaxisverticalspacing() const;
+  inline void clear_tschchartaxisverticalspacing();
+  static const int kTschchartaxisverticalspacingFieldNumber = 39;
+  inline ::google::protobuf::int32 tschchartaxisverticalspacing() const;
+  inline void set_tschchartaxisverticalspacing(::google::protobuf::int32 value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.Generated.ChartAxisGenericPropertyMapArchive)
+ private:
+  inline void set_has_tschchartaxis3dlabelposition();
+  inline void clear_has_tschchartaxis3dlabelposition();
+  inline void set_has_tschchartaxis1_0numberformat();
+  inline void clear_has_tschchartaxis1_0numberformat();
+  inline void set_has_tschchartaxisnumberformat();
+  inline void clear_has_tschchartaxisnumberformat();
+  inline void set_has_tschchartaxis1_0dateformat();
+  inline void clear_has_tschchartaxis1_0dateformat();
+  inline void set_has_tschchartaxisdurationformat();
+  inline void clear_has_tschchartaxisdurationformat();
+  inline void set_has_tschchartaxisdateformat();
+  inline void clear_has_tschchartaxisdateformat();
+  inline void set_has_tschchartaxisnumberformattype();
+  inline void clear_has_tschchartaxisnumberformattype();
+  inline void set_has_tschchartaxisnumberofdecades();
+  inline void clear_has_tschchartaxisnumberofdecades();
+  inline void set_has_tschchartaxisnumberofmajorgridlines();
+  inline void clear_has_tschchartaxisnumberofmajorgridlines();
+  inline void set_has_tschchartaxisnumberofminorgridlines();
+  inline void clear_has_tschchartaxisnumberofminorgridlines();
+  inline void set_has_tschchartaxisplottoedges();
+  inline void clear_has_tschchartaxisplottoedges();
+  inline void set_has_tschchartaxisscale();
+  inline void clear_has_tschchartaxisscale();
+  inline void set_has_tschchartaxisshowlabels();
+  inline void clear_has_tschchartaxisshowlabels();
+  inline void set_has_tschchartaxisshowserieslabels();
+  inline void clear_has_tschchartaxisshowserieslabels();
+  inline void set_has_tschchartaxisshowtitle();
+  inline void clear_has_tschchartaxisshowtitle();
+  inline void set_has_tschchartaxistitle();
+  inline void clear_has_tschchartaxistitle();
+  inline void set_has_tschchartaxisusermax();
+  inline void clear_has_tschchartaxisusermax();
+  inline void set_has_tschchartaxisusermin();
+  inline void clear_has_tschchartaxisusermin();
+  inline void set_has_tschchartaxis3dgridlineopacity();
+  inline void clear_has_tschchartaxis3dgridlineopacity();
+  inline void set_has_tschchartaxis3dgridlinestroke();
+  inline void clear_has_tschchartaxis3dgridlinestroke();
+  inline void set_has_tschchartaxishorizontalspacing();
+  inline void clear_has_tschchartaxishorizontalspacing();
+  inline void set_has_tschchartaxislabelparagraphstyleindex();
+  inline void clear_has_tschchartaxislabelparagraphstyleindex();
+  inline void set_has_tschchartaxislabelsorientation();
+  inline void clear_has_tschchartaxislabelsorientation();
+  inline void set_has_tschchartaxismajorgridlineopacity();
+  inline void clear_has_tschchartaxismajorgridlineopacity();
+  inline void set_has_tschchartaxismajorgridlineshadow();
+  inline void clear_has_tschchartaxismajorgridlineshadow();
+  inline void set_has_tschchartaxismajorgridlinestroke();
+  inline void clear_has_tschchartaxismajorgridlinestroke();
+  inline void set_has_tschchartaxisminorgridlineopacity();
+  inline void clear_has_tschchartaxisminorgridlineopacity();
+  inline void set_has_tschchartaxisminorgridlineshadow();
+  inline void clear_has_tschchartaxisminorgridlineshadow();
+  inline void set_has_tschchartaxisminorgridlinestroke();
+  inline void clear_has_tschchartaxisminorgridlinestroke();
+  inline void set_has_tschchartaxisshowaxis();
+  inline void clear_has_tschchartaxisshowaxis();
+  inline void set_has_tschchartaxisshowlastlabel();
+  inline void clear_has_tschchartaxisshowlastlabel();
+  inline void set_has_tschchartaxisshowmajorgridlines();
+  inline void clear_has_tschchartaxisshowmajorgridlines();
+  inline void set_has_tschchartaxisshowmajortickmarks();
+  inline void clear_has_tschchartaxisshowmajortickmarks();
+  inline void set_has_tschchartaxisshowminimumlabel();
+  inline void clear_has_tschchartaxisshowminimumlabel();
+  inline void set_has_tschchartaxisshowminorgridlines();
+  inline void clear_has_tschchartaxisshowminorgridlines();
+  inline void set_has_tschchartaxisshowminortickmarks();
+  inline void clear_has_tschchartaxisshowminortickmarks();
+  inline void set_has_tschchartaxistickmarklocation();
+  inline void clear_has_tschchartaxistickmarklocation();
+  inline void set_has_tschchartaxistitleparagraphstyleindex();
+  inline void clear_has_tschchartaxistitleparagraphstyleindex();
+  inline void set_has_tschchartaxisverticalspacing();
+  inline void clear_has_tschchartaxisverticalspacing();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::FormatStructArchive* tschchartaxis1_0numberformat_;
+  ::TSK::FormatStructArchive* tschchartaxisnumberformat_;
+  ::TSK::FormatStructArchive* tschchartaxis1_0dateformat_;
+  ::google::protobuf::int32 tschchartaxis3dlabelposition_;
+  ::google::protobuf::int32 tschchartaxisnumberformattype_;
+  ::TSK::FormatStructArchive* tschchartaxisdurationformat_;
+  ::TSK::FormatStructArchive* tschchartaxisdateformat_;
+  ::google::protobuf::int32 tschchartaxisnumberofdecades_;
+  ::google::protobuf::int32 tschchartaxisnumberofmajorgridlines_;
+  ::google::protobuf::int32 tschchartaxisnumberofminorgridlines_;
+  ::google::protobuf::int32 tschchartaxisscale_;
+  bool tschchartaxisplottoedges_;
+  bool tschchartaxisshowlabels_;
+  bool tschchartaxisshowserieslabels_;
+  bool tschchartaxisshowtitle_;
+  float tschchartaxis3dgridlineopacity_;
+  ::std::string* tschchartaxistitle_;
+  ::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisusermax_;
+  ::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisusermin_;
+  ::TSD::StrokeArchive* tschchartaxis3dgridlinestroke_;
+  ::google::protobuf::int32 tschchartaxishorizontalspacing_;
+  ::google::protobuf::int32 tschchartaxislabelparagraphstyleindex_;
+  float tschchartaxislabelsorientation_;
+  float tschchartaxismajorgridlineopacity_;
+  ::TSD::ShadowArchive* tschchartaxismajorgridlineshadow_;
+  ::TSD::StrokeArchive* tschchartaxismajorgridlinestroke_;
+  ::TSD::ShadowArchive* tschchartaxisminorgridlineshadow_;
+  ::TSD::StrokeArchive* tschchartaxisminorgridlinestroke_;
+  float tschchartaxisminorgridlineopacity_;
+  bool tschchartaxisshowaxis_;
+  bool tschchartaxisshowlastlabel_;
+  bool tschchartaxisshowmajorgridlines_;
+  bool tschchartaxisshowmajortickmarks_;
+  bool tschchartaxisshowminimumlabel_;
+  bool tschchartaxisshowminorgridlines_;
+  bool tschchartaxisshowminortickmarks_;
+  ::google::protobuf::int32 tschchartaxistickmarklocation_;
+  ::google::protobuf::int32 tschchartaxistitleparagraphstyleindex_;
+  ::google::protobuf::int32 tschchartaxisverticalspacing_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(39 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_ShutdownFile_TSCHArchives_2eGEN_2eproto();
+
+  void InitAsDefaultInstance();
+  static ChartAxisGenericPropertyMapArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ChartSeriesGenericPropertyMapArchive : public ::google::protobuf::Message {
+ public:
+  ChartSeriesGenericPropertyMapArchive();
+  virtual ~ChartSeriesGenericPropertyMapArchive();
+
+  ChartSeriesGenericPropertyMapArchive(const ChartSeriesGenericPropertyMapArchive& from);
+
+  inline ChartSeriesGenericPropertyMapArchive& operator=(const ChartSeriesGenericPropertyMapArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ChartSeriesGenericPropertyMapArchive& default_instance();
+
+  void Swap(ChartSeriesGenericPropertyMapArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ChartSeriesGenericPropertyMapArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ChartSeriesGenericPropertyMapArchive& from);
+  void MergeFrom(const ChartSeriesGenericPropertyMapArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional float tschchartseriesadjustmentscale = 1;
+  inline bool has_tschchartseriesadjustmentscale() const;
+  inline void clear_tschchartseriesadjustmentscale();
+  static const int kTschchartseriesadjustmentscaleFieldNumber = 1;
+  inline float tschchartseriesadjustmentscale() const;
+  inline void set_tschchartseriesadjustmentscale(float value);
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+  inline bool has_tschchartserieserrorbarcustomnegativedata() const;
+  inline void clear_tschchartserieserrorbarcustomnegativedata();
+  static const int kTschchartserieserrorbarcustomnegativedataFieldNumber = 2;
+  inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& tschchartserieserrorbarcustomnegativedata() const;
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* mutable_tschchartserieserrorbarcustomnegativedata();
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* release_tschchartserieserrorbarcustomnegativedata();
+  inline void set_allocated_tschchartserieserrorbarcustomnegativedata(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustomnegativedata);
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+  inline bool has_tschchartserieserrorbarcustomnegativedatascatterx() const;
+  inline void clear_tschchartserieserrorbarcustomnegativedatascatterx();
+  static const int kTschchartserieserrorbarcustomnegativedatascatterxFieldNumber = 3;
+  inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& tschchartserieserrorbarcustomnegativedatascatterx() const;
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* mutable_tschchartserieserrorbarcustomnegativedatascatterx();
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* release_tschchartserieserrorbarcustomnegativedatascatterx();
+  inline void set_allocated_tschchartserieserrorbarcustomnegativedatascatterx(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustomnegativedatascatterx);
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+  inline bool has_tschchartserieserrorbarcustompositivedata() const;
+  inline void clear_tschchartserieserrorbarcustompositivedata();
+  static const int kTschchartserieserrorbarcustompositivedataFieldNumber = 4;
+  inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& tschchartserieserrorbarcustompositivedata() const;
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* mutable_tschchartserieserrorbarcustompositivedata();
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* release_tschchartserieserrorbarcustompositivedata();
+  inline void set_allocated_tschchartserieserrorbarcustompositivedata(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustompositivedata);
+
+  // optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+  inline bool has_tschchartserieserrorbarcustompositivedatascatterx() const;
+  inline void clear_tschchartserieserrorbarcustompositivedatascatterx();
+  static const int kTschchartserieserrorbarcustompositivedatascatterxFieldNumber = 5;
+  inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& tschchartserieserrorbarcustompositivedatascatterx() const;
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* mutable_tschchartserieserrorbarcustompositivedatascatterx();
+  inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* release_tschchartserieserrorbarcustompositivedatascatterx();
+  inline void set_allocated_tschchartserieserrorbarcustompositivedatascatterx(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustompositivedatascatterx);
+
+  // optional float tschchartserieserrorbarfixedvalue = 6;
+  inline bool has_tschchartserieserrorbarfixedvalue() const;
+  inline void clear_tschchartserieserrorbarfixedvalue();
+  static const int kTschchartserieserrorbarfixedvalueFieldNumber = 6;
+  inline float tschchartserieserrorbarfixedvalue() const;
+  inline void set_tschchartserieserrorbarfixedvalue(float value);
+
+  // optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+  inline bool has_tschchartserieserrorbarfixedvaluescatterx() const;
+  inline void clear_tschchartserieserrorbarfixedvaluescatterx();
+  static const int kTschchartserieserrorbarfixedvaluescatterxFieldNumber = 7;
+  inline float tschchartserieserrorbarfixedvaluescatterx() const;
+  inline void set_tschchartserieserrorbarfixedvaluescatterx(float value);
+
+  // optional float tschchartserieserrorbarpercentvalue = 8;
+  inline bool has_tschchartserieserrorbarpercentvalue() const;
+  inline void clear_tschchartserieserrorbarpercentvalue();
+  static const int kTschchartserieserrorbarpercentvalueFieldNumber = 8;
+  inline float tschchartserieserrorbarpercentvalue() const;
+  inline void set_tschchartserieserrorbarpercentvalue(float value);
+
+  // optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+  inline bool has_tschchartserieserrorbarpercentvaluescatterx() const;
+  inline void clear_tschchartserieserrorbarpercentvaluescatterx();
+  static const int kTschchartserieserrorbarpercentvaluescatterxFieldNumber = 9;
+  inline float tschchartserieserrorbarpercentvaluescatterx() const;
+  inline void set_tschchartserieserrorbarpercentvaluescatterx(float value);
+
+  // optional int32 tschchartserieserrorbarsetting = 10;
+  inline bool has_tschchartserieserrorbarsetting() const;
+  inline void clear_tschchartserieserrorbarsetting();
+  static const int kTschchartserieserrorbarsettingFieldNumber = 10;
+  inline ::google::protobuf::int32 tschchartserieserrorbarsetting() const;
+  inline void set_tschchartserieserrorbarsetting(::google::protobuf::int32 value);
+
+  // optional int32 tschchartserieserrorbarsettingscatterx = 11;
+  inline bool has_tschchartserieserrorbarsettingscatterx() const;
+  inline void clear_tschchartserieserrorbarsettingscatterx();
+  static const int kTschchartserieserrorbarsettingscatterxFieldNumber = 11;
+  inline ::google::protobuf::int32 tschchartserieserrorbarsettingscatterx() const;
+  inline void set_tschchartserieserrorbarsettingscatterx(::google::protobuf::int32 value);
+
+  // optional float tschchartserieserrorbarstddevvalue = 12;
+  inline bool has_tschchartserieserrorbarstddevvalue() const;
+  inline void clear_tschchartserieserrorbarstddevvalue();
+  static const int kTschchartserieserrorbarstddevvalueFieldNumber = 12;
+  inline float tschchartserieserrorbarstddevvalue() const;
+  inline void set_tschchartserieserrorbarstddevvalue(float value);
+
+  // optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+  inline bool has_tschchartserieserrorbarstddevvaluescatterx() const;
+  inline void clear_tschchartserieserrorbarstddevvaluescatterx();
+  static const int kTschchartserieserrorbarstddevvaluescatterxFieldNumber = 13;
+  inline float tschchartserieserrorbarstddevvaluescatterx() const;
+  inline void set_tschchartserieserrorbarstddevvaluescatterx(float value);
+
+  // optional int32 tschchartserieserrorbartype = 14;
+  inline bool has_tschchartserieserrorbartype() const;
+  inline void clear_tschchartserieserrorbartype();
+  static const int kTschchartserieserrorbartypeFieldNumber = 14;
+  inline ::google::protobuf::int32 tschchartserieserrorbartype() const;
+  inline void set_tschchartserieserrorbartype(::google::protobuf::int32 value);
+
+  // optional int32 tschchartserieserrorbartypescatterx = 15;
+  inline bool has_tschchartserieserrorbartypescatterx() const;
+  inline void clear_tschchartserieserrorbartypescatterx();
+  static const int kTschchartserieserrorbartypescatterxFieldNumber = 15;
+  inline ::google::protobuf::int32 tschchartserieserrorbartypescatterx() const;
+  inline void set_tschchartserieserrorbartypescatterx(::google::protobuf::int32 value);
+
+  // optional float tschchartserieslabelexplosion = 16;
+  inline bool has_tschchartserieslabelexplosion() const;
+  inline void clear_tschchartserieslabelexplosion();
+  static const int kTschchartserieslabelexplosionFieldNumber = 16;
+  inline float tschchartserieslabelexplosion() const;
+  inline void set_tschchartserieslabelexplosion(float value);
+
+  // optional int32 tschchartserieslinetype = 17;
+  inline bool has_tschchartserieslinetype() const;
+  inline void clear_tschchartserieslinetype();
+  static const int kTschchartserieslinetypeFieldNumber = 17;
+  inline ::google::protobuf::int32 tschchartserieslinetype() const;
+  inline void set_tschchartserieslinetype(::google::protobuf::int32 value);
+
+  // optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+  inline bool has_tschchartseries1_0numberformat() const;
+  inline void clear_tschchartseries1_0numberformat();
+  static const int kTschchartseries10NumberformatFieldNumber = 18;
+  inline const ::TSK::FormatStructArchive& tschchartseries1_0numberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseries1_0numberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseries1_0numberformat();
+  inline void set_allocated_tschchartseries1_0numberformat(::TSK::FormatStructArchive* tschchartseries1_0numberformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+  inline bool has_tschchartseriesnumberformat() const;
+  inline void clear_tschchartseriesnumberformat();
+  static const int kTschchartseriesnumberformatFieldNumber = 19;
+  inline const ::TSK::FormatStructArchive& tschchartseriesnumberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesnumberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesnumberformat();
+  inline void set_allocated_tschchartseriesnumberformat(::TSK::FormatStructArchive* tschchartseriesnumberformat);
+
+  // optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+  inline bool has_tschchartseries1_0dateformat() const;
+  inline void clear_tschchartseries1_0dateformat();
+  static const int kTschchartseries10DateformatFieldNumber = 20;
+  inline const ::TSK::FormatStructArchive& tschchartseries1_0dateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseries1_0dateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseries1_0dateformat();
+  inline void set_allocated_tschchartseries1_0dateformat(::TSK::FormatStructArchive* tschchartseries1_0dateformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+  inline bool has_tschchartseriesdurationformat() const;
+  inline void clear_tschchartseriesdurationformat();
+  static const int kTschchartseriesdurationformatFieldNumber = 21;
+  inline const ::TSK::FormatStructArchive& tschchartseriesdurationformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesdurationformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesdurationformat();
+  inline void set_allocated_tschchartseriesdurationformat(::TSK::FormatStructArchive* tschchartseriesdurationformat);
+
+  // optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+  inline bool has_tschchartseriesdateformat() const;
+  inline void clear_tschchartseriesdateformat();
+  static const int kTschchartseriesdateformatFieldNumber = 22;
+  inline const ::TSK::FormatStructArchive& tschchartseriesdateformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriesdateformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriesdateformat();
+  inline void set_allocated_tschchartseriesdateformat(::TSK::FormatStructArchive* tschchartseriesdateformat);
+
+  // optional int32 tschchartseriesnumberformattype = 23;
+  inline bool has_tschchartseriesnumberformattype() const;
+  inline void clear_tschchartseriesnumberformattype();
+  static const int kTschchartseriesnumberformattypeFieldNumber = 23;
+  inline ::google::protobuf::int32 tschchartseriesnumberformattype() const;
+  inline void set_tschchartseriesnumberformattype(::google::protobuf::int32 value);
+
+  // optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+  inline bool has_tschchartseriespercentnumberformat() const;
+  inline void clear_tschchartseriespercentnumberformat();
+  static const int kTschchartseriespercentnumberformatFieldNumber = 24;
+  inline const ::TSK::FormatStructArchive& tschchartseriespercentnumberformat() const;
+  inline ::TSK::FormatStructArchive* mutable_tschchartseriespercentnumberformat();
+  inline ::TSK::FormatStructArchive* release_tschchartseriespercentnumberformat();
+  inline void set_allocated_tschchartseriespercentnumberformat(::TSK::FormatStructArchive* tschchartseriespercentnumberformat);
+
+  // optional int32 tschchartseriesseriestype = 25;
+  inline bool has_tschchartseriesseriestype() const;
+  inline void clear_tschchartseriesseriestype();
+  static const int kTschchartseriesseriestypeFieldNumber = 25;
+  inline ::google::protobuf::int32 tschchartseriesseriestype() const;
+  inline void set_tschchartseriesseriestype(::google::protobuf::int32 value);
+
+  // optional bool tschchartseriesshowerrorbar = 26;
+  inline bool has_tschchartseriesshowerrorbar() const;
+  inline void clear_tschchartseriesshowerrorbar();
+  static const int kTschchartseriesshowerrorbarFieldNumber = 26;
+  inline bool tschchartseriesshowerrorbar() const;
+  inline void set_tschchartseriesshowerrorbar(bool value);
+
+  // optional bool tschchartseriesshowerrorbarscatterx = 27;
+  inline bool has_tschchartseriesshowerrorbarscatterx() const;
+  inline void clear_tschchartseriesshowerrorbarscatterx();
+  static const int kTschchartseriesshowerrorbarscatterxFieldNumber = 27;
+  inline bool tschchartseriesshowerrorbarscatterx() const;
+  inline void set_tschchartseriesshowerrorbarscatterx(bool value);
+
+  // optional bool tschchartseriesshowline = 28;
+  inline bool has_tschchartseriesshowline() const;
+  inline void clear_tschchartseriesshowline();
+  static const int kTschchartseriesshowlineFieldNumber = 28;
+  inline bool tschchartseriesshowline() const;
+  inline void set_tschchartseriesshowline(bool value);
+
+  // optional bool tschchartseriesshownegativedata = 29;
+  inline bool has_tschchartseriesshownegativedata() const;
+  inline void clear_tschchartseriesshownegativedata();
+  static const int kTschchartseriesshownegativedataFieldNumber = 29;
+  inline bool tschchartseriesshownegativedata() const;
+  inline void set_tschchartseriesshownegativedata(bool value);
+
+  // optional bool tschchartseriesshowserieslabels = 30;
+  inline bool has_tschchartseriesshowserieslabels() const;
+  inline void clear_tschchartseriesshowserieslabels();
+  static const int kTschchartseriesshowserieslabelsFieldNumber = 30;
+  inline bool tschchartseriesshowserieslabels() const;
+  inline void set_tschchartseriesshowserieslabels(bool value);
+
+  // optional bool tschchartseriesshowsymbol = 31;
+  inline bool has_tschchartseriesshowsymbol() const;
+  inline void clear_tschchartseriesshowsymbol();
+  static const int kTschchartseriesshowsymbolFieldNumber = 31;
+  inline bool tschchartseriesshowsymbol() const;
+  inline void set_tschchartseriesshowsymbol(bool value);
+
+  // optional bool tschchartseriesshowtrendline = 32;
+  inline bool has_tschchartseriesshowtrendline() const;
+  inline void clear_tschchartseriesshowtrendline();
+  static const int kTschchartseriesshowtrendlineFieldNumber = 32;
+  inline bool tschchartseriesshowtrendline() const;
+  inline void set_tschchartseriesshowtrendline(bool value);
+
+  // optional bool tschchartseriesshowvaluelabels = 33;
+  inline bool has_tschchartseriesshowvaluelabels() const;
+  inline void clear_tschchartseriesshowvaluelabels();
+  static const int kTschchartseriesshowvaluelabelsFieldNumber = 33;
+  inline bool tschchartseriesshowvaluelabels() const;
+  inline void set_tschchartseriesshowvaluelabels(bool value);
+
+  // optional int32 tschchartseriessizedimension = 34;
+  inline bool has_tschchartseriessizedimension() const;
+  inline void clear_tschchartseriessizedimension();
+  static const int kTschchartseriessizedimensionFieldNumber = 34;
+  inline ::google::protobuf::int32 tschchartseriessizedimension() const;
+  inline void set_tschchartseriessizedimension(::google::protobuf::int32 value);
+
+  // optional int32 tschchartseriessymboltype = 35;
+  inline bool has_tschchartseriessymboltype() const;
+  inline void clear_tschchartseriessymboltype();
+  static const int kTschchartseriessymboltypeFieldNumber = 35;
+  inline ::google::protobuf::int32 tschchartseriessymboltype() const;
+  inline void set_tschchartseriessymboltype(::google::protobuf::int32 value);
+
+  // optional float tschchartseriestrendlineequationoffsetx = 36;
+  inline bool has_tschchartseriestrendlineequationoffsetx() const;
+  inline void clear_tschchartseriestrendlineequationoffsetx();
+  static const int kTschchartseriestrendlineequationoffsetxFieldNumber = 36;
+  inline float tschchartseriestrendlineequationoffsetx() const;
+  inline void set_tschchartseriestrendlineequationoffsetx(float value);
+
+  // optional float tschchartseriestrendlineequationoffsety = 37;
+  inline bool has_tschchartseriestrendlineequationoffsety() const;
+  inline void clear_tschchartseriestrendlineequationoffsety();
+  static const int kTschchartseriestrendlineequationoffsetyFieldNumber = 37;
+  inline float tschchartseriestrendlineequationoffsety() const;
+  inline void set_tschchartseriestrendlineequationoffsety(float value);
+
+  // optional string tschchartseriestrendlinelabelstring = 38;
+  inline bool has_tschchartseriestrendlinelabelstring() const;
+  inline void clear_tschchartseriestrendlinelabelstring();
+  static const int kTschchartseriestrendlinelabelstringFieldNumber = 38;
+  inline const ::std::string& tschchartseriestrendlinelabelstring() const;
+  inline void set_tschchartseriestrendlinelabelstring(const ::std::string& value);
+  inline void set_tschchartseriestrendlinelabelstring(const char* value);
+  inline void set_tschchartseriestrendlinelabelstring(const char* value, size_t size);
+  inline ::std::string* mutable_tschchartseriestrendlinelabelstring();
+  inline ::std::string* release_tschchartseriestrendlinelabelstring();
+  inline void set_allocated_tschchartseriestrendlinelabelstring(::std::string* tschchartseriestrendlinelabelstring);
+
+  // optional int32 tschchartseriestrendlineorder = 39;
+  inline bool has_tschchartseriestrendlineorder() const;
+  inline void clear_tschchartseriestrendlineorder();
+  static const int kTschchartseriestrendlineorderFieldNumber = 39;
+  inline ::google::protobuf::int32 tschchartseriestrendlineorder() const;
+  inline void set_tschchartseriestrendlineorder(::google::protobuf::int32 value);
+
+  // optional int32 tschchartseriestrendlineperiod = 40;
+  inline bool has_tschchartseriestrendlineperiod() const;
+  inline void clear_tschchartseriestrendlineperiod();
+  static const int kTschchartseriestrendlineperiodFieldNumber = 40;
+  inline ::google::protobuf::int32 tschchartseriestrendlineperiod() const;
+  inline void set_tschchartseriestrendlineperiod(::google::protobuf::int32 value);
+
+  // optional float tschchartseriestrendlinersquaredoffsetx = 41;
+  inline bool has_tschchartseriestrendlinersquaredoffsetx() const;
+  inline void clear_tschchartseriestrendlinersquaredoffsetx();
+  static const int kTschchartseriestrendlinersquaredoffsetxFieldNumber = 41;
+  inline float tschchartseriestrendlinersquaredoffsetx() const;
+  inline void set_tschchartseriestrendlinersquaredoffsetx(float value);
+
+  // optional float tschchartseriestrendlinersquaredoffsety = 42;
+  inline bool has_tschchartseriestrendlinersquaredoffsety() const;
+  inline void clear_tschchartseriestrendlinersquaredoffsety();
+  static const int kTschchartseriestrendlinersquaredoffsetyFieldNumber = 42;
+  inline float tschchartseriestrendlinersquaredoffsety() const;
+  inline void set_tschchartseriestrendlinersquaredoffsety(float value);
+
+  // optional bool tschchartseriestrendlineshowequation = 43;
+  inline bool has_tschchartseriestrendlineshowequation() const;
+  inline void clear_tschchartseriestrendlineshowequation();
+  static const int kTschchartseriestrendlineshowequationFieldNumber = 43;
+  inline bool tschchartseriestrendlineshowequation() const;
+  inline void set_tschchartseriestrendlineshowequation(bool value);
+
+  // optional bool tschchartseriestrendlineshowlabel = 44;
+  inline bool has_tschchartseriestrendlineshowlabel() const;
+  inline void clear_tschchartseriestrendlineshowlabel();
+  static const int kTschchartseriestrendlineshowlabelFieldNumber = 44;
+  inline bool tschchartseriestrendlineshowlabel() const;
+  inline void set_tschchartseriestrendlineshowlabel(bool value);
+
+  // optional bool tschchartseriestrendlineshowr2value = 45;
+  inline bool has_tschchartseriestrendlineshowr2value() const;
+  inline void clear_tschchartseriestrendlineshowr2value();
+  static const int kTschchartseriestrendlineshowr2ValueFieldNumber = 45;
+  inline bool tschchartseriestrendlineshowr2value() const;
+  inline void set_tschchartseriestrendlineshowr2value(bool value);
+
+  // optional int32 tschchartseriestrendlinetype = 46;
+  inline bool has_tschchartseriestrendlinetype() const;
+  inline void clear_tschchartseriestrendlinetype();
+  static const int kTschchartseriestrendlinetypeFieldNumber = 46;
+  inline ::google::protobuf::int32 tschchartseriestrendlinetype() const;
+  inline void set_tschchartseriestrendlinetype(::google::protobuf::int32 value);
+
+  // optional float tschchartserieswedgeexplosion = 47;
+  inline bool has_tschchartserieswedgeexplosion() const;
+  inline void clear_tschchartserieswedgeexplosion();
+  static const int kTschchartserieswedgeexplosionFieldNumber = 47;
+  inline float tschchartserieswedgeexplosion() const;
+  inline void set_tschchartserieswedgeexplosion(float value);
+
+  // optional int32 tschchartseriesyaxisordinal = 48;
+  inline bool has_tschchartseriesyaxisordinal() const;
+  inline void clear_tschchartseriesyaxisordinal();
+  static const int kTschchartseriesyaxisordinalFieldNumber = 48;
+  inline ::google::protobuf::int32 tschchartseriesyaxisordinal() const;
+  inline void set_tschchartseriesyaxisordinal(::google::protobuf::int32 value);
+
+  // optional int32 tschchartseriesvaluelabelsaxis = 49;
+  inline bool has_tschchartseriesvaluelabelsaxis() const;
+  inline void clear_tschchartseriesvaluelabelsaxis();
+  static const int kTschchartseriesvaluelabelsaxisFieldNumber = 49;
+  inline ::google::protobuf::int32 tschchartseriesvaluelabelsaxis() const;
+  inline void set_tschchartseriesvaluelabelsaxis(::google::protobuf::int32 value);
+
+  // optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+  inline bool has_tschchartserieserrorbarlineend() const;
+  inline void clear_tschchartserieserrorbarlineend();
+  static const int kTschchartserieserrorbarlineendFieldNumber = 50;
+  inline const ::TSD::LineEndArchive& tschchartserieserrorbarlineend() const;
+  inline ::TSD::LineEndArchive* mutable_tschchartserieserrorbarlineend();
+  inline ::TSD::LineEndArchive* release_tschchartserieserrorbarlineend();
+  inline void set_allocated_tschchartserieserrorbarlineend(::TSD::LineEndArchive* tschchartserieserrorbarlineend);
+
+  // optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+  inline bool has_tschchartserieserrorbarlineendscatterx() const;
+  inline void clear_tschchartserieserrorbarlineendscatterx();
+  static const int kTschchartserieserrorbarlineendscatterxFieldNumber = 51;
+  inline const ::TSD::LineEndArchive& tschchartserieserrorbarlineendscatterx() const;
+  inline ::TSD::LineEndArchive* mutable_tschchartserieserrorbarlineendscatterx();
+  inline ::TSD::LineEndArchive* release_tschchartserieserrorbarlineendscatterx();
+  inline void set_allocated_tschchartserieserrorbarlineendscatterx(::TSD::LineEndArchive* tschchartserieserrorbarlineendscatterx);
+
+  // optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+  inline bool has_tschchartserieserrorbarshadow() const;
+  inline void clear_tschchartserieserrorbarshadow();
+  static const int kTschchartserieserrorbarshadowFieldNumber = 52;
+  inline const ::TSD::ShadowArchive& tschchartserieserrorbarshadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschchartserieserrorbarshadow();
+  inline ::TSD::ShadowArchive* release_tschchartserieserrorbarshadow();
+  inline void set_allocated_tschchartserieserrorbarshadow(::TSD::ShadowArchive* tschchartserieserrorbarshadow);
+
+  // optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+  inline bool has_tschchartserieserrorbarstroke() const;
+  inline void clear_tschchartserieserrorbarstroke();
+  static const int kTschchartserieserrorbarstrokeFieldNumber = 53;
+  inline const ::TSD::StrokeArchive& tschchartserieserrorbarstroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartserieserrorbarstroke();
+  inline ::TSD::StrokeArchive* release_tschchartserieserrorbarstroke();
+  inline void set_allocated_tschchartserieserrorbarstroke(::TSD::StrokeArchive* tschchartserieserrorbarstroke);
+
+  // optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+  inline bool has_tschchartserieserrorbarstrokescatterx() const;
+  inline void clear_tschchartserieserrorbarstrokescatterx();
+  static const int kTschchartserieserrorbarstrokescatterxFieldNumber = 54;
+  inline const ::TSD::StrokeArchive& tschchartserieserrorbarstrokescatterx() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartserieserrorbarstrokescatterx();
+  inline ::TSD::StrokeArchive* release_tschchartserieserrorbarstrokescatterx();
+  inline void set_allocated_tschchartserieserrorbarstrokescatterx(::TSD::StrokeArchive* tschchartserieserrorbarstrokescatterx);
+
+  // optional .TSD.FillArchive tschchartseriesfill = 55;
+  inline bool has_tschchartseriesfill() const;
+  inline void clear_tschchartseriesfill();
+  static const int kTschchartseriesfillFieldNumber = 55;
+  inline const ::TSD::FillArchive& tschchartseriesfill() const;
+  inline ::TSD::FillArchive* mutable_tschchartseriesfill();
+  inline ::TSD::FillArchive* release_tschchartseriesfill();
+  inline void set_allocated_tschchartseriesfill(::TSD::FillArchive* tschchartseriesfill);
+
+  // optional int32 tschchartserieslabelparagraphstyleindex = 56;
+  inline bool has_tschchartserieslabelparagraphstyleindex() const;
+  inline void clear_tschchartserieslabelparagraphstyleindex();
+  static const int kTschchartserieslabelparagraphstyleindexFieldNumber = 56;
+  inline ::google::protobuf::int32 tschchartserieslabelparagraphstyleindex() const;
+  inline void set_tschchartserieslabelparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional float tschchartseriesopacity = 57;
+  inline bool has_tschchartseriesopacity() const;
+  inline void clear_tschchartseriesopacity();
+  static const int kTschchartseriesopacityFieldNumber = 57;
+  inline float tschchartseriesopacity() const;
+  inline void set_tschchartseriesopacity(float value);
+
+  // optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+  inline bool has_tschchartseriesoutsidelabelparagraphstyleindex() const;
+  inline void clear_tschchartseriesoutsidelabelparagraphstyleindex();
+  static const int kTschchartseriesoutsidelabelparagraphstyleindexFieldNumber = 58;
+  inline ::google::protobuf::int32 tschchartseriesoutsidelabelparagraphstyleindex() const;
+  inline void set_tschchartseriesoutsidelabelparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+  inline bool has_tschchartseriesshadow() const;
+  inline void clear_tschchartseriesshadow();
+  static const int kTschchartseriesshadowFieldNumber = 59;
+  inline const ::TSD::ShadowArchive& tschchartseriesshadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschchartseriesshadow();
+  inline ::TSD::ShadowArchive* release_tschchartseriesshadow();
+  inline void set_allocated_tschchartseriesshadow(::TSD::ShadowArchive* tschchartseriesshadow);
+
+  // optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+  inline bool has_tschchartseriesstroke() const;
+  inline void clear_tschchartseriesstroke();
+  static const int kTschchartseriesstrokeFieldNumber = 60;
+  inline const ::TSD::StrokeArchive& tschchartseriesstroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartseriesstroke();
+  inline ::TSD::StrokeArchive* release_tschchartseriesstroke();
+  inline void set_allocated_tschchartseriesstroke(::TSD::StrokeArchive* tschchartseriesstroke);
+
+  // optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+  inline bool has_tschchartseriessymbolfill() const;
+  inline void clear_tschchartseriessymbolfill();
+  static const int kTschchartseriessymbolfillFieldNumber = 61;
+  inline const ::TSD::FillArchive& tschchartseriessymbolfill() const;
+  inline ::TSD::FillArchive* mutable_tschchartseriessymbolfill();
+  inline ::TSD::FillArchive* release_tschchartseriessymbolfill();
+  inline void set_allocated_tschchartseriessymbolfill(::TSD::FillArchive* tschchartseriessymbolfill);
+
+  // optional bool tschchartseriessymbolfilluseseriesfill = 62;
+  inline bool has_tschchartseriessymbolfilluseseriesfill() const;
+  inline void clear_tschchartseriessymbolfilluseseriesfill();
+  static const int kTschchartseriessymbolfilluseseriesfillFieldNumber = 62;
+  inline bool tschchartseriessymbolfilluseseriesfill() const;
+  inline void set_tschchartseriessymbolfilluseseriesfill(bool value);
+
+  // optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+  inline bool has_tschchartseriessymbolfilluseseriesstroke() const;
+  inline void clear_tschchartseriessymbolfilluseseriesstroke();
+  static const int kTschchartseriessymbolfilluseseriesstrokeFieldNumber = 63;
+  inline bool tschchartseriessymbolfilluseseriesstroke() const;
+  inline void set_tschchartseriessymbolfilluseseriesstroke(bool value);
+
+  // optional float tschchartseriessymbolsize = 64;
+  inline bool has_tschchartseriessymbolsize() const;
+  inline void clear_tschchartseriessymbolsize();
+  static const int kTschchartseriessymbolsizeFieldNumber = 64;
+  inline float tschchartseriessymbolsize() const;
+  inline void set_tschchartseriessymbolsize(float value);
+
+  // optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+  inline bool has_tschchartseriessymbolstroke() const;
+  inline void clear_tschchartseriessymbolstroke();
+  static const int kTschchartseriessymbolstrokeFieldNumber = 65;
+  inline const ::TSD::StrokeArchive& tschchartseriessymbolstroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartseriessymbolstroke();
+  inline ::TSD::StrokeArchive* release_tschchartseriessymbolstroke();
+  inline void set_allocated_tschchartseriessymbolstroke(::TSD::StrokeArchive* tschchartseriessymbolstroke);
+
+  // optional float tschchartseriestrendlineequationopacity = 66;
+  inline bool has_tschchartseriestrendlineequationopacity() const;
+  inline void clear_tschchartseriestrendlineequationopacity();
+  static const int kTschchartseriestrendlineequationopacityFieldNumber = 66;
+  inline float tschchartseriestrendlineequationopacity() const;
+  inline void set_tschchartseriestrendlineequationopacity(float value);
+
+  // optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+  inline bool has_tschchartseriestrendlineequationparagraphstyleindex() const;
+  inline void clear_tschchartseriestrendlineequationparagraphstyleindex();
+  static const int kTschchartseriestrendlineequationparagraphstyleindexFieldNumber = 67;
+  inline ::google::protobuf::int32 tschchartseriestrendlineequationparagraphstyleindex() const;
+  inline void set_tschchartseriestrendlineequationparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional float tschchartseriestrendlinersquaredopacity = 68;
+  inline bool has_tschchartseriestrendlinersquaredopacity() const;
+  inline void clear_tschchartseriestrendlinersquaredopacity();
+  static const int kTschchartseriestrendlinersquaredopacityFieldNumber = 68;
+  inline float tschchartseriestrendlinersquaredopacity() const;
+  inline void set_tschchartseriestrendlinersquaredopacity(float value);
+
+  // optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+  inline bool has_tschchartseriestrendlinersquaredparagraphstyleindex() const;
+  inline void clear_tschchartseriestrendlinersquaredparagraphstyleindex();
+  static const int kTschchartseriestrendlinersquaredparagraphstyleindexFieldNumber = 69;
+  inline ::google::protobuf::int32 tschchartseriestrendlinersquaredparagraphstyleindex() const;
+  inline void set_tschchartseriestrendlinersquaredparagraphstyleindex(::google::protobuf::int32 value);
+
+  // optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+  inline bool has_tschchartseriestrendlineshadow() const;
+  inline void clear_tschchartseriestrendlineshadow();
+  static const int kTschchartseriestrendlineshadowFieldNumber = 70;
+  inline const ::TSD::ShadowArchive& tschchartseriestrendlineshadow() const;
+  inline ::TSD::ShadowArchive* mutable_tschchartseriestrendlineshadow();
+  inline ::TSD::ShadowArchive* release_tschchartseriestrendlineshadow();
+  inline void set_allocated_tschchartseriestrendlineshadow(::TSD::ShadowArchive* tschchartseriestrendlineshadow);
+
+  // optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+  inline bool has_tschchartseriestrendlinestroke() const;
+  inline void clear_tschchartseriestrendlinestroke();
+  static const int kTschchartseriestrendlinestrokeFieldNumber = 71;
+  inline const ::TSD::StrokeArchive& tschchartseriestrendlinestroke() const;
+  inline ::TSD::StrokeArchive* mutable_tschchartseriestrendlinestroke();
+  inline ::TSD::StrokeArchive* release_tschchartseriestrendlinestroke();
+  inline void set_allocated_tschchartseriestrendlinestroke(::TSD::StrokeArchive* tschchartseriestrendlinestroke);
+
+  // optional int32 tschchartseriesvaluelabelposition = 72;
+  inline bool has_tschchartseriesvaluelabelposition() const;
+  inline void clear_tschchartseriesvaluelabelposition();
+  static const int kTschchartseriesvaluelabelpositionFieldNumber = 72;
+  inline ::google::protobuf::int32 tschchartseriesvaluelabelposition() const;
+  inline void set_tschchartseriesvaluelabelposition(::google::protobuf::int32 value);
+
+  // optional bool tschchartseriesshowlabelsinfront = 73;
+  inline bool has_tschchartseriesshowlabelsinfront() const;
+  inline void clear_tschchartseriesshowlabelsinfront();
+  static const int kTschchartseriesshowlabelsinfrontFieldNumber = 73;
+  inline bool tschchartseriesshowlabelsinfront() const;
+  inline void set_tschchartseriesshowlabelsinfront(bool value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.Generated.ChartSeriesGenericPropertyMapArchive)
+ private:
+  inline void set_has_tschchartseriesadjustmentscale();
+  inline void clear_has_tschchartseriesadjustmentscale();
+  inline void set_has_tschchartserieserrorbarcustomnegativedata();
+  inline void clear_has_tschchartserieserrorbarcustomnegativedata();
+  inline void set_has_tschchartserieserrorbarcustomnegativedatascatterx();
+  inline void clear_has_tschchartserieserrorbarcustomnegativedatascatterx();
+  inline void set_has_tschchartserieserrorbarcustompositivedata();
+  inline void clear_has_tschchartserieserrorbarcustompositivedata();
+  inline void set_has_tschchartserieserrorbarcustompositivedatascatterx();
+  inline void clear_has_tschchartserieserrorbarcustompositivedatascatterx();
+  inline void set_has_tschchartserieserrorbarfixedvalue();
+  inline void clear_has_tschchartserieserrorbarfixedvalue();
+  inline void set_has_tschchartserieserrorbarfixedvaluescatterx();
+  inline void clear_has_tschchartserieserrorbarfixedvaluescatterx();
+  inline void set_has_tschchartserieserrorbarpercentvalue();
+  inline void clear_has_tschchartserieserrorbarpercentvalue();
+  inline void set_has_tschchartserieserrorbarpercentvaluescatterx();
+  inline void clear_has_tschchartserieserrorbarpercentvaluescatterx();
+  inline void set_has_tschchartserieserrorbarsetting();
+  inline void clear_has_tschchartserieserrorbarsetting();
+  inline void set_has_tschchartserieserrorbarsettingscatterx();
+  inline void clear_has_tschchartserieserrorbarsettingscatterx();
+  inline void set_has_tschchartserieserrorbarstddevvalue();
+  inline void clear_has_tschchartserieserrorbarstddevvalue();
+  inline void set_has_tschchartserieserrorbarstddevvaluescatterx();
+  inline void clear_has_tschchartserieserrorbarstddevvaluescatterx();
+  inline void set_has_tschchartserieserrorbartype();
+  inline void clear_has_tschchartserieserrorbartype();
+  inline void set_has_tschchartserieserrorbartypescatterx();
+  inline void clear_has_tschchartserieserrorbartypescatterx();
+  inline void set_has_tschchartserieslabelexplosion();
+  inline void clear_has_tschchartserieslabelexplosion();
+  inline void set_has_tschchartserieslinetype();
+  inline void clear_has_tschchartserieslinetype();
+  inline void set_has_tschchartseries1_0numberformat();
+  inline void clear_has_tschchartseries1_0numberformat();
+  inline void set_has_tschchartseriesnumberformat();
+  inline void clear_has_tschchartseriesnumberformat();
+  inline void set_has_tschchartseries1_0dateformat();
+  inline void clear_has_tschchartseries1_0dateformat();
+  inline void set_has_tschchartseriesdurationformat();
+  inline void clear_has_tschchartseriesdurationformat();
+  inline void set_has_tschchartseriesdateformat();
+  inline void clear_has_tschchartseriesdateformat();
+  inline void set_has_tschchartseriesnumberformattype();
+  inline void clear_has_tschchartseriesnumberformattype();
+  inline void set_has_tschchartseriespercentnumberformat();
+  inline void clear_has_tschchartseriespercentnumberformat();
+  inline void set_has_tschchartseriesseriestype();
+  inline void clear_has_tschchartseriesseriestype();
+  inline void set_has_tschchartseriesshowerrorbar();
+  inline void clear_has_tschchartseriesshowerrorbar();
+  inline void set_has_tschchartseriesshowerrorbarscatterx();
+  inline void clear_has_tschchartseriesshowerrorbarscatterx();
+  inline void set_has_tschchartseriesshowline();
+  inline void clear_has_tschchartseriesshowline();
+  inline void set_has_tschchartseriesshownegativedata();
+  inline void clear_has_tschchartseriesshownegativedata();
+  inline void set_has_tschchartseriesshowserieslabels();
+  inline void clear_has_tschchartseriesshowserieslabels();
+  inline void set_has_tschchartseriesshowsymbol();
+  inline void clear_has_tschchartseriesshowsymbol();
+  inline void set_has_tschchartseriesshowtrendline();
+  inline void clear_has_tschchartseriesshowtrendline();
+  inline void set_has_tschchartseriesshowvaluelabels();
+  inline void clear_has_tschchartseriesshowvaluelabels();
+  inline void set_has_tschchartseriessizedimension();
+  inline void clear_has_tschchartseriessizedimension();
+  inline void set_has_tschchartseriessymboltype();
+  inline void clear_has_tschchartseriessymboltype();
+  inline void set_has_tschchartseriestrendlineequationoffsetx();
+  inline void clear_has_tschchartseriestrendlineequationoffsetx();
+  inline void set_has_tschchartseriestrendlineequationoffsety();
+  inline void clear_has_tschchartseriestrendlineequationoffsety();
+  inline void set_has_tschchartseriestrendlinelabelstring();
+  inline void clear_has_tschchartseriestrendlinelabelstring();
+  inline void set_has_tschchartseriestrendlineorder();
+  inline void clear_has_tschchartseriestrendlineorder();
+  inline void set_has_tschchartseriestrendlineperiod();
+  inline void clear_has_tschchartseriestrendlineperiod();
+  inline void set_has_tschchartseriestrendlinersquaredoffsetx();
+  inline void clear_has_tschchartseriestrendlinersquaredoffsetx();
+  inline void set_has_tschchartseriestrendlinersquaredoffsety();
+  inline void clear_has_tschchartseriestrendlinersquaredoffsety();
+  inline void set_has_tschchartseriestrendlineshowequation();
+  inline void clear_has_tschchartseriestrendlineshowequation();
+  inline void set_has_tschchartseriestrendlineshowlabel();
+  inline void clear_has_tschchartseriestrendlineshowlabel();
+  inline void set_has_tschchartseriestrendlineshowr2value();
+  inline void clear_has_tschchartseriestrendlineshowr2value();
+  inline void set_has_tschchartseriestrendlinetype();
+  inline void clear_has_tschchartseriestrendlinetype();
+  inline void set_has_tschchartserieswedgeexplosion();
+  inline void clear_has_tschchartserieswedgeexplosion();
+  inline void set_has_tschchartseriesyaxisordinal();
+  inline void clear_has_tschchartseriesyaxisordinal();
+  inline void set_has_tschchartseriesvaluelabelsaxis();
+  inline void clear_has_tschchartseriesvaluelabelsaxis();
+  inline void set_has_tschchartserieserrorbarlineend();
+  inline void clear_has_tschchartserieserrorbarlineend();
+  inline void set_has_tschchartserieserrorbarlineendscatterx();
+  inline void clear_has_tschchartserieserrorbarlineendscatterx();
+  inline void set_has_tschchartserieserrorbarshadow();
+  inline void clear_has_tschchartserieserrorbarshadow();
+  inline void set_has_tschchartserieserrorbarstroke();
+  inline void clear_has_tschchartserieserrorbarstroke();
+  inline void set_has_tschchartserieserrorbarstrokescatterx();
+  inline void clear_has_tschchartserieserrorbarstrokescatterx();
+  inline void set_has_tschchartseriesfill();
+  inline void clear_has_tschchartseriesfill();
+  inline void set_has_tschchartserieslabelparagraphstyleindex();
+  inline void clear_has_tschchartserieslabelparagraphstyleindex();
+  inline void set_has_tschchartseriesopacity();
+  inline void clear_has_tschchartseriesopacity();
+  inline void set_has_tschchartseriesoutsidelabelparagraphstyleindex();
+  inline void clear_has_tschchartseriesoutsidelabelparagraphstyleindex();
+  inline void set_has_tschchartseriesshadow();
+  inline void clear_has_tschchartseriesshadow();
+  inline void set_has_tschchartseriesstroke();
+  inline void clear_has_tschchartseriesstroke();
+  inline void set_has_tschchartseriessymbolfill();
+  inline void clear_has_tschchartseriessymbolfill();
+  inline void set_has_tschchartseriessymbolfilluseseriesfill();
+  inline void clear_has_tschchartseriessymbolfilluseseriesfill();
+  inline void set_has_tschchartseriessymbolfilluseseriesstroke();
+  inline void clear_has_tschchartseriessymbolfilluseseriesstroke();
+  inline void set_has_tschchartseriessymbolsize();
+  inline void clear_has_tschchartseriessymbolsize();
+  inline void set_has_tschchartseriessymbolstroke();
+  inline void clear_has_tschchartseriessymbolstroke();
+  inline void set_has_tschchartseriestrendlineequationopacity();
+  inline void clear_has_tschchartseriestrendlineequationopacity();
+  inline void set_has_tschchartseriestrendlineequationparagraphstyleindex();
+  inline void clear_has_tschchartseriestrendlineequationparagraphstyleindex();
+  inline void set_has_tschchartseriestrendlinersquaredopacity();
+  inline void clear_has_tschchartseriestrendlinersquaredopacity();
+  inline void set_has_tschchartseriestrendlinersquaredparagraphstyleindex();
+  inline void clear_has_tschchartseriestrendlinersquaredparagraphstyleindex();
+  inline void set_has_tschchartseriestrendlineshadow();
+  inline void clear_has_tschchartseriestrendlineshadow();
+  inline void set_has_tschchartseriestrendlinestroke();
+  inline void clear_has_tschchartseriestrendlinestroke();
+  inline void set_has_tschchartseriesvaluelabelposition();
+  inline void clear_has_tschchartseriesvaluelabelposition();
+  inline void set_has_tschchartseriesshowlabelsinfront();
+  inline void clear_has_tschchartseriesshowlabelsinfront();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustomnegativedata_;
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustomnegativedatascatterx_;
+  float tschchartseriesadjustmentscale_;
+  float tschchartserieserrorbarfixedvalue_;
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustompositivedata_;
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustompositivedatascatterx_;
+  float tschchartserieserrorbarfixedvaluescatterx_;
+  float tschchartserieserrorbarpercentvalue_;
+  float tschchartserieserrorbarpercentvaluescatterx_;
+  ::google::protobuf::int32 tschchartserieserrorbarsetting_;
+  ::google::protobuf::int32 tschchartserieserrorbarsettingscatterx_;
+  float tschchartserieserrorbarstddevvalue_;
+  float tschchartserieserrorbarstddevvaluescatterx_;
+  ::google::protobuf::int32 tschchartserieserrorbartype_;
+  ::google::protobuf::int32 tschchartserieserrorbartypescatterx_;
+  float tschchartserieslabelexplosion_;
+  ::TSK::FormatStructArchive* tschchartseries1_0numberformat_;
+  ::TSK::FormatStructArchive* tschchartseriesnumberformat_;
+  ::TSK::FormatStructArchive* tschchartseries1_0dateformat_;
+  ::google::protobuf::int32 tschchartserieslinetype_;
+  ::google::protobuf::int32 tschchartseriesnumberformattype_;
+  ::TSK::FormatStructArchive* tschchartseriesdurationformat_;
+  ::TSK::FormatStructArchive* tschchartseriesdateformat_;
+  ::TSK::FormatStructArchive* tschchartseriespercentnumberformat_;
+  ::google::protobuf::int32 tschchartseriesseriestype_;
+  bool tschchartseriesshowerrorbar_;
+  bool tschchartseriesshowerrorbarscatterx_;
+  bool tschchartseriesshowline_;
+  bool tschchartseriesshownegativedata_;
+  bool tschchartseriesshowserieslabels_;
+  bool tschchartseriesshowsymbol_;
+  bool tschchartseriesshowtrendline_;
+  bool tschchartseriesshowvaluelabels_;
+  ::google::protobuf::int32 tschchartseriessizedimension_;
+  ::google::protobuf::int32 tschchartseriessymboltype_;
+  float tschchartseriestrendlineequationoffsetx_;
+  ::std::string* tschchartseriestrendlinelabelstring_;
+  float tschchartseriestrendlineequationoffsety_;
+  ::google::protobuf::int32 tschchartseriestrendlineorder_;
+  ::google::protobuf::int32 tschchartseriestrendlineperiod_;
+  float tschchartseriestrendlinersquaredoffsetx_;
+  float tschchartseriestrendlinersquaredoffsety_;
+  ::google::protobuf::int32 tschchartseriestrendlinetype_;
+  float tschchartserieswedgeexplosion_;
+  ::google::protobuf::int32 tschchartseriesyaxisordinal_;
+  bool tschchartseriestrendlineshowequation_;
+  bool tschchartseriestrendlineshowlabel_;
+  bool tschchartseriestrendlineshowr2value_;
+  bool tschchartseriessymbolfilluseseriesfill_;
+  ::google::protobuf::int32 tschchartseriesvaluelabelsaxis_;
+  ::TSD::LineEndArchive* tschchartserieserrorbarlineend_;
+  ::TSD::LineEndArchive* tschchartserieserrorbarlineendscatterx_;
+  ::TSD::ShadowArchive* tschchartserieserrorbarshadow_;
+  ::TSD::StrokeArchive* tschchartserieserrorbarstroke_;
+  ::TSD::StrokeArchive* tschchartserieserrorbarstrokescatterx_;
+  ::TSD::FillArchive* tschchartseriesfill_;
+  ::google::protobuf::int32 tschchartserieslabelparagraphstyleindex_;
+  float tschchartseriesopacity_;
+  ::TSD::ShadowArchive* tschchartseriesshadow_;
+  ::TSD::StrokeArchive* tschchartseriesstroke_;
+  ::google::protobuf::int32 tschchartseriesoutsidelabelparagraphstyleindex_;
+  float tschchartseriessymbolsize_;
+  ::TSD::FillArchive* tschchartseriessymbolfill_;
+  ::TSD::StrokeArchive* tschchartseriessymbolstroke_;
+  float tschchartseriestrendlineequationopacity_;
+  ::google::protobuf::int32 tschchartseriestrendlineequationparagraphstyleindex_;
+  float tschchartseriestrendlinersquaredopacity_;
+  bool tschchartseriessymbolfilluseseriesstroke_;
+  bool tschchartseriesshowlabelsinfront_;
+  ::TSD::ShadowArchive* tschchartseriestrendlineshadow_;
+  ::google::protobuf::int32 tschchartseriestrendlinersquaredparagraphstyleindex_;
+  ::google::protobuf::int32 tschchartseriesvaluelabelposition_;
+  ::TSD::StrokeArchive* tschchartseriestrendlinestroke_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(73 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_AssignDesc_TSCHArchives_2eGEN_2eproto();
+  friend void protobuf_ShutdownFile_TSCHArchives_2eGEN_2eproto();
+
+  void InitAsDefaultInstance();
+  static ChartSeriesGenericPropertyMapArchive* default_instance_;
+};
 // ===================================================================
 
 
@@ -6058,30 +8047,68 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisdefault3dlabelposition(::
   tschchartaxisdefault3dlabelposition_ = value;
 }
 
-// optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 2;
-inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultnumberformat() const {
+// optional .TSK.FormatStructArchive tschchartaxisdefault1_0numberformat = 2;
+inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefault1_0numberformat() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultnumberformat() {
+inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefault1_0numberformat() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultnumberformat() {
+inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefault1_0numberformat() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultnumberformat() {
-  if (tschchartaxisdefaultnumberformat_ != NULL) tschchartaxisdefaultnumberformat_->::TSK::FormatStructArchive::Clear();
-  clear_has_tschchartaxisdefaultnumberformat();
+inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefault1_0numberformat() {
+  if (tschchartaxisdefault1_0numberformat_ != NULL) tschchartaxisdefault1_0numberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdefault1_0numberformat();
 }
-inline const ::TSK::FormatStructArchive& ChartAxisNonStyleArchive::tschchartaxisdefaultnumberformat() const {
-  return tschchartaxisdefaultnumberformat_ != NULL ? *tschchartaxisdefaultnumberformat_ : *default_instance_->tschchartaxisdefaultnumberformat_;
+inline const ::TSK::FormatStructArchive& ChartAxisNonStyleArchive::tschchartaxisdefault1_0numberformat() const {
+  return tschchartaxisdefault1_0numberformat_ != NULL ? *tschchartaxisdefault1_0numberformat_ : *default_instance_->tschchartaxisdefault1_0numberformat_;
 }
-inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::mutable_tschchartaxisdefaultnumberformat() {
-  set_has_tschchartaxisdefaultnumberformat();
-  if (tschchartaxisdefaultnumberformat_ == NULL) tschchartaxisdefaultnumberformat_ = new ::TSK::FormatStructArchive;
-  return tschchartaxisdefaultnumberformat_;
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::mutable_tschchartaxisdefault1_0numberformat() {
+  set_has_tschchartaxisdefault1_0numberformat();
+  if (tschchartaxisdefault1_0numberformat_ == NULL) tschchartaxisdefault1_0numberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdefault1_0numberformat_;
 }
-inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::release_tschchartaxisdefaultnumberformat() {
-  clear_has_tschchartaxisdefaultnumberformat();
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::release_tschchartaxisdefault1_0numberformat() {
+  clear_has_tschchartaxisdefault1_0numberformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisdefault1_0numberformat_;
+  tschchartaxisdefault1_0numberformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisdefault1_0numberformat(::TSK::FormatStructArchive* tschchartaxisdefault1_0numberformat) {
+  delete tschchartaxisdefault1_0numberformat_;
+  tschchartaxisdefault1_0numberformat_ = tschchartaxisdefault1_0numberformat;
+  if (tschchartaxisdefault1_0numberformat) {
+    set_has_tschchartaxisdefault1_0numberformat();
+  } else {
+    clear_has_tschchartaxisdefault1_0numberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxisdefaultnumberformat = 42;
+inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultnumberformat() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultnumberformat() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultnumberformat() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultnumberformat() {
+  if (tschchartaxisdefaultnumberformat_ != NULL) tschchartaxisdefaultnumberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdefaultnumberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisNonStyleArchive::tschchartaxisdefaultnumberformat() const {
+  return tschchartaxisdefaultnumberformat_ != NULL ? *tschchartaxisdefaultnumberformat_ : *default_instance_->tschchartaxisdefaultnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::mutable_tschchartaxisdefaultnumberformat() {
+  set_has_tschchartaxisdefaultnumberformat();
+  if (tschchartaxisdefaultnumberformat_ == NULL) tschchartaxisdefaultnumberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdefaultnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::release_tschchartaxisdefaultnumberformat() {
+  clear_has_tschchartaxisdefaultnumberformat();
   ::TSK::FormatStructArchive* temp = tschchartaxisdefaultnumberformat_;
   tschchartaxisdefaultnumberformat_ = NULL;
   return temp;
@@ -6096,15 +8123,129 @@ inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisdefaultnumberfo
   }
 }
 
+// optional .TSK.FormatStructArchive tschchartaxisdefault1_0dateformat = 20;
+inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefault1_0dateformat() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefault1_0dateformat() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefault1_0dateformat() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefault1_0dateformat() {
+  if (tschchartaxisdefault1_0dateformat_ != NULL) tschchartaxisdefault1_0dateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdefault1_0dateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisNonStyleArchive::tschchartaxisdefault1_0dateformat() const {
+  return tschchartaxisdefault1_0dateformat_ != NULL ? *tschchartaxisdefault1_0dateformat_ : *default_instance_->tschchartaxisdefault1_0dateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::mutable_tschchartaxisdefault1_0dateformat() {
+  set_has_tschchartaxisdefault1_0dateformat();
+  if (tschchartaxisdefault1_0dateformat_ == NULL) tschchartaxisdefault1_0dateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdefault1_0dateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::release_tschchartaxisdefault1_0dateformat() {
+  clear_has_tschchartaxisdefault1_0dateformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisdefault1_0dateformat_;
+  tschchartaxisdefault1_0dateformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisdefault1_0dateformat(::TSK::FormatStructArchive* tschchartaxisdefault1_0dateformat) {
+  delete tschchartaxisdefault1_0dateformat_;
+  tschchartaxisdefault1_0dateformat_ = tschchartaxisdefault1_0dateformat;
+  if (tschchartaxisdefault1_0dateformat) {
+    set_has_tschchartaxisdefault1_0dateformat();
+  } else {
+    clear_has_tschchartaxisdefault1_0dateformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxisdefaultdurationformat = 21;
+inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultdurationformat() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultdurationformat() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultdurationformat() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultdurationformat() {
+  if (tschchartaxisdefaultdurationformat_ != NULL) tschchartaxisdefaultdurationformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdefaultdurationformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisNonStyleArchive::tschchartaxisdefaultdurationformat() const {
+  return tschchartaxisdefaultdurationformat_ != NULL ? *tschchartaxisdefaultdurationformat_ : *default_instance_->tschchartaxisdefaultdurationformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::mutable_tschchartaxisdefaultdurationformat() {
+  set_has_tschchartaxisdefaultdurationformat();
+  if (tschchartaxisdefaultdurationformat_ == NULL) tschchartaxisdefaultdurationformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdefaultdurationformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::release_tschchartaxisdefaultdurationformat() {
+  clear_has_tschchartaxisdefaultdurationformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisdefaultdurationformat_;
+  tschchartaxisdefaultdurationformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisdefaultdurationformat(::TSK::FormatStructArchive* tschchartaxisdefaultdurationformat) {
+  delete tschchartaxisdefaultdurationformat_;
+  tschchartaxisdefaultdurationformat_ = tschchartaxisdefaultdurationformat;
+  if (tschchartaxisdefaultdurationformat) {
+    set_has_tschchartaxisdefaultdurationformat();
+  } else {
+    clear_has_tschchartaxisdefaultdurationformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxisdefaultdateformat = 22;
+inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultdateformat() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultdateformat() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultdateformat() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultdateformat() {
+  if (tschchartaxisdefaultdateformat_ != NULL) tschchartaxisdefaultdateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdefaultdateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisNonStyleArchive::tschchartaxisdefaultdateformat() const {
+  return tschchartaxisdefaultdateformat_ != NULL ? *tschchartaxisdefaultdateformat_ : *default_instance_->tschchartaxisdefaultdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::mutable_tschchartaxisdefaultdateformat() {
+  set_has_tschchartaxisdefaultdateformat();
+  if (tschchartaxisdefaultdateformat_ == NULL) tschchartaxisdefaultdateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdefaultdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisNonStyleArchive::release_tschchartaxisdefaultdateformat() {
+  clear_has_tschchartaxisdefaultdateformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisdefaultdateformat_;
+  tschchartaxisdefaultdateformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisdefaultdateformat(::TSK::FormatStructArchive* tschchartaxisdefaultdateformat) {
+  delete tschchartaxisdefaultdateformat_;
+  tschchartaxisdefaultdateformat_ = tschchartaxisdefaultdateformat;
+  if (tschchartaxisdefaultdateformat) {
+    set_has_tschchartaxisdefaultdateformat();
+  } else {
+    clear_has_tschchartaxisdefaultdateformat();
+  }
+}
+
 // optional int32 tschchartaxisdefaultnumberformattype = 3;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultnumberformattype() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+  return (_has_bits_[0] & 0x00000040u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultnumberformattype() {
-  _has_bits_[0] |= 0x00000004u;
+  _has_bits_[0] |= 0x00000040u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultnumberformattype() {
-  _has_bits_[0] &= ~0x00000004u;
+  _has_bits_[0] &= ~0x00000040u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultnumberformattype() {
   tschchartaxisdefaultnumberformattype_ = 0;
@@ -6120,13 +8261,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisdefaultnumberformattype(:
 
 // optional int32 tschchartaxisvaluenumberofdecades = 4;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvaluenumberofdecades() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+  return (_has_bits_[0] & 0x00000080u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvaluenumberofdecades() {
-  _has_bits_[0] |= 0x00000008u;
+  _has_bits_[0] |= 0x00000080u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvaluenumberofdecades() {
-  _has_bits_[0] &= ~0x00000008u;
+  _has_bits_[0] &= ~0x00000080u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvaluenumberofdecades() {
   tschchartaxisvaluenumberofdecades_ = 0;
@@ -6142,13 +8283,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisvaluenumberofdecades(::go
 
 // optional int32 tschchartaxisvaluenumberofmajorgridlines = 5;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvaluenumberofmajorgridlines() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+  return (_has_bits_[0] & 0x00000100u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvaluenumberofmajorgridlines() {
-  _has_bits_[0] |= 0x00000010u;
+  _has_bits_[0] |= 0x00000100u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvaluenumberofmajorgridlines() {
-  _has_bits_[0] &= ~0x00000010u;
+  _has_bits_[0] &= ~0x00000100u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvaluenumberofmajorgridlines() {
   tschchartaxisvaluenumberofmajorgridlines_ = 0;
@@ -6164,13 +8305,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisvaluenumberofmajorgridlin
 
 // optional int32 tschchartaxisvaluenumberofminorgridlines = 6;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvaluenumberofminorgridlines() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvaluenumberofminorgridlines() {
-  _has_bits_[0] |= 0x00000020u;
+  _has_bits_[0] |= 0x00000200u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvaluenumberofminorgridlines() {
-  _has_bits_[0] &= ~0x00000020u;
+  _has_bits_[0] &= ~0x00000200u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvaluenumberofminorgridlines() {
   tschchartaxisvaluenumberofminorgridlines_ = 0;
@@ -6186,13 +8327,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisvaluenumberofminorgridlin
 
 // optional bool tschchartaxiscategoryplottoedges = 7;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxiscategoryplottoedges() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
+  return (_has_bits_[0] & 0x00000400u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxiscategoryplottoedges() {
-  _has_bits_[0] |= 0x00000040u;
+  _has_bits_[0] |= 0x00000400u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxiscategoryplottoedges() {
-  _has_bits_[0] &= ~0x00000040u;
+  _has_bits_[0] &= ~0x00000400u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxiscategoryplottoedges() {
   tschchartaxiscategoryplottoedges_ = false;
@@ -6208,13 +8349,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxiscategoryplottoedges(bool
 
 // optional int32 tschchartaxisvaluescale = 8;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvaluescale() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvaluescale() {
-  _has_bits_[0] |= 0x00000080u;
+  _has_bits_[0] |= 0x00000800u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvaluescale() {
-  _has_bits_[0] &= ~0x00000080u;
+  _has_bits_[0] &= ~0x00000800u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvaluescale() {
   tschchartaxisvaluescale_ = 0;
@@ -6230,13 +8371,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisvaluescale(::google::prot
 
 // optional bool tschchartaxiscategoryshowlabels = 9;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxiscategoryshowlabels() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
+  return (_has_bits_[0] & 0x00001000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxiscategoryshowlabels() {
-  _has_bits_[0] |= 0x00000100u;
+  _has_bits_[0] |= 0x00001000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxiscategoryshowlabels() {
-  _has_bits_[0] &= ~0x00000100u;
+  _has_bits_[0] &= ~0x00001000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxiscategoryshowlabels() {
   tschchartaxiscategoryshowlabels_ = false;
@@ -6252,13 +8393,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxiscategoryshowlabels(bool v
 
 // optional bool tschchartaxisdefaultshowlabels = 10;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultshowlabels() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultshowlabels() {
-  _has_bits_[0] |= 0x00000200u;
+  _has_bits_[0] |= 0x00002000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultshowlabels() {
-  _has_bits_[0] &= ~0x00000200u;
+  _has_bits_[0] &= ~0x00002000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultshowlabels() {
   tschchartaxisdefaultshowlabels_ = false;
@@ -6274,13 +8415,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisdefaultshowlabels(bool va
 
 // optional bool tschchartaxisvalueshowlabels = 11;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvalueshowlabels() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvalueshowlabels() {
-  _has_bits_[0] |= 0x00000400u;
+  _has_bits_[0] |= 0x00004000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvalueshowlabels() {
-  _has_bits_[0] &= ~0x00000400u;
+  _has_bits_[0] &= ~0x00004000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvalueshowlabels() {
   tschchartaxisvalueshowlabels_ = false;
@@ -6296,13 +8437,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisvalueshowlabels(bool valu
 
 // optional bool tschchartaxiscategoryshowserieslabels = 12;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxiscategoryshowserieslabels() const {
-  return (_has_bits_[0] & 0x00000800u) != 0;
+  return (_has_bits_[0] & 0x00008000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxiscategoryshowserieslabels() {
-  _has_bits_[0] |= 0x00000800u;
+  _has_bits_[0] |= 0x00008000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxiscategoryshowserieslabels() {
-  _has_bits_[0] &= ~0x00000800u;
+  _has_bits_[0] &= ~0x00008000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxiscategoryshowserieslabels() {
   tschchartaxiscategoryshowserieslabels_ = false;
@@ -6318,13 +8459,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxiscategoryshowserieslabels(
 
 // optional bool tschchartaxismultidatashowserieslabels = 19;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxismultidatashowserieslabels() const {
-  return (_has_bits_[0] & 0x00001000u) != 0;
+  return (_has_bits_[0] & 0x00010000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxismultidatashowserieslabels() {
-  _has_bits_[0] |= 0x00001000u;
+  _has_bits_[0] |= 0x00010000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxismultidatashowserieslabels() {
-  _has_bits_[0] &= ~0x00001000u;
+  _has_bits_[0] &= ~0x00010000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxismultidatashowserieslabels() {
   tschchartaxismultidatashowserieslabels_ = false;
@@ -6340,13 +8481,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxismultidatashowserieslabels
 
 // optional bool tschchartaxiscategoryshowtitle = 13;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxiscategoryshowtitle() const {
-  return (_has_bits_[0] & 0x00002000u) != 0;
+  return (_has_bits_[0] & 0x00020000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxiscategoryshowtitle() {
-  _has_bits_[0] |= 0x00002000u;
+  _has_bits_[0] |= 0x00020000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxiscategoryshowtitle() {
-  _has_bits_[0] &= ~0x00002000u;
+  _has_bits_[0] &= ~0x00020000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxiscategoryshowtitle() {
   tschchartaxiscategoryshowtitle_ = false;
@@ -6362,13 +8503,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxiscategoryshowtitle(bool va
 
 // optional bool tschchartaxisvalueshowtitle = 14;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvalueshowtitle() const {
-  return (_has_bits_[0] & 0x00004000u) != 0;
+  return (_has_bits_[0] & 0x00040000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvalueshowtitle() {
-  _has_bits_[0] |= 0x00004000u;
+  _has_bits_[0] |= 0x00040000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvalueshowtitle() {
-  _has_bits_[0] &= ~0x00004000u;
+  _has_bits_[0] &= ~0x00040000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvalueshowtitle() {
   tschchartaxisvalueshowtitle_ = false;
@@ -6384,13 +8525,13 @@ inline void ChartAxisNonStyleArchive::set_tschchartaxisvalueshowtitle(bool value
 
 // optional string tschchartaxiscategorytitle = 15;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxiscategorytitle() const {
-  return (_has_bits_[0] & 0x00008000u) != 0;
+  return (_has_bits_[0] & 0x00080000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxiscategorytitle() {
-  _has_bits_[0] |= 0x00008000u;
+  _has_bits_[0] |= 0x00080000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxiscategorytitle() {
-  _has_bits_[0] &= ~0x00008000u;
+  _has_bits_[0] &= ~0x00080000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxiscategorytitle() {
   if (tschchartaxiscategorytitle_ != &::google::protobuf::internal::kEmptyString) {
@@ -6454,13 +8595,13 @@ inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxiscategorytitle(:
 
 // optional string tschchartaxisvaluetitle = 16;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisvaluetitle() const {
-  return (_has_bits_[0] & 0x00010000u) != 0;
+  return (_has_bits_[0] & 0x00100000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisvaluetitle() {
-  _has_bits_[0] |= 0x00010000u;
+  _has_bits_[0] |= 0x00100000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisvaluetitle() {
-  _has_bits_[0] &= ~0x00010000u;
+  _has_bits_[0] &= ~0x00100000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisvaluetitle() {
   if (tschchartaxisvaluetitle_ != &::google::protobuf::internal::kEmptyString) {
@@ -6524,13 +8665,13 @@ inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisvaluetitle(::st
 
 // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisdefaultusermax = 17;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultusermax() const {
-  return (_has_bits_[0] & 0x00020000u) != 0;
+  return (_has_bits_[0] & 0x00200000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultusermax() {
-  _has_bits_[0] |= 0x00020000u;
+  _has_bits_[0] |= 0x00200000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultusermax() {
-  _has_bits_[0] &= ~0x00020000u;
+  _has_bits_[0] &= ~0x00200000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultusermax() {
   if (tschchartaxisdefaultusermax_ != NULL) tschchartaxisdefaultusermax_->::TSCH::ChartsNSNumberDoubleArchive::Clear();
@@ -6562,13 +8703,13 @@ inline void ChartAxisNonStyleArchive::set_allocated_tschchartaxisdefaultusermax(
 
 // optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisdefaultusermin = 18;
 inline bool ChartAxisNonStyleArchive::has_tschchartaxisdefaultusermin() const {
-  return (_has_bits_[0] & 0x00040000u) != 0;
+  return (_has_bits_[0] & 0x00400000u) != 0;
 }
 inline void ChartAxisNonStyleArchive::set_has_tschchartaxisdefaultusermin() {
-  _has_bits_[0] |= 0x00040000u;
+  _has_bits_[0] |= 0x00400000u;
 }
 inline void ChartAxisNonStyleArchive::clear_has_tschchartaxisdefaultusermin() {
-  _has_bits_[0] &= ~0x00040000u;
+  _has_bits_[0] &= ~0x00400000u;
 }
 inline void ChartAxisNonStyleArchive::clear_tschchartaxisdefaultusermin() {
   if (tschchartaxisdefaultusermin_ != NULL) tschchartaxisdefaultusermin_->::TSCH::ChartsNSNumberDoubleArchive::Clear();
@@ -10124,16 +12265,54 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscatterlinetype(::goo
   tschchartseriesscatterlinetype_ = value;
 }
 
-// optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 21;
-inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultnumberformat() const {
+// optional .TSK.FormatStructArchive tschchartseriesdefault1_0numberformat = 21;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefault1_0numberformat() const {
   return (_has_bits_[0] & 0x00100000u) != 0;
 }
-inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultnumberformat() {
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefault1_0numberformat() {
   _has_bits_[0] |= 0x00100000u;
 }
-inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultnumberformat() {
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefault1_0numberformat() {
   _has_bits_[0] &= ~0x00100000u;
 }
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefault1_0numberformat() {
+  if (tschchartseriesdefault1_0numberformat_ != NULL) tschchartseriesdefault1_0numberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesdefault1_0numberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriesdefault1_0numberformat() const {
+  return tschchartseriesdefault1_0numberformat_ != NULL ? *tschchartseriesdefault1_0numberformat_ : *default_instance_->tschchartseriesdefault1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriesdefault1_0numberformat() {
+  set_has_tschchartseriesdefault1_0numberformat();
+  if (tschchartseriesdefault1_0numberformat_ == NULL) tschchartseriesdefault1_0numberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesdefault1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriesdefault1_0numberformat() {
+  clear_has_tschchartseriesdefault1_0numberformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesdefault1_0numberformat_;
+  tschchartseriesdefault1_0numberformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesdefault1_0numberformat(::TSK::FormatStructArchive* tschchartseriesdefault1_0numberformat) {
+  delete tschchartseriesdefault1_0numberformat_;
+  tschchartseriesdefault1_0numberformat_ = tschchartseriesdefault1_0numberformat;
+  if (tschchartseriesdefault1_0numberformat) {
+    set_has_tschchartseriesdefault1_0numberformat();
+  } else {
+    clear_has_tschchartseriesdefault1_0numberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseriesdefaultnumberformat = 98;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultnumberformat() const {
+  return (_has_bits_[0] & 0x00200000u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultnumberformat() {
+  _has_bits_[0] |= 0x00200000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultnumberformat() {
+  _has_bits_[0] &= ~0x00200000u;
+}
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultnumberformat() {
   if (tschchartseriesdefaultnumberformat_ != NULL) tschchartseriesdefaultnumberformat_->::TSK::FormatStructArchive::Clear();
   clear_has_tschchartseriesdefaultnumberformat();
@@ -10162,75 +12341,227 @@ inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesdefaultnumb
   }
 }
 
-// optional .TSK.FormatStructArchive tschchartseriespienumberformat = 22;
-inline bool ChartSeriesNonStyleArchive::has_tschchartseriespienumberformat() const {
-  return (_has_bits_[0] & 0x00200000u) != 0;
+// optional .TSK.FormatStructArchive tschchartseriesdefault1_0dateformat = 69;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefault1_0dateformat() const {
+  return (_has_bits_[0] & 0x00400000u) != 0;
 }
-inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespienumberformat() {
-  _has_bits_[0] |= 0x00200000u;
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefault1_0dateformat() {
+  _has_bits_[0] |= 0x00400000u;
 }
-inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespienumberformat() {
-  _has_bits_[0] &= ~0x00200000u;
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefault1_0dateformat() {
+  _has_bits_[0] &= ~0x00400000u;
 }
-inline void ChartSeriesNonStyleArchive::clear_tschchartseriespienumberformat() {
-  if (tschchartseriespienumberformat_ != NULL) tschchartseriespienumberformat_->::TSK::FormatStructArchive::Clear();
-  clear_has_tschchartseriespienumberformat();
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefault1_0dateformat() {
+  if (tschchartseriesdefault1_0dateformat_ != NULL) tschchartseriesdefault1_0dateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesdefault1_0dateformat();
 }
-inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriespienumberformat() const {
-  return tschchartseriespienumberformat_ != NULL ? *tschchartseriespienumberformat_ : *default_instance_->tschchartseriespienumberformat_;
+inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriesdefault1_0dateformat() const {
+  return tschchartseriesdefault1_0dateformat_ != NULL ? *tschchartseriesdefault1_0dateformat_ : *default_instance_->tschchartseriesdefault1_0dateformat_;
 }
-inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriespienumberformat() {
-  set_has_tschchartseriespienumberformat();
-  if (tschchartseriespienumberformat_ == NULL) tschchartseriespienumberformat_ = new ::TSK::FormatStructArchive;
-  return tschchartseriespienumberformat_;
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriesdefault1_0dateformat() {
+  set_has_tschchartseriesdefault1_0dateformat();
+  if (tschchartseriesdefault1_0dateformat_ == NULL) tschchartseriesdefault1_0dateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesdefault1_0dateformat_;
 }
-inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriespienumberformat() {
-  clear_has_tschchartseriespienumberformat();
-  ::TSK::FormatStructArchive* temp = tschchartseriespienumberformat_;
-  tschchartseriespienumberformat_ = NULL;
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriesdefault1_0dateformat() {
+  clear_has_tschchartseriesdefault1_0dateformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesdefault1_0dateformat_;
+  tschchartseriesdefault1_0dateformat_ = NULL;
   return temp;
 }
-inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriespienumberformat(::TSK::FormatStructArchive* tschchartseriespienumberformat) {
-  delete tschchartseriespienumberformat_;
-  tschchartseriespienumberformat_ = tschchartseriespienumberformat;
-  if (tschchartseriespienumberformat) {
-    set_has_tschchartseriespienumberformat();
+inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesdefault1_0dateformat(::TSK::FormatStructArchive* tschchartseriesdefault1_0dateformat) {
+  delete tschchartseriesdefault1_0dateformat_;
+  tschchartseriesdefault1_0dateformat_ = tschchartseriesdefault1_0dateformat;
+  if (tschchartseriesdefault1_0dateformat) {
+    set_has_tschchartseriesdefault1_0dateformat();
   } else {
-    clear_has_tschchartseriespienumberformat();
+    clear_has_tschchartseriesdefault1_0dateformat();
   }
 }
 
-// optional int32 tschchartseriesdefaultnumberformattype = 23;
-inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultnumberformattype() const {
-  return (_has_bits_[0] & 0x00400000u) != 0;
+// optional .TSK.FormatStructArchive tschchartseriesdefaultdurationformat = 70;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultdurationformat() const {
+  return (_has_bits_[0] & 0x00800000u) != 0;
 }
-inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultnumberformattype() {
-  _has_bits_[0] |= 0x00400000u;
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultdurationformat() {
+  _has_bits_[0] |= 0x00800000u;
 }
-inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultnumberformattype() {
-  _has_bits_[0] &= ~0x00400000u;
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultdurationformat() {
+  _has_bits_[0] &= ~0x00800000u;
 }
-inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultnumberformattype() {
-  tschchartseriesdefaultnumberformattype_ = 0;
-  clear_has_tschchartseriesdefaultnumberformattype();
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultdurationformat() {
+  if (tschchartseriesdefaultdurationformat_ != NULL) tschchartseriesdefaultdurationformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesdefaultdurationformat();
 }
-inline ::google::protobuf::int32 ChartSeriesNonStyleArchive::tschchartseriesdefaultnumberformattype() const {
-  return tschchartseriesdefaultnumberformattype_;
+inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriesdefaultdurationformat() const {
+  return tschchartseriesdefaultdurationformat_ != NULL ? *tschchartseriesdefaultdurationformat_ : *default_instance_->tschchartseriesdefaultdurationformat_;
 }
-inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultnumberformattype(::google::protobuf::int32 value) {
-  set_has_tschchartseriesdefaultnumberformattype();
-  tschchartseriesdefaultnumberformattype_ = value;
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriesdefaultdurationformat() {
+  set_has_tschchartseriesdefaultdurationformat();
+  if (tschchartseriesdefaultdurationformat_ == NULL) tschchartseriesdefaultdurationformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesdefaultdurationformat_;
 }
-
-// optional int32 tschchartseriespienumberformattype = 24;
-inline bool ChartSeriesNonStyleArchive::has_tschchartseriespienumberformattype() const {
-  return (_has_bits_[0] & 0x00800000u) != 0;
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriesdefaultdurationformat() {
+  clear_has_tschchartseriesdefaultdurationformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesdefaultdurationformat_;
+  tschchartseriesdefaultdurationformat_ = NULL;
+  return temp;
 }
-inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespienumberformattype() {
-  _has_bits_[0] |= 0x00800000u;
+inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesdefaultdurationformat(::TSK::FormatStructArchive* tschchartseriesdefaultdurationformat) {
+  delete tschchartseriesdefaultdurationformat_;
+  tschchartseriesdefaultdurationformat_ = tschchartseriesdefaultdurationformat;
+  if (tschchartseriesdefaultdurationformat) {
+    set_has_tschchartseriesdefaultdurationformat();
+  } else {
+    clear_has_tschchartseriesdefaultdurationformat();
+  }
 }
-inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespienumberformattype() {
-  _has_bits_[0] &= ~0x00800000u;
+
+// optional .TSK.FormatStructArchive tschchartseriesdefaultdateformat = 71;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultdateformat() const {
+  return (_has_bits_[0] & 0x01000000u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultdateformat() {
+  _has_bits_[0] |= 0x01000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultdateformat() {
+  _has_bits_[0] &= ~0x01000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultdateformat() {
+  if (tschchartseriesdefaultdateformat_ != NULL) tschchartseriesdefaultdateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesdefaultdateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriesdefaultdateformat() const {
+  return tschchartseriesdefaultdateformat_ != NULL ? *tschchartseriesdefaultdateformat_ : *default_instance_->tschchartseriesdefaultdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriesdefaultdateformat() {
+  set_has_tschchartseriesdefaultdateformat();
+  if (tschchartseriesdefaultdateformat_ == NULL) tschchartseriesdefaultdateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesdefaultdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriesdefaultdateformat() {
+  clear_has_tschchartseriesdefaultdateformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesdefaultdateformat_;
+  tschchartseriesdefaultdateformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesdefaultdateformat(::TSK::FormatStructArchive* tschchartseriesdefaultdateformat) {
+  delete tschchartseriesdefaultdateformat_;
+  tschchartseriesdefaultdateformat_ = tschchartseriesdefaultdateformat;
+  if (tschchartseriesdefaultdateformat) {
+    set_has_tschchartseriesdefaultdateformat();
+  } else {
+    clear_has_tschchartseriesdefaultdateformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseriespie1_0numberformat = 22;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriespie1_0numberformat() const {
+  return (_has_bits_[0] & 0x02000000u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespie1_0numberformat() {
+  _has_bits_[0] |= 0x02000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespie1_0numberformat() {
+  _has_bits_[0] &= ~0x02000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriespie1_0numberformat() {
+  if (tschchartseriespie1_0numberformat_ != NULL) tschchartseriespie1_0numberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriespie1_0numberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriespie1_0numberformat() const {
+  return tschchartseriespie1_0numberformat_ != NULL ? *tschchartseriespie1_0numberformat_ : *default_instance_->tschchartseriespie1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriespie1_0numberformat() {
+  set_has_tschchartseriespie1_0numberformat();
+  if (tschchartseriespie1_0numberformat_ == NULL) tschchartseriespie1_0numberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriespie1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriespie1_0numberformat() {
+  clear_has_tschchartseriespie1_0numberformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriespie1_0numberformat_;
+  tschchartseriespie1_0numberformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriespie1_0numberformat(::TSK::FormatStructArchive* tschchartseriespie1_0numberformat) {
+  delete tschchartseriespie1_0numberformat_;
+  tschchartseriespie1_0numberformat_ = tschchartseriespie1_0numberformat;
+  if (tschchartseriespie1_0numberformat) {
+    set_has_tschchartseriespie1_0numberformat();
+  } else {
+    clear_has_tschchartseriespie1_0numberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseriespienumberformat = 99;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriespienumberformat() const {
+  return (_has_bits_[0] & 0x04000000u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespienumberformat() {
+  _has_bits_[0] |= 0x04000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespienumberformat() {
+  _has_bits_[0] &= ~0x04000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriespienumberformat() {
+  if (tschchartseriespienumberformat_ != NULL) tschchartseriespienumberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriespienumberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesNonStyleArchive::tschchartseriespienumberformat() const {
+  return tschchartseriespienumberformat_ != NULL ? *tschchartseriespienumberformat_ : *default_instance_->tschchartseriespienumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::mutable_tschchartseriespienumberformat() {
+  set_has_tschchartseriespienumberformat();
+  if (tschchartseriespienumberformat_ == NULL) tschchartseriespienumberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriespienumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesNonStyleArchive::release_tschchartseriespienumberformat() {
+  clear_has_tschchartseriespienumberformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriespienumberformat_;
+  tschchartseriespienumberformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriespienumberformat(::TSK::FormatStructArchive* tschchartseriespienumberformat) {
+  delete tschchartseriespienumberformat_;
+  tschchartseriespienumberformat_ = tschchartseriespienumberformat;
+  if (tschchartseriespienumberformat) {
+    set_has_tschchartseriespienumberformat();
+  } else {
+    clear_has_tschchartseriespienumberformat();
+  }
+}
+
+// optional int32 tschchartseriesdefaultnumberformattype = 23;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultnumberformattype() const {
+  return (_has_bits_[0] & 0x08000000u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultnumberformattype() {
+  _has_bits_[0] |= 0x08000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultnumberformattype() {
+  _has_bits_[0] &= ~0x08000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultnumberformattype() {
+  tschchartseriesdefaultnumberformattype_ = 0;
+  clear_has_tschchartseriesdefaultnumberformattype();
+}
+inline ::google::protobuf::int32 ChartSeriesNonStyleArchive::tschchartseriesdefaultnumberformattype() const {
+  return tschchartseriesdefaultnumberformattype_;
+}
+inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultnumberformattype(::google::protobuf::int32 value) {
+  set_has_tschchartseriesdefaultnumberformattype();
+  tschchartseriesdefaultnumberformattype_ = value;
+}
+
+// optional int32 tschchartseriespienumberformattype = 24;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriespienumberformattype() const {
+  return (_has_bits_[0] & 0x10000000u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespienumberformattype() {
+  _has_bits_[0] |= 0x10000000u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespienumberformattype() {
+  _has_bits_[0] &= ~0x10000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriespienumberformattype() {
   tschchartseriespienumberformattype_ = 0;
@@ -10246,13 +12577,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriespienumberformattype(:
 
 // optional .TSK.FormatStructArchive tschchartseriesstackedpercentnumberformat = 25;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesstackedpercentnumberformat() const {
-  return (_has_bits_[0] & 0x01000000u) != 0;
+  return (_has_bits_[0] & 0x20000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesstackedpercentnumberformat() {
-  _has_bits_[0] |= 0x01000000u;
+  _has_bits_[0] |= 0x20000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesstackedpercentnumberformat() {
-  _has_bits_[0] &= ~0x01000000u;
+  _has_bits_[0] &= ~0x20000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesstackedpercentnumberformat() {
   if (tschchartseriesstackedpercentnumberformat_ != NULL) tschchartseriesstackedpercentnumberformat_->::TSK::FormatStructArchive::Clear();
@@ -10284,13 +12615,13 @@ inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesstackedperc
 
 // optional int32 tschchartseriesdefaultseriestype = 26;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultseriestype() const {
-  return (_has_bits_[0] & 0x02000000u) != 0;
+  return (_has_bits_[0] & 0x40000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultseriestype() {
-  _has_bits_[0] |= 0x02000000u;
+  _has_bits_[0] |= 0x40000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultseriestype() {
-  _has_bits_[0] &= ~0x02000000u;
+  _has_bits_[0] &= ~0x40000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultseriestype() {
   tschchartseriesdefaultseriestype_ = 0;
@@ -10306,13 +12637,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultseriestype(::g
 
 // optional bool tschchartseriesdefaultshowerrorbar = 27;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultshowerrorbar() const {
-  return (_has_bits_[0] & 0x04000000u) != 0;
+  return (_has_bits_[0] & 0x80000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultshowerrorbar() {
-  _has_bits_[0] |= 0x04000000u;
+  _has_bits_[0] |= 0x80000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultshowerrorbar() {
-  _has_bits_[0] &= ~0x04000000u;
+  _has_bits_[0] &= ~0x80000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultshowerrorbar() {
   tschchartseriesdefaultshowerrorbar_ = false;
@@ -10328,13 +12659,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultshowerrorbar(b
 
 // optional bool tschchartseriesdefaultshowerrorbarscatterx = 28;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultshowerrorbarscatterx() const {
-  return (_has_bits_[0] & 0x08000000u) != 0;
+  return (_has_bits_[1] & 0x00000001u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultshowerrorbarscatterx() {
-  _has_bits_[0] |= 0x08000000u;
+  _has_bits_[1] |= 0x00000001u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultshowerrorbarscatterx() {
-  _has_bits_[0] &= ~0x08000000u;
+  _has_bits_[1] &= ~0x00000001u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultshowerrorbarscatterx() {
   tschchartseriesdefaultshowerrorbarscatterx_ = false;
@@ -10350,13 +12681,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultshowerrorbarsc
 
 // optional bool tschchartseriesscattershowline = 29;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesscattershowline() const {
-  return (_has_bits_[0] & 0x10000000u) != 0;
+  return (_has_bits_[1] & 0x00000002u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesscattershowline() {
-  _has_bits_[0] |= 0x10000000u;
+  _has_bits_[1] |= 0x00000002u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesscattershowline() {
-  _has_bits_[0] &= ~0x10000000u;
+  _has_bits_[1] &= ~0x00000002u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesscattershowline() {
   tschchartseriesscattershowline_ = false;
@@ -10372,13 +12703,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscattershowline(bool
 
 // optional bool tschchartseriesbubbleshownegativedata = 30;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbubbleshownegativedata() const {
-  return (_has_bits_[0] & 0x20000000u) != 0;
+  return (_has_bits_[1] & 0x00000004u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbubbleshownegativedata() {
-  _has_bits_[0] |= 0x20000000u;
+  _has_bits_[1] |= 0x00000004u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbubbleshownegativedata() {
-  _has_bits_[0] &= ~0x20000000u;
+  _has_bits_[1] &= ~0x00000004u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbubbleshownegativedata() {
   tschchartseriesbubbleshownegativedata_ = false;
@@ -10394,13 +12725,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesbubbleshownegativedat
 
 // optional bool tschchartseriespieshowserieslabels = 31;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriespieshowserieslabels() const {
-  return (_has_bits_[0] & 0x40000000u) != 0;
+  return (_has_bits_[1] & 0x00000008u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespieshowserieslabels() {
-  _has_bits_[0] |= 0x40000000u;
+  _has_bits_[1] |= 0x00000008u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespieshowserieslabels() {
-  _has_bits_[0] &= ~0x40000000u;
+  _has_bits_[1] &= ~0x00000008u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriespieshowserieslabels() {
   tschchartseriespieshowserieslabels_ = false;
@@ -10416,13 +12747,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriespieshowserieslabels(b
 
 // optional bool tschchartseriesareashowsymbol = 32;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesareashowsymbol() const {
-  return (_has_bits_[0] & 0x80000000u) != 0;
+  return (_has_bits_[1] & 0x00000010u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesareashowsymbol() {
-  _has_bits_[0] |= 0x80000000u;
+  _has_bits_[1] |= 0x00000010u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesareashowsymbol() {
-  _has_bits_[0] &= ~0x80000000u;
+  _has_bits_[1] &= ~0x00000010u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesareashowsymbol() {
   tschchartseriesareashowsymbol_ = false;
@@ -10438,13 +12769,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesareashowsymbol(bool v
 
 // optional bool tschchartserieslineshowsymbol = 33;
 inline bool ChartSeriesNonStyleArchive::has_tschchartserieslineshowsymbol() const {
-  return (_has_bits_[1] & 0x00000001u) != 0;
+  return (_has_bits_[1] & 0x00000020u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartserieslineshowsymbol() {
-  _has_bits_[1] |= 0x00000001u;
+  _has_bits_[1] |= 0x00000020u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartserieslineshowsymbol() {
-  _has_bits_[1] &= ~0x00000001u;
+  _has_bits_[1] &= ~0x00000020u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartserieslineshowsymbol() {
   tschchartserieslineshowsymbol_ = false;
@@ -10460,13 +12791,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartserieslineshowsymbol(bool v
 
 // optional bool tschchartseriesmixedareashowsymbol = 34;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesmixedareashowsymbol() const {
-  return (_has_bits_[1] & 0x00000002u) != 0;
+  return (_has_bits_[1] & 0x00000040u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesmixedareashowsymbol() {
-  _has_bits_[1] |= 0x00000002u;
+  _has_bits_[1] |= 0x00000040u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesmixedareashowsymbol() {
-  _has_bits_[1] &= ~0x00000002u;
+  _has_bits_[1] &= ~0x00000040u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesmixedareashowsymbol() {
   tschchartseriesmixedareashowsymbol_ = false;
@@ -10482,13 +12813,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesmixedareashowsymbol(b
 
 // optional bool tschchartseriesmixedlineshowsymbol = 35;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesmixedlineshowsymbol() const {
-  return (_has_bits_[1] & 0x00000004u) != 0;
+  return (_has_bits_[1] & 0x00000080u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesmixedlineshowsymbol() {
-  _has_bits_[1] |= 0x00000004u;
+  _has_bits_[1] |= 0x00000080u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesmixedlineshowsymbol() {
-  _has_bits_[1] &= ~0x00000004u;
+  _has_bits_[1] &= ~0x00000080u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesmixedlineshowsymbol() {
   tschchartseriesmixedlineshowsymbol_ = false;
@@ -10504,13 +12835,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesmixedlineshowsymbol(b
 
 // optional bool tschchartseriesscattershowsymbol = 36;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesscattershowsymbol() const {
-  return (_has_bits_[1] & 0x00000008u) != 0;
+  return (_has_bits_[1] & 0x00000100u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesscattershowsymbol() {
-  _has_bits_[1] |= 0x00000008u;
+  _has_bits_[1] |= 0x00000100u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesscattershowsymbol() {
-  _has_bits_[1] &= ~0x00000008u;
+  _has_bits_[1] &= ~0x00000100u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesscattershowsymbol() {
   tschchartseriesscattershowsymbol_ = false;
@@ -10526,13 +12857,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscattershowsymbol(boo
 
 // optional bool tschchartseriesdefaultshowtrendline = 37;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultshowtrendline() const {
-  return (_has_bits_[1] & 0x00000010u) != 0;
+  return (_has_bits_[1] & 0x00000200u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultshowtrendline() {
-  _has_bits_[1] |= 0x00000010u;
+  _has_bits_[1] |= 0x00000200u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultshowtrendline() {
-  _has_bits_[1] &= ~0x00000010u;
+  _has_bits_[1] &= ~0x00000200u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultshowtrendline() {
   tschchartseriesdefaultshowtrendline_ = false;
@@ -10548,13 +12879,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultshowtrendline(
 
 // optional bool tschchartseriesareashowvaluelabels = 38;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesareashowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000020u) != 0;
+  return (_has_bits_[1] & 0x00000400u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesareashowvaluelabels() {
-  _has_bits_[1] |= 0x00000020u;
+  _has_bits_[1] |= 0x00000400u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesareashowvaluelabels() {
-  _has_bits_[1] &= ~0x00000020u;
+  _has_bits_[1] &= ~0x00000400u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesareashowvaluelabels() {
   tschchartseriesareashowvaluelabels_ = false;
@@ -10570,13 +12901,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesareashowvaluelabels(b
 
 // optional bool tschchartseriesbarshowvaluelabels = 39;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbarshowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000040u) != 0;
+  return (_has_bits_[1] & 0x00000800u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbarshowvaluelabels() {
-  _has_bits_[1] |= 0x00000040u;
+  _has_bits_[1] |= 0x00000800u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbarshowvaluelabels() {
-  _has_bits_[1] &= ~0x00000040u;
+  _has_bits_[1] &= ~0x00000800u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbarshowvaluelabels() {
   tschchartseriesbarshowvaluelabels_ = false;
@@ -10592,13 +12923,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesbarshowvaluelabels(bo
 
 // optional bool tschchartseriesbubbleshowvaluelabels = 40;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbubbleshowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000080u) != 0;
+  return (_has_bits_[1] & 0x00001000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbubbleshowvaluelabels() {
-  _has_bits_[1] |= 0x00000080u;
+  _has_bits_[1] |= 0x00001000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbubbleshowvaluelabels() {
-  _has_bits_[1] &= ~0x00000080u;
+  _has_bits_[1] &= ~0x00001000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbubbleshowvaluelabels() {
   tschchartseriesbubbleshowvaluelabels_ = false;
@@ -10614,13 +12945,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesbubbleshowvaluelabels
 
 // optional bool tschchartseriesdefaultshowvaluelabels = 41;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultshowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000100u) != 0;
+  return (_has_bits_[1] & 0x00002000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultshowvaluelabels() {
-  _has_bits_[1] |= 0x00000100u;
+  _has_bits_[1] |= 0x00002000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultshowvaluelabels() {
-  _has_bits_[1] &= ~0x00000100u;
+  _has_bits_[1] &= ~0x00002000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultshowvaluelabels() {
   tschchartseriesdefaultshowvaluelabels_ = false;
@@ -10636,13 +12967,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultshowvaluelabel
 
 // optional bool tschchartserieslineshowvaluelabels = 42;
 inline bool ChartSeriesNonStyleArchive::has_tschchartserieslineshowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000200u) != 0;
+  return (_has_bits_[1] & 0x00004000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartserieslineshowvaluelabels() {
-  _has_bits_[1] |= 0x00000200u;
+  _has_bits_[1] |= 0x00004000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartserieslineshowvaluelabels() {
-  _has_bits_[1] &= ~0x00000200u;
+  _has_bits_[1] &= ~0x00004000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartserieslineshowvaluelabels() {
   tschchartserieslineshowvaluelabels_ = false;
@@ -10658,13 +12989,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartserieslineshowvaluelabels(b
 
 // optional bool tschchartseriesmixedshowvaluelabels = 43;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesmixedshowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000400u) != 0;
+  return (_has_bits_[1] & 0x00008000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesmixedshowvaluelabels() {
-  _has_bits_[1] |= 0x00000400u;
+  _has_bits_[1] |= 0x00008000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesmixedshowvaluelabels() {
-  _has_bits_[1] &= ~0x00000400u;
+  _has_bits_[1] &= ~0x00008000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesmixedshowvaluelabels() {
   tschchartseriesmixedshowvaluelabels_ = false;
@@ -10680,13 +13011,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesmixedshowvaluelabels(
 
 // optional bool tschchartseriespieshowvaluelabels = 44;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriespieshowvaluelabels() const {
-  return (_has_bits_[1] & 0x00000800u) != 0;
+  return (_has_bits_[1] & 0x00010000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespieshowvaluelabels() {
-  _has_bits_[1] |= 0x00000800u;
+  _has_bits_[1] |= 0x00010000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespieshowvaluelabels() {
-  _has_bits_[1] &= ~0x00000800u;
+  _has_bits_[1] &= ~0x00010000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriespieshowvaluelabels() {
   tschchartseriespieshowvaluelabels_ = false;
@@ -10702,13 +13033,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriespieshowvaluelabels(bo
 
 // optional bool tschchartseriesscattershowvaluelabels = 45;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesscattershowvaluelabels() const {
-  return (_has_bits_[1] & 0x00001000u) != 0;
+  return (_has_bits_[1] & 0x00020000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesscattershowvaluelabels() {
-  _has_bits_[1] |= 0x00001000u;
+  _has_bits_[1] |= 0x00020000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesscattershowvaluelabels() {
-  _has_bits_[1] &= ~0x00001000u;
+  _has_bits_[1] &= ~0x00020000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesscattershowvaluelabels() {
   tschchartseriesscattershowvaluelabels_ = false;
@@ -10724,13 +13055,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscattershowvaluelabel
 
 // optional int32 tschchartseriesbubblesizedimension = 46;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbubblesizedimension() const {
-  return (_has_bits_[1] & 0x00002000u) != 0;
+  return (_has_bits_[1] & 0x00040000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbubblesizedimension() {
-  _has_bits_[1] |= 0x00002000u;
+  _has_bits_[1] |= 0x00040000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbubblesizedimension() {
-  _has_bits_[1] &= ~0x00002000u;
+  _has_bits_[1] &= ~0x00040000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbubblesizedimension() {
   tschchartseriesbubblesizedimension_ = 0;
@@ -10746,13 +13077,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesbubblesizedimension(:
 
 // optional int32 tschchartseriesareasymboltype = 47;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesareasymboltype() const {
-  return (_has_bits_[1] & 0x00004000u) != 0;
+  return (_has_bits_[1] & 0x00080000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesareasymboltype() {
-  _has_bits_[1] |= 0x00004000u;
+  _has_bits_[1] |= 0x00080000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesareasymboltype() {
-  _has_bits_[1] &= ~0x00004000u;
+  _has_bits_[1] &= ~0x00080000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesareasymboltype() {
   tschchartseriesareasymboltype_ = 0;
@@ -10768,13 +13099,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesareasymboltype(::goog
 
 // optional int32 tschchartserieslinesymboltype = 48;
 inline bool ChartSeriesNonStyleArchive::has_tschchartserieslinesymboltype() const {
-  return (_has_bits_[1] & 0x00008000u) != 0;
+  return (_has_bits_[1] & 0x00100000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartserieslinesymboltype() {
-  _has_bits_[1] |= 0x00008000u;
+  _has_bits_[1] |= 0x00100000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartserieslinesymboltype() {
-  _has_bits_[1] &= ~0x00008000u;
+  _has_bits_[1] &= ~0x00100000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartserieslinesymboltype() {
   tschchartserieslinesymboltype_ = 0;
@@ -10790,13 +13121,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartserieslinesymboltype(::goog
 
 // optional int32 tschchartseriesmixedareasymboltype = 49;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesmixedareasymboltype() const {
-  return (_has_bits_[1] & 0x00010000u) != 0;
+  return (_has_bits_[1] & 0x00200000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesmixedareasymboltype() {
-  _has_bits_[1] |= 0x00010000u;
+  _has_bits_[1] |= 0x00200000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesmixedareasymboltype() {
-  _has_bits_[1] &= ~0x00010000u;
+  _has_bits_[1] &= ~0x00200000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesmixedareasymboltype() {
   tschchartseriesmixedareasymboltype_ = 0;
@@ -10812,13 +13143,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesmixedareasymboltype(:
 
 // optional int32 tschchartseriesmixedlinesymboltype = 50;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesmixedlinesymboltype() const {
-  return (_has_bits_[1] & 0x00020000u) != 0;
+  return (_has_bits_[1] & 0x00400000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesmixedlinesymboltype() {
-  _has_bits_[1] |= 0x00020000u;
+  _has_bits_[1] |= 0x00400000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesmixedlinesymboltype() {
-  _has_bits_[1] &= ~0x00020000u;
+  _has_bits_[1] &= ~0x00400000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesmixedlinesymboltype() {
   tschchartseriesmixedlinesymboltype_ = 0;
@@ -10834,13 +13165,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesmixedlinesymboltype(:
 
 // optional int32 tschchartseriesscattersymboltype = 51;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesscattersymboltype() const {
-  return (_has_bits_[1] & 0x00040000u) != 0;
+  return (_has_bits_[1] & 0x00800000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesscattersymboltype() {
-  _has_bits_[1] |= 0x00040000u;
+  _has_bits_[1] |= 0x00800000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesscattersymboltype() {
-  _has_bits_[1] &= ~0x00040000u;
+  _has_bits_[1] &= ~0x00800000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesscattersymboltype() {
   tschchartseriesscattersymboltype_ = 0;
@@ -10856,13 +13187,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscattersymboltype(::g
 
 // optional float tschchartseriesdefaulttrendlineequationoffsetx = 52;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineequationoffsetx() const {
-  return (_has_bits_[1] & 0x00080000u) != 0;
+  return (_has_bits_[1] & 0x01000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineequationoffsetx() {
-  _has_bits_[1] |= 0x00080000u;
+  _has_bits_[1] |= 0x01000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineequationoffsetx() {
-  _has_bits_[1] &= ~0x00080000u;
+  _has_bits_[1] &= ~0x01000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineequationoffsetx() {
   tschchartseriesdefaulttrendlineequationoffsetx_ = 0;
@@ -10878,13 +13209,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineequat
 
 // optional float tschchartseriesdefaulttrendlineequationoffsety = 53;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineequationoffsety() const {
-  return (_has_bits_[1] & 0x00100000u) != 0;
+  return (_has_bits_[1] & 0x02000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineequationoffsety() {
-  _has_bits_[1] |= 0x00100000u;
+  _has_bits_[1] |= 0x02000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineequationoffsety() {
-  _has_bits_[1] &= ~0x00100000u;
+  _has_bits_[1] &= ~0x02000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineequationoffsety() {
   tschchartseriesdefaulttrendlineequationoffsety_ = 0;
@@ -10900,13 +13231,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineequat
 
 // optional string tschchartseriesdefaulttrendlinelabelstring = 54;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlinelabelstring() const {
-  return (_has_bits_[1] & 0x00200000u) != 0;
+  return (_has_bits_[1] & 0x04000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlinelabelstring() {
-  _has_bits_[1] |= 0x00200000u;
+  _has_bits_[1] |= 0x04000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlinelabelstring() {
-  _has_bits_[1] &= ~0x00200000u;
+  _has_bits_[1] &= ~0x04000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlinelabelstring() {
   if (tschchartseriesdefaulttrendlinelabelstring_ != &::google::protobuf::internal::kEmptyString) {
@@ -10970,13 +13301,13 @@ inline void ChartSeriesNonStyleArchive::set_allocated_tschchartseriesdefaulttren
 
 // optional int32 tschchartseriesdefaulttrendlineorder = 55;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineorder() const {
-  return (_has_bits_[1] & 0x00400000u) != 0;
+  return (_has_bits_[1] & 0x08000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineorder() {
-  _has_bits_[1] |= 0x00400000u;
+  _has_bits_[1] |= 0x08000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineorder() {
-  _has_bits_[1] &= ~0x00400000u;
+  _has_bits_[1] &= ~0x08000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineorder() {
   tschchartseriesdefaulttrendlineorder_ = 0;
@@ -10992,13 +13323,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineorder
 
 // optional int32 tschchartseriesdefaulttrendlineperiod = 56;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineperiod() const {
-  return (_has_bits_[1] & 0x00800000u) != 0;
+  return (_has_bits_[1] & 0x10000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineperiod() {
-  _has_bits_[1] |= 0x00800000u;
+  _has_bits_[1] |= 0x10000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineperiod() {
-  _has_bits_[1] &= ~0x00800000u;
+  _has_bits_[1] &= ~0x10000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineperiod() {
   tschchartseriesdefaulttrendlineperiod_ = 0;
@@ -11014,13 +13345,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineperio
 
 // optional float tschchartseriesdefaulttrendlinersquaredoffsetx = 57;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlinersquaredoffsetx() const {
-  return (_has_bits_[1] & 0x01000000u) != 0;
+  return (_has_bits_[1] & 0x20000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlinersquaredoffsetx() {
-  _has_bits_[1] |= 0x01000000u;
+  _has_bits_[1] |= 0x20000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlinersquaredoffsetx() {
-  _has_bits_[1] &= ~0x01000000u;
+  _has_bits_[1] &= ~0x20000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlinersquaredoffsetx() {
   tschchartseriesdefaulttrendlinersquaredoffsetx_ = 0;
@@ -11036,13 +13367,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlinersqua
 
 // optional float tschchartseriesdefaulttrendlinersquaredoffsety = 58;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlinersquaredoffsety() const {
-  return (_has_bits_[1] & 0x02000000u) != 0;
+  return (_has_bits_[1] & 0x40000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlinersquaredoffsety() {
-  _has_bits_[1] |= 0x02000000u;
+  _has_bits_[1] |= 0x40000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlinersquaredoffsety() {
-  _has_bits_[1] &= ~0x02000000u;
+  _has_bits_[1] &= ~0x40000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlinersquaredoffsety() {
   tschchartseriesdefaulttrendlinersquaredoffsety_ = 0;
@@ -11058,13 +13389,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlinersqua
 
 // optional bool tschchartseriesdefaulttrendlineshowequation = 59;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineshowequation() const {
-  return (_has_bits_[1] & 0x04000000u) != 0;
+  return (_has_bits_[1] & 0x80000000u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineshowequation() {
-  _has_bits_[1] |= 0x04000000u;
+  _has_bits_[1] |= 0x80000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineshowequation() {
-  _has_bits_[1] &= ~0x04000000u;
+  _has_bits_[1] &= ~0x80000000u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineshowequation() {
   tschchartseriesdefaulttrendlineshowequation_ = false;
@@ -11080,13 +13411,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineshowe
 
 // optional bool tschchartseriesdefaulttrendlineshowlabel = 60;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineshowlabel() const {
-  return (_has_bits_[1] & 0x08000000u) != 0;
+  return (_has_bits_[2] & 0x00000001u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineshowlabel() {
-  _has_bits_[1] |= 0x08000000u;
+  _has_bits_[2] |= 0x00000001u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineshowlabel() {
-  _has_bits_[1] &= ~0x08000000u;
+  _has_bits_[2] &= ~0x00000001u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineshowlabel() {
   tschchartseriesdefaulttrendlineshowlabel_ = false;
@@ -11102,13 +13433,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineshowl
 
 // optional bool tschchartseriesdefaulttrendlineshowr2value = 61;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlineshowr2value() const {
-  return (_has_bits_[1] & 0x10000000u) != 0;
+  return (_has_bits_[2] & 0x00000002u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlineshowr2value() {
-  _has_bits_[1] |= 0x10000000u;
+  _has_bits_[2] |= 0x00000002u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlineshowr2value() {
-  _has_bits_[1] &= ~0x10000000u;
+  _has_bits_[2] &= ~0x00000002u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlineshowr2value() {
   tschchartseriesdefaulttrendlineshowr2value_ = false;
@@ -11124,13 +13455,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlineshowr
 
 // optional int32 tschchartseriesdefaulttrendlinetype = 62;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaulttrendlinetype() const {
-  return (_has_bits_[1] & 0x20000000u) != 0;
+  return (_has_bits_[2] & 0x00000004u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaulttrendlinetype() {
-  _has_bits_[1] |= 0x20000000u;
+  _has_bits_[2] |= 0x00000004u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaulttrendlinetype() {
-  _has_bits_[1] &= ~0x20000000u;
+  _has_bits_[2] &= ~0x00000004u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaulttrendlinetype() {
   tschchartseriesdefaulttrendlinetype_ = 0;
@@ -11146,13 +13477,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaulttrendlinetype(
 
 // optional float tschchartseriespiewedgeexplosion = 63;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriespiewedgeexplosion() const {
-  return (_has_bits_[1] & 0x40000000u) != 0;
+  return (_has_bits_[2] & 0x00000008u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriespiewedgeexplosion() {
-  _has_bits_[1] |= 0x40000000u;
+  _has_bits_[2] |= 0x00000008u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriespiewedgeexplosion() {
-  _has_bits_[1] &= ~0x40000000u;
+  _has_bits_[2] &= ~0x00000008u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriespiewedgeexplosion() {
   tschchartseriespiewedgeexplosion_ = 0;
@@ -11168,13 +13499,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriespiewedgeexplosion(flo
 
 // optional int32 tschchartseriesdefaultyaxisordinal = 64;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultyaxisordinal() const {
-  return (_has_bits_[1] & 0x80000000u) != 0;
+  return (_has_bits_[2] & 0x00000010u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultyaxisordinal() {
-  _has_bits_[1] |= 0x80000000u;
+  _has_bits_[2] |= 0x00000010u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultyaxisordinal() {
-  _has_bits_[1] &= ~0x80000000u;
+  _has_bits_[2] &= ~0x00000010u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultyaxisordinal() {
   tschchartseriesdefaultyaxisordinal_ = 0;
@@ -11190,13 +13521,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultyaxisordinal(:
 
 // optional bool tschchartseriesbubbleshowserieslabels = 65;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbubbleshowserieslabels() const {
-  return (_has_bits_[2] & 0x00000001u) != 0;
+  return (_has_bits_[2] & 0x00000020u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbubbleshowserieslabels() {
-  _has_bits_[2] |= 0x00000001u;
+  _has_bits_[2] |= 0x00000020u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbubbleshowserieslabels() {
-  _has_bits_[2] &= ~0x00000001u;
+  _has_bits_[2] &= ~0x00000020u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbubbleshowserieslabels() {
   tschchartseriesbubbleshowserieslabels_ = false;
@@ -11212,13 +13543,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesbubbleshowserieslabel
 
 // optional int32 tschchartseriesbubblevaluelabelsaxis = 66;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbubblevaluelabelsaxis() const {
-  return (_has_bits_[2] & 0x00000002u) != 0;
+  return (_has_bits_[2] & 0x00000040u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbubblevaluelabelsaxis() {
-  _has_bits_[2] |= 0x00000002u;
+  _has_bits_[2] |= 0x00000040u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbubblevaluelabelsaxis() {
-  _has_bits_[2] &= ~0x00000002u;
+  _has_bits_[2] &= ~0x00000040u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbubblevaluelabelsaxis() {
   tschchartseriesbubblevaluelabelsaxis_ = 0;
@@ -11234,13 +13565,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesbubblevaluelabelsaxis
 
 // optional bool tschchartseriesscattershowserieslabels = 67;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesscattershowserieslabels() const {
-  return (_has_bits_[2] & 0x00000004u) != 0;
+  return (_has_bits_[2] & 0x00000080u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesscattershowserieslabels() {
-  _has_bits_[2] |= 0x00000004u;
+  _has_bits_[2] |= 0x00000080u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesscattershowserieslabels() {
-  _has_bits_[2] &= ~0x00000004u;
+  _has_bits_[2] &= ~0x00000080u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesscattershowserieslabels() {
   tschchartseriesscattershowserieslabels_ = false;
@@ -11256,13 +13587,13 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscattershowserieslabe
 
 // optional int32 tschchartseriesscattervaluelabelsaxis = 68;
 inline bool ChartSeriesNonStyleArchive::has_tschchartseriesscattervaluelabelsaxis() const {
-  return (_has_bits_[2] & 0x00000008u) != 0;
+  return (_has_bits_[2] & 0x00000100u) != 0;
 }
 inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesscattervaluelabelsaxis() {
-  _has_bits_[2] |= 0x00000008u;
+  _has_bits_[2] |= 0x00000100u;
 }
 inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesscattervaluelabelsaxis() {
-  _has_bits_[2] &= ~0x00000008u;
+  _has_bits_[2] &= ~0x00000100u;
 }
 inline void ChartSeriesNonStyleArchive::clear_tschchartseriesscattervaluelabelsaxis() {
   tschchartseriesscattervaluelabelsaxis_ = 0;
@@ -11276,6 +13607,4174 @@ inline void ChartSeriesNonStyleArchive::set_tschchartseriesscattervaluelabelsaxi
   tschchartseriesscattervaluelabelsaxis_ = value;
 }
 
+// optional bool tschchartseriesdefaultshowlabelsinfront = 100;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesdefaultshowlabelsinfront() const {
+  return (_has_bits_[2] & 0x00000200u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesdefaultshowlabelsinfront() {
+  _has_bits_[2] |= 0x00000200u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesdefaultshowlabelsinfront() {
+  _has_bits_[2] &= ~0x00000200u;
+}
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesdefaultshowlabelsinfront() {
+  tschchartseriesdefaultshowlabelsinfront_ = false;
+  clear_has_tschchartseriesdefaultshowlabelsinfront();
+}
+inline bool ChartSeriesNonStyleArchive::tschchartseriesdefaultshowlabelsinfront() const {
+  return tschchartseriesdefaultshowlabelsinfront_;
+}
+inline void ChartSeriesNonStyleArchive::set_tschchartseriesdefaultshowlabelsinfront(bool value) {
+  set_has_tschchartseriesdefaultshowlabelsinfront();
+  tschchartseriesdefaultshowlabelsinfront_ = value;
+}
+
+// optional bool tschchartseriesbubbleshowlabelsinfront = 101;
+inline bool ChartSeriesNonStyleArchive::has_tschchartseriesbubbleshowlabelsinfront() const {
+  return (_has_bits_[2] & 0x00000400u) != 0;
+}
+inline void ChartSeriesNonStyleArchive::set_has_tschchartseriesbubbleshowlabelsinfront() {
+  _has_bits_[2] |= 0x00000400u;
+}
+inline void ChartSeriesNonStyleArchive::clear_has_tschchartseriesbubbleshowlabelsinfront() {
+  _has_bits_[2] &= ~0x00000400u;
+}
+inline void ChartSeriesNonStyleArchive::clear_tschchartseriesbubbleshowlabelsinfront() {
+  tschchartseriesbubbleshowlabelsinfront_ = false;
+  clear_has_tschchartseriesbubbleshowlabelsinfront();
+}
+inline bool ChartSeriesNonStyleArchive::tschchartseriesbubbleshowlabelsinfront() const {
+  return tschchartseriesbubbleshowlabelsinfront_;
+}
+inline void ChartSeriesNonStyleArchive::set_tschchartseriesbubbleshowlabelsinfront(bool value) {
+  set_has_tschchartseriesbubbleshowlabelsinfront();
+  tschchartseriesbubbleshowlabelsinfront_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// ChartGenericPropertyMapArchive
+
+// optional int32 tschchartinfo3dbarshape = 1;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dbarshape() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dbarshape() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dbarshape() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dbarshape() {
+  tschchartinfo3dbarshape_ = 0;
+  clear_has_tschchartinfo3dbarshape();
+}
+inline ::google::protobuf::int32 ChartGenericPropertyMapArchive::tschchartinfo3dbarshape() const {
+  return tschchartinfo3dbarshape_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfo3dbarshape(::google::protobuf::int32 value) {
+  set_has_tschchartinfo3dbarshape();
+  tschchartinfo3dbarshape_ = value;
+}
+
+// optional bool tschchartinfo3dbeveledges = 2;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dbeveledges() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dbeveledges() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dbeveledges() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dbeveledges() {
+  tschchartinfo3dbeveledges_ = false;
+  clear_has_tschchartinfo3dbeveledges();
+}
+inline bool ChartGenericPropertyMapArchive::tschchartinfo3dbeveledges() const {
+  return tschchartinfo3dbeveledges_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfo3dbeveledges(bool value) {
+  set_has_tschchartinfo3dbeveledges();
+  tschchartinfo3dbeveledges_ = value;
+}
+
+// optional float tschchartinfo3dintersetdepthgap = 3;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dintersetdepthgap() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dintersetdepthgap() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dintersetdepthgap() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dintersetdepthgap() {
+  tschchartinfo3dintersetdepthgap_ = 0;
+  clear_has_tschchartinfo3dintersetdepthgap();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfo3dintersetdepthgap() const {
+  return tschchartinfo3dintersetdepthgap_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfo3dintersetdepthgap(float value) {
+  set_has_tschchartinfo3dintersetdepthgap();
+  tschchartinfo3dintersetdepthgap_ = value;
+}
+
+// optional .TSCH.Chart3DVectorArchive tschchartinfo3drotation = 4;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3drotation() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3drotation() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3drotation() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3drotation() {
+  if (tschchartinfo3drotation_ != NULL) tschchartinfo3drotation_->::TSCH::Chart3DVectorArchive::Clear();
+  clear_has_tschchartinfo3drotation();
+}
+inline const ::TSCH::Chart3DVectorArchive& ChartGenericPropertyMapArchive::tschchartinfo3drotation() const {
+  return tschchartinfo3drotation_ != NULL ? *tschchartinfo3drotation_ : *default_instance_->tschchartinfo3drotation_;
+}
+inline ::TSCH::Chart3DVectorArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfo3drotation() {
+  set_has_tschchartinfo3drotation();
+  if (tschchartinfo3drotation_ == NULL) tschchartinfo3drotation_ = new ::TSCH::Chart3DVectorArchive;
+  return tschchartinfo3drotation_;
+}
+inline ::TSCH::Chart3DVectorArchive* ChartGenericPropertyMapArchive::release_tschchartinfo3drotation() {
+  clear_has_tschchartinfo3drotation();
+  ::TSCH::Chart3DVectorArchive* temp = tschchartinfo3drotation_;
+  tschchartinfo3drotation_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfo3drotation(::TSCH::Chart3DVectorArchive* tschchartinfo3drotation) {
+  delete tschchartinfo3drotation_;
+  tschchartinfo3drotation_ = tschchartinfo3drotation;
+  if (tschchartinfo3drotation) {
+    set_has_tschchartinfo3drotation();
+  } else {
+    clear_has_tschchartinfo3drotation();
+  }
+}
+
+// optional .TSCH.Chart3DVectorArchive tschchartinfo3dscale = 5;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dscale() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dscale() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dscale() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dscale() {
+  if (tschchartinfo3dscale_ != NULL) tschchartinfo3dscale_->::TSCH::Chart3DVectorArchive::Clear();
+  clear_has_tschchartinfo3dscale();
+}
+inline const ::TSCH::Chart3DVectorArchive& ChartGenericPropertyMapArchive::tschchartinfo3dscale() const {
+  return tschchartinfo3dscale_ != NULL ? *tschchartinfo3dscale_ : *default_instance_->tschchartinfo3dscale_;
+}
+inline ::TSCH::Chart3DVectorArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfo3dscale() {
+  set_has_tschchartinfo3dscale();
+  if (tschchartinfo3dscale_ == NULL) tschchartinfo3dscale_ = new ::TSCH::Chart3DVectorArchive;
+  return tschchartinfo3dscale_;
+}
+inline ::TSCH::Chart3DVectorArchive* ChartGenericPropertyMapArchive::release_tschchartinfo3dscale() {
+  clear_has_tschchartinfo3dscale();
+  ::TSCH::Chart3DVectorArchive* temp = tschchartinfo3dscale_;
+  tschchartinfo3dscale_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfo3dscale(::TSCH::Chart3DVectorArchive* tschchartinfo3dscale) {
+  delete tschchartinfo3dscale_;
+  tschchartinfo3dscale_ = tschchartinfo3dscale;
+  if (tschchartinfo3dscale) {
+    set_has_tschchartinfo3dscale();
+  } else {
+    clear_has_tschchartinfo3dscale();
+  }
+}
+
+// optional .TSCH.Chart3DVectorArchive tschchartinfo3dviewport = 6;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dviewport() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dviewport() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dviewport() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dviewport() {
+  if (tschchartinfo3dviewport_ != NULL) tschchartinfo3dviewport_->::TSCH::Chart3DVectorArchive::Clear();
+  clear_has_tschchartinfo3dviewport();
+}
+inline const ::TSCH::Chart3DVectorArchive& ChartGenericPropertyMapArchive::tschchartinfo3dviewport() const {
+  return tschchartinfo3dviewport_ != NULL ? *tschchartinfo3dviewport_ : *default_instance_->tschchartinfo3dviewport_;
+}
+inline ::TSCH::Chart3DVectorArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfo3dviewport() {
+  set_has_tschchartinfo3dviewport();
+  if (tschchartinfo3dviewport_ == NULL) tschchartinfo3dviewport_ = new ::TSCH::Chart3DVectorArchive;
+  return tschchartinfo3dviewport_;
+}
+inline ::TSCH::Chart3DVectorArchive* ChartGenericPropertyMapArchive::release_tschchartinfo3dviewport() {
+  clear_has_tschchartinfo3dviewport();
+  ::TSCH::Chart3DVectorArchive* temp = tschchartinfo3dviewport_;
+  tschchartinfo3dviewport_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfo3dviewport(::TSCH::Chart3DVectorArchive* tschchartinfo3dviewport) {
+  delete tschchartinfo3dviewport_;
+  tschchartinfo3dviewport_ = tschchartinfo3dviewport;
+  if (tschchartinfo3dviewport) {
+    set_has_tschchartinfo3dviewport();
+  } else {
+    clear_has_tschchartinfo3dviewport();
+  }
+}
+
+// optional float tschchartinfopiestartangle = 7;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfopiestartangle() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfopiestartangle() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfopiestartangle() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfopiestartangle() {
+  tschchartinfopiestartangle_ = 0;
+  clear_has_tschchartinfopiestartangle();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfopiestartangle() const {
+  return tschchartinfopiestartangle_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfopiestartangle(float value) {
+  set_has_tschchartinfopiestartangle();
+  tschchartinfopiestartangle_ = value;
+}
+
+// optional bool tschchartinfoshowlegend = 8;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfoshowlegend() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfoshowlegend() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfoshowlegend() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfoshowlegend() {
+  tschchartinfoshowlegend_ = false;
+  clear_has_tschchartinfoshowlegend();
+}
+inline bool ChartGenericPropertyMapArchive::tschchartinfoshowlegend() const {
+  return tschchartinfoshowlegend_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfoshowlegend(bool value) {
+  set_has_tschchartinfoshowlegend();
+  tschchartinfoshowlegend_ = value;
+}
+
+// optional bool tschchartinfoshowtitle = 9;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfoshowtitle() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfoshowtitle() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfoshowtitle() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfoshowtitle() {
+  tschchartinfoshowtitle_ = false;
+  clear_has_tschchartinfoshowtitle();
+}
+inline bool ChartGenericPropertyMapArchive::tschchartinfoshowtitle() const {
+  return tschchartinfoshowtitle_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfoshowtitle(bool value) {
+  set_has_tschchartinfoshowtitle();
+  tschchartinfoshowtitle_ = value;
+}
+
+// optional bool tschchartinfoskiphiddendata = 10;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfoskiphiddendata() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfoskiphiddendata() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfoskiphiddendata() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfoskiphiddendata() {
+  tschchartinfoskiphiddendata_ = false;
+  clear_has_tschchartinfoskiphiddendata();
+}
+inline bool ChartGenericPropertyMapArchive::tschchartinfoskiphiddendata() const {
+  return tschchartinfoskiphiddendata_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfoskiphiddendata(bool value) {
+  set_has_tschchartinfoskiphiddendata();
+  tschchartinfoskiphiddendata_ = value;
+}
+
+// optional string tschchartinfotitle = 11;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfotitle() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfotitle() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfotitle() {
+  _has_bits_[0] &= ~0x00000400u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfotitle() {
+  if (tschchartinfotitle_ != &::google::protobuf::internal::kEmptyString) {
+    tschchartinfotitle_->clear();
+  }
+  clear_has_tschchartinfotitle();
+}
+inline const ::std::string& ChartGenericPropertyMapArchive::tschchartinfotitle() const {
+  return *tschchartinfotitle_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfotitle(const ::std::string& value) {
+  set_has_tschchartinfotitle();
+  if (tschchartinfotitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartinfotitle_ = new ::std::string;
+  }
+  tschchartinfotitle_->assign(value);
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfotitle(const char* value) {
+  set_has_tschchartinfotitle();
+  if (tschchartinfotitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartinfotitle_ = new ::std::string;
+  }
+  tschchartinfotitle_->assign(value);
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfotitle(const char* value, size_t size) {
+  set_has_tschchartinfotitle();
+  if (tschchartinfotitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartinfotitle_ = new ::std::string;
+  }
+  tschchartinfotitle_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ChartGenericPropertyMapArchive::mutable_tschchartinfotitle() {
+  set_has_tschchartinfotitle();
+  if (tschchartinfotitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartinfotitle_ = new ::std::string;
+  }
+  return tschchartinfotitle_;
+}
+inline ::std::string* ChartGenericPropertyMapArchive::release_tschchartinfotitle() {
+  clear_has_tschchartinfotitle();
+  if (tschchartinfotitle_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = tschchartinfotitle_;
+    tschchartinfotitle_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfotitle(::std::string* tschchartinfotitle) {
+  if (tschchartinfotitle_ != &::google::protobuf::internal::kEmptyString) {
+    delete tschchartinfotitle_;
+  }
+  if (tschchartinfotitle) {
+    set_has_tschchartinfotitle();
+    tschchartinfotitle_ = tschchartinfotitle;
+  } else {
+    clear_has_tschchartinfotitle();
+    tschchartinfotitle_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional int32 tschchartinfodatasetnamelocation = 12;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfodatasetnamelocation() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfodatasetnamelocation() {
+  _has_bits_[0] |= 0x00000800u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfodatasetnamelocation() {
+  _has_bits_[0] &= ~0x00000800u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfodatasetnamelocation() {
+  tschchartinfodatasetnamelocation_ = 0;
+  clear_has_tschchartinfodatasetnamelocation();
+}
+inline ::google::protobuf::int32 ChartGenericPropertyMapArchive::tschchartinfodatasetnamelocation() const {
+  return tschchartinfodatasetnamelocation_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfodatasetnamelocation(::google::protobuf::int32 value) {
+  set_has_tschchartinfodatasetnamelocation();
+  tschchartinfodatasetnamelocation_ = value;
+}
+
+// optional int32 tschchartinfomultidatacontroltype = 13;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfomultidatacontroltype() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfomultidatacontroltype() {
+  _has_bits_[0] |= 0x00001000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfomultidatacontroltype() {
+  _has_bits_[0] &= ~0x00001000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfomultidatacontroltype() {
+  tschchartinfomultidatacontroltype_ = 0;
+  clear_has_tschchartinfomultidatacontroltype();
+}
+inline ::google::protobuf::int32 ChartGenericPropertyMapArchive::tschchartinfomultidatacontroltype() const {
+  return tschchartinfomultidatacontroltype_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfomultidatacontroltype(::google::protobuf::int32 value) {
+  set_has_tschchartinfomultidatacontroltype();
+  tschchartinfomultidatacontroltype_ = value;
+}
+
+// optional float tschchartinfo3dchartopacity = 14;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dchartopacity() const {
+  return (_has_bits_[0] & 0x00002000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dchartopacity() {
+  _has_bits_[0] |= 0x00002000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dchartopacity() {
+  _has_bits_[0] &= ~0x00002000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dchartopacity() {
+  tschchartinfo3dchartopacity_ = 0;
+  clear_has_tschchartinfo3dchartopacity();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfo3dchartopacity() const {
+  return tschchartinfo3dchartopacity_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfo3dchartopacity(float value) {
+  set_has_tschchartinfo3dchartopacity();
+  tschchartinfo3dchartopacity_ = value;
+}
+
+// optional .TSCH.Chart3DLightingPackageArchive tschchartinfo3dlightingpackage = 15;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfo3dlightingpackage() const {
+  return (_has_bits_[0] & 0x00004000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfo3dlightingpackage() {
+  _has_bits_[0] |= 0x00004000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfo3dlightingpackage() {
+  _has_bits_[0] &= ~0x00004000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfo3dlightingpackage() {
+  if (tschchartinfo3dlightingpackage_ != NULL) tschchartinfo3dlightingpackage_->::TSCH::Chart3DLightingPackageArchive::Clear();
+  clear_has_tschchartinfo3dlightingpackage();
+}
+inline const ::TSCH::Chart3DLightingPackageArchive& ChartGenericPropertyMapArchive::tschchartinfo3dlightingpackage() const {
+  return tschchartinfo3dlightingpackage_ != NULL ? *tschchartinfo3dlightingpackage_ : *default_instance_->tschchartinfo3dlightingpackage_;
+}
+inline ::TSCH::Chart3DLightingPackageArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfo3dlightingpackage() {
+  set_has_tschchartinfo3dlightingpackage();
+  if (tschchartinfo3dlightingpackage_ == NULL) tschchartinfo3dlightingpackage_ = new ::TSCH::Chart3DLightingPackageArchive;
+  return tschchartinfo3dlightingpackage_;
+}
+inline ::TSCH::Chart3DLightingPackageArchive* ChartGenericPropertyMapArchive::release_tschchartinfo3dlightingpackage() {
+  clear_has_tschchartinfo3dlightingpackage();
+  ::TSCH::Chart3DLightingPackageArchive* temp = tschchartinfo3dlightingpackage_;
+  tschchartinfo3dlightingpackage_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfo3dlightingpackage(::TSCH::Chart3DLightingPackageArchive* tschchartinfo3dlightingpackage) {
+  delete tschchartinfo3dlightingpackage_;
+  tschchartinfo3dlightingpackage_ = tschchartinfo3dlightingpackage;
+  if (tschchartinfo3dlightingpackage) {
+    set_has_tschchartinfo3dlightingpackage();
+  } else {
+    clear_has_tschchartinfo3dlightingpackage();
+  }
+}
+
+// optional .TSD.FillArchive tschchartinfobackgroundfill = 16;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfobackgroundfill() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfobackgroundfill() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfobackgroundfill() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfobackgroundfill() {
+  if (tschchartinfobackgroundfill_ != NULL) tschchartinfobackgroundfill_->::TSD::FillArchive::Clear();
+  clear_has_tschchartinfobackgroundfill();
+}
+inline const ::TSD::FillArchive& ChartGenericPropertyMapArchive::tschchartinfobackgroundfill() const {
+  return tschchartinfobackgroundfill_ != NULL ? *tschchartinfobackgroundfill_ : *default_instance_->tschchartinfobackgroundfill_;
+}
+inline ::TSD::FillArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfobackgroundfill() {
+  set_has_tschchartinfobackgroundfill();
+  if (tschchartinfobackgroundfill_ == NULL) tschchartinfobackgroundfill_ = new ::TSD::FillArchive;
+  return tschchartinfobackgroundfill_;
+}
+inline ::TSD::FillArchive* ChartGenericPropertyMapArchive::release_tschchartinfobackgroundfill() {
+  clear_has_tschchartinfobackgroundfill();
+  ::TSD::FillArchive* temp = tschchartinfobackgroundfill_;
+  tschchartinfobackgroundfill_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfobackgroundfill(::TSD::FillArchive* tschchartinfobackgroundfill) {
+  delete tschchartinfobackgroundfill_;
+  tschchartinfobackgroundfill_ = tschchartinfobackgroundfill;
+  if (tschchartinfobackgroundfill) {
+    set_has_tschchartinfobackgroundfill();
+  } else {
+    clear_has_tschchartinfobackgroundfill();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartinfobackgroundstroke = 17;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfobackgroundstroke() const {
+  return (_has_bits_[0] & 0x00010000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfobackgroundstroke() {
+  _has_bits_[0] |= 0x00010000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfobackgroundstroke() {
+  _has_bits_[0] &= ~0x00010000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfobackgroundstroke() {
+  if (tschchartinfobackgroundstroke_ != NULL) tschchartinfobackgroundstroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartinfobackgroundstroke();
+}
+inline const ::TSD::StrokeArchive& ChartGenericPropertyMapArchive::tschchartinfobackgroundstroke() const {
+  return tschchartinfobackgroundstroke_ != NULL ? *tschchartinfobackgroundstroke_ : *default_instance_->tschchartinfobackgroundstroke_;
+}
+inline ::TSD::StrokeArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfobackgroundstroke() {
+  set_has_tschchartinfobackgroundstroke();
+  if (tschchartinfobackgroundstroke_ == NULL) tschchartinfobackgroundstroke_ = new ::TSD::StrokeArchive;
+  return tschchartinfobackgroundstroke_;
+}
+inline ::TSD::StrokeArchive* ChartGenericPropertyMapArchive::release_tschchartinfobackgroundstroke() {
+  clear_has_tschchartinfobackgroundstroke();
+  ::TSD::StrokeArchive* temp = tschchartinfobackgroundstroke_;
+  tschchartinfobackgroundstroke_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfobackgroundstroke(::TSD::StrokeArchive* tschchartinfobackgroundstroke) {
+  delete tschchartinfobackgroundstroke_;
+  tschchartinfobackgroundstroke_ = tschchartinfobackgroundstroke;
+  if (tschchartinfobackgroundstroke) {
+    set_has_tschchartinfobackgroundstroke();
+  } else {
+    clear_has_tschchartinfobackgroundstroke();
+  }
+}
+
+// optional float tschchartinfoborderopacity = 18;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfoborderopacity() const {
+  return (_has_bits_[0] & 0x00020000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfoborderopacity() {
+  _has_bits_[0] |= 0x00020000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfoborderopacity() {
+  _has_bits_[0] &= ~0x00020000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfoborderopacity() {
+  tschchartinfoborderopacity_ = 0;
+  clear_has_tschchartinfoborderopacity();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfoborderopacity() const {
+  return tschchartinfoborderopacity_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfoborderopacity(float value) {
+  set_has_tschchartinfoborderopacity();
+  tschchartinfoborderopacity_ = value;
+}
+
+// optional .TSD.ShadowArchive tschchartinfobordershadow = 19;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfobordershadow() const {
+  return (_has_bits_[0] & 0x00040000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfobordershadow() {
+  _has_bits_[0] |= 0x00040000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfobordershadow() {
+  _has_bits_[0] &= ~0x00040000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfobordershadow() {
+  if (tschchartinfobordershadow_ != NULL) tschchartinfobordershadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschchartinfobordershadow();
+}
+inline const ::TSD::ShadowArchive& ChartGenericPropertyMapArchive::tschchartinfobordershadow() const {
+  return tschchartinfobordershadow_ != NULL ? *tschchartinfobordershadow_ : *default_instance_->tschchartinfobordershadow_;
+}
+inline ::TSD::ShadowArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfobordershadow() {
+  set_has_tschchartinfobordershadow();
+  if (tschchartinfobordershadow_ == NULL) tschchartinfobordershadow_ = new ::TSD::ShadowArchive;
+  return tschchartinfobordershadow_;
+}
+inline ::TSD::ShadowArchive* ChartGenericPropertyMapArchive::release_tschchartinfobordershadow() {
+  clear_has_tschchartinfobordershadow();
+  ::TSD::ShadowArchive* temp = tschchartinfobordershadow_;
+  tschchartinfobordershadow_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfobordershadow(::TSD::ShadowArchive* tschchartinfobordershadow) {
+  delete tschchartinfobordershadow_;
+  tschchartinfobordershadow_ = tschchartinfobordershadow;
+  if (tschchartinfobordershadow) {
+    set_has_tschchartinfobordershadow();
+  } else {
+    clear_has_tschchartinfobordershadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartinfoborderstroke = 20;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfoborderstroke() const {
+  return (_has_bits_[0] & 0x00080000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfoborderstroke() {
+  _has_bits_[0] |= 0x00080000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfoborderstroke() {
+  _has_bits_[0] &= ~0x00080000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfoborderstroke() {
+  if (tschchartinfoborderstroke_ != NULL) tschchartinfoborderstroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartinfoborderstroke();
+}
+inline const ::TSD::StrokeArchive& ChartGenericPropertyMapArchive::tschchartinfoborderstroke() const {
+  return tschchartinfoborderstroke_ != NULL ? *tschchartinfoborderstroke_ : *default_instance_->tschchartinfoborderstroke_;
+}
+inline ::TSD::StrokeArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfoborderstroke() {
+  set_has_tschchartinfoborderstroke();
+  if (tschchartinfoborderstroke_ == NULL) tschchartinfoborderstroke_ = new ::TSD::StrokeArchive;
+  return tschchartinfoborderstroke_;
+}
+inline ::TSD::StrokeArchive* ChartGenericPropertyMapArchive::release_tschchartinfoborderstroke() {
+  clear_has_tschchartinfoborderstroke();
+  ::TSD::StrokeArchive* temp = tschchartinfoborderstroke_;
+  tschchartinfoborderstroke_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfoborderstroke(::TSD::StrokeArchive* tschchartinfoborderstroke) {
+  delete tschchartinfoborderstroke_;
+  tschchartinfoborderstroke_ = tschchartinfoborderstroke;
+  if (tschchartinfoborderstroke) {
+    set_has_tschchartinfoborderstroke();
+  } else {
+    clear_has_tschchartinfoborderstroke();
+  }
+}
+
+// optional bool tschchartinfocombinelayers = 21;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfocombinelayers() const {
+  return (_has_bits_[0] & 0x00100000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfocombinelayers() {
+  _has_bits_[0] |= 0x00100000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfocombinelayers() {
+  _has_bits_[0] &= ~0x00100000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfocombinelayers() {
+  tschchartinfocombinelayers_ = false;
+  clear_has_tschchartinfocombinelayers();
+}
+inline bool ChartGenericPropertyMapArchive::tschchartinfocombinelayers() const {
+  return tschchartinfocombinelayers_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfocombinelayers(bool value) {
+  set_has_tschchartinfocombinelayers();
+  tschchartinfocombinelayers_ = value;
+}
+
+// optional .TSD.FillArchive tschchartinfogridbackgroundfill = 22;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfogridbackgroundfill() const {
+  return (_has_bits_[0] & 0x00200000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfogridbackgroundfill() {
+  _has_bits_[0] |= 0x00200000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfogridbackgroundfill() {
+  _has_bits_[0] &= ~0x00200000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfogridbackgroundfill() {
+  if (tschchartinfogridbackgroundfill_ != NULL) tschchartinfogridbackgroundfill_->::TSD::FillArchive::Clear();
+  clear_has_tschchartinfogridbackgroundfill();
+}
+inline const ::TSD::FillArchive& ChartGenericPropertyMapArchive::tschchartinfogridbackgroundfill() const {
+  return tschchartinfogridbackgroundfill_ != NULL ? *tschchartinfogridbackgroundfill_ : *default_instance_->tschchartinfogridbackgroundfill_;
+}
+inline ::TSD::FillArchive* ChartGenericPropertyMapArchive::mutable_tschchartinfogridbackgroundfill() {
+  set_has_tschchartinfogridbackgroundfill();
+  if (tschchartinfogridbackgroundfill_ == NULL) tschchartinfogridbackgroundfill_ = new ::TSD::FillArchive;
+  return tschchartinfogridbackgroundfill_;
+}
+inline ::TSD::FillArchive* ChartGenericPropertyMapArchive::release_tschchartinfogridbackgroundfill() {
+  clear_has_tschchartinfogridbackgroundfill();
+  ::TSD::FillArchive* temp = tschchartinfogridbackgroundfill_;
+  tschchartinfogridbackgroundfill_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfogridbackgroundfill(::TSD::FillArchive* tschchartinfogridbackgroundfill) {
+  delete tschchartinfogridbackgroundfill_;
+  tschchartinfogridbackgroundfill_ = tschchartinfogridbackgroundfill;
+  if (tschchartinfogridbackgroundfill) {
+    set_has_tschchartinfogridbackgroundfill();
+  } else {
+    clear_has_tschchartinfogridbackgroundfill();
+  }
+}
+
+// optional float tschchartinfogridbackgroundopacity = 23;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfogridbackgroundopacity() const {
+  return (_has_bits_[0] & 0x00400000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfogridbackgroundopacity() {
+  _has_bits_[0] |= 0x00400000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfogridbackgroundopacity() {
+  _has_bits_[0] &= ~0x00400000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfogridbackgroundopacity() {
+  tschchartinfogridbackgroundopacity_ = 0;
+  clear_has_tschchartinfogridbackgroundopacity();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfogridbackgroundopacity() const {
+  return tschchartinfogridbackgroundopacity_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfogridbackgroundopacity(float value) {
+  set_has_tschchartinfogridbackgroundopacity();
+  tschchartinfogridbackgroundopacity_ = value;
+}
+
+// optional float tschchartinfointerbargap = 24;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfointerbargap() const {
+  return (_has_bits_[0] & 0x00800000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfointerbargap() {
+  _has_bits_[0] |= 0x00800000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfointerbargap() {
+  _has_bits_[0] &= ~0x00800000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfointerbargap() {
+  tschchartinfointerbargap_ = 0;
+  clear_has_tschchartinfointerbargap();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfointerbargap() const {
+  return tschchartinfointerbargap_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfointerbargap(float value) {
+  set_has_tschchartinfointerbargap();
+  tschchartinfointerbargap_ = value;
+}
+
+// optional float tschchartinfointersetgap = 25;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfointersetgap() const {
+  return (_has_bits_[0] & 0x01000000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfointersetgap() {
+  _has_bits_[0] |= 0x01000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfointersetgap() {
+  _has_bits_[0] &= ~0x01000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfointersetgap() {
+  tschchartinfointersetgap_ = 0;
+  clear_has_tschchartinfointersetgap();
+}
+inline float ChartGenericPropertyMapArchive::tschchartinfointersetgap() const {
+  return tschchartinfointersetgap_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfointersetgap(float value) {
+  set_has_tschchartinfointersetgap();
+  tschchartinfointersetgap_ = value;
+}
+
+// optional bool tschchartinfoshowborder = 26;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfoshowborder() const {
+  return (_has_bits_[0] & 0x02000000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfoshowborder() {
+  _has_bits_[0] |= 0x02000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfoshowborder() {
+  _has_bits_[0] &= ~0x02000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfoshowborder() {
+  tschchartinfoshowborder_ = false;
+  clear_has_tschchartinfoshowborder();
+}
+inline bool ChartGenericPropertyMapArchive::tschchartinfoshowborder() const {
+  return tschchartinfoshowborder_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfoshowborder(bool value) {
+  set_has_tschchartinfoshowborder();
+  tschchartinfoshowborder_ = value;
+}
+
+// optional .TSP.Color tschchartinfotitlecolor = 27;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfotitlecolor() const {
+  return (_has_bits_[0] & 0x04000000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfotitlecolor() {
+  _has_bits_[0] |= 0x04000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfotitlecolor() {
+  _has_bits_[0] &= ~0x04000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfotitlecolor() {
+  if (tschchartinfotitlecolor_ != NULL) tschchartinfotitlecolor_->::TSP::Color::Clear();
+  clear_has_tschchartinfotitlecolor();
+}
+inline const ::TSP::Color& ChartGenericPropertyMapArchive::tschchartinfotitlecolor() const {
+  return tschchartinfotitlecolor_ != NULL ? *tschchartinfotitlecolor_ : *default_instance_->tschchartinfotitlecolor_;
+}
+inline ::TSP::Color* ChartGenericPropertyMapArchive::mutable_tschchartinfotitlecolor() {
+  set_has_tschchartinfotitlecolor();
+  if (tschchartinfotitlecolor_ == NULL) tschchartinfotitlecolor_ = new ::TSP::Color;
+  return tschchartinfotitlecolor_;
+}
+inline ::TSP::Color* ChartGenericPropertyMapArchive::release_tschchartinfotitlecolor() {
+  clear_has_tschchartinfotitlecolor();
+  ::TSP::Color* temp = tschchartinfotitlecolor_;
+  tschchartinfotitlecolor_ = NULL;
+  return temp;
+}
+inline void ChartGenericPropertyMapArchive::set_allocated_tschchartinfotitlecolor(::TSP::Color* tschchartinfotitlecolor) {
+  delete tschchartinfotitlecolor_;
+  tschchartinfotitlecolor_ = tschchartinfotitlecolor;
+  if (tschchartinfotitlecolor) {
+    set_has_tschchartinfotitlecolor();
+  } else {
+    clear_has_tschchartinfotitlecolor();
+  }
+}
+
+// optional int32 tschchartinfotitleparagraphstyleindex = 28;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfotitleparagraphstyleindex() const {
+  return (_has_bits_[0] & 0x08000000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfotitleparagraphstyleindex() {
+  _has_bits_[0] |= 0x08000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfotitleparagraphstyleindex() {
+  _has_bits_[0] &= ~0x08000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfotitleparagraphstyleindex() {
+  tschchartinfotitleparagraphstyleindex_ = 0;
+  clear_has_tschchartinfotitleparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartGenericPropertyMapArchive::tschchartinfotitleparagraphstyleindex() const {
+  return tschchartinfotitleparagraphstyleindex_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfotitleparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartinfotitleparagraphstyleindex();
+  tschchartinfotitleparagraphstyleindex_ = value;
+}
+
+// optional int32 tschchartinfodatasetnameparagraphstyleindex = 29;
+inline bool ChartGenericPropertyMapArchive::has_tschchartinfodatasetnameparagraphstyleindex() const {
+  return (_has_bits_[0] & 0x10000000u) != 0;
+}
+inline void ChartGenericPropertyMapArchive::set_has_tschchartinfodatasetnameparagraphstyleindex() {
+  _has_bits_[0] |= 0x10000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_has_tschchartinfodatasetnameparagraphstyleindex() {
+  _has_bits_[0] &= ~0x10000000u;
+}
+inline void ChartGenericPropertyMapArchive::clear_tschchartinfodatasetnameparagraphstyleindex() {
+  tschchartinfodatasetnameparagraphstyleindex_ = 0;
+  clear_has_tschchartinfodatasetnameparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartGenericPropertyMapArchive::tschchartinfodatasetnameparagraphstyleindex() const {
+  return tschchartinfodatasetnameparagraphstyleindex_;
+}
+inline void ChartGenericPropertyMapArchive::set_tschchartinfodatasetnameparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartinfodatasetnameparagraphstyleindex();
+  tschchartinfodatasetnameparagraphstyleindex_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// LegendGenericPropertyMapArchive
+
+// optional .TSD.FillArchive tschlegendmodelfill = 1;
+inline bool LegendGenericPropertyMapArchive::has_tschlegendmodelfill() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void LegendGenericPropertyMapArchive::set_has_tschlegendmodelfill() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void LegendGenericPropertyMapArchive::clear_has_tschlegendmodelfill() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void LegendGenericPropertyMapArchive::clear_tschlegendmodelfill() {
+  if (tschlegendmodelfill_ != NULL) tschlegendmodelfill_->::TSD::FillArchive::Clear();
+  clear_has_tschlegendmodelfill();
+}
+inline const ::TSD::FillArchive& LegendGenericPropertyMapArchive::tschlegendmodelfill() const {
+  return tschlegendmodelfill_ != NULL ? *tschlegendmodelfill_ : *default_instance_->tschlegendmodelfill_;
+}
+inline ::TSD::FillArchive* LegendGenericPropertyMapArchive::mutable_tschlegendmodelfill() {
+  set_has_tschlegendmodelfill();
+  if (tschlegendmodelfill_ == NULL) tschlegendmodelfill_ = new ::TSD::FillArchive;
+  return tschlegendmodelfill_;
+}
+inline ::TSD::FillArchive* LegendGenericPropertyMapArchive::release_tschlegendmodelfill() {
+  clear_has_tschlegendmodelfill();
+  ::TSD::FillArchive* temp = tschlegendmodelfill_;
+  tschlegendmodelfill_ = NULL;
+  return temp;
+}
+inline void LegendGenericPropertyMapArchive::set_allocated_tschlegendmodelfill(::TSD::FillArchive* tschlegendmodelfill) {
+  delete tschlegendmodelfill_;
+  tschlegendmodelfill_ = tschlegendmodelfill;
+  if (tschlegendmodelfill) {
+    set_has_tschlegendmodelfill();
+  } else {
+    clear_has_tschlegendmodelfill();
+  }
+}
+
+// optional int32 tschlegendmodellabelparagraphstyleindex = 2;
+inline bool LegendGenericPropertyMapArchive::has_tschlegendmodellabelparagraphstyleindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void LegendGenericPropertyMapArchive::set_has_tschlegendmodellabelparagraphstyleindex() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void LegendGenericPropertyMapArchive::clear_has_tschlegendmodellabelparagraphstyleindex() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void LegendGenericPropertyMapArchive::clear_tschlegendmodellabelparagraphstyleindex() {
+  tschlegendmodellabelparagraphstyleindex_ = 0;
+  clear_has_tschlegendmodellabelparagraphstyleindex();
+}
+inline ::google::protobuf::int32 LegendGenericPropertyMapArchive::tschlegendmodellabelparagraphstyleindex() const {
+  return tschlegendmodellabelparagraphstyleindex_;
+}
+inline void LegendGenericPropertyMapArchive::set_tschlegendmodellabelparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschlegendmodellabelparagraphstyleindex();
+  tschlegendmodellabelparagraphstyleindex_ = value;
+}
+
+// optional float tschlegendmodelopacity = 3;
+inline bool LegendGenericPropertyMapArchive::has_tschlegendmodelopacity() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void LegendGenericPropertyMapArchive::set_has_tschlegendmodelopacity() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void LegendGenericPropertyMapArchive::clear_has_tschlegendmodelopacity() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void LegendGenericPropertyMapArchive::clear_tschlegendmodelopacity() {
+  tschlegendmodelopacity_ = 0;
+  clear_has_tschlegendmodelopacity();
+}
+inline float LegendGenericPropertyMapArchive::tschlegendmodelopacity() const {
+  return tschlegendmodelopacity_;
+}
+inline void LegendGenericPropertyMapArchive::set_tschlegendmodelopacity(float value) {
+  set_has_tschlegendmodelopacity();
+  tschlegendmodelopacity_ = value;
+}
+
+// optional .TSD.ShadowArchive tschlegendmodelshadow = 4;
+inline bool LegendGenericPropertyMapArchive::has_tschlegendmodelshadow() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void LegendGenericPropertyMapArchive::set_has_tschlegendmodelshadow() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void LegendGenericPropertyMapArchive::clear_has_tschlegendmodelshadow() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void LegendGenericPropertyMapArchive::clear_tschlegendmodelshadow() {
+  if (tschlegendmodelshadow_ != NULL) tschlegendmodelshadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschlegendmodelshadow();
+}
+inline const ::TSD::ShadowArchive& LegendGenericPropertyMapArchive::tschlegendmodelshadow() const {
+  return tschlegendmodelshadow_ != NULL ? *tschlegendmodelshadow_ : *default_instance_->tschlegendmodelshadow_;
+}
+inline ::TSD::ShadowArchive* LegendGenericPropertyMapArchive::mutable_tschlegendmodelshadow() {
+  set_has_tschlegendmodelshadow();
+  if (tschlegendmodelshadow_ == NULL) tschlegendmodelshadow_ = new ::TSD::ShadowArchive;
+  return tschlegendmodelshadow_;
+}
+inline ::TSD::ShadowArchive* LegendGenericPropertyMapArchive::release_tschlegendmodelshadow() {
+  clear_has_tschlegendmodelshadow();
+  ::TSD::ShadowArchive* temp = tschlegendmodelshadow_;
+  tschlegendmodelshadow_ = NULL;
+  return temp;
+}
+inline void LegendGenericPropertyMapArchive::set_allocated_tschlegendmodelshadow(::TSD::ShadowArchive* tschlegendmodelshadow) {
+  delete tschlegendmodelshadow_;
+  tschlegendmodelshadow_ = tschlegendmodelshadow;
+  if (tschlegendmodelshadow) {
+    set_has_tschlegendmodelshadow();
+  } else {
+    clear_has_tschlegendmodelshadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschlegendmodelstroke = 5;
+inline bool LegendGenericPropertyMapArchive::has_tschlegendmodelstroke() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void LegendGenericPropertyMapArchive::set_has_tschlegendmodelstroke() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void LegendGenericPropertyMapArchive::clear_has_tschlegendmodelstroke() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void LegendGenericPropertyMapArchive::clear_tschlegendmodelstroke() {
+  if (tschlegendmodelstroke_ != NULL) tschlegendmodelstroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschlegendmodelstroke();
+}
+inline const ::TSD::StrokeArchive& LegendGenericPropertyMapArchive::tschlegendmodelstroke() const {
+  return tschlegendmodelstroke_ != NULL ? *tschlegendmodelstroke_ : *default_instance_->tschlegendmodelstroke_;
+}
+inline ::TSD::StrokeArchive* LegendGenericPropertyMapArchive::mutable_tschlegendmodelstroke() {
+  set_has_tschlegendmodelstroke();
+  if (tschlegendmodelstroke_ == NULL) tschlegendmodelstroke_ = new ::TSD::StrokeArchive;
+  return tschlegendmodelstroke_;
+}
+inline ::TSD::StrokeArchive* LegendGenericPropertyMapArchive::release_tschlegendmodelstroke() {
+  clear_has_tschlegendmodelstroke();
+  ::TSD::StrokeArchive* temp = tschlegendmodelstroke_;
+  tschlegendmodelstroke_ = NULL;
+  return temp;
+}
+inline void LegendGenericPropertyMapArchive::set_allocated_tschlegendmodelstroke(::TSD::StrokeArchive* tschlegendmodelstroke) {
+  delete tschlegendmodelstroke_;
+  tschlegendmodelstroke_ = tschlegendmodelstroke;
+  if (tschlegendmodelstroke) {
+    set_has_tschlegendmodelstroke();
+  } else {
+    clear_has_tschlegendmodelstroke();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// ChartAxisGenericPropertyMapArchive
+
+// optional int32 tschchartaxis3dlabelposition = 1;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxis3dlabelposition() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxis3dlabelposition() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxis3dlabelposition() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxis3dlabelposition() {
+  tschchartaxis3dlabelposition_ = 0;
+  clear_has_tschchartaxis3dlabelposition();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxis3dlabelposition() const {
+  return tschchartaxis3dlabelposition_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxis3dlabelposition(::google::protobuf::int32 value) {
+  set_has_tschchartaxis3dlabelposition();
+  tschchartaxis3dlabelposition_ = value;
+}
+
+// optional .TSK.FormatStructArchive tschchartaxis1_0numberformat = 2;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxis1_0numberformat() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxis1_0numberformat() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxis1_0numberformat() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxis1_0numberformat() {
+  if (tschchartaxis1_0numberformat_ != NULL) tschchartaxis1_0numberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxis1_0numberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisGenericPropertyMapArchive::tschchartaxis1_0numberformat() const {
+  return tschchartaxis1_0numberformat_ != NULL ? *tschchartaxis1_0numberformat_ : *default_instance_->tschchartaxis1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxis1_0numberformat() {
+  set_has_tschchartaxis1_0numberformat();
+  if (tschchartaxis1_0numberformat_ == NULL) tschchartaxis1_0numberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxis1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxis1_0numberformat() {
+  clear_has_tschchartaxis1_0numberformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxis1_0numberformat_;
+  tschchartaxis1_0numberformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxis1_0numberformat(::TSK::FormatStructArchive* tschchartaxis1_0numberformat) {
+  delete tschchartaxis1_0numberformat_;
+  tschchartaxis1_0numberformat_ = tschchartaxis1_0numberformat;
+  if (tschchartaxis1_0numberformat) {
+    set_has_tschchartaxis1_0numberformat();
+  } else {
+    clear_has_tschchartaxis1_0numberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxisnumberformat = 3;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisnumberformat() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisnumberformat() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisnumberformat() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisnumberformat() {
+  if (tschchartaxisnumberformat_ != NULL) tschchartaxisnumberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisnumberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisnumberformat() const {
+  return tschchartaxisnumberformat_ != NULL ? *tschchartaxisnumberformat_ : *default_instance_->tschchartaxisnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisnumberformat() {
+  set_has_tschchartaxisnumberformat();
+  if (tschchartaxisnumberformat_ == NULL) tschchartaxisnumberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisnumberformat() {
+  clear_has_tschchartaxisnumberformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisnumberformat_;
+  tschchartaxisnumberformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisnumberformat(::TSK::FormatStructArchive* tschchartaxisnumberformat) {
+  delete tschchartaxisnumberformat_;
+  tschchartaxisnumberformat_ = tschchartaxisnumberformat;
+  if (tschchartaxisnumberformat) {
+    set_has_tschchartaxisnumberformat();
+  } else {
+    clear_has_tschchartaxisnumberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxis1_0dateformat = 4;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxis1_0dateformat() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxis1_0dateformat() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxis1_0dateformat() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxis1_0dateformat() {
+  if (tschchartaxis1_0dateformat_ != NULL) tschchartaxis1_0dateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxis1_0dateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisGenericPropertyMapArchive::tschchartaxis1_0dateformat() const {
+  return tschchartaxis1_0dateformat_ != NULL ? *tschchartaxis1_0dateformat_ : *default_instance_->tschchartaxis1_0dateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxis1_0dateformat() {
+  set_has_tschchartaxis1_0dateformat();
+  if (tschchartaxis1_0dateformat_ == NULL) tschchartaxis1_0dateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxis1_0dateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxis1_0dateformat() {
+  clear_has_tschchartaxis1_0dateformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxis1_0dateformat_;
+  tschchartaxis1_0dateformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxis1_0dateformat(::TSK::FormatStructArchive* tschchartaxis1_0dateformat) {
+  delete tschchartaxis1_0dateformat_;
+  tschchartaxis1_0dateformat_ = tschchartaxis1_0dateformat;
+  if (tschchartaxis1_0dateformat) {
+    set_has_tschchartaxis1_0dateformat();
+  } else {
+    clear_has_tschchartaxis1_0dateformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxisdurationformat = 5;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisdurationformat() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisdurationformat() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisdurationformat() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisdurationformat() {
+  if (tschchartaxisdurationformat_ != NULL) tschchartaxisdurationformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdurationformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisdurationformat() const {
+  return tschchartaxisdurationformat_ != NULL ? *tschchartaxisdurationformat_ : *default_instance_->tschchartaxisdurationformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisdurationformat() {
+  set_has_tschchartaxisdurationformat();
+  if (tschchartaxisdurationformat_ == NULL) tschchartaxisdurationformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdurationformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisdurationformat() {
+  clear_has_tschchartaxisdurationformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisdurationformat_;
+  tschchartaxisdurationformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisdurationformat(::TSK::FormatStructArchive* tschchartaxisdurationformat) {
+  delete tschchartaxisdurationformat_;
+  tschchartaxisdurationformat_ = tschchartaxisdurationformat;
+  if (tschchartaxisdurationformat) {
+    set_has_tschchartaxisdurationformat();
+  } else {
+    clear_has_tschchartaxisdurationformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartaxisdateformat = 6;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisdateformat() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisdateformat() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisdateformat() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisdateformat() {
+  if (tschchartaxisdateformat_ != NULL) tschchartaxisdateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartaxisdateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisdateformat() const {
+  return tschchartaxisdateformat_ != NULL ? *tschchartaxisdateformat_ : *default_instance_->tschchartaxisdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisdateformat() {
+  set_has_tschchartaxisdateformat();
+  if (tschchartaxisdateformat_ == NULL) tschchartaxisdateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartaxisdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisdateformat() {
+  clear_has_tschchartaxisdateformat();
+  ::TSK::FormatStructArchive* temp = tschchartaxisdateformat_;
+  tschchartaxisdateformat_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisdateformat(::TSK::FormatStructArchive* tschchartaxisdateformat) {
+  delete tschchartaxisdateformat_;
+  tschchartaxisdateformat_ = tschchartaxisdateformat;
+  if (tschchartaxisdateformat) {
+    set_has_tschchartaxisdateformat();
+  } else {
+    clear_has_tschchartaxisdateformat();
+  }
+}
+
+// optional int32 tschchartaxisnumberformattype = 7;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisnumberformattype() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisnumberformattype() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisnumberformattype() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisnumberformattype() {
+  tschchartaxisnumberformattype_ = 0;
+  clear_has_tschchartaxisnumberformattype();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxisnumberformattype() const {
+  return tschchartaxisnumberformattype_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisnumberformattype(::google::protobuf::int32 value) {
+  set_has_tschchartaxisnumberformattype();
+  tschchartaxisnumberformattype_ = value;
+}
+
+// optional int32 tschchartaxisnumberofdecades = 8;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisnumberofdecades() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisnumberofdecades() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisnumberofdecades() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisnumberofdecades() {
+  tschchartaxisnumberofdecades_ = 0;
+  clear_has_tschchartaxisnumberofdecades();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxisnumberofdecades() const {
+  return tschchartaxisnumberofdecades_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisnumberofdecades(::google::protobuf::int32 value) {
+  set_has_tschchartaxisnumberofdecades();
+  tschchartaxisnumberofdecades_ = value;
+}
+
+// optional int32 tschchartaxisnumberofmajorgridlines = 9;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisnumberofmajorgridlines() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisnumberofmajorgridlines() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisnumberofmajorgridlines() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisnumberofmajorgridlines() {
+  tschchartaxisnumberofmajorgridlines_ = 0;
+  clear_has_tschchartaxisnumberofmajorgridlines();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxisnumberofmajorgridlines() const {
+  return tschchartaxisnumberofmajorgridlines_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisnumberofmajorgridlines(::google::protobuf::int32 value) {
+  set_has_tschchartaxisnumberofmajorgridlines();
+  tschchartaxisnumberofmajorgridlines_ = value;
+}
+
+// optional int32 tschchartaxisnumberofminorgridlines = 10;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisnumberofminorgridlines() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisnumberofminorgridlines() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisnumberofminorgridlines() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisnumberofminorgridlines() {
+  tschchartaxisnumberofminorgridlines_ = 0;
+  clear_has_tschchartaxisnumberofminorgridlines();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxisnumberofminorgridlines() const {
+  return tschchartaxisnumberofminorgridlines_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisnumberofminorgridlines(::google::protobuf::int32 value) {
+  set_has_tschchartaxisnumberofminorgridlines();
+  tschchartaxisnumberofminorgridlines_ = value;
+}
+
+// optional bool tschchartaxisplottoedges = 11;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisplottoedges() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisplottoedges() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisplottoedges() {
+  _has_bits_[0] &= ~0x00000400u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisplottoedges() {
+  tschchartaxisplottoedges_ = false;
+  clear_has_tschchartaxisplottoedges();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisplottoedges() const {
+  return tschchartaxisplottoedges_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisplottoedges(bool value) {
+  set_has_tschchartaxisplottoedges();
+  tschchartaxisplottoedges_ = value;
+}
+
+// optional int32 tschchartaxisscale = 12;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisscale() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisscale() {
+  _has_bits_[0] |= 0x00000800u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisscale() {
+  _has_bits_[0] &= ~0x00000800u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisscale() {
+  tschchartaxisscale_ = 0;
+  clear_has_tschchartaxisscale();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxisscale() const {
+  return tschchartaxisscale_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisscale(::google::protobuf::int32 value) {
+  set_has_tschchartaxisscale();
+  tschchartaxisscale_ = value;
+}
+
+// optional bool tschchartaxisshowlabels = 13;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowlabels() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowlabels() {
+  _has_bits_[0] |= 0x00001000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowlabels() {
+  _has_bits_[0] &= ~0x00001000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowlabels() {
+  tschchartaxisshowlabels_ = false;
+  clear_has_tschchartaxisshowlabels();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowlabels() const {
+  return tschchartaxisshowlabels_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowlabels(bool value) {
+  set_has_tschchartaxisshowlabels();
+  tschchartaxisshowlabels_ = value;
+}
+
+// optional bool tschchartaxisshowserieslabels = 14;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowserieslabels() const {
+  return (_has_bits_[0] & 0x00002000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowserieslabels() {
+  _has_bits_[0] |= 0x00002000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowserieslabels() {
+  _has_bits_[0] &= ~0x00002000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowserieslabels() {
+  tschchartaxisshowserieslabels_ = false;
+  clear_has_tschchartaxisshowserieslabels();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowserieslabels() const {
+  return tschchartaxisshowserieslabels_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowserieslabels(bool value) {
+  set_has_tschchartaxisshowserieslabels();
+  tschchartaxisshowserieslabels_ = value;
+}
+
+// optional bool tschchartaxisshowtitle = 15;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowtitle() const {
+  return (_has_bits_[0] & 0x00004000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowtitle() {
+  _has_bits_[0] |= 0x00004000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowtitle() {
+  _has_bits_[0] &= ~0x00004000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowtitle() {
+  tschchartaxisshowtitle_ = false;
+  clear_has_tschchartaxisshowtitle();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowtitle() const {
+  return tschchartaxisshowtitle_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowtitle(bool value) {
+  set_has_tschchartaxisshowtitle();
+  tschchartaxisshowtitle_ = value;
+}
+
+// optional string tschchartaxistitle = 16;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxistitle() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxistitle() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxistitle() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxistitle() {
+  if (tschchartaxistitle_ != &::google::protobuf::internal::kEmptyString) {
+    tschchartaxistitle_->clear();
+  }
+  clear_has_tschchartaxistitle();
+}
+inline const ::std::string& ChartAxisGenericPropertyMapArchive::tschchartaxistitle() const {
+  return *tschchartaxistitle_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxistitle(const ::std::string& value) {
+  set_has_tschchartaxistitle();
+  if (tschchartaxistitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartaxistitle_ = new ::std::string;
+  }
+  tschchartaxistitle_->assign(value);
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxistitle(const char* value) {
+  set_has_tschchartaxistitle();
+  if (tschchartaxistitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartaxistitle_ = new ::std::string;
+  }
+  tschchartaxistitle_->assign(value);
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxistitle(const char* value, size_t size) {
+  set_has_tschchartaxistitle();
+  if (tschchartaxistitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartaxistitle_ = new ::std::string;
+  }
+  tschchartaxistitle_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxistitle() {
+  set_has_tschchartaxistitle();
+  if (tschchartaxistitle_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartaxistitle_ = new ::std::string;
+  }
+  return tschchartaxistitle_;
+}
+inline ::std::string* ChartAxisGenericPropertyMapArchive::release_tschchartaxistitle() {
+  clear_has_tschchartaxistitle();
+  if (tschchartaxistitle_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = tschchartaxistitle_;
+    tschchartaxistitle_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxistitle(::std::string* tschchartaxistitle) {
+  if (tschchartaxistitle_ != &::google::protobuf::internal::kEmptyString) {
+    delete tschchartaxistitle_;
+  }
+  if (tschchartaxistitle) {
+    set_has_tschchartaxistitle();
+    tschchartaxistitle_ = tschchartaxistitle;
+  } else {
+    clear_has_tschchartaxistitle();
+    tschchartaxistitle_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermax = 17;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisusermax() const {
+  return (_has_bits_[0] & 0x00010000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisusermax() {
+  _has_bits_[0] |= 0x00010000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisusermax() {
+  _has_bits_[0] &= ~0x00010000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisusermax() {
+  if (tschchartaxisusermax_ != NULL) tschchartaxisusermax_->::TSCH::ChartsNSNumberDoubleArchive::Clear();
+  clear_has_tschchartaxisusermax();
+}
+inline const ::TSCH::ChartsNSNumberDoubleArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisusermax() const {
+  return tschchartaxisusermax_ != NULL ? *tschchartaxisusermax_ : *default_instance_->tschchartaxisusermax_;
+}
+inline ::TSCH::ChartsNSNumberDoubleArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisusermax() {
+  set_has_tschchartaxisusermax();
+  if (tschchartaxisusermax_ == NULL) tschchartaxisusermax_ = new ::TSCH::ChartsNSNumberDoubleArchive;
+  return tschchartaxisusermax_;
+}
+inline ::TSCH::ChartsNSNumberDoubleArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisusermax() {
+  clear_has_tschchartaxisusermax();
+  ::TSCH::ChartsNSNumberDoubleArchive* temp = tschchartaxisusermax_;
+  tschchartaxisusermax_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisusermax(::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisusermax) {
+  delete tschchartaxisusermax_;
+  tschchartaxisusermax_ = tschchartaxisusermax;
+  if (tschchartaxisusermax) {
+    set_has_tschchartaxisusermax();
+  } else {
+    clear_has_tschchartaxisusermax();
+  }
+}
+
+// optional .TSCH.ChartsNSNumberDoubleArchive tschchartaxisusermin = 18;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisusermin() const {
+  return (_has_bits_[0] & 0x00020000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisusermin() {
+  _has_bits_[0] |= 0x00020000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisusermin() {
+  _has_bits_[0] &= ~0x00020000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisusermin() {
+  if (tschchartaxisusermin_ != NULL) tschchartaxisusermin_->::TSCH::ChartsNSNumberDoubleArchive::Clear();
+  clear_has_tschchartaxisusermin();
+}
+inline const ::TSCH::ChartsNSNumberDoubleArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisusermin() const {
+  return tschchartaxisusermin_ != NULL ? *tschchartaxisusermin_ : *default_instance_->tschchartaxisusermin_;
+}
+inline ::TSCH::ChartsNSNumberDoubleArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisusermin() {
+  set_has_tschchartaxisusermin();
+  if (tschchartaxisusermin_ == NULL) tschchartaxisusermin_ = new ::TSCH::ChartsNSNumberDoubleArchive;
+  return tschchartaxisusermin_;
+}
+inline ::TSCH::ChartsNSNumberDoubleArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisusermin() {
+  clear_has_tschchartaxisusermin();
+  ::TSCH::ChartsNSNumberDoubleArchive* temp = tschchartaxisusermin_;
+  tschchartaxisusermin_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisusermin(::TSCH::ChartsNSNumberDoubleArchive* tschchartaxisusermin) {
+  delete tschchartaxisusermin_;
+  tschchartaxisusermin_ = tschchartaxisusermin;
+  if (tschchartaxisusermin) {
+    set_has_tschchartaxisusermin();
+  } else {
+    clear_has_tschchartaxisusermin();
+  }
+}
+
+// optional float tschchartaxis3dgridlineopacity = 19;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxis3dgridlineopacity() const {
+  return (_has_bits_[0] & 0x00040000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxis3dgridlineopacity() {
+  _has_bits_[0] |= 0x00040000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxis3dgridlineopacity() {
+  _has_bits_[0] &= ~0x00040000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxis3dgridlineopacity() {
+  tschchartaxis3dgridlineopacity_ = 0;
+  clear_has_tschchartaxis3dgridlineopacity();
+}
+inline float ChartAxisGenericPropertyMapArchive::tschchartaxis3dgridlineopacity() const {
+  return tschchartaxis3dgridlineopacity_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxis3dgridlineopacity(float value) {
+  set_has_tschchartaxis3dgridlineopacity();
+  tschchartaxis3dgridlineopacity_ = value;
+}
+
+// optional .TSD.StrokeArchive tschchartaxis3dgridlinestroke = 20;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxis3dgridlinestroke() const {
+  return (_has_bits_[0] & 0x00080000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxis3dgridlinestroke() {
+  _has_bits_[0] |= 0x00080000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxis3dgridlinestroke() {
+  _has_bits_[0] &= ~0x00080000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxis3dgridlinestroke() {
+  if (tschchartaxis3dgridlinestroke_ != NULL) tschchartaxis3dgridlinestroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartaxis3dgridlinestroke();
+}
+inline const ::TSD::StrokeArchive& ChartAxisGenericPropertyMapArchive::tschchartaxis3dgridlinestroke() const {
+  return tschchartaxis3dgridlinestroke_ != NULL ? *tschchartaxis3dgridlinestroke_ : *default_instance_->tschchartaxis3dgridlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxis3dgridlinestroke() {
+  set_has_tschchartaxis3dgridlinestroke();
+  if (tschchartaxis3dgridlinestroke_ == NULL) tschchartaxis3dgridlinestroke_ = new ::TSD::StrokeArchive;
+  return tschchartaxis3dgridlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxis3dgridlinestroke() {
+  clear_has_tschchartaxis3dgridlinestroke();
+  ::TSD::StrokeArchive* temp = tschchartaxis3dgridlinestroke_;
+  tschchartaxis3dgridlinestroke_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxis3dgridlinestroke(::TSD::StrokeArchive* tschchartaxis3dgridlinestroke) {
+  delete tschchartaxis3dgridlinestroke_;
+  tschchartaxis3dgridlinestroke_ = tschchartaxis3dgridlinestroke;
+  if (tschchartaxis3dgridlinestroke) {
+    set_has_tschchartaxis3dgridlinestroke();
+  } else {
+    clear_has_tschchartaxis3dgridlinestroke();
+  }
+}
+
+// optional int32 tschchartaxishorizontalspacing = 21;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxishorizontalspacing() const {
+  return (_has_bits_[0] & 0x00100000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxishorizontalspacing() {
+  _has_bits_[0] |= 0x00100000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxishorizontalspacing() {
+  _has_bits_[0] &= ~0x00100000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxishorizontalspacing() {
+  tschchartaxishorizontalspacing_ = 0;
+  clear_has_tschchartaxishorizontalspacing();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxishorizontalspacing() const {
+  return tschchartaxishorizontalspacing_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxishorizontalspacing(::google::protobuf::int32 value) {
+  set_has_tschchartaxishorizontalspacing();
+  tschchartaxishorizontalspacing_ = value;
+}
+
+// optional int32 tschchartaxislabelparagraphstyleindex = 22;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxislabelparagraphstyleindex() const {
+  return (_has_bits_[0] & 0x00200000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxislabelparagraphstyleindex() {
+  _has_bits_[0] |= 0x00200000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxislabelparagraphstyleindex() {
+  _has_bits_[0] &= ~0x00200000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxislabelparagraphstyleindex() {
+  tschchartaxislabelparagraphstyleindex_ = 0;
+  clear_has_tschchartaxislabelparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxislabelparagraphstyleindex() const {
+  return tschchartaxislabelparagraphstyleindex_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxislabelparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartaxislabelparagraphstyleindex();
+  tschchartaxislabelparagraphstyleindex_ = value;
+}
+
+// optional float tschchartaxislabelsorientation = 23;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxislabelsorientation() const {
+  return (_has_bits_[0] & 0x00400000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxislabelsorientation() {
+  _has_bits_[0] |= 0x00400000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxislabelsorientation() {
+  _has_bits_[0] &= ~0x00400000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxislabelsorientation() {
+  tschchartaxislabelsorientation_ = 0;
+  clear_has_tschchartaxislabelsorientation();
+}
+inline float ChartAxisGenericPropertyMapArchive::tschchartaxislabelsorientation() const {
+  return tschchartaxislabelsorientation_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxislabelsorientation(float value) {
+  set_has_tschchartaxislabelsorientation();
+  tschchartaxislabelsorientation_ = value;
+}
+
+// optional float tschchartaxismajorgridlineopacity = 24;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxismajorgridlineopacity() const {
+  return (_has_bits_[0] & 0x00800000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxismajorgridlineopacity() {
+  _has_bits_[0] |= 0x00800000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxismajorgridlineopacity() {
+  _has_bits_[0] &= ~0x00800000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxismajorgridlineopacity() {
+  tschchartaxismajorgridlineopacity_ = 0;
+  clear_has_tschchartaxismajorgridlineopacity();
+}
+inline float ChartAxisGenericPropertyMapArchive::tschchartaxismajorgridlineopacity() const {
+  return tschchartaxismajorgridlineopacity_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxismajorgridlineopacity(float value) {
+  set_has_tschchartaxismajorgridlineopacity();
+  tschchartaxismajorgridlineopacity_ = value;
+}
+
+// optional .TSD.ShadowArchive tschchartaxismajorgridlineshadow = 25;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxismajorgridlineshadow() const {
+  return (_has_bits_[0] & 0x01000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxismajorgridlineshadow() {
+  _has_bits_[0] |= 0x01000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxismajorgridlineshadow() {
+  _has_bits_[0] &= ~0x01000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxismajorgridlineshadow() {
+  if (tschchartaxismajorgridlineshadow_ != NULL) tschchartaxismajorgridlineshadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschchartaxismajorgridlineshadow();
+}
+inline const ::TSD::ShadowArchive& ChartAxisGenericPropertyMapArchive::tschchartaxismajorgridlineshadow() const {
+  return tschchartaxismajorgridlineshadow_ != NULL ? *tschchartaxismajorgridlineshadow_ : *default_instance_->tschchartaxismajorgridlineshadow_;
+}
+inline ::TSD::ShadowArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxismajorgridlineshadow() {
+  set_has_tschchartaxismajorgridlineshadow();
+  if (tschchartaxismajorgridlineshadow_ == NULL) tschchartaxismajorgridlineshadow_ = new ::TSD::ShadowArchive;
+  return tschchartaxismajorgridlineshadow_;
+}
+inline ::TSD::ShadowArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxismajorgridlineshadow() {
+  clear_has_tschchartaxismajorgridlineshadow();
+  ::TSD::ShadowArchive* temp = tschchartaxismajorgridlineshadow_;
+  tschchartaxismajorgridlineshadow_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxismajorgridlineshadow(::TSD::ShadowArchive* tschchartaxismajorgridlineshadow) {
+  delete tschchartaxismajorgridlineshadow_;
+  tschchartaxismajorgridlineshadow_ = tschchartaxismajorgridlineshadow;
+  if (tschchartaxismajorgridlineshadow) {
+    set_has_tschchartaxismajorgridlineshadow();
+  } else {
+    clear_has_tschchartaxismajorgridlineshadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartaxismajorgridlinestroke = 26;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxismajorgridlinestroke() const {
+  return (_has_bits_[0] & 0x02000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxismajorgridlinestroke() {
+  _has_bits_[0] |= 0x02000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxismajorgridlinestroke() {
+  _has_bits_[0] &= ~0x02000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxismajorgridlinestroke() {
+  if (tschchartaxismajorgridlinestroke_ != NULL) tschchartaxismajorgridlinestroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartaxismajorgridlinestroke();
+}
+inline const ::TSD::StrokeArchive& ChartAxisGenericPropertyMapArchive::tschchartaxismajorgridlinestroke() const {
+  return tschchartaxismajorgridlinestroke_ != NULL ? *tschchartaxismajorgridlinestroke_ : *default_instance_->tschchartaxismajorgridlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxismajorgridlinestroke() {
+  set_has_tschchartaxismajorgridlinestroke();
+  if (tschchartaxismajorgridlinestroke_ == NULL) tschchartaxismajorgridlinestroke_ = new ::TSD::StrokeArchive;
+  return tschchartaxismajorgridlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxismajorgridlinestroke() {
+  clear_has_tschchartaxismajorgridlinestroke();
+  ::TSD::StrokeArchive* temp = tschchartaxismajorgridlinestroke_;
+  tschchartaxismajorgridlinestroke_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxismajorgridlinestroke(::TSD::StrokeArchive* tschchartaxismajorgridlinestroke) {
+  delete tschchartaxismajorgridlinestroke_;
+  tschchartaxismajorgridlinestroke_ = tschchartaxismajorgridlinestroke;
+  if (tschchartaxismajorgridlinestroke) {
+    set_has_tschchartaxismajorgridlinestroke();
+  } else {
+    clear_has_tschchartaxismajorgridlinestroke();
+  }
+}
+
+// optional float tschchartaxisminorgridlineopacity = 27;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisminorgridlineopacity() const {
+  return (_has_bits_[0] & 0x04000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisminorgridlineopacity() {
+  _has_bits_[0] |= 0x04000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisminorgridlineopacity() {
+  _has_bits_[0] &= ~0x04000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisminorgridlineopacity() {
+  tschchartaxisminorgridlineopacity_ = 0;
+  clear_has_tschchartaxisminorgridlineopacity();
+}
+inline float ChartAxisGenericPropertyMapArchive::tschchartaxisminorgridlineopacity() const {
+  return tschchartaxisminorgridlineopacity_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisminorgridlineopacity(float value) {
+  set_has_tschchartaxisminorgridlineopacity();
+  tschchartaxisminorgridlineopacity_ = value;
+}
+
+// optional .TSD.ShadowArchive tschchartaxisminorgridlineshadow = 28;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisminorgridlineshadow() const {
+  return (_has_bits_[0] & 0x08000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisminorgridlineshadow() {
+  _has_bits_[0] |= 0x08000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisminorgridlineshadow() {
+  _has_bits_[0] &= ~0x08000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisminorgridlineshadow() {
+  if (tschchartaxisminorgridlineshadow_ != NULL) tschchartaxisminorgridlineshadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschchartaxisminorgridlineshadow();
+}
+inline const ::TSD::ShadowArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisminorgridlineshadow() const {
+  return tschchartaxisminorgridlineshadow_ != NULL ? *tschchartaxisminorgridlineshadow_ : *default_instance_->tschchartaxisminorgridlineshadow_;
+}
+inline ::TSD::ShadowArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisminorgridlineshadow() {
+  set_has_tschchartaxisminorgridlineshadow();
+  if (tschchartaxisminorgridlineshadow_ == NULL) tschchartaxisminorgridlineshadow_ = new ::TSD::ShadowArchive;
+  return tschchartaxisminorgridlineshadow_;
+}
+inline ::TSD::ShadowArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisminorgridlineshadow() {
+  clear_has_tschchartaxisminorgridlineshadow();
+  ::TSD::ShadowArchive* temp = tschchartaxisminorgridlineshadow_;
+  tschchartaxisminorgridlineshadow_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisminorgridlineshadow(::TSD::ShadowArchive* tschchartaxisminorgridlineshadow) {
+  delete tschchartaxisminorgridlineshadow_;
+  tschchartaxisminorgridlineshadow_ = tschchartaxisminorgridlineshadow;
+  if (tschchartaxisminorgridlineshadow) {
+    set_has_tschchartaxisminorgridlineshadow();
+  } else {
+    clear_has_tschchartaxisminorgridlineshadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartaxisminorgridlinestroke = 29;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisminorgridlinestroke() const {
+  return (_has_bits_[0] & 0x10000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisminorgridlinestroke() {
+  _has_bits_[0] |= 0x10000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisminorgridlinestroke() {
+  _has_bits_[0] &= ~0x10000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisminorgridlinestroke() {
+  if (tschchartaxisminorgridlinestroke_ != NULL) tschchartaxisminorgridlinestroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartaxisminorgridlinestroke();
+}
+inline const ::TSD::StrokeArchive& ChartAxisGenericPropertyMapArchive::tschchartaxisminorgridlinestroke() const {
+  return tschchartaxisminorgridlinestroke_ != NULL ? *tschchartaxisminorgridlinestroke_ : *default_instance_->tschchartaxisminorgridlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartAxisGenericPropertyMapArchive::mutable_tschchartaxisminorgridlinestroke() {
+  set_has_tschchartaxisminorgridlinestroke();
+  if (tschchartaxisminorgridlinestroke_ == NULL) tschchartaxisminorgridlinestroke_ = new ::TSD::StrokeArchive;
+  return tschchartaxisminorgridlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartAxisGenericPropertyMapArchive::release_tschchartaxisminorgridlinestroke() {
+  clear_has_tschchartaxisminorgridlinestroke();
+  ::TSD::StrokeArchive* temp = tschchartaxisminorgridlinestroke_;
+  tschchartaxisminorgridlinestroke_ = NULL;
+  return temp;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_allocated_tschchartaxisminorgridlinestroke(::TSD::StrokeArchive* tschchartaxisminorgridlinestroke) {
+  delete tschchartaxisminorgridlinestroke_;
+  tschchartaxisminorgridlinestroke_ = tschchartaxisminorgridlinestroke;
+  if (tschchartaxisminorgridlinestroke) {
+    set_has_tschchartaxisminorgridlinestroke();
+  } else {
+    clear_has_tschchartaxisminorgridlinestroke();
+  }
+}
+
+// optional bool tschchartaxisshowaxis = 30;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowaxis() const {
+  return (_has_bits_[0] & 0x20000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowaxis() {
+  _has_bits_[0] |= 0x20000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowaxis() {
+  _has_bits_[0] &= ~0x20000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowaxis() {
+  tschchartaxisshowaxis_ = false;
+  clear_has_tschchartaxisshowaxis();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowaxis() const {
+  return tschchartaxisshowaxis_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowaxis(bool value) {
+  set_has_tschchartaxisshowaxis();
+  tschchartaxisshowaxis_ = value;
+}
+
+// optional bool tschchartaxisshowlastlabel = 31;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowlastlabel() const {
+  return (_has_bits_[0] & 0x40000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowlastlabel() {
+  _has_bits_[0] |= 0x40000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowlastlabel() {
+  _has_bits_[0] &= ~0x40000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowlastlabel() {
+  tschchartaxisshowlastlabel_ = false;
+  clear_has_tschchartaxisshowlastlabel();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowlastlabel() const {
+  return tschchartaxisshowlastlabel_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowlastlabel(bool value) {
+  set_has_tschchartaxisshowlastlabel();
+  tschchartaxisshowlastlabel_ = value;
+}
+
+// optional bool tschchartaxisshowmajorgridlines = 32;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowmajorgridlines() const {
+  return (_has_bits_[0] & 0x80000000u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowmajorgridlines() {
+  _has_bits_[0] |= 0x80000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowmajorgridlines() {
+  _has_bits_[0] &= ~0x80000000u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowmajorgridlines() {
+  tschchartaxisshowmajorgridlines_ = false;
+  clear_has_tschchartaxisshowmajorgridlines();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowmajorgridlines() const {
+  return tschchartaxisshowmajorgridlines_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowmajorgridlines(bool value) {
+  set_has_tschchartaxisshowmajorgridlines();
+  tschchartaxisshowmajorgridlines_ = value;
+}
+
+// optional bool tschchartaxisshowmajortickmarks = 33;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowmajortickmarks() const {
+  return (_has_bits_[1] & 0x00000001u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowmajortickmarks() {
+  _has_bits_[1] |= 0x00000001u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowmajortickmarks() {
+  _has_bits_[1] &= ~0x00000001u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowmajortickmarks() {
+  tschchartaxisshowmajortickmarks_ = false;
+  clear_has_tschchartaxisshowmajortickmarks();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowmajortickmarks() const {
+  return tschchartaxisshowmajortickmarks_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowmajortickmarks(bool value) {
+  set_has_tschchartaxisshowmajortickmarks();
+  tschchartaxisshowmajortickmarks_ = value;
+}
+
+// optional bool tschchartaxisshowminimumlabel = 34;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowminimumlabel() const {
+  return (_has_bits_[1] & 0x00000002u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowminimumlabel() {
+  _has_bits_[1] |= 0x00000002u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowminimumlabel() {
+  _has_bits_[1] &= ~0x00000002u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowminimumlabel() {
+  tschchartaxisshowminimumlabel_ = false;
+  clear_has_tschchartaxisshowminimumlabel();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowminimumlabel() const {
+  return tschchartaxisshowminimumlabel_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowminimumlabel(bool value) {
+  set_has_tschchartaxisshowminimumlabel();
+  tschchartaxisshowminimumlabel_ = value;
+}
+
+// optional bool tschchartaxisshowminorgridlines = 35;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowminorgridlines() const {
+  return (_has_bits_[1] & 0x00000004u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowminorgridlines() {
+  _has_bits_[1] |= 0x00000004u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowminorgridlines() {
+  _has_bits_[1] &= ~0x00000004u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowminorgridlines() {
+  tschchartaxisshowminorgridlines_ = false;
+  clear_has_tschchartaxisshowminorgridlines();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowminorgridlines() const {
+  return tschchartaxisshowminorgridlines_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowminorgridlines(bool value) {
+  set_has_tschchartaxisshowminorgridlines();
+  tschchartaxisshowminorgridlines_ = value;
+}
+
+// optional bool tschchartaxisshowminortickmarks = 36;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisshowminortickmarks() const {
+  return (_has_bits_[1] & 0x00000008u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisshowminortickmarks() {
+  _has_bits_[1] |= 0x00000008u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisshowminortickmarks() {
+  _has_bits_[1] &= ~0x00000008u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisshowminortickmarks() {
+  tschchartaxisshowminortickmarks_ = false;
+  clear_has_tschchartaxisshowminortickmarks();
+}
+inline bool ChartAxisGenericPropertyMapArchive::tschchartaxisshowminortickmarks() const {
+  return tschchartaxisshowminortickmarks_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisshowminortickmarks(bool value) {
+  set_has_tschchartaxisshowminortickmarks();
+  tschchartaxisshowminortickmarks_ = value;
+}
+
+// optional int32 tschchartaxistickmarklocation = 37;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxistickmarklocation() const {
+  return (_has_bits_[1] & 0x00000010u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxistickmarklocation() {
+  _has_bits_[1] |= 0x00000010u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxistickmarklocation() {
+  _has_bits_[1] &= ~0x00000010u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxistickmarklocation() {
+  tschchartaxistickmarklocation_ = 0;
+  clear_has_tschchartaxistickmarklocation();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxistickmarklocation() const {
+  return tschchartaxistickmarklocation_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxistickmarklocation(::google::protobuf::int32 value) {
+  set_has_tschchartaxistickmarklocation();
+  tschchartaxistickmarklocation_ = value;
+}
+
+// optional int32 tschchartaxistitleparagraphstyleindex = 38;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxistitleparagraphstyleindex() const {
+  return (_has_bits_[1] & 0x00000020u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxistitleparagraphstyleindex() {
+  _has_bits_[1] |= 0x00000020u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxistitleparagraphstyleindex() {
+  _has_bits_[1] &= ~0x00000020u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxistitleparagraphstyleindex() {
+  tschchartaxistitleparagraphstyleindex_ = 0;
+  clear_has_tschchartaxistitleparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxistitleparagraphstyleindex() const {
+  return tschchartaxistitleparagraphstyleindex_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxistitleparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartaxistitleparagraphstyleindex();
+  tschchartaxistitleparagraphstyleindex_ = value;
+}
+
+// optional int32 tschchartaxisverticalspacing = 39;
+inline bool ChartAxisGenericPropertyMapArchive::has_tschchartaxisverticalspacing() const {
+  return (_has_bits_[1] & 0x00000040u) != 0;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_has_tschchartaxisverticalspacing() {
+  _has_bits_[1] |= 0x00000040u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_has_tschchartaxisverticalspacing() {
+  _has_bits_[1] &= ~0x00000040u;
+}
+inline void ChartAxisGenericPropertyMapArchive::clear_tschchartaxisverticalspacing() {
+  tschchartaxisverticalspacing_ = 0;
+  clear_has_tschchartaxisverticalspacing();
+}
+inline ::google::protobuf::int32 ChartAxisGenericPropertyMapArchive::tschchartaxisverticalspacing() const {
+  return tschchartaxisverticalspacing_;
+}
+inline void ChartAxisGenericPropertyMapArchive::set_tschchartaxisverticalspacing(::google::protobuf::int32 value) {
+  set_has_tschchartaxisverticalspacing();
+  tschchartaxisverticalspacing_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// ChartSeriesGenericPropertyMapArchive
+
+// optional float tschchartseriesadjustmentscale = 1;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesadjustmentscale() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesadjustmentscale() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesadjustmentscale() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesadjustmentscale() {
+  tschchartseriesadjustmentscale_ = 0;
+  clear_has_tschchartseriesadjustmentscale();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriesadjustmentscale() const {
+  return tschchartseriesadjustmentscale_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesadjustmentscale(float value) {
+  set_has_tschchartseriesadjustmentscale();
+  tschchartseriesadjustmentscale_ = value;
+}
+
+// optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedata = 2;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarcustomnegativedata() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarcustomnegativedata() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarcustomnegativedata() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarcustomnegativedata() {
+  if (tschchartserieserrorbarcustomnegativedata_ != NULL) tschchartserieserrorbarcustomnegativedata_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+  clear_has_tschchartserieserrorbarcustomnegativedata();
+}
+inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarcustomnegativedata() const {
+  return tschchartserieserrorbarcustomnegativedata_ != NULL ? *tschchartserieserrorbarcustomnegativedata_ : *default_instance_->tschchartserieserrorbarcustomnegativedata_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarcustomnegativedata() {
+  set_has_tschchartserieserrorbarcustomnegativedata();
+  if (tschchartserieserrorbarcustomnegativedata_ == NULL) tschchartserieserrorbarcustomnegativedata_ = new ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive;
+  return tschchartserieserrorbarcustomnegativedata_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarcustomnegativedata() {
+  clear_has_tschchartserieserrorbarcustomnegativedata();
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* temp = tschchartserieserrorbarcustomnegativedata_;
+  tschchartserieserrorbarcustomnegativedata_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarcustomnegativedata(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustomnegativedata) {
+  delete tschchartserieserrorbarcustomnegativedata_;
+  tschchartserieserrorbarcustomnegativedata_ = tschchartserieserrorbarcustomnegativedata;
+  if (tschchartserieserrorbarcustomnegativedata) {
+    set_has_tschchartserieserrorbarcustomnegativedata();
+  } else {
+    clear_has_tschchartserieserrorbarcustomnegativedata();
+  }
+}
+
+// optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustomnegativedatascatterx = 3;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarcustomnegativedatascatterx() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarcustomnegativedatascatterx() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarcustomnegativedatascatterx() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarcustomnegativedatascatterx() {
+  if (tschchartserieserrorbarcustomnegativedatascatterx_ != NULL) tschchartserieserrorbarcustomnegativedatascatterx_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+  clear_has_tschchartserieserrorbarcustomnegativedatascatterx();
+}
+inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarcustomnegativedatascatterx() const {
+  return tschchartserieserrorbarcustomnegativedatascatterx_ != NULL ? *tschchartserieserrorbarcustomnegativedatascatterx_ : *default_instance_->tschchartserieserrorbarcustomnegativedatascatterx_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarcustomnegativedatascatterx() {
+  set_has_tschchartserieserrorbarcustomnegativedatascatterx();
+  if (tschchartserieserrorbarcustomnegativedatascatterx_ == NULL) tschchartserieserrorbarcustomnegativedatascatterx_ = new ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive;
+  return tschchartserieserrorbarcustomnegativedatascatterx_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarcustomnegativedatascatterx() {
+  clear_has_tschchartserieserrorbarcustomnegativedatascatterx();
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* temp = tschchartserieserrorbarcustomnegativedatascatterx_;
+  tschchartserieserrorbarcustomnegativedatascatterx_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarcustomnegativedatascatterx(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustomnegativedatascatterx) {
+  delete tschchartserieserrorbarcustomnegativedatascatterx_;
+  tschchartserieserrorbarcustomnegativedatascatterx_ = tschchartserieserrorbarcustomnegativedatascatterx;
+  if (tschchartserieserrorbarcustomnegativedatascatterx) {
+    set_has_tschchartserieserrorbarcustomnegativedatascatterx();
+  } else {
+    clear_has_tschchartserieserrorbarcustomnegativedatascatterx();
+  }
+}
+
+// optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedata = 4;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarcustompositivedata() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarcustompositivedata() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarcustompositivedata() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarcustompositivedata() {
+  if (tschchartserieserrorbarcustompositivedata_ != NULL) tschchartserieserrorbarcustompositivedata_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+  clear_has_tschchartserieserrorbarcustompositivedata();
+}
+inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarcustompositivedata() const {
+  return tschchartserieserrorbarcustompositivedata_ != NULL ? *tschchartserieserrorbarcustompositivedata_ : *default_instance_->tschchartserieserrorbarcustompositivedata_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarcustompositivedata() {
+  set_has_tschchartserieserrorbarcustompositivedata();
+  if (tschchartserieserrorbarcustompositivedata_ == NULL) tschchartserieserrorbarcustompositivedata_ = new ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive;
+  return tschchartserieserrorbarcustompositivedata_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarcustompositivedata() {
+  clear_has_tschchartserieserrorbarcustompositivedata();
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* temp = tschchartserieserrorbarcustompositivedata_;
+  tschchartserieserrorbarcustompositivedata_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarcustompositivedata(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustompositivedata) {
+  delete tschchartserieserrorbarcustompositivedata_;
+  tschchartserieserrorbarcustompositivedata_ = tschchartserieserrorbarcustompositivedata;
+  if (tschchartserieserrorbarcustompositivedata) {
+    set_has_tschchartserieserrorbarcustompositivedata();
+  } else {
+    clear_has_tschchartserieserrorbarcustompositivedata();
+  }
+}
+
+// optional .TSCH.ChartsNSArrayOfNSNumberDoubleArchive tschchartserieserrorbarcustompositivedatascatterx = 5;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarcustompositivedatascatterx() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarcustompositivedatascatterx() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarcustompositivedatascatterx() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarcustompositivedatascatterx() {
+  if (tschchartserieserrorbarcustompositivedatascatterx_ != NULL) tschchartserieserrorbarcustompositivedatascatterx_->::TSCH::ChartsNSArrayOfNSNumberDoubleArchive::Clear();
+  clear_has_tschchartserieserrorbarcustompositivedatascatterx();
+}
+inline const ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarcustompositivedatascatterx() const {
+  return tschchartserieserrorbarcustompositivedatascatterx_ != NULL ? *tschchartserieserrorbarcustompositivedatascatterx_ : *default_instance_->tschchartserieserrorbarcustompositivedatascatterx_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarcustompositivedatascatterx() {
+  set_has_tschchartserieserrorbarcustompositivedatascatterx();
+  if (tschchartserieserrorbarcustompositivedatascatterx_ == NULL) tschchartserieserrorbarcustompositivedatascatterx_ = new ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive;
+  return tschchartserieserrorbarcustompositivedatascatterx_;
+}
+inline ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarcustompositivedatascatterx() {
+  clear_has_tschchartserieserrorbarcustompositivedatascatterx();
+  ::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* temp = tschchartserieserrorbarcustompositivedatascatterx_;
+  tschchartserieserrorbarcustompositivedatascatterx_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarcustompositivedatascatterx(::TSCH::ChartsNSArrayOfNSNumberDoubleArchive* tschchartserieserrorbarcustompositivedatascatterx) {
+  delete tschchartserieserrorbarcustompositivedatascatterx_;
+  tschchartserieserrorbarcustompositivedatascatterx_ = tschchartserieserrorbarcustompositivedatascatterx;
+  if (tschchartserieserrorbarcustompositivedatascatterx) {
+    set_has_tschchartserieserrorbarcustompositivedatascatterx();
+  } else {
+    clear_has_tschchartserieserrorbarcustompositivedatascatterx();
+  }
+}
+
+// optional float tschchartserieserrorbarfixedvalue = 6;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarfixedvalue() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarfixedvalue() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarfixedvalue() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarfixedvalue() {
+  tschchartserieserrorbarfixedvalue_ = 0;
+  clear_has_tschchartserieserrorbarfixedvalue();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarfixedvalue() const {
+  return tschchartserieserrorbarfixedvalue_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarfixedvalue(float value) {
+  set_has_tschchartserieserrorbarfixedvalue();
+  tschchartserieserrorbarfixedvalue_ = value;
+}
+
+// optional float tschchartserieserrorbarfixedvaluescatterx = 7;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarfixedvaluescatterx() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarfixedvaluescatterx() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarfixedvaluescatterx() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarfixedvaluescatterx() {
+  tschchartserieserrorbarfixedvaluescatterx_ = 0;
+  clear_has_tschchartserieserrorbarfixedvaluescatterx();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarfixedvaluescatterx() const {
+  return tschchartserieserrorbarfixedvaluescatterx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarfixedvaluescatterx(float value) {
+  set_has_tschchartserieserrorbarfixedvaluescatterx();
+  tschchartserieserrorbarfixedvaluescatterx_ = value;
+}
+
+// optional float tschchartserieserrorbarpercentvalue = 8;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarpercentvalue() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarpercentvalue() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarpercentvalue() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarpercentvalue() {
+  tschchartserieserrorbarpercentvalue_ = 0;
+  clear_has_tschchartserieserrorbarpercentvalue();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarpercentvalue() const {
+  return tschchartserieserrorbarpercentvalue_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarpercentvalue(float value) {
+  set_has_tschchartserieserrorbarpercentvalue();
+  tschchartserieserrorbarpercentvalue_ = value;
+}
+
+// optional float tschchartserieserrorbarpercentvaluescatterx = 9;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarpercentvaluescatterx() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarpercentvaluescatterx() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarpercentvaluescatterx() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarpercentvaluescatterx() {
+  tschchartserieserrorbarpercentvaluescatterx_ = 0;
+  clear_has_tschchartserieserrorbarpercentvaluescatterx();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarpercentvaluescatterx() const {
+  return tschchartserieserrorbarpercentvaluescatterx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarpercentvaluescatterx(float value) {
+  set_has_tschchartserieserrorbarpercentvaluescatterx();
+  tschchartserieserrorbarpercentvaluescatterx_ = value;
+}
+
+// optional int32 tschchartserieserrorbarsetting = 10;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarsetting() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarsetting() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarsetting() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarsetting() {
+  tschchartserieserrorbarsetting_ = 0;
+  clear_has_tschchartserieserrorbarsetting();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarsetting() const {
+  return tschchartserieserrorbarsetting_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarsetting(::google::protobuf::int32 value) {
+  set_has_tschchartserieserrorbarsetting();
+  tschchartserieserrorbarsetting_ = value;
+}
+
+// optional int32 tschchartserieserrorbarsettingscatterx = 11;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarsettingscatterx() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarsettingscatterx() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarsettingscatterx() {
+  _has_bits_[0] &= ~0x00000400u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarsettingscatterx() {
+  tschchartserieserrorbarsettingscatterx_ = 0;
+  clear_has_tschchartserieserrorbarsettingscatterx();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarsettingscatterx() const {
+  return tschchartserieserrorbarsettingscatterx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarsettingscatterx(::google::protobuf::int32 value) {
+  set_has_tschchartserieserrorbarsettingscatterx();
+  tschchartserieserrorbarsettingscatterx_ = value;
+}
+
+// optional float tschchartserieserrorbarstddevvalue = 12;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarstddevvalue() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarstddevvalue() {
+  _has_bits_[0] |= 0x00000800u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarstddevvalue() {
+  _has_bits_[0] &= ~0x00000800u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarstddevvalue() {
+  tschchartserieserrorbarstddevvalue_ = 0;
+  clear_has_tschchartserieserrorbarstddevvalue();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarstddevvalue() const {
+  return tschchartserieserrorbarstddevvalue_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarstddevvalue(float value) {
+  set_has_tschchartserieserrorbarstddevvalue();
+  tschchartserieserrorbarstddevvalue_ = value;
+}
+
+// optional float tschchartserieserrorbarstddevvaluescatterx = 13;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarstddevvaluescatterx() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarstddevvaluescatterx() {
+  _has_bits_[0] |= 0x00001000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarstddevvaluescatterx() {
+  _has_bits_[0] &= ~0x00001000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarstddevvaluescatterx() {
+  tschchartserieserrorbarstddevvaluescatterx_ = 0;
+  clear_has_tschchartserieserrorbarstddevvaluescatterx();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarstddevvaluescatterx() const {
+  return tschchartserieserrorbarstddevvaluescatterx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbarstddevvaluescatterx(float value) {
+  set_has_tschchartserieserrorbarstddevvaluescatterx();
+  tschchartserieserrorbarstddevvaluescatterx_ = value;
+}
+
+// optional int32 tschchartserieserrorbartype = 14;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbartype() const {
+  return (_has_bits_[0] & 0x00002000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbartype() {
+  _has_bits_[0] |= 0x00002000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbartype() {
+  _has_bits_[0] &= ~0x00002000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbartype() {
+  tschchartserieserrorbartype_ = 0;
+  clear_has_tschchartserieserrorbartype();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbartype() const {
+  return tschchartserieserrorbartype_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbartype(::google::protobuf::int32 value) {
+  set_has_tschchartserieserrorbartype();
+  tschchartserieserrorbartype_ = value;
+}
+
+// optional int32 tschchartserieserrorbartypescatterx = 15;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbartypescatterx() const {
+  return (_has_bits_[0] & 0x00004000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbartypescatterx() {
+  _has_bits_[0] |= 0x00004000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbartypescatterx() {
+  _has_bits_[0] &= ~0x00004000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbartypescatterx() {
+  tschchartserieserrorbartypescatterx_ = 0;
+  clear_has_tschchartserieserrorbartypescatterx();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbartypescatterx() const {
+  return tschchartserieserrorbartypescatterx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieserrorbartypescatterx(::google::protobuf::int32 value) {
+  set_has_tschchartserieserrorbartypescatterx();
+  tschchartserieserrorbartypescatterx_ = value;
+}
+
+// optional float tschchartserieslabelexplosion = 16;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieslabelexplosion() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieslabelexplosion() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieslabelexplosion() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieslabelexplosion() {
+  tschchartserieslabelexplosion_ = 0;
+  clear_has_tschchartserieslabelexplosion();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieslabelexplosion() const {
+  return tschchartserieslabelexplosion_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieslabelexplosion(float value) {
+  set_has_tschchartserieslabelexplosion();
+  tschchartserieslabelexplosion_ = value;
+}
+
+// optional int32 tschchartserieslinetype = 17;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieslinetype() const {
+  return (_has_bits_[0] & 0x00010000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieslinetype() {
+  _has_bits_[0] |= 0x00010000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieslinetype() {
+  _has_bits_[0] &= ~0x00010000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieslinetype() {
+  tschchartserieslinetype_ = 0;
+  clear_has_tschchartserieslinetype();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartserieslinetype() const {
+  return tschchartserieslinetype_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieslinetype(::google::protobuf::int32 value) {
+  set_has_tschchartserieslinetype();
+  tschchartserieslinetype_ = value;
+}
+
+// optional .TSK.FormatStructArchive tschchartseries1_0numberformat = 18;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseries1_0numberformat() const {
+  return (_has_bits_[0] & 0x00020000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseries1_0numberformat() {
+  _has_bits_[0] |= 0x00020000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseries1_0numberformat() {
+  _has_bits_[0] &= ~0x00020000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseries1_0numberformat() {
+  if (tschchartseries1_0numberformat_ != NULL) tschchartseries1_0numberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseries1_0numberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesGenericPropertyMapArchive::tschchartseries1_0numberformat() const {
+  return tschchartseries1_0numberformat_ != NULL ? *tschchartseries1_0numberformat_ : *default_instance_->tschchartseries1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseries1_0numberformat() {
+  set_has_tschchartseries1_0numberformat();
+  if (tschchartseries1_0numberformat_ == NULL) tschchartseries1_0numberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseries1_0numberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseries1_0numberformat() {
+  clear_has_tschchartseries1_0numberformat();
+  ::TSK::FormatStructArchive* temp = tschchartseries1_0numberformat_;
+  tschchartseries1_0numberformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseries1_0numberformat(::TSK::FormatStructArchive* tschchartseries1_0numberformat) {
+  delete tschchartseries1_0numberformat_;
+  tschchartseries1_0numberformat_ = tschchartseries1_0numberformat;
+  if (tschchartseries1_0numberformat) {
+    set_has_tschchartseries1_0numberformat();
+  } else {
+    clear_has_tschchartseries1_0numberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseriesnumberformat = 19;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesnumberformat() const {
+  return (_has_bits_[0] & 0x00040000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesnumberformat() {
+  _has_bits_[0] |= 0x00040000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesnumberformat() {
+  _has_bits_[0] &= ~0x00040000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesnumberformat() {
+  if (tschchartseriesnumberformat_ != NULL) tschchartseriesnumberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesnumberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriesnumberformat() const {
+  return tschchartseriesnumberformat_ != NULL ? *tschchartseriesnumberformat_ : *default_instance_->tschchartseriesnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriesnumberformat() {
+  set_has_tschchartseriesnumberformat();
+  if (tschchartseriesnumberformat_ == NULL) tschchartseriesnumberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriesnumberformat() {
+  clear_has_tschchartseriesnumberformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesnumberformat_;
+  tschchartseriesnumberformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriesnumberformat(::TSK::FormatStructArchive* tschchartseriesnumberformat) {
+  delete tschchartseriesnumberformat_;
+  tschchartseriesnumberformat_ = tschchartseriesnumberformat;
+  if (tschchartseriesnumberformat) {
+    set_has_tschchartseriesnumberformat();
+  } else {
+    clear_has_tschchartseriesnumberformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseries1_0dateformat = 20;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseries1_0dateformat() const {
+  return (_has_bits_[0] & 0x00080000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseries1_0dateformat() {
+  _has_bits_[0] |= 0x00080000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseries1_0dateformat() {
+  _has_bits_[0] &= ~0x00080000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseries1_0dateformat() {
+  if (tschchartseries1_0dateformat_ != NULL) tschchartseries1_0dateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseries1_0dateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesGenericPropertyMapArchive::tschchartseries1_0dateformat() const {
+  return tschchartseries1_0dateformat_ != NULL ? *tschchartseries1_0dateformat_ : *default_instance_->tschchartseries1_0dateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseries1_0dateformat() {
+  set_has_tschchartseries1_0dateformat();
+  if (tschchartseries1_0dateformat_ == NULL) tschchartseries1_0dateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseries1_0dateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseries1_0dateformat() {
+  clear_has_tschchartseries1_0dateformat();
+  ::TSK::FormatStructArchive* temp = tschchartseries1_0dateformat_;
+  tschchartseries1_0dateformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseries1_0dateformat(::TSK::FormatStructArchive* tschchartseries1_0dateformat) {
+  delete tschchartseries1_0dateformat_;
+  tschchartseries1_0dateformat_ = tschchartseries1_0dateformat;
+  if (tschchartseries1_0dateformat) {
+    set_has_tschchartseries1_0dateformat();
+  } else {
+    clear_has_tschchartseries1_0dateformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseriesdurationformat = 21;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesdurationformat() const {
+  return (_has_bits_[0] & 0x00100000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesdurationformat() {
+  _has_bits_[0] |= 0x00100000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesdurationformat() {
+  _has_bits_[0] &= ~0x00100000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesdurationformat() {
+  if (tschchartseriesdurationformat_ != NULL) tschchartseriesdurationformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesdurationformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriesdurationformat() const {
+  return tschchartseriesdurationformat_ != NULL ? *tschchartseriesdurationformat_ : *default_instance_->tschchartseriesdurationformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriesdurationformat() {
+  set_has_tschchartseriesdurationformat();
+  if (tschchartseriesdurationformat_ == NULL) tschchartseriesdurationformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesdurationformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriesdurationformat() {
+  clear_has_tschchartseriesdurationformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesdurationformat_;
+  tschchartseriesdurationformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriesdurationformat(::TSK::FormatStructArchive* tschchartseriesdurationformat) {
+  delete tschchartseriesdurationformat_;
+  tschchartseriesdurationformat_ = tschchartseriesdurationformat;
+  if (tschchartseriesdurationformat) {
+    set_has_tschchartseriesdurationformat();
+  } else {
+    clear_has_tschchartseriesdurationformat();
+  }
+}
+
+// optional .TSK.FormatStructArchive tschchartseriesdateformat = 22;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesdateformat() const {
+  return (_has_bits_[0] & 0x00200000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesdateformat() {
+  _has_bits_[0] |= 0x00200000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesdateformat() {
+  _has_bits_[0] &= ~0x00200000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesdateformat() {
+  if (tschchartseriesdateformat_ != NULL) tschchartseriesdateformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriesdateformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriesdateformat() const {
+  return tschchartseriesdateformat_ != NULL ? *tschchartseriesdateformat_ : *default_instance_->tschchartseriesdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriesdateformat() {
+  set_has_tschchartseriesdateformat();
+  if (tschchartseriesdateformat_ == NULL) tschchartseriesdateformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriesdateformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriesdateformat() {
+  clear_has_tschchartseriesdateformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriesdateformat_;
+  tschchartseriesdateformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriesdateformat(::TSK::FormatStructArchive* tschchartseriesdateformat) {
+  delete tschchartseriesdateformat_;
+  tschchartseriesdateformat_ = tschchartseriesdateformat;
+  if (tschchartseriesdateformat) {
+    set_has_tschchartseriesdateformat();
+  } else {
+    clear_has_tschchartseriesdateformat();
+  }
+}
+
+// optional int32 tschchartseriesnumberformattype = 23;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesnumberformattype() const {
+  return (_has_bits_[0] & 0x00400000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesnumberformattype() {
+  _has_bits_[0] |= 0x00400000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesnumberformattype() {
+  _has_bits_[0] &= ~0x00400000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesnumberformattype() {
+  tschchartseriesnumberformattype_ = 0;
+  clear_has_tschchartseriesnumberformattype();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriesnumberformattype() const {
+  return tschchartseriesnumberformattype_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesnumberformattype(::google::protobuf::int32 value) {
+  set_has_tschchartseriesnumberformattype();
+  tschchartseriesnumberformattype_ = value;
+}
+
+// optional .TSK.FormatStructArchive tschchartseriespercentnumberformat = 24;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriespercentnumberformat() const {
+  return (_has_bits_[0] & 0x00800000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriespercentnumberformat() {
+  _has_bits_[0] |= 0x00800000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriespercentnumberformat() {
+  _has_bits_[0] &= ~0x00800000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriespercentnumberformat() {
+  if (tschchartseriespercentnumberformat_ != NULL) tschchartseriespercentnumberformat_->::TSK::FormatStructArchive::Clear();
+  clear_has_tschchartseriespercentnumberformat();
+}
+inline const ::TSK::FormatStructArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriespercentnumberformat() const {
+  return tschchartseriespercentnumberformat_ != NULL ? *tschchartseriespercentnumberformat_ : *default_instance_->tschchartseriespercentnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriespercentnumberformat() {
+  set_has_tschchartseriespercentnumberformat();
+  if (tschchartseriespercentnumberformat_ == NULL) tschchartseriespercentnumberformat_ = new ::TSK::FormatStructArchive;
+  return tschchartseriespercentnumberformat_;
+}
+inline ::TSK::FormatStructArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriespercentnumberformat() {
+  clear_has_tschchartseriespercentnumberformat();
+  ::TSK::FormatStructArchive* temp = tschchartseriespercentnumberformat_;
+  tschchartseriespercentnumberformat_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriespercentnumberformat(::TSK::FormatStructArchive* tschchartseriespercentnumberformat) {
+  delete tschchartseriespercentnumberformat_;
+  tschchartseriespercentnumberformat_ = tschchartseriespercentnumberformat;
+  if (tschchartseriespercentnumberformat) {
+    set_has_tschchartseriespercentnumberformat();
+  } else {
+    clear_has_tschchartseriespercentnumberformat();
+  }
+}
+
+// optional int32 tschchartseriesseriestype = 25;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesseriestype() const {
+  return (_has_bits_[0] & 0x01000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesseriestype() {
+  _has_bits_[0] |= 0x01000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesseriestype() {
+  _has_bits_[0] &= ~0x01000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesseriestype() {
+  tschchartseriesseriestype_ = 0;
+  clear_has_tschchartseriesseriestype();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriesseriestype() const {
+  return tschchartseriesseriestype_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesseriestype(::google::protobuf::int32 value) {
+  set_has_tschchartseriesseriestype();
+  tschchartseriesseriestype_ = value;
+}
+
+// optional bool tschchartseriesshowerrorbar = 26;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowerrorbar() const {
+  return (_has_bits_[0] & 0x02000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowerrorbar() {
+  _has_bits_[0] |= 0x02000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowerrorbar() {
+  _has_bits_[0] &= ~0x02000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowerrorbar() {
+  tschchartseriesshowerrorbar_ = false;
+  clear_has_tschchartseriesshowerrorbar();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowerrorbar() const {
+  return tschchartseriesshowerrorbar_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowerrorbar(bool value) {
+  set_has_tschchartseriesshowerrorbar();
+  tschchartseriesshowerrorbar_ = value;
+}
+
+// optional bool tschchartseriesshowerrorbarscatterx = 27;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowerrorbarscatterx() const {
+  return (_has_bits_[0] & 0x04000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowerrorbarscatterx() {
+  _has_bits_[0] |= 0x04000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowerrorbarscatterx() {
+  _has_bits_[0] &= ~0x04000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowerrorbarscatterx() {
+  tschchartseriesshowerrorbarscatterx_ = false;
+  clear_has_tschchartseriesshowerrorbarscatterx();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowerrorbarscatterx() const {
+  return tschchartseriesshowerrorbarscatterx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowerrorbarscatterx(bool value) {
+  set_has_tschchartseriesshowerrorbarscatterx();
+  tschchartseriesshowerrorbarscatterx_ = value;
+}
+
+// optional bool tschchartseriesshowline = 28;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowline() const {
+  return (_has_bits_[0] & 0x08000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowline() {
+  _has_bits_[0] |= 0x08000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowline() {
+  _has_bits_[0] &= ~0x08000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowline() {
+  tschchartseriesshowline_ = false;
+  clear_has_tschchartseriesshowline();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowline() const {
+  return tschchartseriesshowline_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowline(bool value) {
+  set_has_tschchartseriesshowline();
+  tschchartseriesshowline_ = value;
+}
+
+// optional bool tschchartseriesshownegativedata = 29;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshownegativedata() const {
+  return (_has_bits_[0] & 0x10000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshownegativedata() {
+  _has_bits_[0] |= 0x10000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshownegativedata() {
+  _has_bits_[0] &= ~0x10000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshownegativedata() {
+  tschchartseriesshownegativedata_ = false;
+  clear_has_tschchartseriesshownegativedata();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshownegativedata() const {
+  return tschchartseriesshownegativedata_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshownegativedata(bool value) {
+  set_has_tschchartseriesshownegativedata();
+  tschchartseriesshownegativedata_ = value;
+}
+
+// optional bool tschchartseriesshowserieslabels = 30;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowserieslabels() const {
+  return (_has_bits_[0] & 0x20000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowserieslabels() {
+  _has_bits_[0] |= 0x20000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowserieslabels() {
+  _has_bits_[0] &= ~0x20000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowserieslabels() {
+  tschchartseriesshowserieslabels_ = false;
+  clear_has_tschchartseriesshowserieslabels();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowserieslabels() const {
+  return tschchartseriesshowserieslabels_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowserieslabels(bool value) {
+  set_has_tschchartseriesshowserieslabels();
+  tschchartseriesshowserieslabels_ = value;
+}
+
+// optional bool tschchartseriesshowsymbol = 31;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowsymbol() const {
+  return (_has_bits_[0] & 0x40000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowsymbol() {
+  _has_bits_[0] |= 0x40000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowsymbol() {
+  _has_bits_[0] &= ~0x40000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowsymbol() {
+  tschchartseriesshowsymbol_ = false;
+  clear_has_tschchartseriesshowsymbol();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowsymbol() const {
+  return tschchartseriesshowsymbol_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowsymbol(bool value) {
+  set_has_tschchartseriesshowsymbol();
+  tschchartseriesshowsymbol_ = value;
+}
+
+// optional bool tschchartseriesshowtrendline = 32;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowtrendline() const {
+  return (_has_bits_[0] & 0x80000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowtrendline() {
+  _has_bits_[0] |= 0x80000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowtrendline() {
+  _has_bits_[0] &= ~0x80000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowtrendline() {
+  tschchartseriesshowtrendline_ = false;
+  clear_has_tschchartseriesshowtrendline();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowtrendline() const {
+  return tschchartseriesshowtrendline_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowtrendline(bool value) {
+  set_has_tschchartseriesshowtrendline();
+  tschchartseriesshowtrendline_ = value;
+}
+
+// optional bool tschchartseriesshowvaluelabels = 33;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowvaluelabels() const {
+  return (_has_bits_[1] & 0x00000001u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowvaluelabels() {
+  _has_bits_[1] |= 0x00000001u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowvaluelabels() {
+  _has_bits_[1] &= ~0x00000001u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowvaluelabels() {
+  tschchartseriesshowvaluelabels_ = false;
+  clear_has_tschchartseriesshowvaluelabels();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowvaluelabels() const {
+  return tschchartseriesshowvaluelabels_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowvaluelabels(bool value) {
+  set_has_tschchartseriesshowvaluelabels();
+  tschchartseriesshowvaluelabels_ = value;
+}
+
+// optional int32 tschchartseriessizedimension = 34;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessizedimension() const {
+  return (_has_bits_[1] & 0x00000002u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessizedimension() {
+  _has_bits_[1] |= 0x00000002u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessizedimension() {
+  _has_bits_[1] &= ~0x00000002u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessizedimension() {
+  tschchartseriessizedimension_ = 0;
+  clear_has_tschchartseriessizedimension();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriessizedimension() const {
+  return tschchartseriessizedimension_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriessizedimension(::google::protobuf::int32 value) {
+  set_has_tschchartseriessizedimension();
+  tschchartseriessizedimension_ = value;
+}
+
+// optional int32 tschchartseriessymboltype = 35;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessymboltype() const {
+  return (_has_bits_[1] & 0x00000004u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessymboltype() {
+  _has_bits_[1] |= 0x00000004u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessymboltype() {
+  _has_bits_[1] &= ~0x00000004u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessymboltype() {
+  tschchartseriessymboltype_ = 0;
+  clear_has_tschchartseriessymboltype();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriessymboltype() const {
+  return tschchartseriessymboltype_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriessymboltype(::google::protobuf::int32 value) {
+  set_has_tschchartseriessymboltype();
+  tschchartseriessymboltype_ = value;
+}
+
+// optional float tschchartseriestrendlineequationoffsetx = 36;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineequationoffsetx() const {
+  return (_has_bits_[1] & 0x00000008u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineequationoffsetx() {
+  _has_bits_[1] |= 0x00000008u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineequationoffsetx() {
+  _has_bits_[1] &= ~0x00000008u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineequationoffsetx() {
+  tschchartseriestrendlineequationoffsetx_ = 0;
+  clear_has_tschchartseriestrendlineequationoffsetx();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineequationoffsetx() const {
+  return tschchartseriestrendlineequationoffsetx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineequationoffsetx(float value) {
+  set_has_tschchartseriestrendlineequationoffsetx();
+  tschchartseriestrendlineequationoffsetx_ = value;
+}
+
+// optional float tschchartseriestrendlineequationoffsety = 37;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineequationoffsety() const {
+  return (_has_bits_[1] & 0x00000010u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineequationoffsety() {
+  _has_bits_[1] |= 0x00000010u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineequationoffsety() {
+  _has_bits_[1] &= ~0x00000010u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineequationoffsety() {
+  tschchartseriestrendlineequationoffsety_ = 0;
+  clear_has_tschchartseriestrendlineequationoffsety();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineequationoffsety() const {
+  return tschchartseriestrendlineequationoffsety_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineequationoffsety(float value) {
+  set_has_tschchartseriestrendlineequationoffsety();
+  tschchartseriestrendlineequationoffsety_ = value;
+}
+
+// optional string tschchartseriestrendlinelabelstring = 38;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinelabelstring() const {
+  return (_has_bits_[1] & 0x00000020u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinelabelstring() {
+  _has_bits_[1] |= 0x00000020u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinelabelstring() {
+  _has_bits_[1] &= ~0x00000020u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinelabelstring() {
+  if (tschchartseriestrendlinelabelstring_ != &::google::protobuf::internal::kEmptyString) {
+    tschchartseriestrendlinelabelstring_->clear();
+  }
+  clear_has_tschchartseriestrendlinelabelstring();
+}
+inline const ::std::string& ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinelabelstring() const {
+  return *tschchartseriestrendlinelabelstring_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinelabelstring(const ::std::string& value) {
+  set_has_tschchartseriestrendlinelabelstring();
+  if (tschchartseriestrendlinelabelstring_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartseriestrendlinelabelstring_ = new ::std::string;
+  }
+  tschchartseriestrendlinelabelstring_->assign(value);
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinelabelstring(const char* value) {
+  set_has_tschchartseriestrendlinelabelstring();
+  if (tschchartseriestrendlinelabelstring_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartseriestrendlinelabelstring_ = new ::std::string;
+  }
+  tschchartseriestrendlinelabelstring_->assign(value);
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinelabelstring(const char* value, size_t size) {
+  set_has_tschchartseriestrendlinelabelstring();
+  if (tschchartseriestrendlinelabelstring_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartseriestrendlinelabelstring_ = new ::std::string;
+  }
+  tschchartseriestrendlinelabelstring_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriestrendlinelabelstring() {
+  set_has_tschchartseriestrendlinelabelstring();
+  if (tschchartseriestrendlinelabelstring_ == &::google::protobuf::internal::kEmptyString) {
+    tschchartseriestrendlinelabelstring_ = new ::std::string;
+  }
+  return tschchartseriestrendlinelabelstring_;
+}
+inline ::std::string* ChartSeriesGenericPropertyMapArchive::release_tschchartseriestrendlinelabelstring() {
+  clear_has_tschchartseriestrendlinelabelstring();
+  if (tschchartseriestrendlinelabelstring_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = tschchartseriestrendlinelabelstring_;
+    tschchartseriestrendlinelabelstring_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriestrendlinelabelstring(::std::string* tschchartseriestrendlinelabelstring) {
+  if (tschchartseriestrendlinelabelstring_ != &::google::protobuf::internal::kEmptyString) {
+    delete tschchartseriestrendlinelabelstring_;
+  }
+  if (tschchartseriestrendlinelabelstring) {
+    set_has_tschchartseriestrendlinelabelstring();
+    tschchartseriestrendlinelabelstring_ = tschchartseriestrendlinelabelstring;
+  } else {
+    clear_has_tschchartseriestrendlinelabelstring();
+    tschchartseriestrendlinelabelstring_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional int32 tschchartseriestrendlineorder = 39;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineorder() const {
+  return (_has_bits_[1] & 0x00000040u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineorder() {
+  _has_bits_[1] |= 0x00000040u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineorder() {
+  _has_bits_[1] &= ~0x00000040u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineorder() {
+  tschchartseriestrendlineorder_ = 0;
+  clear_has_tschchartseriestrendlineorder();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineorder() const {
+  return tschchartseriestrendlineorder_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineorder(::google::protobuf::int32 value) {
+  set_has_tschchartseriestrendlineorder();
+  tschchartseriestrendlineorder_ = value;
+}
+
+// optional int32 tschchartseriestrendlineperiod = 40;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineperiod() const {
+  return (_has_bits_[1] & 0x00000080u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineperiod() {
+  _has_bits_[1] |= 0x00000080u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineperiod() {
+  _has_bits_[1] &= ~0x00000080u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineperiod() {
+  tschchartseriestrendlineperiod_ = 0;
+  clear_has_tschchartseriestrendlineperiod();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineperiod() const {
+  return tschchartseriestrendlineperiod_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineperiod(::google::protobuf::int32 value) {
+  set_has_tschchartseriestrendlineperiod();
+  tschchartseriestrendlineperiod_ = value;
+}
+
+// optional float tschchartseriestrendlinersquaredoffsetx = 41;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinersquaredoffsetx() const {
+  return (_has_bits_[1] & 0x00000100u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinersquaredoffsetx() {
+  _has_bits_[1] |= 0x00000100u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinersquaredoffsetx() {
+  _has_bits_[1] &= ~0x00000100u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinersquaredoffsetx() {
+  tschchartseriestrendlinersquaredoffsetx_ = 0;
+  clear_has_tschchartseriestrendlinersquaredoffsetx();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinersquaredoffsetx() const {
+  return tschchartseriestrendlinersquaredoffsetx_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinersquaredoffsetx(float value) {
+  set_has_tschchartseriestrendlinersquaredoffsetx();
+  tschchartseriestrendlinersquaredoffsetx_ = value;
+}
+
+// optional float tschchartseriestrendlinersquaredoffsety = 42;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinersquaredoffsety() const {
+  return (_has_bits_[1] & 0x00000200u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinersquaredoffsety() {
+  _has_bits_[1] |= 0x00000200u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinersquaredoffsety() {
+  _has_bits_[1] &= ~0x00000200u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinersquaredoffsety() {
+  tschchartseriestrendlinersquaredoffsety_ = 0;
+  clear_has_tschchartseriestrendlinersquaredoffsety();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinersquaredoffsety() const {
+  return tschchartseriestrendlinersquaredoffsety_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinersquaredoffsety(float value) {
+  set_has_tschchartseriestrendlinersquaredoffsety();
+  tschchartseriestrendlinersquaredoffsety_ = value;
+}
+
+// optional bool tschchartseriestrendlineshowequation = 43;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineshowequation() const {
+  return (_has_bits_[1] & 0x00000400u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineshowequation() {
+  _has_bits_[1] |= 0x00000400u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineshowequation() {
+  _has_bits_[1] &= ~0x00000400u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineshowequation() {
+  tschchartseriestrendlineshowequation_ = false;
+  clear_has_tschchartseriestrendlineshowequation();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineshowequation() const {
+  return tschchartseriestrendlineshowequation_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineshowequation(bool value) {
+  set_has_tschchartseriestrendlineshowequation();
+  tschchartseriestrendlineshowequation_ = value;
+}
+
+// optional bool tschchartseriestrendlineshowlabel = 44;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineshowlabel() const {
+  return (_has_bits_[1] & 0x00000800u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineshowlabel() {
+  _has_bits_[1] |= 0x00000800u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineshowlabel() {
+  _has_bits_[1] &= ~0x00000800u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineshowlabel() {
+  tschchartseriestrendlineshowlabel_ = false;
+  clear_has_tschchartseriestrendlineshowlabel();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineshowlabel() const {
+  return tschchartseriestrendlineshowlabel_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineshowlabel(bool value) {
+  set_has_tschchartseriestrendlineshowlabel();
+  tschchartseriestrendlineshowlabel_ = value;
+}
+
+// optional bool tschchartseriestrendlineshowr2value = 45;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineshowr2value() const {
+  return (_has_bits_[1] & 0x00001000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineshowr2value() {
+  _has_bits_[1] |= 0x00001000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineshowr2value() {
+  _has_bits_[1] &= ~0x00001000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineshowr2value() {
+  tschchartseriestrendlineshowr2value_ = false;
+  clear_has_tschchartseriestrendlineshowr2value();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineshowr2value() const {
+  return tschchartseriestrendlineshowr2value_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineshowr2value(bool value) {
+  set_has_tschchartseriestrendlineshowr2value();
+  tschchartseriestrendlineshowr2value_ = value;
+}
+
+// optional int32 tschchartseriestrendlinetype = 46;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinetype() const {
+  return (_has_bits_[1] & 0x00002000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinetype() {
+  _has_bits_[1] |= 0x00002000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinetype() {
+  _has_bits_[1] &= ~0x00002000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinetype() {
+  tschchartseriestrendlinetype_ = 0;
+  clear_has_tschchartseriestrendlinetype();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinetype() const {
+  return tschchartseriestrendlinetype_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinetype(::google::protobuf::int32 value) {
+  set_has_tschchartseriestrendlinetype();
+  tschchartseriestrendlinetype_ = value;
+}
+
+// optional float tschchartserieswedgeexplosion = 47;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieswedgeexplosion() const {
+  return (_has_bits_[1] & 0x00004000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieswedgeexplosion() {
+  _has_bits_[1] |= 0x00004000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieswedgeexplosion() {
+  _has_bits_[1] &= ~0x00004000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieswedgeexplosion() {
+  tschchartserieswedgeexplosion_ = 0;
+  clear_has_tschchartserieswedgeexplosion();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartserieswedgeexplosion() const {
+  return tschchartserieswedgeexplosion_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieswedgeexplosion(float value) {
+  set_has_tschchartserieswedgeexplosion();
+  tschchartserieswedgeexplosion_ = value;
+}
+
+// optional int32 tschchartseriesyaxisordinal = 48;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesyaxisordinal() const {
+  return (_has_bits_[1] & 0x00008000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesyaxisordinal() {
+  _has_bits_[1] |= 0x00008000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesyaxisordinal() {
+  _has_bits_[1] &= ~0x00008000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesyaxisordinal() {
+  tschchartseriesyaxisordinal_ = 0;
+  clear_has_tschchartseriesyaxisordinal();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriesyaxisordinal() const {
+  return tschchartseriesyaxisordinal_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesyaxisordinal(::google::protobuf::int32 value) {
+  set_has_tschchartseriesyaxisordinal();
+  tschchartseriesyaxisordinal_ = value;
+}
+
+// optional int32 tschchartseriesvaluelabelsaxis = 49;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesvaluelabelsaxis() const {
+  return (_has_bits_[1] & 0x00010000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesvaluelabelsaxis() {
+  _has_bits_[1] |= 0x00010000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesvaluelabelsaxis() {
+  _has_bits_[1] &= ~0x00010000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesvaluelabelsaxis() {
+  tschchartseriesvaluelabelsaxis_ = 0;
+  clear_has_tschchartseriesvaluelabelsaxis();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriesvaluelabelsaxis() const {
+  return tschchartseriesvaluelabelsaxis_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesvaluelabelsaxis(::google::protobuf::int32 value) {
+  set_has_tschchartseriesvaluelabelsaxis();
+  tschchartseriesvaluelabelsaxis_ = value;
+}
+
+// optional .TSD.LineEndArchive tschchartserieserrorbarlineend = 50;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarlineend() const {
+  return (_has_bits_[1] & 0x00020000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarlineend() {
+  _has_bits_[1] |= 0x00020000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarlineend() {
+  _has_bits_[1] &= ~0x00020000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarlineend() {
+  if (tschchartserieserrorbarlineend_ != NULL) tschchartserieserrorbarlineend_->::TSD::LineEndArchive::Clear();
+  clear_has_tschchartserieserrorbarlineend();
+}
+inline const ::TSD::LineEndArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarlineend() const {
+  return tschchartserieserrorbarlineend_ != NULL ? *tschchartserieserrorbarlineend_ : *default_instance_->tschchartserieserrorbarlineend_;
+}
+inline ::TSD::LineEndArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarlineend() {
+  set_has_tschchartserieserrorbarlineend();
+  if (tschchartserieserrorbarlineend_ == NULL) tschchartserieserrorbarlineend_ = new ::TSD::LineEndArchive;
+  return tschchartserieserrorbarlineend_;
+}
+inline ::TSD::LineEndArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarlineend() {
+  clear_has_tschchartserieserrorbarlineend();
+  ::TSD::LineEndArchive* temp = tschchartserieserrorbarlineend_;
+  tschchartserieserrorbarlineend_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarlineend(::TSD::LineEndArchive* tschchartserieserrorbarlineend) {
+  delete tschchartserieserrorbarlineend_;
+  tschchartserieserrorbarlineend_ = tschchartserieserrorbarlineend;
+  if (tschchartserieserrorbarlineend) {
+    set_has_tschchartserieserrorbarlineend();
+  } else {
+    clear_has_tschchartserieserrorbarlineend();
+  }
+}
+
+// optional .TSD.LineEndArchive tschchartserieserrorbarlineendscatterx = 51;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarlineendscatterx() const {
+  return (_has_bits_[1] & 0x00040000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarlineendscatterx() {
+  _has_bits_[1] |= 0x00040000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarlineendscatterx() {
+  _has_bits_[1] &= ~0x00040000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarlineendscatterx() {
+  if (tschchartserieserrorbarlineendscatterx_ != NULL) tschchartserieserrorbarlineendscatterx_->::TSD::LineEndArchive::Clear();
+  clear_has_tschchartserieserrorbarlineendscatterx();
+}
+inline const ::TSD::LineEndArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarlineendscatterx() const {
+  return tschchartserieserrorbarlineendscatterx_ != NULL ? *tschchartserieserrorbarlineendscatterx_ : *default_instance_->tschchartserieserrorbarlineendscatterx_;
+}
+inline ::TSD::LineEndArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarlineendscatterx() {
+  set_has_tschchartserieserrorbarlineendscatterx();
+  if (tschchartserieserrorbarlineendscatterx_ == NULL) tschchartserieserrorbarlineendscatterx_ = new ::TSD::LineEndArchive;
+  return tschchartserieserrorbarlineendscatterx_;
+}
+inline ::TSD::LineEndArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarlineendscatterx() {
+  clear_has_tschchartserieserrorbarlineendscatterx();
+  ::TSD::LineEndArchive* temp = tschchartserieserrorbarlineendscatterx_;
+  tschchartserieserrorbarlineendscatterx_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarlineendscatterx(::TSD::LineEndArchive* tschchartserieserrorbarlineendscatterx) {
+  delete tschchartserieserrorbarlineendscatterx_;
+  tschchartserieserrorbarlineendscatterx_ = tschchartserieserrorbarlineendscatterx;
+  if (tschchartserieserrorbarlineendscatterx) {
+    set_has_tschchartserieserrorbarlineendscatterx();
+  } else {
+    clear_has_tschchartserieserrorbarlineendscatterx();
+  }
+}
+
+// optional .TSD.ShadowArchive tschchartserieserrorbarshadow = 52;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarshadow() const {
+  return (_has_bits_[1] & 0x00080000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarshadow() {
+  _has_bits_[1] |= 0x00080000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarshadow() {
+  _has_bits_[1] &= ~0x00080000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarshadow() {
+  if (tschchartserieserrorbarshadow_ != NULL) tschchartserieserrorbarshadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschchartserieserrorbarshadow();
+}
+inline const ::TSD::ShadowArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarshadow() const {
+  return tschchartserieserrorbarshadow_ != NULL ? *tschchartserieserrorbarshadow_ : *default_instance_->tschchartserieserrorbarshadow_;
+}
+inline ::TSD::ShadowArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarshadow() {
+  set_has_tschchartserieserrorbarshadow();
+  if (tschchartserieserrorbarshadow_ == NULL) tschchartserieserrorbarshadow_ = new ::TSD::ShadowArchive;
+  return tschchartserieserrorbarshadow_;
+}
+inline ::TSD::ShadowArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarshadow() {
+  clear_has_tschchartserieserrorbarshadow();
+  ::TSD::ShadowArchive* temp = tschchartserieserrorbarshadow_;
+  tschchartserieserrorbarshadow_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarshadow(::TSD::ShadowArchive* tschchartserieserrorbarshadow) {
+  delete tschchartserieserrorbarshadow_;
+  tschchartserieserrorbarshadow_ = tschchartserieserrorbarshadow;
+  if (tschchartserieserrorbarshadow) {
+    set_has_tschchartserieserrorbarshadow();
+  } else {
+    clear_has_tschchartserieserrorbarshadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartserieserrorbarstroke = 53;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarstroke() const {
+  return (_has_bits_[1] & 0x00100000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarstroke() {
+  _has_bits_[1] |= 0x00100000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarstroke() {
+  _has_bits_[1] &= ~0x00100000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarstroke() {
+  if (tschchartserieserrorbarstroke_ != NULL) tschchartserieserrorbarstroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartserieserrorbarstroke();
+}
+inline const ::TSD::StrokeArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarstroke() const {
+  return tschchartserieserrorbarstroke_ != NULL ? *tschchartserieserrorbarstroke_ : *default_instance_->tschchartserieserrorbarstroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarstroke() {
+  set_has_tschchartserieserrorbarstroke();
+  if (tschchartserieserrorbarstroke_ == NULL) tschchartserieserrorbarstroke_ = new ::TSD::StrokeArchive;
+  return tschchartserieserrorbarstroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarstroke() {
+  clear_has_tschchartserieserrorbarstroke();
+  ::TSD::StrokeArchive* temp = tschchartserieserrorbarstroke_;
+  tschchartserieserrorbarstroke_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarstroke(::TSD::StrokeArchive* tschchartserieserrorbarstroke) {
+  delete tschchartserieserrorbarstroke_;
+  tschchartserieserrorbarstroke_ = tschchartserieserrorbarstroke;
+  if (tschchartserieserrorbarstroke) {
+    set_has_tschchartserieserrorbarstroke();
+  } else {
+    clear_has_tschchartserieserrorbarstroke();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartserieserrorbarstrokescatterx = 54;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieserrorbarstrokescatterx() const {
+  return (_has_bits_[1] & 0x00200000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieserrorbarstrokescatterx() {
+  _has_bits_[1] |= 0x00200000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieserrorbarstrokescatterx() {
+  _has_bits_[1] &= ~0x00200000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieserrorbarstrokescatterx() {
+  if (tschchartserieserrorbarstrokescatterx_ != NULL) tschchartserieserrorbarstrokescatterx_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartserieserrorbarstrokescatterx();
+}
+inline const ::TSD::StrokeArchive& ChartSeriesGenericPropertyMapArchive::tschchartserieserrorbarstrokescatterx() const {
+  return tschchartserieserrorbarstrokescatterx_ != NULL ? *tschchartserieserrorbarstrokescatterx_ : *default_instance_->tschchartserieserrorbarstrokescatterx_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartserieserrorbarstrokescatterx() {
+  set_has_tschchartserieserrorbarstrokescatterx();
+  if (tschchartserieserrorbarstrokescatterx_ == NULL) tschchartserieserrorbarstrokescatterx_ = new ::TSD::StrokeArchive;
+  return tschchartserieserrorbarstrokescatterx_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartserieserrorbarstrokescatterx() {
+  clear_has_tschchartserieserrorbarstrokescatterx();
+  ::TSD::StrokeArchive* temp = tschchartserieserrorbarstrokescatterx_;
+  tschchartserieserrorbarstrokescatterx_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartserieserrorbarstrokescatterx(::TSD::StrokeArchive* tschchartserieserrorbarstrokescatterx) {
+  delete tschchartserieserrorbarstrokescatterx_;
+  tschchartserieserrorbarstrokescatterx_ = tschchartserieserrorbarstrokescatterx;
+  if (tschchartserieserrorbarstrokescatterx) {
+    set_has_tschchartserieserrorbarstrokescatterx();
+  } else {
+    clear_has_tschchartserieserrorbarstrokescatterx();
+  }
+}
+
+// optional .TSD.FillArchive tschchartseriesfill = 55;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesfill() const {
+  return (_has_bits_[1] & 0x00400000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesfill() {
+  _has_bits_[1] |= 0x00400000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesfill() {
+  _has_bits_[1] &= ~0x00400000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesfill() {
+  if (tschchartseriesfill_ != NULL) tschchartseriesfill_->::TSD::FillArchive::Clear();
+  clear_has_tschchartseriesfill();
+}
+inline const ::TSD::FillArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriesfill() const {
+  return tschchartseriesfill_ != NULL ? *tschchartseriesfill_ : *default_instance_->tschchartseriesfill_;
+}
+inline ::TSD::FillArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriesfill() {
+  set_has_tschchartseriesfill();
+  if (tschchartseriesfill_ == NULL) tschchartseriesfill_ = new ::TSD::FillArchive;
+  return tschchartseriesfill_;
+}
+inline ::TSD::FillArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriesfill() {
+  clear_has_tschchartseriesfill();
+  ::TSD::FillArchive* temp = tschchartseriesfill_;
+  tschchartseriesfill_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriesfill(::TSD::FillArchive* tschchartseriesfill) {
+  delete tschchartseriesfill_;
+  tschchartseriesfill_ = tschchartseriesfill;
+  if (tschchartseriesfill) {
+    set_has_tschchartseriesfill();
+  } else {
+    clear_has_tschchartseriesfill();
+  }
+}
+
+// optional int32 tschchartserieslabelparagraphstyleindex = 56;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartserieslabelparagraphstyleindex() const {
+  return (_has_bits_[1] & 0x00800000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartserieslabelparagraphstyleindex() {
+  _has_bits_[1] |= 0x00800000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartserieslabelparagraphstyleindex() {
+  _has_bits_[1] &= ~0x00800000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartserieslabelparagraphstyleindex() {
+  tschchartserieslabelparagraphstyleindex_ = 0;
+  clear_has_tschchartserieslabelparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartserieslabelparagraphstyleindex() const {
+  return tschchartserieslabelparagraphstyleindex_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartserieslabelparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartserieslabelparagraphstyleindex();
+  tschchartserieslabelparagraphstyleindex_ = value;
+}
+
+// optional float tschchartseriesopacity = 57;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesopacity() const {
+  return (_has_bits_[1] & 0x01000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesopacity() {
+  _has_bits_[1] |= 0x01000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesopacity() {
+  _has_bits_[1] &= ~0x01000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesopacity() {
+  tschchartseriesopacity_ = 0;
+  clear_has_tschchartseriesopacity();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriesopacity() const {
+  return tschchartseriesopacity_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesopacity(float value) {
+  set_has_tschchartseriesopacity();
+  tschchartseriesopacity_ = value;
+}
+
+// optional int32 tschchartseriesoutsidelabelparagraphstyleindex = 58;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesoutsidelabelparagraphstyleindex() const {
+  return (_has_bits_[1] & 0x02000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesoutsidelabelparagraphstyleindex() {
+  _has_bits_[1] |= 0x02000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesoutsidelabelparagraphstyleindex() {
+  _has_bits_[1] &= ~0x02000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesoutsidelabelparagraphstyleindex() {
+  tschchartseriesoutsidelabelparagraphstyleindex_ = 0;
+  clear_has_tschchartseriesoutsidelabelparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriesoutsidelabelparagraphstyleindex() const {
+  return tschchartseriesoutsidelabelparagraphstyleindex_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesoutsidelabelparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartseriesoutsidelabelparagraphstyleindex();
+  tschchartseriesoutsidelabelparagraphstyleindex_ = value;
+}
+
+// optional .TSD.ShadowArchive tschchartseriesshadow = 59;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshadow() const {
+  return (_has_bits_[1] & 0x04000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshadow() {
+  _has_bits_[1] |= 0x04000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshadow() {
+  _has_bits_[1] &= ~0x04000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshadow() {
+  if (tschchartseriesshadow_ != NULL) tschchartseriesshadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschchartseriesshadow();
+}
+inline const ::TSD::ShadowArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriesshadow() const {
+  return tschchartseriesshadow_ != NULL ? *tschchartseriesshadow_ : *default_instance_->tschchartseriesshadow_;
+}
+inline ::TSD::ShadowArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriesshadow() {
+  set_has_tschchartseriesshadow();
+  if (tschchartseriesshadow_ == NULL) tschchartseriesshadow_ = new ::TSD::ShadowArchive;
+  return tschchartseriesshadow_;
+}
+inline ::TSD::ShadowArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriesshadow() {
+  clear_has_tschchartseriesshadow();
+  ::TSD::ShadowArchive* temp = tschchartseriesshadow_;
+  tschchartseriesshadow_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriesshadow(::TSD::ShadowArchive* tschchartseriesshadow) {
+  delete tschchartseriesshadow_;
+  tschchartseriesshadow_ = tschchartseriesshadow;
+  if (tschchartseriesshadow) {
+    set_has_tschchartseriesshadow();
+  } else {
+    clear_has_tschchartseriesshadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartseriesstroke = 60;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesstroke() const {
+  return (_has_bits_[1] & 0x08000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesstroke() {
+  _has_bits_[1] |= 0x08000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesstroke() {
+  _has_bits_[1] &= ~0x08000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesstroke() {
+  if (tschchartseriesstroke_ != NULL) tschchartseriesstroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartseriesstroke();
+}
+inline const ::TSD::StrokeArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriesstroke() const {
+  return tschchartseriesstroke_ != NULL ? *tschchartseriesstroke_ : *default_instance_->tschchartseriesstroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriesstroke() {
+  set_has_tschchartseriesstroke();
+  if (tschchartseriesstroke_ == NULL) tschchartseriesstroke_ = new ::TSD::StrokeArchive;
+  return tschchartseriesstroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriesstroke() {
+  clear_has_tschchartseriesstroke();
+  ::TSD::StrokeArchive* temp = tschchartseriesstroke_;
+  tschchartseriesstroke_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriesstroke(::TSD::StrokeArchive* tschchartseriesstroke) {
+  delete tschchartseriesstroke_;
+  tschchartseriesstroke_ = tschchartseriesstroke;
+  if (tschchartseriesstroke) {
+    set_has_tschchartseriesstroke();
+  } else {
+    clear_has_tschchartseriesstroke();
+  }
+}
+
+// optional .TSD.FillArchive tschchartseriessymbolfill = 61;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessymbolfill() const {
+  return (_has_bits_[1] & 0x10000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessymbolfill() {
+  _has_bits_[1] |= 0x10000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessymbolfill() {
+  _has_bits_[1] &= ~0x10000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessymbolfill() {
+  if (tschchartseriessymbolfill_ != NULL) tschchartseriessymbolfill_->::TSD::FillArchive::Clear();
+  clear_has_tschchartseriessymbolfill();
+}
+inline const ::TSD::FillArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriessymbolfill() const {
+  return tschchartseriessymbolfill_ != NULL ? *tschchartseriessymbolfill_ : *default_instance_->tschchartseriessymbolfill_;
+}
+inline ::TSD::FillArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriessymbolfill() {
+  set_has_tschchartseriessymbolfill();
+  if (tschchartseriessymbolfill_ == NULL) tschchartseriessymbolfill_ = new ::TSD::FillArchive;
+  return tschchartseriessymbolfill_;
+}
+inline ::TSD::FillArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriessymbolfill() {
+  clear_has_tschchartseriessymbolfill();
+  ::TSD::FillArchive* temp = tschchartseriessymbolfill_;
+  tschchartseriessymbolfill_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriessymbolfill(::TSD::FillArchive* tschchartseriessymbolfill) {
+  delete tschchartseriessymbolfill_;
+  tschchartseriessymbolfill_ = tschchartseriessymbolfill;
+  if (tschchartseriessymbolfill) {
+    set_has_tschchartseriessymbolfill();
+  } else {
+    clear_has_tschchartseriessymbolfill();
+  }
+}
+
+// optional bool tschchartseriessymbolfilluseseriesfill = 62;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessymbolfilluseseriesfill() const {
+  return (_has_bits_[1] & 0x20000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessymbolfilluseseriesfill() {
+  _has_bits_[1] |= 0x20000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessymbolfilluseseriesfill() {
+  _has_bits_[1] &= ~0x20000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessymbolfilluseseriesfill() {
+  tschchartseriessymbolfilluseseriesfill_ = false;
+  clear_has_tschchartseriessymbolfilluseseriesfill();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriessymbolfilluseseriesfill() const {
+  return tschchartseriessymbolfilluseseriesfill_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriessymbolfilluseseriesfill(bool value) {
+  set_has_tschchartseriessymbolfilluseseriesfill();
+  tschchartseriessymbolfilluseseriesfill_ = value;
+}
+
+// optional bool tschchartseriessymbolfilluseseriesstroke = 63;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessymbolfilluseseriesstroke() const {
+  return (_has_bits_[1] & 0x40000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessymbolfilluseseriesstroke() {
+  _has_bits_[1] |= 0x40000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessymbolfilluseseriesstroke() {
+  _has_bits_[1] &= ~0x40000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessymbolfilluseseriesstroke() {
+  tschchartseriessymbolfilluseseriesstroke_ = false;
+  clear_has_tschchartseriessymbolfilluseseriesstroke();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriessymbolfilluseseriesstroke() const {
+  return tschchartseriessymbolfilluseseriesstroke_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriessymbolfilluseseriesstroke(bool value) {
+  set_has_tschchartseriessymbolfilluseseriesstroke();
+  tschchartseriessymbolfilluseseriesstroke_ = value;
+}
+
+// optional float tschchartseriessymbolsize = 64;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessymbolsize() const {
+  return (_has_bits_[1] & 0x80000000u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessymbolsize() {
+  _has_bits_[1] |= 0x80000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessymbolsize() {
+  _has_bits_[1] &= ~0x80000000u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessymbolsize() {
+  tschchartseriessymbolsize_ = 0;
+  clear_has_tschchartseriessymbolsize();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriessymbolsize() const {
+  return tschchartseriessymbolsize_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriessymbolsize(float value) {
+  set_has_tschchartseriessymbolsize();
+  tschchartseriessymbolsize_ = value;
+}
+
+// optional .TSD.StrokeArchive tschchartseriessymbolstroke = 65;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriessymbolstroke() const {
+  return (_has_bits_[2] & 0x00000001u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriessymbolstroke() {
+  _has_bits_[2] |= 0x00000001u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriessymbolstroke() {
+  _has_bits_[2] &= ~0x00000001u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriessymbolstroke() {
+  if (tschchartseriessymbolstroke_ != NULL) tschchartseriessymbolstroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartseriessymbolstroke();
+}
+inline const ::TSD::StrokeArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriessymbolstroke() const {
+  return tschchartseriessymbolstroke_ != NULL ? *tschchartseriessymbolstroke_ : *default_instance_->tschchartseriessymbolstroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriessymbolstroke() {
+  set_has_tschchartseriessymbolstroke();
+  if (tschchartseriessymbolstroke_ == NULL) tschchartseriessymbolstroke_ = new ::TSD::StrokeArchive;
+  return tschchartseriessymbolstroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriessymbolstroke() {
+  clear_has_tschchartseriessymbolstroke();
+  ::TSD::StrokeArchive* temp = tschchartseriessymbolstroke_;
+  tschchartseriessymbolstroke_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriessymbolstroke(::TSD::StrokeArchive* tschchartseriessymbolstroke) {
+  delete tschchartseriessymbolstroke_;
+  tschchartseriessymbolstroke_ = tschchartseriessymbolstroke;
+  if (tschchartseriessymbolstroke) {
+    set_has_tschchartseriessymbolstroke();
+  } else {
+    clear_has_tschchartseriessymbolstroke();
+  }
+}
+
+// optional float tschchartseriestrendlineequationopacity = 66;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineequationopacity() const {
+  return (_has_bits_[2] & 0x00000002u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineequationopacity() {
+  _has_bits_[2] |= 0x00000002u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineequationopacity() {
+  _has_bits_[2] &= ~0x00000002u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineequationopacity() {
+  tschchartseriestrendlineequationopacity_ = 0;
+  clear_has_tschchartseriestrendlineequationopacity();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineequationopacity() const {
+  return tschchartseriestrendlineequationopacity_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineequationopacity(float value) {
+  set_has_tschchartseriestrendlineequationopacity();
+  tschchartseriestrendlineequationopacity_ = value;
+}
+
+// optional int32 tschchartseriestrendlineequationparagraphstyleindex = 67;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineequationparagraphstyleindex() const {
+  return (_has_bits_[2] & 0x00000004u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineequationparagraphstyleindex() {
+  _has_bits_[2] |= 0x00000004u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineequationparagraphstyleindex() {
+  _has_bits_[2] &= ~0x00000004u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineequationparagraphstyleindex() {
+  tschchartseriestrendlineequationparagraphstyleindex_ = 0;
+  clear_has_tschchartseriestrendlineequationparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineequationparagraphstyleindex() const {
+  return tschchartseriestrendlineequationparagraphstyleindex_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlineequationparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartseriestrendlineequationparagraphstyleindex();
+  tschchartseriestrendlineequationparagraphstyleindex_ = value;
+}
+
+// optional float tschchartseriestrendlinersquaredopacity = 68;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinersquaredopacity() const {
+  return (_has_bits_[2] & 0x00000008u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinersquaredopacity() {
+  _has_bits_[2] |= 0x00000008u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinersquaredopacity() {
+  _has_bits_[2] &= ~0x00000008u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinersquaredopacity() {
+  tschchartseriestrendlinersquaredopacity_ = 0;
+  clear_has_tschchartseriestrendlinersquaredopacity();
+}
+inline float ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinersquaredopacity() const {
+  return tschchartseriestrendlinersquaredopacity_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinersquaredopacity(float value) {
+  set_has_tschchartseriestrendlinersquaredopacity();
+  tschchartseriestrendlinersquaredopacity_ = value;
+}
+
+// optional int32 tschchartseriestrendlinersquaredparagraphstyleindex = 69;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinersquaredparagraphstyleindex() const {
+  return (_has_bits_[2] & 0x00000010u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinersquaredparagraphstyleindex() {
+  _has_bits_[2] |= 0x00000010u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinersquaredparagraphstyleindex() {
+  _has_bits_[2] &= ~0x00000010u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinersquaredparagraphstyleindex() {
+  tschchartseriestrendlinersquaredparagraphstyleindex_ = 0;
+  clear_has_tschchartseriestrendlinersquaredparagraphstyleindex();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinersquaredparagraphstyleindex() const {
+  return tschchartseriestrendlinersquaredparagraphstyleindex_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriestrendlinersquaredparagraphstyleindex(::google::protobuf::int32 value) {
+  set_has_tschchartseriestrendlinersquaredparagraphstyleindex();
+  tschchartseriestrendlinersquaredparagraphstyleindex_ = value;
+}
+
+// optional .TSD.ShadowArchive tschchartseriestrendlineshadow = 70;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlineshadow() const {
+  return (_has_bits_[2] & 0x00000020u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlineshadow() {
+  _has_bits_[2] |= 0x00000020u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlineshadow() {
+  _has_bits_[2] &= ~0x00000020u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlineshadow() {
+  if (tschchartseriestrendlineshadow_ != NULL) tschchartseriestrendlineshadow_->::TSD::ShadowArchive::Clear();
+  clear_has_tschchartseriestrendlineshadow();
+}
+inline const ::TSD::ShadowArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlineshadow() const {
+  return tschchartseriestrendlineshadow_ != NULL ? *tschchartseriestrendlineshadow_ : *default_instance_->tschchartseriestrendlineshadow_;
+}
+inline ::TSD::ShadowArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriestrendlineshadow() {
+  set_has_tschchartseriestrendlineshadow();
+  if (tschchartseriestrendlineshadow_ == NULL) tschchartseriestrendlineshadow_ = new ::TSD::ShadowArchive;
+  return tschchartseriestrendlineshadow_;
+}
+inline ::TSD::ShadowArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriestrendlineshadow() {
+  clear_has_tschchartseriestrendlineshadow();
+  ::TSD::ShadowArchive* temp = tschchartseriestrendlineshadow_;
+  tschchartseriestrendlineshadow_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriestrendlineshadow(::TSD::ShadowArchive* tschchartseriestrendlineshadow) {
+  delete tschchartseriestrendlineshadow_;
+  tschchartseriestrendlineshadow_ = tschchartseriestrendlineshadow;
+  if (tschchartseriestrendlineshadow) {
+    set_has_tschchartseriestrendlineshadow();
+  } else {
+    clear_has_tschchartseriestrendlineshadow();
+  }
+}
+
+// optional .TSD.StrokeArchive tschchartseriestrendlinestroke = 71;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriestrendlinestroke() const {
+  return (_has_bits_[2] & 0x00000040u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriestrendlinestroke() {
+  _has_bits_[2] |= 0x00000040u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriestrendlinestroke() {
+  _has_bits_[2] &= ~0x00000040u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriestrendlinestroke() {
+  if (tschchartseriestrendlinestroke_ != NULL) tschchartseriestrendlinestroke_->::TSD::StrokeArchive::Clear();
+  clear_has_tschchartseriestrendlinestroke();
+}
+inline const ::TSD::StrokeArchive& ChartSeriesGenericPropertyMapArchive::tschchartseriestrendlinestroke() const {
+  return tschchartseriestrendlinestroke_ != NULL ? *tschchartseriestrendlinestroke_ : *default_instance_->tschchartseriestrendlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::mutable_tschchartseriestrendlinestroke() {
+  set_has_tschchartseriestrendlinestroke();
+  if (tschchartseriestrendlinestroke_ == NULL) tschchartseriestrendlinestroke_ = new ::TSD::StrokeArchive;
+  return tschchartseriestrendlinestroke_;
+}
+inline ::TSD::StrokeArchive* ChartSeriesGenericPropertyMapArchive::release_tschchartseriestrendlinestroke() {
+  clear_has_tschchartseriestrendlinestroke();
+  ::TSD::StrokeArchive* temp = tschchartseriestrendlinestroke_;
+  tschchartseriestrendlinestroke_ = NULL;
+  return temp;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_allocated_tschchartseriestrendlinestroke(::TSD::StrokeArchive* tschchartseriestrendlinestroke) {
+  delete tschchartseriestrendlinestroke_;
+  tschchartseriestrendlinestroke_ = tschchartseriestrendlinestroke;
+  if (tschchartseriestrendlinestroke) {
+    set_has_tschchartseriestrendlinestroke();
+  } else {
+    clear_has_tschchartseriestrendlinestroke();
+  }
+}
+
+// optional int32 tschchartseriesvaluelabelposition = 72;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesvaluelabelposition() const {
+  return (_has_bits_[2] & 0x00000080u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesvaluelabelposition() {
+  _has_bits_[2] |= 0x00000080u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesvaluelabelposition() {
+  _has_bits_[2] &= ~0x00000080u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesvaluelabelposition() {
+  tschchartseriesvaluelabelposition_ = 0;
+  clear_has_tschchartseriesvaluelabelposition();
+}
+inline ::google::protobuf::int32 ChartSeriesGenericPropertyMapArchive::tschchartseriesvaluelabelposition() const {
+  return tschchartseriesvaluelabelposition_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesvaluelabelposition(::google::protobuf::int32 value) {
+  set_has_tschchartseriesvaluelabelposition();
+  tschchartseriesvaluelabelposition_ = value;
+}
+
+// optional bool tschchartseriesshowlabelsinfront = 73;
+inline bool ChartSeriesGenericPropertyMapArchive::has_tschchartseriesshowlabelsinfront() const {
+  return (_has_bits_[2] & 0x00000100u) != 0;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_has_tschchartseriesshowlabelsinfront() {
+  _has_bits_[2] |= 0x00000100u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_has_tschchartseriesshowlabelsinfront() {
+  _has_bits_[2] &= ~0x00000100u;
+}
+inline void ChartSeriesGenericPropertyMapArchive::clear_tschchartseriesshowlabelsinfront() {
+  tschchartseriesshowlabelsinfront_ = false;
+  clear_has_tschchartseriesshowlabelsinfront();
+}
+inline bool ChartSeriesGenericPropertyMapArchive::tschchartseriesshowlabelsinfront() const {
+  return tschchartseriesshowlabelsinfront_;
+}
+inline void ChartSeriesGenericPropertyMapArchive::set_tschchartseriesshowlabelsinfront(bool value) {
+  set_has_tschchartseriesshowlabelsinfront();
+  tschchartseriesshowlabelsinfront_ = value;
+}
+
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.cc
index a0d1732..ae15aa0 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.cc
@@ -38,6 +38,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ChartGridArchive_GridRow_GridValue_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ChartGridArchive_GridRow_GridValue_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ChartGridArchive_ChartGridRowColumnIdMap_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ChartGridArchive_ChartGridRowColumnIdMap_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ChartGridArchive_ChartGridRowColumnIdMap_Entry_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry_reflection_ = NULL;
 const ::google::protobuf::Descriptor* ChartMediatorArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ChartMediatorArchive_reflection_ = NULL;
@@ -150,10 +156,11 @@ void protobuf_AssignDesc_TSCHArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartPasteboardAdditionsArchive));
   ChartGridArchive_descriptor_ = file->message_type(3);
-  static const int ChartGridArchive_offsets_[3] = {
+  static const int ChartGridArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive, row_name_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive, column_name_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive, grid_row_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive, idmap_),
   };
   ChartGridArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -182,8 +189,10 @@ void protobuf_AssignDesc_TSCHArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartGridArchive_GridRow));
   ChartGridArchive_GridRow_GridValue_descriptor_ = ChartGridArchive_GridRow_descriptor_->nested_type(0);
-  static const int ChartGridArchive_GridRow_GridValue_offsets_[2] = {
+  static const int ChartGridArchive_GridRow_GridValue_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_GridRow_GridValue, numeric_value_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_GridRow_GridValue, date_value_1_0_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_GridRow_GridValue, duration_value_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_GridRow_GridValue, date_value_),
   };
   ChartGridArchive_GridRow_GridValue_reflection_ =
@@ -197,6 +206,38 @@ void protobuf_AssignDesc_TSCHArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartGridArchive_GridRow_GridValue));
+  ChartGridArchive_ChartGridRowColumnIdMap_descriptor_ = ChartGridArchive_descriptor_->nested_type(1);
+  static const int ChartGridArchive_ChartGridRowColumnIdMap_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap, row_id_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap, column_id_map_),
+  };
+  ChartGridArchive_ChartGridRowColumnIdMap_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ChartGridArchive_ChartGridRowColumnIdMap_descriptor_,
+      ChartGridArchive_ChartGridRowColumnIdMap::default_instance_,
+      ChartGridArchive_ChartGridRowColumnIdMap_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ChartGridArchive_ChartGridRowColumnIdMap));
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry_descriptor_ = ChartGridArchive_ChartGridRowColumnIdMap_descriptor_->nested_type(0);
+  static const int ChartGridArchive_ChartGridRowColumnIdMap_Entry_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap_Entry, uniqueid_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap_Entry, index_),
+  };
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ChartGridArchive_ChartGridRowColumnIdMap_Entry_descriptor_,
+      ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance_,
+      ChartGridArchive_ChartGridRowColumnIdMap_Entry_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap_Entry, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartGridArchive_ChartGridRowColumnIdMap_Entry, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ChartGridArchive_ChartGridRowColumnIdMap_Entry));
   ChartMediatorArchive_descriptor_ = file->message_type(4);
   static const int ChartMediatorArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartMediatorArchive, info_),
@@ -375,12 +416,13 @@ void protobuf_AssignDesc_TSCHArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartSelectionArchive));
   ChartUIState_descriptor_ = file->message_type(14);
-  static const int ChartUIState_offsets_[5] = {
+  static const int ChartUIState_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartUIState, chart_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartUIState, cde_last_row_selected_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartUIState, cde_last_col_selected_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartUIState, cde_last_row_count_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartUIState, cde_last_col_count_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartUIState, cde_use_full_keyboard_),
   };
   ChartUIState_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -431,6 +473,10 @@ void protobuf_RegisterTypes(const ::std::string&) {
     ChartGridArchive_GridRow_descriptor_, &ChartGridArchive_GridRow::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ChartGridArchive_GridRow_GridValue_descriptor_, &ChartGridArchive_GridRow_GridValue::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ChartGridArchive_ChartGridRowColumnIdMap_descriptor_, &ChartGridArchive_ChartGridRowColumnIdMap::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ChartGridArchive_ChartGridRowColumnIdMap_Entry_descriptor_, &ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ChartMediatorArchive_descriptor_, &ChartMediatorArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -472,6 +518,10 @@ void protobuf_ShutdownFile_TSCHArchives_2eproto() {
   delete ChartGridArchive_GridRow_reflection_;
   delete ChartGridArchive_GridRow_GridValue::default_instance_;
   delete ChartGridArchive_GridRow_GridValue_reflection_;
+  delete ChartGridArchive_ChartGridRowColumnIdMap::default_instance_;
+  delete ChartGridArchive_ChartGridRowColumnIdMap_reflection_;
+  delete ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance_;
+  delete ChartGridArchive_ChartGridRowColumnIdMap_Entry_reflection_;
   delete ChartMediatorArchive::default_instance_;
   delete ChartMediatorArchive_reflection_;
   delete ChartStylePreset::default_instance_;
@@ -545,74 +595,95 @@ void protobuf_AddDesc_TSCHArchives_2eproto() {
     "ltidataset_index\030\025 \001(\r\0220\n(needs_calc_eng"
     "ine_deferred_import_action\030\026 \001(\010*\t\010\220N\020\200\200"
     "\200\200\0022>\n\005unity\022\032.TSCH.ChartDrawableArchive"
-    "\030\220N \001(\0132\022.TSCH.ChartArchive\"\224\001\n\037ChartPas"
+    "\030\220N \001(\0132\022.TSCH.ChartArchive\"\344\001\n\037ChartPas"
     "teboardAdditionsArchive28\n\033preset_index_"
     "for_pasteboard\022\022.TSCH.ChartArchive\030\220N \001("
     "\r27\n\032preset_uuid_for_pasteboard\022\022.TSCH.C"
-    "hartArchive\030\221N \001(\014\"\347\001\n\020ChartGridArchive\022"
+    "hartArchive\030\221N \001(\0142N\n!custom_format_list"
+    "_for_pasteboard\022\022.TSCH.ChartArchive\030\223N \001"
+    "(\0132\016.TSP.Reference\"\264\004\n\020ChartGridArchive\022"
     "\020\n\010row_name\030\001 \003(\t\022\023\n\013column_name\030\002 \003(\t\0220"
     "\n\010grid_row\030\003 \003(\0132\036.TSCH.ChartGridArchive"
-    ".GridRow\032z\n\007GridRow\0227\n\005value\030\001 \003(\0132(.TSC"
-    "H.ChartGridArchive.GridRow.GridValue\0326\n\t"
-    "GridValue\022\025\n\rnumeric_value\030\001 \001(\001\022\022\n\ndate"
-    "_value\030\002 \001(\001\"q\n\024ChartMediatorArchive\022\034\n\004"
-    "info\030\001 \001(\0132\016.TSP.Reference\022\034\n\024local_seri"
-    "es_indexes\030\002 \003(\r\022\035\n\025remote_series_indexe"
-    "s\030\003 \003(\r\"\225\002\n\020ChartStylePreset\022#\n\013chart_st"
-    "yle\030\001 \001(\0132\016.TSP.Reference\022$\n\014legend_styl"
-    "e\030\002 \001(\0132\016.TSP.Reference\022)\n\021value_axis_st"
-    "yles\030\003 \003(\0132\016.TSP.Reference\022,\n\024category_a"
-    "xis_styles\030\004 \003(\0132\016.TSP.Reference\022%\n\rseri"
-    "es_styles\030\005 \003(\0132\016.TSP.Reference\022(\n\020parag"
-    "raph_styles\030\006 \003(\0132\016.TSP.Reference\022\014\n\004uui"
-    "d\030\007 \001(\014\"}\n\023ChartPresetsArchive\022%\n\rchart_"
-    "presets\030\001 \003(\0132\016.TSP.Reference2\?\n\textensi"
-    "on\022\021.TSS.ThemeArchive\030x \002(\0132\031.TSCH.Chart"
-    "PresetsArchive\"\302\005\n$PropertyValueStorageC"
-    "ontainerArchive\022#\n\013chart_style\030\001 \001(\0132\016.T"
-    "SP.Reference\022&\n\016chart_nonstyle\030\002 \001(\0132\016.T"
-    "SP.Reference\022$\n\014legend_style\030\003 \001(\0132\016.TSP"
-    ".Reference\022\'\n\017legend_nonstyle\030\004 \001(\0132\016.TS"
-    "P.Reference\022<\n\021value_axis_styles\030\005 \001(\0132!"
-    ".TSCH.SparseReferenceArrayArchive\022\?\n\024val"
-    "ue_axis_nonstyles\030\006 \001(\0132!.TSCH.SparseRef"
-    "erenceArrayArchive\022\?\n\024category_axis_styl"
-    "es\030\007 \001(\0132!.TSCH.SparseReferenceArrayArch"
-    "ive\022B\n\027category_axis_nonstyles\030\010 \001(\0132!.T"
-    "SCH.SparseReferenceArrayArchive\022>\n\023serie"
-    "s_theme_styles\030\t \001(\0132!.TSCH.SparseRefere"
-    "nceArrayArchive\022@\n\025series_private_styles"
-    "\030\n \001(\0132!.TSCH.SparseReferenceArrayArchiv"
-    "e\022;\n\020series_nonstyles\030\013 \001(\0132!.TSCH.Spars"
-    "eReferenceArrayArchive\022;\n\020paragraph_styl"
-    "es\030\014 \001(\0132!.TSCH.SparseReferenceArrayArch"
-    "ive\"\243\001\n\032StylePasteboardDataArchive\022 \n\005su"
-    "per\030\001 \001(\0132\021.TSS.StyleArchive\022A\n\rstyle_ne"
-    "twork\030\002 \001(\0132*.TSCH.PropertyValueStorageC"
-    "ontainerArchive\022 \n\030copied_from_entire_ch"
-    "art\030\003 \001(\010\"E\n\035ChartSelectionPathTypeArchi"
-    "ve\022\021\n\tpath_type\030\001 \001(\t\022\021\n\tpath_name\030\002 \001(\t"
-    "\"H\n\022ChartAxisIDArchive\022!\n\taxis_type\030\001 \001("
-    "\0162\016.TSCH.AxisType\022\017\n\007ordinal\030\002 \001(\r\"^\n!Ch"
-    "artSelectionPathArgumentArchive\022\016\n\006numbe"
-    "r\030\001 \001(\r\022)\n\007axis_id\030\002 \001(\0132\030.TSCH.ChartAxi"
-    "sIDArchive\"\307\001\n\031ChartSelectionPathArchive"
-    "\0226\n\tpath_type\030\001 \001(\0132#.TSCH.ChartSelectio"
-    "nPathTypeArchive\0226\n\rsub_selection\030\002 \001(\0132"
-    "\037.TSCH.ChartSelectionPathArchive\022:\n\targu"
-    "ments\030\003 \003(\0132\'.TSCH.ChartSelectionPathArg"
-    "umentArchive\"f\n\025ChartSelectionArchive\022\035\n"
-    "\005chart\030\001 \001(\0132\016.TSP.Reference\022.\n\005paths\030\002 "
-    "\003(\0132\037.TSCH.ChartSelectionPathArchive\"\243\001\n"
-    "\014ChartUIState\022\035\n\005chart\030\001 \001(\0132\016.TSP.Refer"
-    "ence\022\035\n\025cde_last_row_selected\030\002 \001(\005\022\035\n\025c"
-    "de_last_col_selected\030\003 \001(\005\022\032\n\022cde_last_r"
-    "ow_count\030\004 \001(\005\022\032\n\022cde_last_col_count\030\005 \001"
-    "(\005\"s\n\033ChartFormatStructExtensions2)\n\006pre"
-    "fix\022\030.TSK.FormatStructArchive\030\220N \001(\t2)\n\006"
-    "suffix\022\030.TSK.FormatStructArchive\030\221N \001(\t:"
-    "<\n\037scene3d_settings_constant_depth\022\022.TSC"
-    "H.ChartArchive\030\222N \001(\010", 3981);
+    ".GridRow\022=\n\005idMap\030\004 \001(\0132..TSCH.ChartGrid"
+    "Archive.ChartGridRowColumnIdMap\032\252\001\n\007Grid"
+    "Row\0227\n\005value\030\001 \003(\0132(.TSCH.ChartGridArchi"
+    "ve.GridRow.GridValue\032f\n\tGridValue\022\025\n\rnum"
+    "eric_value\030\001 \001(\001\022\026\n\016date_value_1_0\030\002 \001(\001"
+    "\022\026\n\016duration_value\030\003 \001(\001\022\022\n\ndate_value\030\004"
+    " \001(\001\032\332\001\n\027ChartGridRowColumnIdMap\022H\n\nrow_"
+    "id_map\030\001 \003(\01324.TSCH.ChartGridArchive.Cha"
+    "rtGridRowColumnIdMap.Entry\022K\n\rcolumn_id_"
+    "map\030\002 \003(\01324.TSCH.ChartGridArchive.ChartG"
+    "ridRowColumnIdMap.Entry\032(\n\005Entry\022\020\n\010uniq"
+    "ueId\030\001 \002(\t\022\r\n\005index\030\002 \002(\r\"q\n\024ChartMediat"
+    "orArchive\022\034\n\004info\030\001 \001(\0132\016.TSP.Reference\022"
+    "\034\n\024local_series_indexes\030\002 \003(\r\022\035\n\025remote_"
+    "series_indexes\030\003 \003(\r\"\225\002\n\020ChartStylePrese"
+    "t\022#\n\013chart_style\030\001 \001(\0132\016.TSP.Reference\022$"
+    "\n\014legend_style\030\002 \001(\0132\016.TSP.Reference\022)\n\021"
+    "value_axis_styles\030\003 \003(\0132\016.TSP.Reference\022"
+    ",\n\024category_axis_styles\030\004 \003(\0132\016.TSP.Refe"
+    "rence\022%\n\rseries_styles\030\005 \003(\0132\016.TSP.Refer"
+    "ence\022(\n\020paragraph_styles\030\006 \003(\0132\016.TSP.Ref"
+    "erence\022\014\n\004uuid\030\007 \001(\014\"}\n\023ChartPresetsArch"
+    "ive\022%\n\rchart_presets\030\001 \003(\0132\016.TSP.Referen"
+    "ce2\?\n\textension\022\021.TSS.ThemeArchive\030x \002(\013"
+    "2\031.TSCH.ChartPresetsArchive\"\302\005\n$Property"
+    "ValueStorageContainerArchive\022#\n\013chart_st"
+    "yle\030\001 \001(\0132\016.TSP.Reference\022&\n\016chart_nonst"
+    "yle\030\002 \001(\0132\016.TSP.Reference\022$\n\014legend_styl"
+    "e\030\003 \001(\0132\016.TSP.Reference\022\'\n\017legend_nonsty"
+    "le\030\004 \001(\0132\016.TSP.Reference\022<\n\021value_axis_s"
+    "tyles\030\005 \001(\0132!.TSCH.SparseReferenceArrayA"
+    "rchive\022\?\n\024value_axis_nonstyles\030\006 \001(\0132!.T"
+    "SCH.SparseReferenceArrayArchive\022\?\n\024categ"
+    "ory_axis_styles\030\007 \001(\0132!.TSCH.SparseRefer"
+    "enceArrayArchive\022B\n\027category_axis_nonsty"
+    "les\030\010 \001(\0132!.TSCH.SparseReferenceArrayArc"
+    "hive\022>\n\023series_theme_styles\030\t \001(\0132!.TSCH"
+    ".SparseReferenceArrayArchive\022@\n\025series_p"
+    "rivate_styles\030\n \001(\0132!.TSCH.SparseReferen"
+    "ceArrayArchive\022;\n\020series_nonstyles\030\013 \001(\013"
+    "2!.TSCH.SparseReferenceArrayArchive\022;\n\020p"
+    "aragraph_styles\030\014 \001(\0132!.TSCH.SparseRefer"
+    "enceArrayArchive\"\243\001\n\032StylePasteboardData"
+    "Archive\022 \n\005super\030\001 \001(\0132\021.TSS.StyleArchiv"
+    "e\022A\n\rstyle_network\030\002 \001(\0132*.TSCH.Property"
+    "ValueStorageContainerArchive\022 \n\030copied_f"
+    "rom_entire_chart\030\003 \001(\010\"E\n\035ChartSelection"
+    "PathTypeArchive\022\021\n\tpath_type\030\001 \001(\t\022\021\n\tpa"
+    "th_name\030\002 \001(\t\"H\n\022ChartAxisIDArchive\022!\n\ta"
+    "xis_type\030\001 \001(\0162\016.TSCH.AxisType\022\017\n\007ordina"
+    "l\030\002 \001(\r\"^\n!ChartSelectionPathArgumentArc"
+    "hive\022\016\n\006number\030\001 \001(\r\022)\n\007axis_id\030\002 \001(\0132\030."
+    "TSCH.ChartAxisIDArchive\"\307\001\n\031ChartSelecti"
+    "onPathArchive\0226\n\tpath_type\030\001 \001(\0132#.TSCH."
+    "ChartSelectionPathTypeArchive\0226\n\rsub_sel"
+    "ection\030\002 \001(\0132\037.TSCH.ChartSelectionPathAr"
+    "chive\022:\n\targuments\030\003 \003(\0132\'.TSCH.ChartSel"
+    "ectionPathArgumentArchive\"f\n\025ChartSelect"
+    "ionArchive\022\035\n\005chart\030\001 \001(\0132\016.TSP.Referenc"
+    "e\022.\n\005paths\030\002 \003(\0132\037.TSCH.ChartSelectionPa"
+    "thArchive\"\302\001\n\014ChartUIState\022\035\n\005chart\030\001 \001("
+    "\0132\016.TSP.Reference\022\035\n\025cde_last_row_select"
+    "ed\030\002 \001(\005\022\035\n\025cde_last_col_selected\030\003 \001(\005\022"
+    "\032\n\022cde_last_row_count\030\004 \001(\005\022\032\n\022cde_last_"
+    "col_count\030\005 \001(\005\022\035\n\025cde_use_full_keyboard"
+    "\030\006 \001(\010\"s\n\033ChartFormatStructExtensions2)\n"
+    "\006prefix\022\030.TSK.FormatStructArchive\030\220N \001(\t"
+    "2)\n\006suffix\022\030.TSK.FormatStructArchive\030\221N "
+    "\001(\t:<\n\037scene3d_settings_constant_depth\022\022"
+    ".TSCH.ChartArchive\030\222N \001(\010:@\n#last_applie"
+    "d_fill_set_lookup_string\022\022.TSCH.ChartArc"
+    "hive\030\224N \001(\t:O\n$series_supports_custom_nu"
+    "mber_format\022 .TSCH.ChartSeriesNonStyleAr"
+    "chive\030\221N \001(\010:M\n\"series_supports_custom_d"
+    "ate_format\022 .TSCH.ChartSeriesNonStyleArc"
+    "hive\030\222N \001(\010:K\n\"axis_supports_custom_numb"
+    "er_format\022\036.TSCH.ChartAxisNonStyleArchiv"
+    "e\030\221N \001(\010:I\n axis_supports_custom_date_fo"
+    "rmat\022\036.TSCH.ChartAxisNonStyleArchive\030\222N "
+    "\001(\010", 4803);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSCHArchives.proto", &protobuf_RegisterTypes);
   ChartDrawableArchive::default_instance_ = new ChartDrawableArchive();
@@ -621,6 +692,8 @@ void protobuf_AddDesc_TSCHArchives_2eproto() {
   ChartGridArchive::default_instance_ = new ChartGridArchive();
   ChartGridArchive_GridRow::default_instance_ = new ChartGridArchive_GridRow();
   ChartGridArchive_GridRow_GridValue::default_instance_ = new ChartGridArchive_GridRow_GridValue();
+  ChartGridArchive_ChartGridRowColumnIdMap::default_instance_ = new ChartGridArchive_ChartGridRowColumnIdMap();
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance_ = new ChartGridArchive_ChartGridRowColumnIdMap_Entry();
   ChartMediatorArchive::default_instance_ = new ChartMediatorArchive();
   ChartStylePreset::default_instance_ = new ChartStylePreset();
   ChartPresetsArchive::default_instance_ = new ChartPresetsArchive();
@@ -636,6 +709,21 @@ void protobuf_AddDesc_TSCHArchives_2eproto() {
   ::google::protobuf::internal::ExtensionSet::RegisterExtension(
     &::TSCH::ChartArchive::default_instance(),
     10002, 8, false, false);
+  ::google::protobuf::internal::ExtensionSet::RegisterExtension(
+    &::TSCH::ChartArchive::default_instance(),
+    10004, 9, false, false);
+  ::google::protobuf::internal::ExtensionSet::RegisterExtension(
+    &::TSCH::ChartSeriesNonStyleArchive::default_instance(),
+    10001, 8, false, false);
+  ::google::protobuf::internal::ExtensionSet::RegisterExtension(
+    &::TSCH::ChartSeriesNonStyleArchive::default_instance(),
+    10002, 8, false, false);
+  ::google::protobuf::internal::ExtensionSet::RegisterExtension(
+    &::TSCH::ChartAxisNonStyleArchive::default_instance(),
+    10001, 8, false, false);
+  ::google::protobuf::internal::ExtensionSet::RegisterExtension(
+    &::TSCH::ChartAxisNonStyleArchive::default_instance(),
+    10002, 8, false, false);
   ChartDrawableArchive::default_instance_->InitAsDefaultInstance();
   ChartArchive::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::ExtensionSet::RegisterMessageExtension(
@@ -649,9 +737,15 @@ void protobuf_AddDesc_TSCHArchives_2eproto() {
   ::google::protobuf::internal::ExtensionSet::RegisterExtension(
     &::TSCH::ChartArchive::default_instance(),
     10001, 12, false, false);
+  ::google::protobuf::internal::ExtensionSet::RegisterMessageExtension(
+    &::TSCH::ChartArchive::default_instance(),
+    10003, 11, false, false,
+    &::TSP::Reference::default_instance());
   ChartGridArchive::default_instance_->InitAsDefaultInstance();
   ChartGridArchive_GridRow::default_instance_->InitAsDefaultInstance();
   ChartGridArchive_GridRow_GridValue::default_instance_->InitAsDefaultInstance();
+  ChartGridArchive_ChartGridRowColumnIdMap::default_instance_->InitAsDefaultInstance();
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance_->InitAsDefaultInstance();
   ChartMediatorArchive::default_instance_->InitAsDefaultInstance();
   ChartStylePreset::default_instance_->InitAsDefaultInstance();
   ChartPresetsArchive::default_instance_->InitAsDefaultInstance();
@@ -2030,6 +2124,9 @@ bool ChartArchive::IsInitialized() const {
   if (has_preset()) {
     if (!this->preset().IsInitialized()) return false;
   }
+  if (has_grid()) {
+    if (!this->grid().IsInitialized()) return false;
+  }
   if (has_mediator()) {
     if (!this->mediator().IsInitialized()) return false;
   }
@@ -2131,6 +2228,12 @@ const int ChartPasteboardAdditionsArchive::kPresetUuidForPasteboardFieldNumber;
 ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
     ::google::protobuf::internal::StringTypeTraits, 12, false >
   ChartPasteboardAdditionsArchive::preset_uuid_for_pasteboard(kPresetUuidForPasteboardFieldNumber, ChartPasteboardAdditionsArchive_preset_uuid_for_pasteboard_default);
+#ifndef _MSC_VER
+const int ChartPasteboardAdditionsArchive::kCustomFormatListForPasteboardFieldNumber;
+#endif
+::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
+    ::google::protobuf::internal::MessageTypeTraits< ::TSP::Reference >, 11, false >
+  ChartPasteboardAdditionsArchive::custom_format_list_for_pasteboard(kCustomFormatListForPasteboardFieldNumber, ::TSP::Reference::default_instance());
 ChartPasteboardAdditionsArchive::ChartPasteboardAdditionsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
@@ -2286,6 +2389,8 @@ ::google::protobuf::Metadata ChartPasteboardAdditionsArchive::GetMetadata() cons
 
 #ifndef _MSC_VER
 const int ChartGridArchive_GridRow_GridValue::kNumericValueFieldNumber;
+const int ChartGridArchive_GridRow_GridValue::kDateValue10FieldNumber;
+const int ChartGridArchive_GridRow_GridValue::kDurationValueFieldNumber;
 const int ChartGridArchive_GridRow_GridValue::kDateValueFieldNumber;
 #endif  // !_MSC_VER
 
@@ -2306,6 +2411,8 @@ ChartGridArchive_GridRow_GridValue::ChartGridArchive_GridRow_GridValue(const Cha
 void ChartGridArchive_GridRow_GridValue::SharedCtor() {
   _cached_size_ = 0;
   numeric_value_ = 0;
+  date_value_1_0_ = 0;
+  duration_value_ = 0;
   date_value_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
@@ -2343,6 +2450,8 @@ ChartGridArchive_GridRow_GridValue* ChartGridArchive_GridRow_GridValue::New() co
 void ChartGridArchive_GridRow_GridValue::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     numeric_value_ = 0;
+    date_value_1_0_ = 0;
+    duration_value_ = 0;
     date_value_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -2366,12 +2475,44 @@ bool ChartGridArchive_GridRow_GridValue::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(17)) goto parse_date_value;
+        if (input->ExpectTag(17)) goto parse_date_value_1_0;
         break;
       }
 
-      // optional double date_value = 2;
+      // optional double date_value_1_0 = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_date_value_1_0:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &date_value_1_0_)));
+          set_has_date_value_1_0();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(25)) goto parse_duration_value;
+        break;
+      }
+
+      // optional double duration_value = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_duration_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &duration_value_)));
+          set_has_duration_value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(33)) goto parse_date_value;
+        break;
+      }
+
+      // optional double date_value = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
          parse_date_value:
@@ -2409,9 +2550,19 @@ void ChartGridArchive_GridRow_GridValue::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteDouble(1, this->numeric_value(), output);
   }
 
-  // optional double date_value = 2;
+  // optional double date_value_1_0 = 2;
+  if (has_date_value_1_0()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->date_value_1_0(), output);
+  }
+
+  // optional double duration_value = 3;
+  if (has_duration_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->duration_value(), output);
+  }
+
+  // optional double date_value = 4;
   if (has_date_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->date_value(), output);
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(4, this->date_value(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -2427,9 +2578,19 @@ ::google::protobuf::uint8* ChartGridArchive_GridRow_GridValue::SerializeWithCach
     target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(1, this->numeric_value(), target);
   }
 
-  // optional double date_value = 2;
+  // optional double date_value_1_0 = 2;
+  if (has_date_value_1_0()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->date_value_1_0(), target);
+  }
+
+  // optional double duration_value = 3;
+  if (has_duration_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(3, this->duration_value(), target);
+  }
+
+  // optional double date_value = 4;
   if (has_date_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->date_value(), target);
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(4, this->date_value(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -2448,7 +2609,17 @@ int ChartGridArchive_GridRow_GridValue::ByteSize() const {
       total_size += 1 + 8;
     }
 
-    // optional double date_value = 2;
+    // optional double date_value_1_0 = 2;
+    if (has_date_value_1_0()) {
+      total_size += 1 + 8;
+    }
+
+    // optional double duration_value = 3;
+    if (has_duration_value()) {
+      total_size += 1 + 8;
+    }
+
+    // optional double date_value = 4;
     if (has_date_value()) {
       total_size += 1 + 8;
     }
@@ -2483,6 +2654,12 @@ void ChartGridArchive_GridRow_GridValue::MergeFrom(const ChartGridArchive_GridRo
     if (from.has_numeric_value()) {
       set_numeric_value(from.numeric_value());
     }
+    if (from.has_date_value_1_0()) {
+      set_date_value_1_0(from.date_value_1_0());
+    }
+    if (from.has_duration_value()) {
+      set_duration_value(from.duration_value());
+    }
     if (from.has_date_value()) {
       set_date_value(from.date_value());
     }
@@ -2510,6 +2687,8 @@ bool ChartGridArchive_GridRow_GridValue::IsInitialized() const {
 void ChartGridArchive_GridRow_GridValue::Swap(ChartGridArchive_GridRow_GridValue* other) {
   if (other != this) {
     std::swap(numeric_value_, other->numeric_value_);
+    std::swap(date_value_1_0_, other->date_value_1_0_);
+    std::swap(duration_value_, other->duration_value_);
     std::swap(date_value_, other->date_value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -2729,12 +2908,528 @@ ::google::protobuf::Metadata ChartGridArchive_GridRow::GetMetadata() const {
 }
 
 
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int ChartGridArchive_ChartGridRowColumnIdMap_Entry::kUniqueIdFieldNumber;
+const int ChartGridArchive_ChartGridRowColumnIdMap_Entry::kIndexFieldNumber;
+#endif  // !_MSC_VER
+
+ChartGridArchive_ChartGridRowColumnIdMap_Entry::ChartGridArchive_ChartGridRowColumnIdMap_Entry()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::InitAsDefaultInstance() {
+}
+
+ChartGridArchive_ChartGridRowColumnIdMap_Entry::ChartGridArchive_ChartGridRowColumnIdMap_Entry(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::SharedCtor() {
+  _cached_size_ = 0;
+  uniqueid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  index_ = 0u;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ChartGridArchive_ChartGridRowColumnIdMap_Entry::~ChartGridArchive_ChartGridRowColumnIdMap_Entry() {
+  SharedDtor();
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::SharedDtor() {
+  if (uniqueid_ != &::google::protobuf::internal::kEmptyString) {
+    delete uniqueid_;
+  }
+  if (this != default_instance_) {
+  }
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ChartGridArchive_ChartGridRowColumnIdMap_Entry::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ChartGridArchive_ChartGridRowColumnIdMap_Entry_descriptor_;
+}
+
+const ChartGridArchive_ChartGridRowColumnIdMap_Entry& ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHArchives_2eproto();
+  return *default_instance_;
+}
+
+ChartGridArchive_ChartGridRowColumnIdMap_Entry* ChartGridArchive_ChartGridRowColumnIdMap_Entry::default_instance_ = NULL;
+
+ChartGridArchive_ChartGridRowColumnIdMap_Entry* ChartGridArchive_ChartGridRowColumnIdMap_Entry::New() const {
+  return new ChartGridArchive_ChartGridRowColumnIdMap_Entry;
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_uniqueid()) {
+      if (uniqueid_ != &::google::protobuf::internal::kEmptyString) {
+        uniqueid_->clear();
+      }
+    }
+    index_ = 0u;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ChartGridArchive_ChartGridRowColumnIdMap_Entry::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required string uniqueId = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_uniqueid()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->uniqueid().data(), this->uniqueid().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_index;
+        break;
+      }
+
+      // required uint32 index = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &index_)));
+          set_has_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required string uniqueId = 1;
+  if (has_uniqueid()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->uniqueid().data(), this->uniqueid().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->uniqueid(), output);
+  }
+
+  // required uint32 index = 2;
+  if (has_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->index(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ChartGridArchive_ChartGridRowColumnIdMap_Entry::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required string uniqueId = 1;
+  if (has_uniqueid()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->uniqueid().data(), this->uniqueid().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->uniqueid(), target);
+  }
+
+  // required uint32 index = 2;
+  if (has_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->index(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ChartGridArchive_ChartGridRowColumnIdMap_Entry::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required string uniqueId = 1;
+    if (has_uniqueid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->uniqueid());
+    }
+
+    // required uint32 index = 2;
+    if (has_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->index());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ChartGridArchive_ChartGridRowColumnIdMap_Entry* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ChartGridArchive_ChartGridRowColumnIdMap_Entry*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::MergeFrom(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_uniqueid()) {
+      set_uniqueid(from.uniqueid());
+    }
+    if (from.has_index()) {
+      set_index(from.index());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::CopyFrom(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ChartGridArchive_ChartGridRowColumnIdMap_Entry::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  return true;
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap_Entry::Swap(ChartGridArchive_ChartGridRowColumnIdMap_Entry* other) {
+  if (other != this) {
+    std::swap(uniqueid_, other->uniqueid_);
+    std::swap(index_, other->index_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ChartGridArchive_ChartGridRowColumnIdMap_Entry::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ChartGridArchive_ChartGridRowColumnIdMap_Entry_descriptor_;
+  metadata.reflection = ChartGridArchive_ChartGridRowColumnIdMap_Entry_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int ChartGridArchive_ChartGridRowColumnIdMap::kRowIdMapFieldNumber;
+const int ChartGridArchive_ChartGridRowColumnIdMap::kColumnIdMapFieldNumber;
+#endif  // !_MSC_VER
+
+ChartGridArchive_ChartGridRowColumnIdMap::ChartGridArchive_ChartGridRowColumnIdMap()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::InitAsDefaultInstance() {
+}
+
+ChartGridArchive_ChartGridRowColumnIdMap::ChartGridArchive_ChartGridRowColumnIdMap(const ChartGridArchive_ChartGridRowColumnIdMap& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ChartGridArchive_ChartGridRowColumnIdMap::~ChartGridArchive_ChartGridRowColumnIdMap() {
+  SharedDtor();
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ChartGridArchive_ChartGridRowColumnIdMap::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ChartGridArchive_ChartGridRowColumnIdMap_descriptor_;
+}
+
+const ChartGridArchive_ChartGridRowColumnIdMap& ChartGridArchive_ChartGridRowColumnIdMap::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHArchives_2eproto();
+  return *default_instance_;
+}
+
+ChartGridArchive_ChartGridRowColumnIdMap* ChartGridArchive_ChartGridRowColumnIdMap::default_instance_ = NULL;
+
+ChartGridArchive_ChartGridRowColumnIdMap* ChartGridArchive_ChartGridRowColumnIdMap::New() const {
+  return new ChartGridArchive_ChartGridRowColumnIdMap;
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::Clear() {
+  row_id_map_.Clear();
+  column_id_map_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ChartGridArchive_ChartGridRowColumnIdMap::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_row_id_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_row_id_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_row_id_map;
+        if (input->ExpectTag(18)) goto parse_column_id_map;
+        break;
+      }
+
+      // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_column_id_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_column_id_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_column_id_map;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+  for (int i = 0; i < this->row_id_map_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->row_id_map(i), output);
+  }
+
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+  for (int i = 0; i < this->column_id_map_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->column_id_map(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ChartGridArchive_ChartGridRowColumnIdMap::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+  for (int i = 0; i < this->row_id_map_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->row_id_map(i), target);
+  }
+
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+  for (int i = 0; i < this->column_id_map_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->column_id_map(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ChartGridArchive_ChartGridRowColumnIdMap::ByteSize() const {
+  int total_size = 0;
+
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+  total_size += 1 * this->row_id_map_size();
+  for (int i = 0; i < this->row_id_map_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->row_id_map(i));
+  }
+
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+  total_size += 1 * this->column_id_map_size();
+  for (int i = 0; i < this->column_id_map_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->column_id_map(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ChartGridArchive_ChartGridRowColumnIdMap* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ChartGridArchive_ChartGridRowColumnIdMap*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::MergeFrom(const ChartGridArchive_ChartGridRowColumnIdMap& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  row_id_map_.MergeFrom(from.row_id_map_);
+  column_id_map_.MergeFrom(from.column_id_map_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::CopyFrom(const ChartGridArchive_ChartGridRowColumnIdMap& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ChartGridArchive_ChartGridRowColumnIdMap::IsInitialized() const {
+
+  for (int i = 0; i < row_id_map_size(); i++) {
+    if (!this->row_id_map(i).IsInitialized()) return false;
+  }
+  for (int i = 0; i < column_id_map_size(); i++) {
+    if (!this->column_id_map(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ChartGridArchive_ChartGridRowColumnIdMap::Swap(ChartGridArchive_ChartGridRowColumnIdMap* other) {
+  if (other != this) {
+    row_id_map_.Swap(&other->row_id_map_);
+    column_id_map_.Swap(&other->column_id_map_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ChartGridArchive_ChartGridRowColumnIdMap::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ChartGridArchive_ChartGridRowColumnIdMap_descriptor_;
+  metadata.reflection = ChartGridArchive_ChartGridRowColumnIdMap_reflection_;
+  return metadata;
+}
+
+
 // -------------------------------------------------------------------
 
 #ifndef _MSC_VER
 const int ChartGridArchive::kRowNameFieldNumber;
 const int ChartGridArchive::kColumnNameFieldNumber;
 const int ChartGridArchive::kGridRowFieldNumber;
+const int ChartGridArchive::kIdMapFieldNumber;
 #endif  // !_MSC_VER
 
 ChartGridArchive::ChartGridArchive()
@@ -2743,6 +3438,7 @@ ChartGridArchive::ChartGridArchive()
 }
 
 void ChartGridArchive::InitAsDefaultInstance() {
+  idmap_ = const_cast< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap*>(&::TSCH::ChartGridArchive_ChartGridRowColumnIdMap::default_instance());
 }
 
 ChartGridArchive::ChartGridArchive(const ChartGridArchive& from)
@@ -2753,6 +3449,7 @@ ChartGridArchive::ChartGridArchive(const ChartGridArchive& from)
 
 void ChartGridArchive::SharedCtor() {
   _cached_size_ = 0;
+  idmap_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -2762,6 +3459,7 @@ ChartGridArchive::~ChartGridArchive() {
 
 void ChartGridArchive::SharedDtor() {
   if (this != default_instance_) {
+    delete idmap_;
   }
 }
 
@@ -2787,6 +3485,11 @@ ChartGridArchive* ChartGridArchive::New() const {
 }
 
 void ChartGridArchive::Clear() {
+  if (_has_bits_[3 / 32] & (0xffu << (3 % 32))) {
+    if (has_idmap()) {
+      if (idmap_ != NULL) idmap_->::TSCH::ChartGridArchive_ChartGridRowColumnIdMap::Clear();
+    }
+  }
   row_name_.Clear();
   column_name_.Clear();
   grid_row_.Clear();
@@ -2849,6 +3552,20 @@ bool ChartGridArchive::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(26)) goto parse_grid_row;
+        if (input->ExpectTag(34)) goto parse_idMap;
+        break;
+      }
+
+      // optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_idMap:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_idmap()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -2895,6 +3612,12 @@ void ChartGridArchive::SerializeWithCachedSizes(
       3, this->grid_row(i), output);
   }
 
+  // optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
+  if (has_idmap()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->idmap(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -2928,6 +3651,13 @@ ::google::protobuf::uint8* ChartGridArchive::SerializeWithCachedSizesToArray(
         3, this->grid_row(i), target);
   }
 
+  // optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
+  if (has_idmap()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->idmap(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -2938,6 +3668,15 @@ ::google::protobuf::uint8* ChartGridArchive::SerializeWithCachedSizesToArray(
 int ChartGridArchive::ByteSize() const {
   int total_size = 0;
 
+  if (_has_bits_[3 / 32] & (0xffu << (3 % 32))) {
+    // optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
+    if (has_idmap()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->idmap());
+    }
+
+  }
   // repeated string row_name = 1;
   total_size += 1 * this->row_name_size();
   for (int i = 0; i < this->row_name_size(); i++) {
@@ -2988,6 +3727,11 @@ void ChartGridArchive::MergeFrom(const ChartGridArchive& from) {
   row_name_.MergeFrom(from.row_name_);
   column_name_.MergeFrom(from.column_name_);
   grid_row_.MergeFrom(from.grid_row_);
+  if (from._has_bits_[3 / 32] & (0xffu << (3 % 32))) {
+    if (from.has_idmap()) {
+      mutable_idmap()->::TSCH::ChartGridArchive_ChartGridRowColumnIdMap::MergeFrom(from.idmap());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
@@ -3005,6 +3749,9 @@ void ChartGridArchive::CopyFrom(const ChartGridArchive& from) {
 
 bool ChartGridArchive::IsInitialized() const {
 
+  if (has_idmap()) {
+    if (!this->idmap().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -3013,6 +3760,7 @@ void ChartGridArchive::Swap(ChartGridArchive* other) {
     row_name_.Swap(&other->row_name_);
     column_name_.Swap(&other->column_name_);
     grid_row_.Swap(&other->grid_row_);
+    std::swap(idmap_, other->idmap_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -6439,6 +7187,7 @@ const int ChartUIState::kCdeLastRowSelectedFieldNumber;
 const int ChartUIState::kCdeLastColSelectedFieldNumber;
 const int ChartUIState::kCdeLastRowCountFieldNumber;
 const int ChartUIState::kCdeLastColCountFieldNumber;
+const int ChartUIState::kCdeUseFullKeyboardFieldNumber;
 #endif  // !_MSC_VER
 
 ChartUIState::ChartUIState()
@@ -6463,6 +7212,7 @@ void ChartUIState::SharedCtor() {
   cde_last_col_selected_ = 0;
   cde_last_row_count_ = 0;
   cde_last_col_count_ = 0;
+  cde_use_full_keyboard_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -6506,6 +7256,7 @@ void ChartUIState::Clear() {
     cde_last_col_selected_ = 0;
     cde_last_row_count_ = 0;
     cde_last_col_count_ = 0;
+    cde_use_full_keyboard_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -6590,6 +7341,22 @@ bool ChartUIState::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(48)) goto parse_cde_use_full_keyboard;
+        break;
+      }
+
+      // optional bool cde_use_full_keyboard = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cde_use_full_keyboard:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cde_use_full_keyboard_)));
+          set_has_cde_use_full_keyboard();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -6638,6 +7405,11 @@ void ChartUIState::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->cde_last_col_count(), output);
   }
 
+  // optional bool cde_use_full_keyboard = 6;
+  if (has_cde_use_full_keyboard()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->cde_use_full_keyboard(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -6673,6 +7445,11 @@ ::google::protobuf::uint8* ChartUIState::SerializeWithCachedSizesToArray(
     target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->cde_last_col_count(), target);
   }
 
+  // optional bool cde_use_full_keyboard = 6;
+  if (has_cde_use_full_keyboard()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->cde_use_full_keyboard(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -6719,6 +7496,11 @@ int ChartUIState::ByteSize() const {
           this->cde_last_col_count());
     }
 
+    // optional bool cde_use_full_keyboard = 6;
+    if (has_cde_use_full_keyboard()) {
+      total_size += 1 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -6761,6 +7543,9 @@ void ChartUIState::MergeFrom(const ChartUIState& from) {
     if (from.has_cde_last_col_count()) {
       set_cde_last_col_count(from.cde_last_col_count());
     }
+    if (from.has_cde_use_full_keyboard()) {
+      set_cde_use_full_keyboard(from.cde_use_full_keyboard());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -6792,6 +7577,7 @@ void ChartUIState::Swap(ChartUIState* other) {
     std::swap(cde_last_col_selected_, other->cde_last_col_selected_);
     std::swap(cde_last_row_count_, other->cde_last_row_count_);
     std::swap(cde_last_col_count_, other->cde_last_col_count_);
+    std::swap(cde_use_full_keyboard_, other->cde_use_full_keyboard_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -6979,6 +7765,22 @@ ::google::protobuf::Metadata ChartFormatStructExtensions::GetMetadata() const {
 ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
     ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
   scene3d_settings_constant_depth(kScene3DSettingsConstantDepthFieldNumber, false);
+const ::std::string last_applied_fill_set_lookup_string_default("");
+::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
+    ::google::protobuf::internal::StringTypeTraits, 9, false >
+  last_applied_fill_set_lookup_string(kLastAppliedFillSetLookupStringFieldNumber, last_applied_fill_set_lookup_string_default);
+::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartSeriesNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  series_supports_custom_number_format(kSeriesSupportsCustomNumberFormatFieldNumber, false);
+::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartSeriesNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  series_supports_custom_date_format(kSeriesSupportsCustomDateFormatFieldNumber, false);
+::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartAxisNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  axis_supports_custom_number_format(kAxisSupportsCustomNumberFormatFieldNumber, false);
+::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartAxisNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  axis_supports_custom_date_format(kAxisSupportsCustomDateFormatFieldNumber, false);
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.h
index 001eb0b..8b69063 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHArchives.pb.h
@@ -47,6 +47,8 @@ class ChartPasteboardAdditionsArchive;
 class ChartGridArchive;
 class ChartGridArchive_GridRow;
 class ChartGridArchive_GridRow_GridValue;
+class ChartGridArchive_ChartGridRowColumnIdMap;
+class ChartGridArchive_ChartGridRowColumnIdMap_Entry;
 class ChartMediatorArchive;
 class ChartStylePreset;
 class ChartPresetsArchive;
@@ -548,6 +550,10 @@ class ChartPasteboardAdditionsArchive : public ::google::protobuf::Message {
   static ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
       ::google::protobuf::internal::StringTypeTraits, 12, false >
     preset_uuid_for_pasteboard;
+  static const int kCustomFormatListForPasteboardFieldNumber = 10003;
+  static ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
+      ::google::protobuf::internal::MessageTypeTraits< ::TSP::Reference >, 11, false >
+    custom_format_list_for_pasteboard;
   // @@protoc_insertion_point(class_scope:TSCH.ChartPasteboardAdditionsArchive)
  private:
 
@@ -627,10 +633,24 @@ class ChartGridArchive_GridRow_GridValue : public ::google::protobuf::Message {
   inline double numeric_value() const;
   inline void set_numeric_value(double value);
 
-  // optional double date_value = 2;
+  // optional double date_value_1_0 = 2;
+  inline bool has_date_value_1_0() const;
+  inline void clear_date_value_1_0();
+  static const int kDateValue10FieldNumber = 2;
+  inline double date_value_1_0() const;
+  inline void set_date_value_1_0(double value);
+
+  // optional double duration_value = 3;
+  inline bool has_duration_value() const;
+  inline void clear_duration_value();
+  static const int kDurationValueFieldNumber = 3;
+  inline double duration_value() const;
+  inline void set_duration_value(double value);
+
+  // optional double date_value = 4;
   inline bool has_date_value() const;
   inline void clear_date_value();
-  static const int kDateValueFieldNumber = 2;
+  static const int kDateValueFieldNumber = 4;
   inline double date_value() const;
   inline void set_date_value(double value);
 
@@ -638,16 +658,22 @@ class ChartGridArchive_GridRow_GridValue : public ::google::protobuf::Message {
  private:
   inline void set_has_numeric_value();
   inline void clear_has_numeric_value();
+  inline void set_has_date_value_1_0();
+  inline void clear_has_date_value_1_0();
+  inline void set_has_duration_value();
+  inline void clear_has_duration_value();
   inline void set_has_date_value();
   inline void clear_has_date_value();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   double numeric_value_;
+  double date_value_1_0_;
+  double duration_value_;
   double date_value_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHArchives_2eproto();
@@ -745,6 +771,203 @@ class ChartGridArchive_GridRow : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class ChartGridArchive_ChartGridRowColumnIdMap_Entry : public ::google::protobuf::Message {
+ public:
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry();
+  virtual ~ChartGridArchive_ChartGridRowColumnIdMap_Entry();
+
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from);
+
+  inline ChartGridArchive_ChartGridRowColumnIdMap_Entry& operator=(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ChartGridArchive_ChartGridRowColumnIdMap_Entry& default_instance();
+
+  void Swap(ChartGridArchive_ChartGridRowColumnIdMap_Entry* other);
+
+  // implements Message ----------------------------------------------
+
+  ChartGridArchive_ChartGridRowColumnIdMap_Entry* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from);
+  void MergeFrom(const ChartGridArchive_ChartGridRowColumnIdMap_Entry& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required string uniqueId = 1;
+  inline bool has_uniqueid() const;
+  inline void clear_uniqueid();
+  static const int kUniqueIdFieldNumber = 1;
+  inline const ::std::string& uniqueid() const;
+  inline void set_uniqueid(const ::std::string& value);
+  inline void set_uniqueid(const char* value);
+  inline void set_uniqueid(const char* value, size_t size);
+  inline ::std::string* mutable_uniqueid();
+  inline ::std::string* release_uniqueid();
+  inline void set_allocated_uniqueid(::std::string* uniqueid);
+
+  // required uint32 index = 2;
+  inline bool has_index() const;
+  inline void clear_index();
+  static const int kIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 index() const;
+  inline void set_index(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry)
+ private:
+  inline void set_has_uniqueid();
+  inline void clear_has_uniqueid();
+  inline void set_has_index();
+  inline void clear_has_index();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::std::string* uniqueid_;
+  ::google::protobuf::uint32 index_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ChartGridArchive_ChartGridRowColumnIdMap_Entry* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ChartGridArchive_ChartGridRowColumnIdMap : public ::google::protobuf::Message {
+ public:
+  ChartGridArchive_ChartGridRowColumnIdMap();
+  virtual ~ChartGridArchive_ChartGridRowColumnIdMap();
+
+  ChartGridArchive_ChartGridRowColumnIdMap(const ChartGridArchive_ChartGridRowColumnIdMap& from);
+
+  inline ChartGridArchive_ChartGridRowColumnIdMap& operator=(const ChartGridArchive_ChartGridRowColumnIdMap& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ChartGridArchive_ChartGridRowColumnIdMap& default_instance();
+
+  void Swap(ChartGridArchive_ChartGridRowColumnIdMap* other);
+
+  // implements Message ----------------------------------------------
+
+  ChartGridArchive_ChartGridRowColumnIdMap* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ChartGridArchive_ChartGridRowColumnIdMap& from);
+  void MergeFrom(const ChartGridArchive_ChartGridRowColumnIdMap& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef ChartGridArchive_ChartGridRowColumnIdMap_Entry Entry;
+
+  // accessors -------------------------------------------------------
+
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+  inline int row_id_map_size() const;
+  inline void clear_row_id_map();
+  static const int kRowIdMapFieldNumber = 1;
+  inline const ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry& row_id_map(int index) const;
+  inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* mutable_row_id_map(int index);
+  inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* add_row_id_map();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >&
+      row_id_map() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >*
+      mutable_row_id_map();
+
+  // repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+  inline int column_id_map_size() const;
+  inline void clear_column_id_map();
+  static const int kColumnIdMapFieldNumber = 2;
+  inline const ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry& column_id_map(int index) const;
+  inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* mutable_column_id_map(int index);
+  inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* add_column_id_map();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >&
+      column_id_map() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >*
+      mutable_column_id_map();
+
+  // @@protoc_insertion_point(class_scope:TSCH.ChartGridArchive.ChartGridRowColumnIdMap)
+ private:
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry > row_id_map_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry > column_id_map_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ChartGridArchive_ChartGridRowColumnIdMap* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class ChartGridArchive : public ::google::protobuf::Message {
  public:
   ChartGridArchive();
@@ -798,6 +1021,7 @@ class ChartGridArchive : public ::google::protobuf::Message {
   // nested types ----------------------------------------------------
 
   typedef ChartGridArchive_GridRow GridRow;
+  typedef ChartGridArchive_ChartGridRowColumnIdMap ChartGridRowColumnIdMap;
 
   // accessors -------------------------------------------------------
 
@@ -845,17 +1069,29 @@ class ChartGridArchive : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_GridRow >*
       mutable_grid_row();
 
+  // optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
+  inline bool has_idmap() const;
+  inline void clear_idmap();
+  static const int kIdMapFieldNumber = 4;
+  inline const ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap& idmap() const;
+  inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* mutable_idmap();
+  inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* release_idmap();
+  inline void set_allocated_idmap(::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* idmap);
+
   // @@protoc_insertion_point(class_scope:TSCH.ChartGridArchive)
  private:
+  inline void set_has_idmap();
+  inline void clear_has_idmap();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::google::protobuf::RepeatedPtrField< ::std::string> row_name_;
   ::google::protobuf::RepeatedPtrField< ::std::string> column_name_;
   ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_GridRow > grid_row_;
+  ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* idmap_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHArchives_2eproto();
@@ -2135,6 +2371,13 @@ class ChartUIState : public ::google::protobuf::Message {
   inline ::google::protobuf::int32 cde_last_col_count() const;
   inline void set_cde_last_col_count(::google::protobuf::int32 value);
 
+  // optional bool cde_use_full_keyboard = 6;
+  inline bool has_cde_use_full_keyboard() const;
+  inline void clear_cde_use_full_keyboard();
+  static const int kCdeUseFullKeyboardFieldNumber = 6;
+  inline bool cde_use_full_keyboard() const;
+  inline void set_cde_use_full_keyboard(bool value);
+
   // @@protoc_insertion_point(class_scope:TSCH.ChartUIState)
  private:
   inline void set_has_chart();
@@ -2147,6 +2390,8 @@ class ChartUIState : public ::google::protobuf::Message {
   inline void clear_has_cde_last_row_count();
   inline void set_has_cde_last_col_count();
   inline void clear_has_cde_last_col_count();
+  inline void set_has_cde_use_full_keyboard();
+  inline void clear_has_cde_use_full_keyboard();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -2155,9 +2400,10 @@ class ChartUIState : public ::google::protobuf::Message {
   ::google::protobuf::int32 cde_last_col_selected_;
   ::google::protobuf::int32 cde_last_row_count_;
   ::google::protobuf::int32 cde_last_col_count_;
+  bool cde_use_full_keyboard_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHArchives_2eproto();
@@ -2252,6 +2498,26 @@ static const int kScene3DSettingsConstantDepthFieldNumber = 10002;
 extern ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
     ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
   scene3d_settings_constant_depth;
+static const int kLastAppliedFillSetLookupStringFieldNumber = 10004;
+extern ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartArchive,
+    ::google::protobuf::internal::StringTypeTraits, 9, false >
+  last_applied_fill_set_lookup_string;
+static const int kSeriesSupportsCustomNumberFormatFieldNumber = 10001;
+extern ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartSeriesNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  series_supports_custom_number_format;
+static const int kSeriesSupportsCustomDateFormatFieldNumber = 10002;
+extern ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartSeriesNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  series_supports_custom_date_format;
+static const int kAxisSupportsCustomNumberFormatFieldNumber = 10001;
+extern ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartAxisNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  axis_supports_custom_number_format;
+static const int kAxisSupportsCustomDateFormatFieldNumber = 10002;
+extern ::google::protobuf::internal::ExtensionIdentifier< ::TSCH::ChartAxisNonStyleArchive,
+    ::google::protobuf::internal::PrimitiveTypeTraits< bool >, 8, false >
+  axis_supports_custom_date_format;
 
 // ===================================================================
 
@@ -2994,16 +3260,60 @@ inline void ChartGridArchive_GridRow_GridValue::set_numeric_value(double value)
   numeric_value_ = value;
 }
 
-// optional double date_value = 2;
-inline bool ChartGridArchive_GridRow_GridValue::has_date_value() const {
+// optional double date_value_1_0 = 2;
+inline bool ChartGridArchive_GridRow_GridValue::has_date_value_1_0() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void ChartGridArchive_GridRow_GridValue::set_has_date_value() {
+inline void ChartGridArchive_GridRow_GridValue::set_has_date_value_1_0() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void ChartGridArchive_GridRow_GridValue::clear_has_date_value() {
+inline void ChartGridArchive_GridRow_GridValue::clear_has_date_value_1_0() {
   _has_bits_[0] &= ~0x00000002u;
 }
+inline void ChartGridArchive_GridRow_GridValue::clear_date_value_1_0() {
+  date_value_1_0_ = 0;
+  clear_has_date_value_1_0();
+}
+inline double ChartGridArchive_GridRow_GridValue::date_value_1_0() const {
+  return date_value_1_0_;
+}
+inline void ChartGridArchive_GridRow_GridValue::set_date_value_1_0(double value) {
+  set_has_date_value_1_0();
+  date_value_1_0_ = value;
+}
+
+// optional double duration_value = 3;
+inline bool ChartGridArchive_GridRow_GridValue::has_duration_value() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void ChartGridArchive_GridRow_GridValue::set_has_duration_value() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void ChartGridArchive_GridRow_GridValue::clear_has_duration_value() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void ChartGridArchive_GridRow_GridValue::clear_duration_value() {
+  duration_value_ = 0;
+  clear_has_duration_value();
+}
+inline double ChartGridArchive_GridRow_GridValue::duration_value() const {
+  return duration_value_;
+}
+inline void ChartGridArchive_GridRow_GridValue::set_duration_value(double value) {
+  set_has_duration_value();
+  duration_value_ = value;
+}
+
+// optional double date_value = 4;
+inline bool ChartGridArchive_GridRow_GridValue::has_date_value() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ChartGridArchive_GridRow_GridValue::set_has_date_value() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ChartGridArchive_GridRow_GridValue::clear_has_date_value() {
+  _has_bits_[0] &= ~0x00000008u;
+}
 inline void ChartGridArchive_GridRow_GridValue::clear_date_value() {
   date_value_ = 0;
   clear_has_date_value();
@@ -3047,6 +3357,156 @@ ChartGridArchive_GridRow::mutable_value() {
 
 // -------------------------------------------------------------------
 
+// ChartGridArchive_ChartGridRowColumnIdMap_Entry
+
+// required string uniqueId = 1;
+inline bool ChartGridArchive_ChartGridRowColumnIdMap_Entry::has_uniqueid() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_has_uniqueid() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::clear_has_uniqueid() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::clear_uniqueid() {
+  if (uniqueid_ != &::google::protobuf::internal::kEmptyString) {
+    uniqueid_->clear();
+  }
+  clear_has_uniqueid();
+}
+inline const ::std::string& ChartGridArchive_ChartGridRowColumnIdMap_Entry::uniqueid() const {
+  return *uniqueid_;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_uniqueid(const ::std::string& value) {
+  set_has_uniqueid();
+  if (uniqueid_ == &::google::protobuf::internal::kEmptyString) {
+    uniqueid_ = new ::std::string;
+  }
+  uniqueid_->assign(value);
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_uniqueid(const char* value) {
+  set_has_uniqueid();
+  if (uniqueid_ == &::google::protobuf::internal::kEmptyString) {
+    uniqueid_ = new ::std::string;
+  }
+  uniqueid_->assign(value);
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_uniqueid(const char* value, size_t size) {
+  set_has_uniqueid();
+  if (uniqueid_ == &::google::protobuf::internal::kEmptyString) {
+    uniqueid_ = new ::std::string;
+  }
+  uniqueid_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ChartGridArchive_ChartGridRowColumnIdMap_Entry::mutable_uniqueid() {
+  set_has_uniqueid();
+  if (uniqueid_ == &::google::protobuf::internal::kEmptyString) {
+    uniqueid_ = new ::std::string;
+  }
+  return uniqueid_;
+}
+inline ::std::string* ChartGridArchive_ChartGridRowColumnIdMap_Entry::release_uniqueid() {
+  clear_has_uniqueid();
+  if (uniqueid_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = uniqueid_;
+    uniqueid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_allocated_uniqueid(::std::string* uniqueid) {
+  if (uniqueid_ != &::google::protobuf::internal::kEmptyString) {
+    delete uniqueid_;
+  }
+  if (uniqueid) {
+    set_has_uniqueid();
+    uniqueid_ = uniqueid;
+  } else {
+    clear_has_uniqueid();
+    uniqueid_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required uint32 index = 2;
+inline bool ChartGridArchive_ChartGridRowColumnIdMap_Entry::has_index() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_has_index() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::clear_has_index() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::clear_index() {
+  index_ = 0u;
+  clear_has_index();
+}
+inline ::google::protobuf::uint32 ChartGridArchive_ChartGridRowColumnIdMap_Entry::index() const {
+  return index_;
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap_Entry::set_index(::google::protobuf::uint32 value) {
+  set_has_index();
+  index_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// ChartGridArchive_ChartGridRowColumnIdMap
+
+// repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry row_id_map = 1;
+inline int ChartGridArchive_ChartGridRowColumnIdMap::row_id_map_size() const {
+  return row_id_map_.size();
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap::clear_row_id_map() {
+  row_id_map_.Clear();
+}
+inline const ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry& ChartGridArchive_ChartGridRowColumnIdMap::row_id_map(int index) const {
+  return row_id_map_.Get(index);
+}
+inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* ChartGridArchive_ChartGridRowColumnIdMap::mutable_row_id_map(int index) {
+  return row_id_map_.Mutable(index);
+}
+inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* ChartGridArchive_ChartGridRowColumnIdMap::add_row_id_map() {
+  return row_id_map_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >&
+ChartGridArchive_ChartGridRowColumnIdMap::row_id_map() const {
+  return row_id_map_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >*
+ChartGridArchive_ChartGridRowColumnIdMap::mutable_row_id_map() {
+  return &row_id_map_;
+}
+
+// repeated .TSCH.ChartGridArchive.ChartGridRowColumnIdMap.Entry column_id_map = 2;
+inline int ChartGridArchive_ChartGridRowColumnIdMap::column_id_map_size() const {
+  return column_id_map_.size();
+}
+inline void ChartGridArchive_ChartGridRowColumnIdMap::clear_column_id_map() {
+  column_id_map_.Clear();
+}
+inline const ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry& ChartGridArchive_ChartGridRowColumnIdMap::column_id_map(int index) const {
+  return column_id_map_.Get(index);
+}
+inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* ChartGridArchive_ChartGridRowColumnIdMap::mutable_column_id_map(int index) {
+  return column_id_map_.Mutable(index);
+}
+inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry* ChartGridArchive_ChartGridRowColumnIdMap::add_column_id_map() {
+  return column_id_map_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >&
+ChartGridArchive_ChartGridRowColumnIdMap::column_id_map() const {
+  return column_id_map_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap_Entry >*
+ChartGridArchive_ChartGridRowColumnIdMap::mutable_column_id_map() {
+  return &column_id_map_;
+}
+
+// -------------------------------------------------------------------
+
 // ChartGridArchive
 
 // repeated string row_name = 1;
@@ -3162,6 +3622,44 @@ ChartGridArchive::mutable_grid_row() {
   return &grid_row_;
 }
 
+// optional .TSCH.ChartGridArchive.ChartGridRowColumnIdMap idMap = 4;
+inline bool ChartGridArchive::has_idmap() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ChartGridArchive::set_has_idmap() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ChartGridArchive::clear_has_idmap() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ChartGridArchive::clear_idmap() {
+  if (idmap_ != NULL) idmap_->::TSCH::ChartGridArchive_ChartGridRowColumnIdMap::Clear();
+  clear_has_idmap();
+}
+inline const ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap& ChartGridArchive::idmap() const {
+  return idmap_ != NULL ? *idmap_ : *default_instance_->idmap_;
+}
+inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* ChartGridArchive::mutable_idmap() {
+  set_has_idmap();
+  if (idmap_ == NULL) idmap_ = new ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap;
+  return idmap_;
+}
+inline ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* ChartGridArchive::release_idmap() {
+  clear_has_idmap();
+  ::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* temp = idmap_;
+  idmap_ = NULL;
+  return temp;
+}
+inline void ChartGridArchive::set_allocated_idmap(::TSCH::ChartGridArchive_ChartGridRowColumnIdMap* idmap) {
+  delete idmap_;
+  idmap_ = idmap;
+  if (idmap) {
+    set_has_idmap();
+  } else {
+    clear_has_idmap();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // ChartMediatorArchive
@@ -4654,6 +5152,28 @@ inline void ChartUIState::set_cde_last_col_count(::google::protobuf::int32 value
   cde_last_col_count_ = value;
 }
 
+// optional bool cde_use_full_keyboard = 6;
+inline bool ChartUIState::has_cde_use_full_keyboard() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void ChartUIState::set_has_cde_use_full_keyboard() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void ChartUIState::clear_has_cde_use_full_keyboard() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void ChartUIState::clear_cde_use_full_keyboard() {
+  cde_use_full_keyboard_ = false;
+  clear_has_cde_use_full_keyboard();
+}
+inline bool ChartUIState::cde_use_full_keyboard() const {
+  return cde_use_full_keyboard_;
+}
+inline void ChartUIState::set_cde_use_full_keyboard(bool value) {
+  set_has_cde_use_full_keyboard();
+  cde_use_full_keyboard_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // ChartFormatStructExtensions
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.cc
index 4d02327..3555653 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.cc
@@ -23,15 +23,39 @@ namespace {
 const ::google::protobuf::Descriptor* CommandSetChartTypeArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandSetChartTypeArchive_reflection_ = NULL;
-const ::google::protobuf::Descriptor* PropertyMutationUndoTupleArchive_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  PropertyMutationUndoTupleArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* StyleSwapUndoTupleArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   StyleSwapUndoTupleArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandStyleSwapArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandStyleSwapArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandMutatePropertiesArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandScaleAllTextArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandScaleAllTextArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandSetFontFamilyArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandSetFontFamilyArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandApplyFillSetArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandApplyFillSetArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandApplyFillSetArchive_CapturedFillSetArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandApplyFillSetArchive_CapturedFillSetArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandSetSeriesNameArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandSetSeriesNameArchive_reflection_ = NULL;
@@ -119,6 +143,18 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandInvalidateWPCaches_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandInvalidateWPCaches_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandSetGridColumnNameArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandSetGridColumnNameArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandSetGridRowNameArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandSetGridRowNameArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandReplaceCustomFormatArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandReplaceCustomFormatArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandReplaceCustomFormatArchive_FormatObjectMutation_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandReplaceCustomFormatArchive_FormatObjectMutation_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* StyleOwnerType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* StyleSwapType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* ApplyPresetBehavior_descriptor_ = NULL;
@@ -152,28 +188,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetChartTypeArchive));
-  PropertyMutationUndoTupleArchive_descriptor_ = file->message_type(1);
-  static const int PropertyMutationUndoTupleArchive_offsets_[7] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, chart_info_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, style_owner_type_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, index_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, old_style_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, new_style_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, old_non_style_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, new_non_style_),
-  };
-  PropertyMutationUndoTupleArchive_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      PropertyMutationUndoTupleArchive_descriptor_,
-      PropertyMutationUndoTupleArchive::default_instance_,
-      PropertyMutationUndoTupleArchive_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMutationUndoTupleArchive, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(PropertyMutationUndoTupleArchive));
-  StyleSwapUndoTupleArchive_descriptor_ = file->message_type(2);
+  StyleSwapUndoTupleArchive_descriptor_ = file->message_type(1);
   static const int StyleSwapUndoTupleArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StyleSwapUndoTupleArchive, chart_info_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StyleSwapUndoTupleArchive, swap_type_),
@@ -192,7 +207,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StyleSwapUndoTupleArchive));
-  CommandStyleSwapArchive_descriptor_ = file->message_type(3);
+  CommandStyleSwapArchive_descriptor_ = file->message_type(2);
   static const int CommandStyleSwapArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandStyleSwapArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandStyleSwapArchive, undo_tuples_),
@@ -208,7 +223,170 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandStyleSwapArchive));
-  CommandSetSeriesNameArchive_descriptor_ = file->message_type(4);
+  CommandMutatePropertiesArchive_descriptor_ = file->message_type(3);
+  static const int CommandMutatePropertiesArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive, rollback_cmd_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive, generic_property_delta_maps_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive, paragraph_style_delta_maps_),
+  };
+  CommandMutatePropertiesArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandMutatePropertiesArchive_descriptor_,
+      CommandMutatePropertiesArchive::default_instance_,
+      CommandMutatePropertiesArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandMutatePropertiesArchive));
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_ = CommandMutatePropertiesArchive_descriptor_->nested_type(0);
+  static const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap, style_owner_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap, style_owner_index_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap, forward_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap, reverse_map_),
+  };
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_,
+      CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance_,
+      CommandMutatePropertiesArchive_GenericPropertyDeltaMap_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandMutatePropertiesArchive_GenericPropertyDeltaMap));
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_descriptor_ = CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_->nested_type(0);
+  static const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion, chart_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion, legend_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion, axis_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion, series_map_),
+  };
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_descriptor_,
+      CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance_,
+      CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion));
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_ = CommandMutatePropertiesArchive_descriptor_->nested_type(1);
+  static const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, style_owner_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, style_owner_index_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, paragraph_style_index_property_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, forward_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, reverse_map_),
+  };
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_,
+      CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance_,
+      CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap));
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_descriptor_ = CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_->nested_type(0);
+  static const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive, char_properties_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive, para_properties_),
+  };
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_descriptor_,
+      CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance_,
+      CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive));
+  CommandScaleAllTextArchive_descriptor_ = file->message_type(4);
+  static const int CommandScaleAllTextArchive_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandScaleAllTextArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandScaleAllTextArchive, rollback_cmd_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandScaleAllTextArchive, scale_factor_),
+  };
+  CommandScaleAllTextArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandScaleAllTextArchive_descriptor_,
+      CommandScaleAllTextArchive::default_instance_,
+      CommandScaleAllTextArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandScaleAllTextArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandScaleAllTextArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandScaleAllTextArchive));
+  CommandSetFontFamilyArchive_descriptor_ = file->message_type(5);
+  static const int CommandSetFontFamilyArchive_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, rollback_cmd_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, new_font_family_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, old_font_family_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, paragraph_style_delta_maps_),
+  };
+  CommandSetFontFamilyArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandSetFontFamilyArchive_descriptor_,
+      CommandSetFontFamilyArchive::default_instance_,
+      CommandSetFontFamilyArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFontFamilyArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandSetFontFamilyArchive));
+  CommandApplyFillSetArchive_descriptor_ = file->message_type(6);
+  static const int CommandApplyFillSetArchive_offsets_[7] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, rollback_cmd_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, fwd_fill_set_lookup_string_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, rev_fill_set_lookup_string_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, fwd_captured_fill_set_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, rev_captured_fill_set_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, rev_last_applied_fill_set_lookup_string_),
+  };
+  CommandApplyFillSetArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandApplyFillSetArchive_descriptor_,
+      CommandApplyFillSetArchive::default_instance_,
+      CommandApplyFillSetArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandApplyFillSetArchive));
+  CommandApplyFillSetArchive_CapturedFillSetArchive_descriptor_ = CommandApplyFillSetArchive_descriptor_->nested_type(0);
+  static const int CommandApplyFillSetArchive_CapturedFillSetArchive_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive_CapturedFillSetArchive, identifier_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive_CapturedFillSetArchive, number_of_theme_series_styles_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive_CapturedFillSetArchive, property_maps_),
+  };
+  CommandApplyFillSetArchive_CapturedFillSetArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandApplyFillSetArchive_CapturedFillSetArchive_descriptor_,
+      CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance_,
+      CommandApplyFillSetArchive_CapturedFillSetArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive_CapturedFillSetArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyFillSetArchive_CapturedFillSetArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandApplyFillSetArchive_CapturedFillSetArchive));
+  CommandSetSeriesNameArchive_descriptor_ = file->message_type(7);
   static const int CommandSetSeriesNameArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSeriesNameArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSeriesNameArchive, seriesindex_),
@@ -226,7 +404,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetSeriesNameArchive));
-  CommandSetCategoryNameArchive_descriptor_ = file->message_type(5);
+  CommandSetCategoryNameArchive_descriptor_ = file->message_type(8);
   static const int CommandSetCategoryNameArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetCategoryNameArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetCategoryNameArchive, categoryindex_),
@@ -245,12 +423,13 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetCategoryNameArchive));
-  CommandAddGridRowsArchive_descriptor_ = file->message_type(6);
-  static const int CommandAddGridRowsArchive_offsets_[4] = {
+  CommandAddGridRowsArchive_descriptor_ = file->message_type(9);
+  static const int CommandAddGridRowsArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridRowsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridRowsArchive, location_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridRowsArchive, length_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridRowsArchive, name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridRowsArchive, ids_),
   };
   CommandAddGridRowsArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -263,12 +442,13 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandAddGridRowsArchive));
-  CommandAddGridColumnsArchive_descriptor_ = file->message_type(7);
-  static const int CommandAddGridColumnsArchive_offsets_[4] = {
+  CommandAddGridColumnsArchive_descriptor_ = file->message_type(10);
+  static const int CommandAddGridColumnsArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridColumnsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridColumnsArchive, location_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridColumnsArchive, length_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridColumnsArchive, name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddGridColumnsArchive, ids_),
   };
   CommandAddGridColumnsArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -281,7 +461,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandAddGridColumnsArchive));
-  CommandMoveGridRowsArchive_descriptor_ = file->message_type(8);
+  CommandMoveGridRowsArchive_descriptor_ = file->message_type(11);
   static const int CommandMoveGridRowsArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveGridRowsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveGridRowsArchive, location_),
@@ -299,7 +479,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMoveGridRowsArchive));
-  CommandMoveGridColumnsArchive_descriptor_ = file->message_type(9);
+  CommandMoveGridColumnsArchive_descriptor_ = file->message_type(12);
   static const int CommandMoveGridColumnsArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveGridColumnsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveGridColumnsArchive, location_),
@@ -317,8 +497,8 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMoveGridColumnsArchive));
-  CommandDeleteGridRowsArchive_descriptor_ = file->message_type(10);
-  static const int CommandDeleteGridRowsArchive_offsets_[7] = {
+  CommandDeleteGridRowsArchive_descriptor_ = file->message_type(13);
+  static const int CommandDeleteGridRowsArchive_offsets_[10] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, location_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, length_),
@@ -326,6 +506,9 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, value_row_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, removed_all_rows_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, column_names_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, row_ids_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, column_ids_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridRowsArchive, add_dummy_data_on_delete_all_),
   };
   CommandDeleteGridRowsArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -353,8 +536,8 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandDeleteGridRowsArchive_ValueRow));
-  CommandDeleteGridColumnsArchive_descriptor_ = file->message_type(11);
-  static const int CommandDeleteGridColumnsArchive_offsets_[7] = {
+  CommandDeleteGridColumnsArchive_descriptor_ = file->message_type(14);
+  static const int CommandDeleteGridColumnsArchive_offsets_[10] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, location_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, length_),
@@ -362,6 +545,9 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, value_row_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, removed_all_columns_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, row_names_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, row_ids_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, column_ids_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteGridColumnsArchive, add_dummy_data_on_delete_all_),
   };
   CommandDeleteGridColumnsArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -389,7 +575,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandDeleteGridColumnsArchive_ValueRow));
-  CommandSetPreviewLocArchive_descriptor_ = file->message_type(12);
+  CommandSetPreviewLocArchive_descriptor_ = file->message_type(15);
   static const int CommandSetPreviewLocArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetPreviewLocArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetPreviewLocArchive, old_loc_),
@@ -406,7 +592,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetPreviewLocArchive));
-  CommandSetGridValueArchive_descriptor_ = file->message_type(13);
+  CommandSetGridValueArchive_descriptor_ = file->message_type(16);
   static const int CommandSetGridValueArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridValueArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridValueArchive, rowindex_),
@@ -425,7 +611,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetGridValueArchive));
-  CommandSetGridDirectionArchive_descriptor_ = file->message_type(14);
+  CommandSetGridDirectionArchive_descriptor_ = file->message_type(17);
   static const int CommandSetGridDirectionArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridDirectionArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridDirectionArchive, old_direction_),
@@ -442,7 +628,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetGridDirectionArchive));
-  CommandSetSeriesTypeArchive_descriptor_ = file->message_type(15);
+  CommandSetSeriesTypeArchive_descriptor_ = file->message_type(18);
   static const int CommandSetSeriesTypeArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSeriesTypeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSeriesTypeArchive, seriesindex_),
@@ -460,7 +646,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetSeriesTypeArchive));
-  CommandSetScatterFormatArchive_descriptor_ = file->message_type(16);
+  CommandSetScatterFormatArchive_descriptor_ = file->message_type(19);
   static const int CommandSetScatterFormatArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetScatterFormatArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetScatterFormatArchive, oldformat_),
@@ -477,7 +663,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetScatterFormatArchive));
-  CommandSetMultiDataSetIndexArchive_descriptor_ = file->message_type(17);
+  CommandSetMultiDataSetIndexArchive_descriptor_ = file->message_type(20);
   static const int CommandSetMultiDataSetIndexArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultiDataSetIndexArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultiDataSetIndexArchive, oldindex_),
@@ -494,7 +680,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultiDataSetIndexArchive));
-  CommandSetLegendFrameArchive_descriptor_ = file->message_type(18);
+  CommandSetLegendFrameArchive_descriptor_ = file->message_type(21);
   static const int CommandSetLegendFrameArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetLegendFrameArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetLegendFrameArchive, old_legend_frame_),
@@ -511,7 +697,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetLegendFrameArchive));
-  CommandSetPieWedgeExplosion_descriptor_ = file->message_type(19);
+  CommandSetPieWedgeExplosion_descriptor_ = file->message_type(22);
   static const int CommandSetPieWedgeExplosion_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetPieWedgeExplosion, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetPieWedgeExplosion, info_geometry_command_),
@@ -529,7 +715,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetPieWedgeExplosion));
-  SynchronousCommandArchive_descriptor_ = file->message_type(20);
+  SynchronousCommandArchive_descriptor_ = file->message_type(23);
   static const int SynchronousCommandArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SynchronousCommandArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SynchronousCommandArchive, command_),
@@ -545,7 +731,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SynchronousCommandArchive));
-  CommandReplaceAllArchive_descriptor_ = file->message_type(21);
+  CommandReplaceAllArchive_descriptor_ = file->message_type(24);
   static const int CommandReplaceAllArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceAllArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceAllArchive, info_),
@@ -562,7 +748,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandReplaceAllArchive));
-  CommandChartApplyTheme_descriptor_ = file->message_type(22);
+  CommandChartApplyTheme_descriptor_ = file->message_type(25);
   static const int CommandChartApplyTheme_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChartApplyTheme, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChartApplyTheme, info_),
@@ -580,7 +766,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandChartApplyTheme));
-  CommandChartApplyPreset_descriptor_ = file->message_type(23);
+  CommandChartApplyPreset_descriptor_ = file->message_type(26);
   static const int CommandChartApplyPreset_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChartApplyPreset, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChartApplyPreset, swap_command_),
@@ -598,7 +784,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandChartApplyPreset));
-  CommandCleanupGeometryArchive_descriptor_ = file->message_type(24);
+  CommandCleanupGeometryArchive_descriptor_ = file->message_type(27);
   static const int CommandCleanupGeometryArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandCleanupGeometryArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandCleanupGeometryArchive, info_geometry_command_),
@@ -616,7 +802,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandCleanupGeometryArchive));
-  ChartCommandArchive_descriptor_ = file->message_type(25);
+  ChartCommandArchive_descriptor_ = file->message_type(28);
   static const int ChartCommandArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartCommandArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ChartCommandArchive, info_),
@@ -633,8 +819,8 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ChartCommandArchive));
-  CommandReplaceGridValuesArchive_descriptor_ = file->message_type(26);
-  static const int CommandReplaceGridValuesArchive_offsets_[11] = {
+  CommandReplaceGridValuesArchive_descriptor_ = file->message_type(29);
+  static const int CommandReplaceGridValuesArchive_offsets_[13] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, rowindex_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, columnindex_),
@@ -646,6 +832,8 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, new_col_names_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, rows_to_add_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, cols_to_add_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, row_ids_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceGridValuesArchive, column_ids_),
   };
   CommandReplaceGridValuesArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -673,7 +861,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandReplaceGridValuesArchive_ValueRow));
-  CommandReplaceThemePresetArchive_descriptor_ = file->message_type(27);
+  CommandReplaceThemePresetArchive_descriptor_ = file->message_type(30);
   static const int CommandReplaceThemePresetArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceThemePresetArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceThemePresetArchive, theme_),
@@ -709,7 +897,7 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandReplaceThemePresetArchive_StyleAndIdentifierPair));
-  CommandInvalidateWPCaches_descriptor_ = file->message_type(28);
+  CommandInvalidateWPCaches_descriptor_ = file->message_type(31);
   static const int CommandInvalidateWPCaches_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandInvalidateWPCaches, super_),
   };
@@ -724,6 +912,80 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandInvalidateWPCaches));
+  CommandSetGridColumnNameArchive_descriptor_ = file->message_type(32);
+  static const int CommandSetGridColumnNameArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridColumnNameArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridColumnNameArchive, columnindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridColumnNameArchive, oldvalue_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridColumnNameArchive, newvalue_),
+  };
+  CommandSetGridColumnNameArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandSetGridColumnNameArchive_descriptor_,
+      CommandSetGridColumnNameArchive::default_instance_,
+      CommandSetGridColumnNameArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridColumnNameArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridColumnNameArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandSetGridColumnNameArchive));
+  CommandSetGridRowNameArchive_descriptor_ = file->message_type(33);
+  static const int CommandSetGridRowNameArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridRowNameArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridRowNameArchive, rowindex_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridRowNameArchive, oldvalue_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridRowNameArchive, newvalue_),
+  };
+  CommandSetGridRowNameArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandSetGridRowNameArchive_descriptor_,
+      CommandSetGridRowNameArchive::default_instance_,
+      CommandSetGridRowNameArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridRowNameArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetGridRowNameArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandSetGridRowNameArchive));
+  CommandReplaceCustomFormatArchive_descriptor_ = file->message_type(34);
+  static const int CommandReplaceCustomFormatArchive_offsets_[6] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, rollback_cmd_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, old_format_object_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, new_format_object_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, forward_mutations_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, reverse_mutations_),
+  };
+  CommandReplaceCustomFormatArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandReplaceCustomFormatArchive_descriptor_,
+      CommandReplaceCustomFormatArchive::default_instance_,
+      CommandReplaceCustomFormatArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandReplaceCustomFormatArchive));
+  CommandReplaceCustomFormatArchive_FormatObjectMutation_descriptor_ = CommandReplaceCustomFormatArchive_descriptor_->nested_type(0);
+  static const int CommandReplaceCustomFormatArchive_FormatObjectMutation_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive_FormatObjectMutation, style_owner_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive_FormatObjectMutation, style_owner_index_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive_FormatObjectMutation, format_object_property_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive_FormatObjectMutation, format_object_),
+  };
+  CommandReplaceCustomFormatArchive_FormatObjectMutation_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandReplaceCustomFormatArchive_FormatObjectMutation_descriptor_,
+      CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance_,
+      CommandReplaceCustomFormatArchive_FormatObjectMutation_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive_FormatObjectMutation, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive_FormatObjectMutation, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandReplaceCustomFormatArchive_FormatObjectMutation));
   StyleOwnerType_descriptor_ = file->enum_type(0);
   StyleSwapType_descriptor_ = file->enum_type(1);
   ApplyPresetBehavior_descriptor_ = file->enum_type(2);
@@ -741,12 +1003,28 @@ void protobuf_RegisterTypes(const ::std::string&) {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandSetChartTypeArchive_descriptor_, &CommandSetChartTypeArchive::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    PropertyMutationUndoTupleArchive_descriptor_, &PropertyMutationUndoTupleArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     StyleSwapUndoTupleArchive_descriptor_, &StyleSwapUndoTupleArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandStyleSwapArchive_descriptor_, &CommandStyleSwapArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandMutatePropertiesArchive_descriptor_, &CommandMutatePropertiesArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_, &CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_descriptor_, &CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_, &CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_descriptor_, &CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandScaleAllTextArchive_descriptor_, &CommandScaleAllTextArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandSetFontFamilyArchive_descriptor_, &CommandSetFontFamilyArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandApplyFillSetArchive_descriptor_, &CommandApplyFillSetArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandApplyFillSetArchive_CapturedFillSetArchive_descriptor_, &CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandSetSeriesNameArchive_descriptor_, &CommandSetSeriesNameArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -805,6 +1083,14 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandReplaceThemePresetArchive_StyleAndIdentifierPair_descriptor_, &CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandInvalidateWPCaches_descriptor_, &CommandInvalidateWPCaches::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandSetGridColumnNameArchive_descriptor_, &CommandSetGridColumnNameArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandSetGridRowNameArchive_descriptor_, &CommandSetGridRowNameArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandReplaceCustomFormatArchive_descriptor_, &CommandReplaceCustomFormatArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandReplaceCustomFormatArchive_FormatObjectMutation_descriptor_, &CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance());
 }
 
 }  // namespace
@@ -812,12 +1098,28 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void protobuf_ShutdownFile_TSCHCommandArchives_2eproto() {
   delete CommandSetChartTypeArchive::default_instance_;
   delete CommandSetChartTypeArchive_reflection_;
-  delete PropertyMutationUndoTupleArchive::default_instance_;
-  delete PropertyMutationUndoTupleArchive_reflection_;
   delete StyleSwapUndoTupleArchive::default_instance_;
   delete StyleSwapUndoTupleArchive_reflection_;
   delete CommandStyleSwapArchive::default_instance_;
   delete CommandStyleSwapArchive_reflection_;
+  delete CommandMutatePropertiesArchive::default_instance_;
+  delete CommandMutatePropertiesArchive_reflection_;
+  delete CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance_;
+  delete CommandMutatePropertiesArchive_GenericPropertyDeltaMap_reflection_;
+  delete CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance_;
+  delete CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_reflection_;
+  delete CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance_;
+  delete CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_reflection_;
+  delete CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance_;
+  delete CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_reflection_;
+  delete CommandScaleAllTextArchive::default_instance_;
+  delete CommandScaleAllTextArchive_reflection_;
+  delete CommandSetFontFamilyArchive::default_instance_;
+  delete CommandSetFontFamilyArchive_reflection_;
+  delete CommandApplyFillSetArchive::default_instance_;
+  delete CommandApplyFillSetArchive_reflection_;
+  delete CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance_;
+  delete CommandApplyFillSetArchive_CapturedFillSetArchive_reflection_;
   delete CommandSetSeriesNameArchive::default_instance_;
   delete CommandSetSeriesNameArchive_reflection_;
   delete CommandSetCategoryNameArchive::default_instance_;
@@ -876,6 +1178,14 @@ void protobuf_ShutdownFile_TSCHCommandArchives_2eproto() {
   delete CommandReplaceThemePresetArchive_StyleAndIdentifierPair_reflection_;
   delete CommandInvalidateWPCaches::default_instance_;
   delete CommandInvalidateWPCaches_reflection_;
+  delete CommandSetGridColumnNameArchive::default_instance_;
+  delete CommandSetGridColumnNameArchive_reflection_;
+  delete CommandSetGridRowNameArchive::default_instance_;
+  delete CommandSetGridRowNameArchive_reflection_;
+  delete CommandReplaceCustomFormatArchive::default_instance_;
+  delete CommandReplaceCustomFormatArchive_reflection_;
+  delete CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance_;
+  delete CommandReplaceCustomFormatArchive_FormatObjectMutation_reflection_;
 }
 
 void protobuf_AddDesc_TSCHCommandArchives_2eproto() {
@@ -892,160 +1202,248 @@ void protobuf_AddDesc_TSCHCommandArchives_2eproto() {
   ::TSCH::Generated::protobuf_AddDesc_TSCHArchives_2eGEN_2eproto();
   ::TSCH::protobuf_AddDesc_TSCH3DArchives_2eproto();
   ::TSCH::protobuf_AddDesc_TSCHArchives_2eproto();
+  ::TSWP::protobuf_AddDesc_TSWPArchives_2eproto();
   ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
     "\n\031TSCHCommandArchives.proto\022\004TSCH\032\021TSPMe"
     "ssages.proto\032\021TSKArchives.proto\032\021TSSArch"
     "ives.proto\032\021TSDArchives.proto\032\031TSCHArchi"
     "ves.Common.proto\032\026TSCHArchives.GEN.proto"
     "\032\024TSCH3DArchives.proto\032\022TSCHArchives.pro"
-    "to\"\247\002\n\032CommandSetChartTypeArchive\022(\n\005sup"
-    "er\030\001 \002(\0132\031.TSCH.ChartCommandArchive\022%\n\014o"
-    "ldChartType\030\002 \002(\0162\017.TSCH.ChartType\022%\n\014ne"
-    "wChartType\030\003 \002(\0162\017.TSCH.ChartType\022-\n\025inf"
-    "o_geometry_command\030\005 \001(\0132\016.TSP.Reference"
-    "\0221\n\031anchor_attachment_command\030\006 \001(\0132\016.TS"
-    "P.Reference\022/\n\024original_legend_rect\030\007 \001("
-    "\0132\021.TSCH.RectArchive\"\231\002\n PropertyMutatio"
-    "nUndoTupleArchive\022\"\n\nchart_info\030\001 \001(\0132\016."
-    "TSP.Reference\022.\n\020style_owner_type\030\002 \001(\0162"
-    "\024.TSCH.StyleOwnerType\022\r\n\005index\030\003 \001(\r\022!\n\t"
-    "old_style\030\004 \001(\0132\016.TSP.Reference\022!\n\tnew_s"
-    "tyle\030\005 \001(\0132\016.TSP.Reference\022%\n\rold_non_st"
-    "yle\030\006 \001(\0132\016.TSP.Reference\022%\n\rnew_non_sty"
-    "le\030\007 \001(\0132\016.TSP.Reference\"\274\001\n\031StyleSwapUn"
-    "doTupleArchive\022\"\n\nchart_info\030\001 \001(\0132\016.TSP"
-    ".Reference\022&\n\tswap_type\030\002 \001(\0162\023.TSCH.Sty"
-    "leSwapType\022\r\n\005index\030\003 \001(\r\022!\n\told_value\030\004"
-    " \001(\0132\016.TSP.Reference\022!\n\tnew_value\030\005 \001(\0132"
-    "\016.TSP.Reference\"y\n\027CommandStyleSwapArchi"
-    "ve\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartCommandArc"
-    "hive\0224\n\013undo_tuples\030\002 \003(\0132\037.TSCH.StyleSw"
-    "apUndoTupleArchive\"~\n\033CommandSetSeriesNa"
-    "meArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartCom"
-    "mandArchive\022\023\n\013seriesIndex\030\002 \002(\r\022\017\n\007oldN"
-    "ame\030\003 \002(\t\022\017\n\007newName\030\004 \002(\t\"\234\001\n\035CommandSe"
-    "tCategoryNameArchive\022(\n\005super\030\001 \002(\0132\031.TS"
-    "CH.ChartCommandArchive\022\025\n\rcategoryIndex\030"
-    "\002 \002(\r\022\017\n\007oldName\030\003 \002(\t\022\017\n\007newName\030\004 \002(\t\022"
-    "\030\n\020isMultiDataIndex\030\005 \001(\010\"u\n\031CommandAddG"
-    "ridRowsArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.Cha"
-    "rtCommandArchive\022\020\n\010location\030\002 \002(\r\022\016\n\006le"
-    "ngth\030\003 \001(\r\022\014\n\004name\030\004 \003(\t\"x\n\034CommandAddGr"
-    "idColumnsArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.C"
-    "hartCommandArchive\022\020\n\010location\030\002 \002(\r\022\016\n\006"
-    "length\030\003 \001(\r\022\014\n\004name\030\004 \003(\t\"z\n\032CommandMov"
-    "eGridRowsArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.C"
-    "hartCommandArchive\022\020\n\010location\030\002 \002(\r\022\016\n\006"
-    "length\030\003 \002(\r\022\020\n\010afterrow\030\004 \002(\005\"\200\001\n\035Comma"
-    "ndMoveGridColumnsArchive\022(\n\005super\030\001 \002(\0132"
-    "\031.TSCH.ChartCommandArchive\022\020\n\010location\030\002"
-    " \002(\r\022\016\n\006length\030\003 \002(\r\022\023\n\013aftercolumn\030\004 \002("
-    "\005\"\204\002\n\034CommandDeleteGridRowsArchive\022(\n\005su"
-    "per\030\001 \002(\0132\031.TSCH.ChartCommandArchive\022\020\n\010"
-    "location\030\002 \002(\r\022\016\n\006length\030\003 \002(\r\022\r\n\005names\030"
-    "\004 \003(\t\022>\n\tvalue_row\030\006 \003(\0132+.TSCH.CommandD"
-    "eleteGridRowsArchive.ValueRow\022\030\n\020removed"
-    "_all_rows\030\007 \001(\010\022\024\n\014column_names\030\010 \003(\t\032\031\n"
-    "\010ValueRow\022\r\n\005value\030\005 \003(\001\"\212\002\n\037CommandDele"
-    "teGridColumnsArchive\022(\n\005super\030\001 \002(\0132\031.TS"
+    "to\032\022TSWPArchives.proto\"\247\002\n\032CommandSetCha"
+    "rtTypeArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.Char"
+    "tCommandArchive\022%\n\014oldChartType\030\002 \002(\0162\017."
+    "TSCH.ChartType\022%\n\014newChartType\030\003 \002(\0162\017.T"
+    "SCH.ChartType\022-\n\025info_geometry_command\030\005"
+    " \001(\0132\016.TSP.Reference\0221\n\031anchor_attachmen"
+    "t_command\030\006 \001(\0132\016.TSP.Reference\022/\n\024origi"
+    "nal_legend_rect\030\007 \001(\0132\021.TSCH.RectArchive"
+    "\"\274\001\n\031StyleSwapUndoTupleArchive\022\"\n\nchart_"
+    "info\030\001 \001(\0132\016.TSP.Reference\022&\n\tswap_type\030"
+    "\002 \001(\0162\023.TSCH.StyleSwapType\022\r\n\005index\030\003 \001("
+    "\r\022!\n\told_value\030\004 \001(\0132\016.TSP.Reference\022!\n\t"
+    "new_value\030\005 \001(\0132\016.TSP.Reference\"y\n\027Comma"
+    "ndStyleSwapArchive\022(\n\005super\030\001 \002(\0132\031.TSCH"
+    ".ChartCommandArchive\0224\n\013undo_tuples\030\002 \003("
+    "\0132\037.TSCH.StyleSwapUndoTupleArchive\"\246\013\n\036C"
+    "ommandMutatePropertiesArchive\022(\n\005super\030\001"
+    " \002(\0132\031.TSCH.ChartCommandArchive\022$\n\014rollb"
+    "ack_cmd\030\002 \001(\0132\016.TSP.Reference\022a\n\033generic"
+    "_property_delta_maps\030\003 \003(\0132<.TSCH.Comman"
+    "dMutatePropertiesArchive.GenericProperty"
+    "DeltaMap\022_\n\032paragraph_style_delta_maps\030\004"
+    " \003(\0132;.TSCH.CommandMutatePropertiesArchi"
+    "ve.ParagraphStyleDeltaMap\032\326\004\n\027GenericPro"
+    "pertyDeltaMap\022.\n\020style_owner_type\030\001 \001(\0162"
+    "\024.TSCH.StyleOwnerType\022\031\n\021style_owner_ind"
+    "ex\030\002 \001(\r\022a\n\013forward_map\030\003 \001(\0132L.TSCH.Com"
+    "mandMutatePropertiesArchive.GenericPrope"
+    "rtyDeltaMap.GenericMapUnion\022a\n\013reverse_m"
+    "ap\030\004 \001(\0132L.TSCH.CommandMutatePropertiesA"
+    "rchive.GenericPropertyDeltaMap.GenericMa"
+    "pUnion\032\251\002\n\017GenericMapUnion\022A\n\tchart_map\030"
+    "\002 \001(\0132..TSCH.Generated.ChartGenericPrope"
+    "rtyMapArchive\022C\n\nlegend_map\030\003 \001(\0132/.TSCH"
+    ".Generated.LegendGenericPropertyMapArchi"
+    "ve\022D\n\010axis_map\030\004 \001(\01322.TSCH.Generated.Ch"
+    "artAxisGenericPropertyMapArchive\022H\n\nseri"
+    "es_map\030\005 \001(\01324.TSCH.Generated.ChartSerie"
+    "sGenericPropertyMapArchive\032\226\004\n\026Paragraph"
+    "StyleDeltaMap\022.\n\020style_owner_type\030\001 \001(\0162"
+    "\024.TSCH.StyleOwnerType\022\031\n\021style_owner_ind"
+    "ex\030\002 \001(\r\022&\n\036paragraph_style_index_proper"
+    "ty\030\003 \001(\r\022q\n\013forward_map\030\004 \001(\0132\\.TSCH.Com"
+    "mandMutatePropertiesArchive.ParagraphSty"
+    "leDeltaMap.ParagraphStylePropertyMapArch"
+    "ive\022q\n\013reverse_map\030\005 \001(\0132\\.TSCH.CommandM"
+    "utatePropertiesArchive.ParagraphStyleDel"
+    "taMap.ParagraphStylePropertyMapArchive\032\242"
+    "\001\n ParagraphStylePropertyMapArchive\022>\n\017c"
+    "har_properties\030\001 \001(\0132%.TSWP.CharacterSty"
+    "lePropertiesArchive\022>\n\017para_properties\030\002"
+    " \001(\0132%.TSWP.ParagraphStylePropertiesArch"
+    "ive\"\202\001\n\032CommandScaleAllTextArchive\022(\n\005su"
+    "per\030\001 \002(\0132\031.TSCH.ChartCommandArchive\022$\n\014"
+    "rollback_cmd\030\002 \001(\0132\016.TSP.Reference\022\024\n\014sc"
+    "ale_factor\030\003 \001(\001\"\200\002\n\033CommandSetFontFamil"
+    "yArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartComm"
+    "andArchive\022$\n\014rollback_cmd\030\002 \001(\0132\016.TSP.R"
+    "eference\022\027\n\017new_font_family\030\003 \001(\t\022\027\n\017old"
+    "_font_family\030\004 \001(\t\022_\n\032paragraph_style_de"
+    "lta_maps\030\005 \003(\0132;.TSCH.CommandMutatePrope"
+    "rtiesArchive.ParagraphStyleDeltaMap\"\241\004\n\032"
+    "CommandApplyFillSetArchive\022(\n\005super\030\001 \002("
+    "\0132\031.TSCH.ChartCommandArchive\022$\n\014rollback"
+    "_cmd\030\002 \001(\0132\016.TSP.Reference\022\"\n\032fwd_fill_s"
+    "et_lookup_string\030\003 \001(\t\022\"\n\032rev_fill_set_l"
+    "ookup_string\030\004 \001(\t\022V\n\025fwd_captured_fill_"
+    "set\030\005 \001(\01327.TSCH.CommandApplyFillSetArch"
+    "ive.CapturedFillSetArchive\022V\n\025rev_captur"
+    "ed_fill_set\030\006 \001(\01327.TSCH.CommandApplyFil"
+    "lSetArchive.CapturedFillSetArchive\022/\n\'re"
+    "v_last_applied_fill_set_lookup_string\030\007 "
+    "\001(\t\032\211\001\n\026CapturedFillSetArchive\022\022\n\nidenti"
+    "fier\030\001 \001(\t\022%\n\035number_of_theme_series_sty"
+    "les\030\002 \001(\r\0224\n\rproperty_maps\030\003 \003(\0132\035.TSCH."
+    "ChartSeriesStyleArchive\"~\n\033CommandSetSer"
+    "iesNameArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.Cha"
+    "rtCommandArchive\022\023\n\013seriesIndex\030\002 \002(\r\022\017\n"
+    "\007oldName\030\003 \002(\t\022\017\n\007newName\030\004 \002(\t\"\234\001\n\035Comm"
+    "andSetCategoryNameArchive\022(\n\005super\030\001 \002(\013"
+    "2\031.TSCH.ChartCommandArchive\022\025\n\rcategoryI"
+    "ndex\030\002 \002(\r\022\017\n\007oldName\030\003 \002(\t\022\017\n\007newName\030\004"
+    " \002(\t\022\030\n\020isMultiDataIndex\030\005 \001(\010\"\202\001\n\031Comma"
+    "ndAddGridRowsArchive\022(\n\005super\030\001 \002(\0132\031.TS"
     "CH.ChartCommandArchive\022\020\n\010location\030\002 \002(\r"
-    "\022\016\n\006length\030\003 \002(\r\022\r\n\005names\030\004 \003(\t\022A\n\tvalue"
-    "_row\030\006 \003(\0132..TSCH.CommandDeleteGridColum"
-    "nsArchive.ValueRow\022\033\n\023removed_all_column"
-    "s\030\007 \001(\010\022\021\n\trow_names\030\010 \003(\t\032\031\n\010ValueRow\022\r"
-    "\n\005value\030\005 \003(\001\"\201\001\n\033CommandSetPreviewLocAr"
-    "chive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartCommand"
-    "Archive\022\033\n\007old_loc\030\002 \002(\0132\n.TSP.Point\022\033\n\007"
-    "new_loc\030\003 \002(\0132\n.TSP.Point\"\221\001\n\032CommandSet"
-    "GridValueArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.C"
-    "hartCommandArchive\022\020\n\010rowindex\030\002 \002(\r\022\023\n\013"
-    "columnindex\030\003 \002(\r\022\020\n\010oldvalue\030\004 \002(\001\022\020\n\010n"
-    "ewvalue\030\005 \002(\001\"x\n\036CommandSetGridDirection"
-    "Archive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartComma"
-    "ndArchive\022\025\n\rold_direction\030\002 \002(\r\022\025\n\rnew_"
-    "direction\030\003 \002(\r\"~\n\033CommandSetSeriesTypeA"
-    "rchive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartComman"
-    "dArchive\022\023\n\013seriesindex\030\002 \002(\r\022\017\n\007oldtype"
-    "\030\003 \002(\r\022\017\n\007newtype\030\004 \002(\r\"p\n\036CommandSetSca"
-    "tterFormatArchive\022(\n\005super\030\001 \002(\0132\031.TSCH."
-    "ChartCommandArchive\022\021\n\toldformat\030\003 \002(\r\022\021"
-    "\n\tnewformat\030\004 \002(\r\"r\n\"CommandSetMultiData"
-    "SetIndexArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.Ch"
-    "artCommandArchive\022\020\n\010oldindex\030\002 \002(\r\022\020\n\010n"
-    "ewindex\030\003 \002(\r\"\242\001\n\034CommandSetLegendFrameA"
-    "rchive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartComman"
-    "dArchive\022+\n\020old_legend_frame\030\002 \002(\0132\021.TSC"
-    "H.RectArchive\022+\n\020new_legend_frame\030\003 \002(\0132"
-    "\021.TSCH.RectArchive\"\331\001\n\033CommandSetPieWedg"
-    "eExplosion\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartCo"
-    "mmandArchive\022-\n\025info_geometry_command\030\002 "
-    "\001(\0132\016.TSP.Reference\022.\n\026style_mutation_co"
-    "mmand\030\003 \001(\0132\016.TSP.Reference\0221\n\031anchor_at"
-    "tachment_command\030\004 \001(\0132\016.TSP.Reference\"`"
-    "\n\031SynchronousCommandArchive\022\"\n\005super\030\001 \002"
-    "(\0132\023.TSK.CommandArchive\022\037\n\007command\030\002 \002(\013"
-    "2\016.TSP.Reference\"\215\001\n\030CommandReplaceAllAr"
-    "chive\0221\n\005super\030\001 \002(\0132\".TSK.ReplaceAllChi"
-    "ldCommandArchive\022\034\n\004info\030\002 \002(\0132\016.TSP.Ref"
-    "erence\022 \n\010commands\030\003 \003(\0132\016.TSP.Reference"
-    "\"\257\001\n\026CommandChartApplyTheme\0221\n\005super\030\001 \002"
-    "(\0132\".TSS.ApplyThemeChildCommandArchive\022\034"
-    "\n\004info\030\002 \002(\0132\016.TSP.Reference\022$\n\014swap_com"
-    "mand\030\003 \001(\0132\016.TSP.Reference\022\036\n\006preset\030\004 \001"
-    "(\0132\016.TSP.Reference\"\310\001\n\027CommandChartApply"
-    "Preset\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartComman"
-    "dArchive\022$\n\014swap_command\030\002 \001(\0132\016.TSP.Ref"
-    "erence\022\036\n\006preset\030\003 \001(\0132\016.TSP.Reference\022="
-    "\n\010behavior\030\004 \001(\0162\031.TSCH.ApplyPresetBehav"
-    "ior:\020remove_overrides\"\334\001\n\035CommandCleanup"
-    "GeometryArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.Ch"
-    "artCommandArchive\022-\n\025info_geometry_comma"
-    "nd\030\002 \001(\0132\016.TSP.Reference\0221\n\031anchor_attac"
-    "hment_command\030\003 \001(\0132\016.TSP.Reference\022/\n\024o"
-    "riginal_legend_rect\030\004 \001(\0132\021.TSCH.RectArc"
-    "hive\"u\n\023ChartCommandArchive\022\"\n\005super\030\001 \002"
-    "(\0132\023.TSK.CommandArchive\022\034\n\004info\030\002 \002(\0132\016."
-    "TSP.Reference\022\034\n\024original_dirty_state\030\003 "
-    "\001(\010\"\241\003\n\037CommandReplaceGridValuesArchive\022"
+    "\022\016\n\006length\030\003 \001(\r\022\014\n\004name\030\004 \003(\t\022\013\n\003ids\030\005 "
+    "\003(\t\"\205\001\n\034CommandAddGridColumnsArchive\022(\n\005"
+    "super\030\001 \002(\0132\031.TSCH.ChartCommandArchive\022\020"
+    "\n\010location\030\002 \002(\r\022\016\n\006length\030\003 \001(\r\022\014\n\004name"
+    "\030\004 \003(\t\022\013\n\003ids\030\005 \003(\t\"z\n\032CommandMoveGridRo"
+    "wsArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartCom"
+    "mandArchive\022\020\n\010location\030\002 \002(\r\022\016\n\006length\030"
+    "\003 \002(\r\022\020\n\010afterrow\030\004 \002(\005\"\200\001\n\035CommandMoveG"
+    "ridColumnsArchive\022(\n\005super\030\001 \002(\0132\031.TSCH."
+    "ChartCommandArchive\022\020\n\010location\030\002 \002(\r\022\016\n"
+    "\006length\030\003 \002(\r\022\023\n\013aftercolumn\030\004 \002(\005\"\317\002\n\034C"
+    "ommandDeleteGridRowsArchive\022(\n\005super\030\001 \002"
+    "(\0132\031.TSCH.ChartCommandArchive\022\020\n\010locatio"
+    "n\030\002 \002(\r\022\016\n\006length\030\003 \002(\r\022\r\n\005names\030\004 \003(\t\022>"
+    "\n\tvalue_row\030\006 \003(\0132+.TSCH.CommandDeleteGr"
+    "idRowsArchive.ValueRow\022\030\n\020removed_all_ro"
+    "ws\030\007 \001(\010\022\024\n\014column_names\030\010 \003(\t\022\017\n\007row_id"
+    "s\030\t \003(\t\022\022\n\ncolumn_ids\030\n \003(\t\022$\n\034add_dummy"
+    "_data_on_delete_all\030\013 \002(\010\032\031\n\010ValueRow\022\r\n"
+    "\005value\030\005 \003(\001\"\325\002\n\037CommandDeleteGridColumn"
+    "sArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartComm"
+    "andArchive\022\020\n\010location\030\002 \002(\r\022\016\n\006length\030\003"
+    " \002(\r\022\r\n\005names\030\004 \003(\t\022A\n\tvalue_row\030\006 \003(\0132."
+    ".TSCH.CommandDeleteGridColumnsArchive.Va"
+    "lueRow\022\033\n\023removed_all_columns\030\007 \001(\010\022\021\n\tr"
+    "ow_names\030\010 \003(\t\022\017\n\007row_ids\030\t \003(\t\022\022\n\ncolum"
+    "n_ids\030\n \003(\t\022$\n\034add_dummy_data_on_delete_"
+    "all\030\013 \002(\010\032\031\n\010ValueRow\022\r\n\005value\030\005 \003(\001\"\201\001\n"
+    "\033CommandSetPreviewLocArchive\022(\n\005super\030\001 "
+    "\002(\0132\031.TSCH.ChartCommandArchive\022\033\n\007old_lo"
+    "c\030\002 \002(\0132\n.TSP.Point\022\033\n\007new_loc\030\003 \002(\0132\n.T"
+    "SP.Point\"\221\001\n\032CommandSetGridValueArchive\022"
     "(\n\005super\030\001 \002(\0132\031.TSCH.ChartCommandArchiv"
     "e\022\020\n\010rowindex\030\002 \002(\r\022\023\n\013columnindex\030\003 \002(\r"
-    "\022E\n\rold_data_rows\030\004 \003(\0132..TSCH.CommandRe"
-    "placeGridValuesArchive.ValueRow\022E\n\rnew_d"
-    "ata_rows\030\005 \003(\0132..TSCH.CommandReplaceGrid"
-    "ValuesArchive.ValueRow\022\025\n\rold_row_names\030"
-    "\006 \003(\t\022\025\n\rnew_row_names\030\007 \003(\t\022\025\n\rold_col_"
-    "names\030\010 \003(\t\022\025\n\rnew_col_names\030\t \003(\t\022\023\n\013ro"
-    "ws_to_add\030\n \001(\r\022\023\n\013cols_to_add\030\013 \001(\r\032\031\n\010"
-    "ValueRow\022\r\n\005value\030\001 \003(\001\"\350\002\n CommandRepla"
-    "ceThemePresetArchive\022\"\n\005super\030\001 \002(\0132\023.TS"
-    "K.CommandArchive\022\035\n\005theme\030\002 \002(\0132\016.TSP.Re"
-    "ference\022\"\n\nold_preset\030\003 \001(\0132\016.TSP.Refere"
-    "nce\022\"\n\nnew_preset\030\004 \001(\0132\016.TSP.Reference\022"
-    "R\n\013identifiers\030\005 \003(\0132=.TSCH.CommandRepla"
-    "ceThemePresetArchive.StyleAndIdentifierP"
-    "air\022\030\n\020old_preset_index\030\006 \001(\004\032K\n\026StyleAn"
-    "dIdentifierPair\022\035\n\005style\030\001 \002(\0132\016.TSP.Ref"
-    "erence\022\022\n\nidentifier\030\002 \002(\t\"\?\n\031CommandInv"
-    "alidateWPCaches\022\"\n\005super\030\001 \002(\0132\023.TSK.Com"
-    "mandArchive*T\n\016StyleOwnerType\022\016\n\nchart_i"
-    "nfo\020\001\022\020\n\014legend_model\020\002\022\016\n\nchart_axis\020\003\022"
-    "\020\n\014chart_series\020\004*\240\002\n\rStyleSwapType\022\017\n\013c"
-    "hart_style\020\001\022\023\n\017chart_non_style\020\002\022\020\n\014leg"
-    "end_style\020\003\022\024\n\020legend_non_style\020\004\022\024\n\020val"
-    "ue_axis_style\020\005\022\030\n\024value_axis_non_style\020"
-    "\006\022\027\n\023category_axis_style\020\007\022\033\n\027category_a"
-    "xis_non_style\020\010\022\026\n\022series_theme_style\020\t\022"
-    "\030\n\024series_private_style\020\n\022\024\n\020series_non_"
-    "style\020\013\022\023\n\017paragraph_style\020\014*\\\n\023ApplyPre"
-    "setBehavior\022\024\n\020remove_overrides\020\001\022\026\n\022pre"
-    "serve_overrides\020\002\022\027\n\023preserve_appearance"
-    "\020\003", 5842);
+    "\022\020\n\010oldvalue\030\004 \002(\001\022\020\n\010newvalue\030\005 \002(\001\"x\n\036"
+    "CommandSetGridDirectionArchive\022(\n\005super\030"
+    "\001 \002(\0132\031.TSCH.ChartCommandArchive\022\025\n\rold_"
+    "direction\030\002 \002(\r\022\025\n\rnew_direction\030\003 \002(\r\"~"
+    "\n\033CommandSetSeriesTypeArchive\022(\n\005super\030\001"
+    " \002(\0132\031.TSCH.ChartCommandArchive\022\023\n\013serie"
+    "sindex\030\002 \002(\r\022\017\n\007oldtype\030\003 \002(\r\022\017\n\007newtype"
+    "\030\004 \002(\r\"p\n\036CommandSetScatterFormatArchive"
+    "\022(\n\005super\030\001 \002(\0132\031.TSCH.ChartCommandArchi"
+    "ve\022\021\n\toldformat\030\003 \002(\r\022\021\n\tnewformat\030\004 \002(\r"
+    "\"r\n\"CommandSetMultiDataSetIndexArchive\022("
+    "\n\005super\030\001 \002(\0132\031.TSCH.ChartCommandArchive"
+    "\022\020\n\010oldindex\030\002 \002(\r\022\020\n\010newindex\030\003 \002(\r\"\242\001\n"
+    "\034CommandSetLegendFrameArchive\022(\n\005super\030\001"
+    " \002(\0132\031.TSCH.ChartCommandArchive\022+\n\020old_l"
+    "egend_frame\030\002 \002(\0132\021.TSCH.RectArchive\022+\n\020"
+    "new_legend_frame\030\003 \002(\0132\021.TSCH.RectArchiv"
+    "e\"\331\001\n\033CommandSetPieWedgeExplosion\022(\n\005sup"
+    "er\030\001 \002(\0132\031.TSCH.ChartCommandArchive\022-\n\025i"
+    "nfo_geometry_command\030\002 \001(\0132\016.TSP.Referen"
+    "ce\022.\n\026style_mutation_command\030\003 \001(\0132\016.TSP"
+    ".Reference\0221\n\031anchor_attachment_command\030"
+    "\004 \001(\0132\016.TSP.Reference\"`\n\031SynchronousComm"
+    "andArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandA"
+    "rchive\022\037\n\007command\030\002 \002(\0132\016.TSP.Reference\""
+    "\215\001\n\030CommandReplaceAllArchive\0221\n\005super\030\001 "
+    "\002(\0132\".TSK.ReplaceAllChildCommandArchive\022"
+    "\034\n\004info\030\002 \002(\0132\016.TSP.Reference\022 \n\010command"
+    "s\030\003 \003(\0132\016.TSP.Reference\"\257\001\n\026CommandChart"
+    "ApplyTheme\0221\n\005super\030\001 \002(\0132\".TSS.ApplyThe"
+    "meChildCommandArchive\022\034\n\004info\030\002 \002(\0132\016.TS"
+    "P.Reference\022$\n\014swap_command\030\003 \001(\0132\016.TSP."
+    "Reference\022\036\n\006preset\030\004 \001(\0132\016.TSP.Referenc"
+    "e\"\310\001\n\027CommandChartApplyPreset\022(\n\005super\030\001"
+    " \002(\0132\031.TSCH.ChartCommandArchive\022$\n\014swap_"
+    "command\030\002 \001(\0132\016.TSP.Reference\022\036\n\006preset\030"
+    "\003 \001(\0132\016.TSP.Reference\022=\n\010behavior\030\004 \001(\0162"
+    "\031.TSCH.ApplyPresetBehavior:\020remove_overr"
+    "ides\"\334\001\n\035CommandCleanupGeometryArchive\022("
+    "\n\005super\030\001 \002(\0132\031.TSCH.ChartCommandArchive"
+    "\022-\n\025info_geometry_command\030\002 \001(\0132\016.TSP.Re"
+    "ference\0221\n\031anchor_attachment_command\030\003 \001"
+    "(\0132\016.TSP.Reference\022/\n\024original_legend_re"
+    "ct\030\004 \001(\0132\021.TSCH.RectArchive\"u\n\023ChartComm"
+    "andArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandA"
+    "rchive\022\034\n\004info\030\002 \002(\0132\016.TSP.Reference\022\034\n\024"
+    "original_dirty_state\030\003 \001(\010\"\306\003\n\037CommandRe"
+    "placeGridValuesArchive\022(\n\005super\030\001 \002(\0132\031."
+    "TSCH.ChartCommandArchive\022\020\n\010rowindex\030\002 \002"
+    "(\r\022\023\n\013columnindex\030\003 \002(\r\022E\n\rold_data_rows"
+    "\030\004 \003(\0132..TSCH.CommandReplaceGridValuesAr"
+    "chive.ValueRow\022E\n\rnew_data_rows\030\005 \003(\0132.."
+    "TSCH.CommandReplaceGridValuesArchive.Val"
+    "ueRow\022\025\n\rold_row_names\030\006 \003(\t\022\025\n\rnew_row_"
+    "names\030\007 \003(\t\022\025\n\rold_col_names\030\010 \003(\t\022\025\n\rne"
+    "w_col_names\030\t \003(\t\022\023\n\013rows_to_add\030\n \001(\r\022\023"
+    "\n\013cols_to_add\030\013 \001(\r\022\017\n\007row_ids\030\014 \003(\t\022\022\n\n"
+    "column_ids\030\r \003(\t\032\031\n\010ValueRow\022\r\n\005value\030\001 "
+    "\003(\001\"\350\002\n CommandReplaceThemePresetArchive"
+    "\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\035\n\005"
+    "theme\030\002 \002(\0132\016.TSP.Reference\022\"\n\nold_prese"
+    "t\030\003 \001(\0132\016.TSP.Reference\022\"\n\nnew_preset\030\004 "
+    "\001(\0132\016.TSP.Reference\022R\n\013identifiers\030\005 \003(\013"
+    "2=.TSCH.CommandReplaceThemePresetArchive"
+    ".StyleAndIdentifierPair\022\030\n\020old_preset_in"
+    "dex\030\006 \001(\004\032K\n\026StyleAndIdentifierPair\022\035\n\005s"
+    "tyle\030\001 \002(\0132\016.TSP.Reference\022\022\n\nidentifier"
+    "\030\002 \002(\t\"\?\n\031CommandInvalidateWPCaches\022\"\n\005s"
+    "uper\030\001 \002(\0132\023.TSK.CommandArchive\"\204\001\n\037Comm"
+    "andSetGridColumnNameArchive\022(\n\005super\030\001 \002"
+    "(\0132\031.TSCH.ChartCommandArchive\022\023\n\013columni"
+    "ndex\030\002 \002(\r\022\020\n\010oldvalue\030\003 \002(\t\022\020\n\010newvalue"
+    "\030\004 \002(\t\"~\n\034CommandSetGridRowNameArchive\022("
+    "\n\005super\030\001 \002(\0132\031.TSCH.ChartCommandArchive"
+    "\022\020\n\010rowindex\030\002 \002(\r\022\020\n\010oldvalue\030\003 \002(\t\022\020\n\010"
+    "newvalue\030\004 \002(\t\"\304\004\n!CommandReplaceCustomF"
+    "ormatArchive\022(\n\005super\030\001 \002(\0132\031.TSCH.Chart"
+    "CommandArchive\022$\n\014rollback_cmd\030\002 \001(\0132\016.T"
+    "SP.Reference\0223\n\021old_format_object\030\003 \001(\0132"
+    "\030.TSK.FormatStructArchive\0223\n\021new_format_"
+    "object\030\004 \001(\0132\030.TSK.FormatStructArchive\022W"
+    "\n\021forward_mutations\030\005 \003(\0132<.TSCH.Command"
+    "ReplaceCustomFormatArchive.FormatObjectM"
+    "utation\022W\n\021reverse_mutations\030\006 \003(\0132<.TSC"
+    "H.CommandReplaceCustomFormatArchive.Form"
+    "atObjectMutation\032\262\001\n\024FormatObjectMutatio"
+    "n\022.\n\020style_owner_type\030\001 \001(\0162\024.TSCH.Style"
+    "OwnerType\022\031\n\021style_owner_index\030\002 \001(\r\022\036\n\026"
+    "format_object_property\030\003 \001(\r\022/\n\rformat_o"
+    "bject\030\004 \001(\0132\030.TSK.FormatStructArchive*T\n"
+    "\016StyleOwnerType\022\016\n\nchart_info\020\001\022\020\n\014legen"
+    "d_model\020\002\022\016\n\nchart_axis\020\003\022\020\n\014chart_serie"
+    "s\020\004*\240\002\n\rStyleSwapType\022\017\n\013chart_style\020\001\022\023"
+    "\n\017chart_non_style\020\002\022\020\n\014legend_style\020\003\022\024\n"
+    "\020legend_non_style\020\004\022\024\n\020value_axis_style\020"
+    "\005\022\030\n\024value_axis_non_style\020\006\022\027\n\023category_"
+    "axis_style\020\007\022\033\n\027category_axis_non_style\020"
+    "\010\022\026\n\022series_theme_style\020\t\022\030\n\024series_priv"
+    "ate_style\020\n\022\024\n\020series_non_style\020\013\022\023\n\017par"
+    "agraph_style\020\014*\\\n\023ApplyPresetBehavior\022\024\n"
+    "\020remove_overrides\020\001\022\026\n\022preserve_override"
+    "s\020\002\022\027\n\023preserve_appearance\020\003", 9028);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSCHCommandArchives.proto", &protobuf_RegisterTypes);
   CommandSetChartTypeArchive::default_instance_ = new CommandSetChartTypeArchive();
-  PropertyMutationUndoTupleArchive::default_instance_ = new PropertyMutationUndoTupleArchive();
   StyleSwapUndoTupleArchive::default_instance_ = new StyleSwapUndoTupleArchive();
   CommandStyleSwapArchive::default_instance_ = new CommandStyleSwapArchive();
+  CommandMutatePropertiesArchive::default_instance_ = new CommandMutatePropertiesArchive();
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance_ = new CommandMutatePropertiesArchive_GenericPropertyDeltaMap();
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance_ = new CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion();
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance_ = new CommandMutatePropertiesArchive_ParagraphStyleDeltaMap();
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance_ = new CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive();
+  CommandScaleAllTextArchive::default_instance_ = new CommandScaleAllTextArchive();
+  CommandSetFontFamilyArchive::default_instance_ = new CommandSetFontFamilyArchive();
+  CommandApplyFillSetArchive::default_instance_ = new CommandApplyFillSetArchive();
+  CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance_ = new CommandApplyFillSetArchive_CapturedFillSetArchive();
   CommandSetSeriesNameArchive::default_instance_ = new CommandSetSeriesNameArchive();
   CommandSetCategoryNameArchive::default_instance_ = new CommandSetCategoryNameArchive();
   CommandAddGridRowsArchive::default_instance_ = new CommandAddGridRowsArchive();
@@ -1075,10 +1473,22 @@ void protobuf_AddDesc_TSCHCommandArchives_2eproto() {
   CommandReplaceThemePresetArchive::default_instance_ = new CommandReplaceThemePresetArchive();
   CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance_ = new CommandReplaceThemePresetArchive_StyleAndIdentifierPair();
   CommandInvalidateWPCaches::default_instance_ = new CommandInvalidateWPCaches();
+  CommandSetGridColumnNameArchive::default_instance_ = new CommandSetGridColumnNameArchive();
+  CommandSetGridRowNameArchive::default_instance_ = new CommandSetGridRowNameArchive();
+  CommandReplaceCustomFormatArchive::default_instance_ = new CommandReplaceCustomFormatArchive();
+  CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance_ = new CommandReplaceCustomFormatArchive_FormatObjectMutation();
   CommandSetChartTypeArchive::default_instance_->InitAsDefaultInstance();
-  PropertyMutationUndoTupleArchive::default_instance_->InitAsDefaultInstance();
   StyleSwapUndoTupleArchive::default_instance_->InitAsDefaultInstance();
   CommandStyleSwapArchive::default_instance_->InitAsDefaultInstance();
+  CommandMutatePropertiesArchive::default_instance_->InitAsDefaultInstance();
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance_->InitAsDefaultInstance();
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance_->InitAsDefaultInstance();
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance_->InitAsDefaultInstance();
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance_->InitAsDefaultInstance();
+  CommandScaleAllTextArchive::default_instance_->InitAsDefaultInstance();
+  CommandSetFontFamilyArchive::default_instance_->InitAsDefaultInstance();
+  CommandApplyFillSetArchive::default_instance_->InitAsDefaultInstance();
+  CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance_->InitAsDefaultInstance();
   CommandSetSeriesNameArchive::default_instance_->InitAsDefaultInstance();
   CommandSetCategoryNameArchive::default_instance_->InitAsDefaultInstance();
   CommandAddGridRowsArchive::default_instance_->InitAsDefaultInstance();
@@ -1108,6 +1518,10 @@ void protobuf_AddDesc_TSCHCommandArchives_2eproto() {
   CommandReplaceThemePresetArchive::default_instance_->InitAsDefaultInstance();
   CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance_->InitAsDefaultInstance();
   CommandInvalidateWPCaches::default_instance_->InitAsDefaultInstance();
+  CommandSetGridColumnNameArchive::default_instance_->InitAsDefaultInstance();
+  CommandSetGridRowNameArchive::default_instance_->InitAsDefaultInstance();
+  CommandReplaceCustomFormatArchive::default_instance_->InitAsDefaultInstance();
+  CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_TSCHCommandArchives_2eproto);
 }
 
@@ -1629,106 +2043,92 @@ ::google::protobuf::Metadata CommandSetChartTypeArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int PropertyMutationUndoTupleArchive::kChartInfoFieldNumber;
-const int PropertyMutationUndoTupleArchive::kStyleOwnerTypeFieldNumber;
-const int PropertyMutationUndoTupleArchive::kIndexFieldNumber;
-const int PropertyMutationUndoTupleArchive::kOldStyleFieldNumber;
-const int PropertyMutationUndoTupleArchive::kNewStyleFieldNumber;
-const int PropertyMutationUndoTupleArchive::kOldNonStyleFieldNumber;
-const int PropertyMutationUndoTupleArchive::kNewNonStyleFieldNumber;
+const int StyleSwapUndoTupleArchive::kChartInfoFieldNumber;
+const int StyleSwapUndoTupleArchive::kSwapTypeFieldNumber;
+const int StyleSwapUndoTupleArchive::kIndexFieldNumber;
+const int StyleSwapUndoTupleArchive::kOldValueFieldNumber;
+const int StyleSwapUndoTupleArchive::kNewValueFieldNumber;
 #endif  // !_MSC_VER
 
-PropertyMutationUndoTupleArchive::PropertyMutationUndoTupleArchive()
+StyleSwapUndoTupleArchive::StyleSwapUndoTupleArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void PropertyMutationUndoTupleArchive::InitAsDefaultInstance() {
+void StyleSwapUndoTupleArchive::InitAsDefaultInstance() {
   chart_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  new_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_non_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  new_non_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_value_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  new_value_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-PropertyMutationUndoTupleArchive::PropertyMutationUndoTupleArchive(const PropertyMutationUndoTupleArchive& from)
+StyleSwapUndoTupleArchive::StyleSwapUndoTupleArchive(const StyleSwapUndoTupleArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void PropertyMutationUndoTupleArchive::SharedCtor() {
+void StyleSwapUndoTupleArchive::SharedCtor() {
   _cached_size_ = 0;
   chart_info_ = NULL;
-  style_owner_type_ = 1;
+  swap_type_ = 1;
   index_ = 0u;
-  old_style_ = NULL;
-  new_style_ = NULL;
-  old_non_style_ = NULL;
-  new_non_style_ = NULL;
+  old_value_ = NULL;
+  new_value_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-PropertyMutationUndoTupleArchive::~PropertyMutationUndoTupleArchive() {
+StyleSwapUndoTupleArchive::~StyleSwapUndoTupleArchive() {
   SharedDtor();
 }
 
-void PropertyMutationUndoTupleArchive::SharedDtor() {
+void StyleSwapUndoTupleArchive::SharedDtor() {
   if (this != default_instance_) {
     delete chart_info_;
-    delete old_style_;
-    delete new_style_;
-    delete old_non_style_;
-    delete new_non_style_;
+    delete old_value_;
+    delete new_value_;
   }
 }
 
-void PropertyMutationUndoTupleArchive::SetCachedSize(int size) const {
+void StyleSwapUndoTupleArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* PropertyMutationUndoTupleArchive::descriptor() {
+const ::google::protobuf::Descriptor* StyleSwapUndoTupleArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return PropertyMutationUndoTupleArchive_descriptor_;
+  return StyleSwapUndoTupleArchive_descriptor_;
 }
 
-const PropertyMutationUndoTupleArchive& PropertyMutationUndoTupleArchive::default_instance() {
+const StyleSwapUndoTupleArchive& StyleSwapUndoTupleArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-PropertyMutationUndoTupleArchive* PropertyMutationUndoTupleArchive::default_instance_ = NULL;
+StyleSwapUndoTupleArchive* StyleSwapUndoTupleArchive::default_instance_ = NULL;
 
-PropertyMutationUndoTupleArchive* PropertyMutationUndoTupleArchive::New() const {
-  return new PropertyMutationUndoTupleArchive;
+StyleSwapUndoTupleArchive* StyleSwapUndoTupleArchive::New() const {
+  return new StyleSwapUndoTupleArchive;
 }
 
-void PropertyMutationUndoTupleArchive::Clear() {
+void StyleSwapUndoTupleArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_chart_info()) {
       if (chart_info_ != NULL) chart_info_->::TSP::Reference::Clear();
     }
-    style_owner_type_ = 1;
+    swap_type_ = 1;
     index_ = 0u;
-    if (has_old_style()) {
-      if (old_style_ != NULL) old_style_->::TSP::Reference::Clear();
-    }
-    if (has_new_style()) {
-      if (new_style_ != NULL) new_style_->::TSP::Reference::Clear();
-    }
-    if (has_old_non_style()) {
-      if (old_non_style_ != NULL) old_non_style_->::TSP::Reference::Clear();
+    if (has_old_value()) {
+      if (old_value_ != NULL) old_value_->::TSP::Reference::Clear();
     }
-    if (has_new_non_style()) {
-      if (new_non_style_ != NULL) new_non_style_->::TSP::Reference::Clear();
+    if (has_new_value()) {
+      if (new_value_ != NULL) new_value_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool PropertyMutationUndoTupleArchive::MergePartialFromCodedStream(
+bool StyleSwapUndoTupleArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -1743,21 +2143,21 @@ bool PropertyMutationUndoTupleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_style_owner_type;
+        if (input->ExpectTag(16)) goto parse_swap_type;
         break;
       }
 
-      // optional .TSCH.StyleOwnerType style_owner_type = 2;
+      // optional .TSCH.StyleSwapType swap_type = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_style_owner_type:
+         parse_swap_type:
           int value;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::TSCH::StyleOwnerType_IsValid(value)) {
-            set_style_owner_type(static_cast< ::TSCH::StyleOwnerType >(value));
+          if (::TSCH::StyleSwapType_IsValid(value)) {
+            set_swap_type(static_cast< ::TSCH::StyleSwapType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(2, value);
           }
@@ -1780,59 +2180,31 @@ bool PropertyMutationUndoTupleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_old_style;
+        if (input->ExpectTag(34)) goto parse_old_value;
         break;
       }
 
-      // optional .TSP.Reference old_style = 4;
+      // optional .TSP.Reference old_value = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_style:
+         parse_old_value:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_style()));
+               input, mutable_old_value()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_new_style;
+        if (input->ExpectTag(42)) goto parse_new_value;
         break;
       }
 
-      // optional .TSP.Reference new_style = 5;
+      // optional .TSP.Reference new_value = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_old_non_style;
-        break;
-      }
-
-      // optional .TSP.Reference old_non_style = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_non_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_non_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_new_non_style;
-        break;
-      }
-
-      // optional .TSP.Reference new_non_style = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_non_style:
+         parse_new_value:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_non_style()));
+               input, mutable_new_value()));
         } else {
           goto handle_uninterpreted;
         }
@@ -1856,7 +2228,7 @@ bool PropertyMutationUndoTupleArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void PropertyMutationUndoTupleArchive::SerializeWithCachedSizes(
+void StyleSwapUndoTupleArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // optional .TSP.Reference chart_info = 1;
   if (has_chart_info()) {
@@ -1864,10 +2236,10 @@ void PropertyMutationUndoTupleArchive::SerializeWithCachedSizes(
       1, this->chart_info(), output);
   }
 
-  // optional .TSCH.StyleOwnerType style_owner_type = 2;
-  if (has_style_owner_type()) {
+  // optional .TSCH.StyleSwapType swap_type = 2;
+  if (has_swap_type()) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->style_owner_type(), output);
+      2, this->swap_type(), output);
   }
 
   // optional uint32 index = 3;
@@ -1875,28 +2247,16 @@ void PropertyMutationUndoTupleArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->index(), output);
   }
 
-  // optional .TSP.Reference old_style = 4;
-  if (has_old_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->old_style(), output);
-  }
-
-  // optional .TSP.Reference new_style = 5;
-  if (has_new_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->new_style(), output);
-  }
-
-  // optional .TSP.Reference old_non_style = 6;
-  if (has_old_non_style()) {
+  // optional .TSP.Reference old_value = 4;
+  if (has_old_value()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->old_non_style(), output);
+      4, this->old_value(), output);
   }
 
-  // optional .TSP.Reference new_non_style = 7;
-  if (has_new_non_style()) {
+  // optional .TSP.Reference new_value = 5;
+  if (has_new_value()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->new_non_style(), output);
+      5, this->new_value(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -1905,7 +2265,7 @@ void PropertyMutationUndoTupleArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* PropertyMutationUndoTupleArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* StyleSwapUndoTupleArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // optional .TSP.Reference chart_info = 1;
   if (has_chart_info()) {
@@ -1914,10 +2274,10 @@ ::google::protobuf::uint8* PropertyMutationUndoTupleArchive::SerializeWithCached
         1, this->chart_info(), target);
   }
 
-  // optional .TSCH.StyleOwnerType style_owner_type = 2;
-  if (has_style_owner_type()) {
+  // optional .TSCH.StyleSwapType swap_type = 2;
+  if (has_swap_type()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->style_owner_type(), target);
+      2, this->swap_type(), target);
   }
 
   // optional uint32 index = 3;
@@ -1925,32 +2285,18 @@ ::google::protobuf::uint8* PropertyMutationUndoTupleArchive::SerializeWithCached
     target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->index(), target);
   }
 
-  // optional .TSP.Reference old_style = 4;
-  if (has_old_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->old_style(), target);
-  }
-
-  // optional .TSP.Reference new_style = 5;
-  if (has_new_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->new_style(), target);
-  }
-
-  // optional .TSP.Reference old_non_style = 6;
-  if (has_old_non_style()) {
+  // optional .TSP.Reference old_value = 4;
+  if (has_old_value()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->old_non_style(), target);
+        4, this->old_value(), target);
   }
 
-  // optional .TSP.Reference new_non_style = 7;
-  if (has_new_non_style()) {
+  // optional .TSP.Reference new_value = 5;
+  if (has_new_value()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->new_non_style(), target);
+        5, this->new_value(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -1960,7 +2306,7 @@ ::google::protobuf::uint8* PropertyMutationUndoTupleArchive::SerializeWithCached
   return target;
 }
 
-int PropertyMutationUndoTupleArchive::ByteSize() const {
+int StyleSwapUndoTupleArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -1971,10 +2317,10 @@ int PropertyMutationUndoTupleArchive::ByteSize() const {
           this->chart_info());
     }
 
-    // optional .TSCH.StyleOwnerType style_owner_type = 2;
-    if (has_style_owner_type()) {
+    // optional .TSCH.StyleSwapType swap_type = 2;
+    if (has_swap_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->style_owner_type());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->swap_type());
     }
 
     // optional uint32 index = 3;
@@ -1984,32 +2330,18 @@ int PropertyMutationUndoTupleArchive::ByteSize() const {
           this->index());
     }
 
-    // optional .TSP.Reference old_style = 4;
-    if (has_old_style()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_style());
-    }
-
-    // optional .TSP.Reference new_style = 5;
-    if (has_new_style()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_style());
-    }
-
-    // optional .TSP.Reference old_non_style = 6;
-    if (has_old_non_style()) {
+    // optional .TSP.Reference old_value = 4;
+    if (has_old_value()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_non_style());
+          this->old_value());
     }
 
-    // optional .TSP.Reference new_non_style = 7;
-    if (has_new_non_style()) {
+    // optional .TSP.Reference new_value = 5;
+    if (has_new_value()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_non_style());
+          this->new_value());
     }
 
   }
@@ -2024,10 +2356,10 @@ int PropertyMutationUndoTupleArchive::ByteSize() const {
   return total_size;
 }
 
-void PropertyMutationUndoTupleArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void StyleSwapUndoTupleArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const PropertyMutationUndoTupleArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const PropertyMutationUndoTupleArchive*>(
+  const StyleSwapUndoTupleArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const StyleSwapUndoTupleArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -2036,86 +2368,72 @@ void PropertyMutationUndoTupleArchive::MergeFrom(const ::google::protobuf::Messa
   }
 }
 
-void PropertyMutationUndoTupleArchive::MergeFrom(const PropertyMutationUndoTupleArchive& from) {
+void StyleSwapUndoTupleArchive::MergeFrom(const StyleSwapUndoTupleArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_chart_info()) {
       mutable_chart_info()->::TSP::Reference::MergeFrom(from.chart_info());
     }
-    if (from.has_style_owner_type()) {
-      set_style_owner_type(from.style_owner_type());
+    if (from.has_swap_type()) {
+      set_swap_type(from.swap_type());
     }
     if (from.has_index()) {
       set_index(from.index());
     }
-    if (from.has_old_style()) {
-      mutable_old_style()->::TSP::Reference::MergeFrom(from.old_style());
-    }
-    if (from.has_new_style()) {
-      mutable_new_style()->::TSP::Reference::MergeFrom(from.new_style());
-    }
-    if (from.has_old_non_style()) {
-      mutable_old_non_style()->::TSP::Reference::MergeFrom(from.old_non_style());
+    if (from.has_old_value()) {
+      mutable_old_value()->::TSP::Reference::MergeFrom(from.old_value());
     }
-    if (from.has_new_non_style()) {
-      mutable_new_non_style()->::TSP::Reference::MergeFrom(from.new_non_style());
+    if (from.has_new_value()) {
+      mutable_new_value()->::TSP::Reference::MergeFrom(from.new_value());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void PropertyMutationUndoTupleArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void StyleSwapUndoTupleArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void PropertyMutationUndoTupleArchive::CopyFrom(const PropertyMutationUndoTupleArchive& from) {
+void StyleSwapUndoTupleArchive::CopyFrom(const StyleSwapUndoTupleArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool PropertyMutationUndoTupleArchive::IsInitialized() const {
+bool StyleSwapUndoTupleArchive::IsInitialized() const {
 
   if (has_chart_info()) {
     if (!this->chart_info().IsInitialized()) return false;
   }
-  if (has_old_style()) {
-    if (!this->old_style().IsInitialized()) return false;
-  }
-  if (has_new_style()) {
-    if (!this->new_style().IsInitialized()) return false;
-  }
-  if (has_old_non_style()) {
-    if (!this->old_non_style().IsInitialized()) return false;
+  if (has_old_value()) {
+    if (!this->old_value().IsInitialized()) return false;
   }
-  if (has_new_non_style()) {
-    if (!this->new_non_style().IsInitialized()) return false;
+  if (has_new_value()) {
+    if (!this->new_value().IsInitialized()) return false;
   }
   return true;
 }
 
-void PropertyMutationUndoTupleArchive::Swap(PropertyMutationUndoTupleArchive* other) {
+void StyleSwapUndoTupleArchive::Swap(StyleSwapUndoTupleArchive* other) {
   if (other != this) {
     std::swap(chart_info_, other->chart_info_);
-    std::swap(style_owner_type_, other->style_owner_type_);
+    std::swap(swap_type_, other->swap_type_);
     std::swap(index_, other->index_);
-    std::swap(old_style_, other->old_style_);
-    std::swap(new_style_, other->new_style_);
-    std::swap(old_non_style_, other->old_non_style_);
-    std::swap(new_non_style_, other->new_non_style_);
+    std::swap(old_value_, other->old_value_);
+    std::swap(new_value_, other->new_value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata PropertyMutationUndoTupleArchive::GetMetadata() const {
+::google::protobuf::Metadata StyleSwapUndoTupleArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = PropertyMutationUndoTupleArchive_descriptor_;
-  metadata.reflection = PropertyMutationUndoTupleArchive_reflection_;
+  metadata.descriptor = StyleSwapUndoTupleArchive_descriptor_;
+  metadata.reflection = StyleSwapUndoTupleArchive_reflection_;
   return metadata;
 }
 
@@ -2123,171 +2441,103 @@ ::google::protobuf::Metadata PropertyMutationUndoTupleArchive::GetMetadata() con
 // ===================================================================
 
 #ifndef _MSC_VER
-const int StyleSwapUndoTupleArchive::kChartInfoFieldNumber;
-const int StyleSwapUndoTupleArchive::kSwapTypeFieldNumber;
-const int StyleSwapUndoTupleArchive::kIndexFieldNumber;
-const int StyleSwapUndoTupleArchive::kOldValueFieldNumber;
-const int StyleSwapUndoTupleArchive::kNewValueFieldNumber;
+const int CommandStyleSwapArchive::kSuperFieldNumber;
+const int CommandStyleSwapArchive::kUndoTuplesFieldNumber;
 #endif  // !_MSC_VER
 
-StyleSwapUndoTupleArchive::StyleSwapUndoTupleArchive()
+CommandStyleSwapArchive::CommandStyleSwapArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void StyleSwapUndoTupleArchive::InitAsDefaultInstance() {
-  chart_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_value_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  new_value_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandStyleSwapArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-StyleSwapUndoTupleArchive::StyleSwapUndoTupleArchive(const StyleSwapUndoTupleArchive& from)
+CommandStyleSwapArchive::CommandStyleSwapArchive(const CommandStyleSwapArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void StyleSwapUndoTupleArchive::SharedCtor() {
+void CommandStyleSwapArchive::SharedCtor() {
   _cached_size_ = 0;
-  chart_info_ = NULL;
-  swap_type_ = 1;
-  index_ = 0u;
-  old_value_ = NULL;
-  new_value_ = NULL;
+  super_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-StyleSwapUndoTupleArchive::~StyleSwapUndoTupleArchive() {
+CommandStyleSwapArchive::~CommandStyleSwapArchive() {
   SharedDtor();
 }
 
-void StyleSwapUndoTupleArchive::SharedDtor() {
+void CommandStyleSwapArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete chart_info_;
-    delete old_value_;
-    delete new_value_;
+    delete super_;
   }
 }
 
-void StyleSwapUndoTupleArchive::SetCachedSize(int size) const {
+void CommandStyleSwapArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* StyleSwapUndoTupleArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandStyleSwapArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return StyleSwapUndoTupleArchive_descriptor_;
+  return CommandStyleSwapArchive_descriptor_;
 }
 
-const StyleSwapUndoTupleArchive& StyleSwapUndoTupleArchive::default_instance() {
+const CommandStyleSwapArchive& CommandStyleSwapArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-StyleSwapUndoTupleArchive* StyleSwapUndoTupleArchive::default_instance_ = NULL;
+CommandStyleSwapArchive* CommandStyleSwapArchive::default_instance_ = NULL;
 
-StyleSwapUndoTupleArchive* StyleSwapUndoTupleArchive::New() const {
-  return new StyleSwapUndoTupleArchive;
+CommandStyleSwapArchive* CommandStyleSwapArchive::New() const {
+  return new CommandStyleSwapArchive;
 }
 
-void StyleSwapUndoTupleArchive::Clear() {
+void CommandStyleSwapArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_chart_info()) {
-      if (chart_info_ != NULL) chart_info_->::TSP::Reference::Clear();
-    }
-    swap_type_ = 1;
-    index_ = 0u;
-    if (has_old_value()) {
-      if (old_value_ != NULL) old_value_->::TSP::Reference::Clear();
-    }
-    if (has_new_value()) {
-      if (new_value_ != NULL) new_value_->::TSP::Reference::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
   }
+  undo_tuples_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool StyleSwapUndoTupleArchive::MergePartialFromCodedStream(
+bool CommandStyleSwapArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .TSP.Reference chart_info = 1;
+      // required .TSCH.ChartCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_chart_info()));
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_swap_type;
+        if (input->ExpectTag(18)) goto parse_undo_tuples;
         break;
       }
 
-      // optional .TSCH.StyleSwapType swap_type = 2;
+      // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_swap_type:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TSCH::StyleSwapType_IsValid(value)) {
-            set_swap_type(static_cast< ::TSCH::StyleSwapType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_index;
-        break;
-      }
-
-      // optional uint32 index = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &index_)));
-          set_has_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_old_value;
-        break;
-      }
-
-      // optional .TSP.Reference old_value = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_value:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_value()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_new_value;
-        break;
-      }
-
-      // optional .TSP.Reference new_value = 5;
-      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_value:
+         parse_undo_tuples:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_value()));
+                input, add_undo_tuples()));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_undo_tuples;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -2308,35 +2558,18 @@ bool StyleSwapUndoTupleArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void StyleSwapUndoTupleArchive::SerializeWithCachedSizes(
+void CommandStyleSwapArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .TSP.Reference chart_info = 1;
-  if (has_chart_info()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->chart_info(), output);
-  }
-
-  // optional .TSCH.StyleSwapType swap_type = 2;
-  if (has_swap_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->swap_type(), output);
-  }
-
-  // optional uint32 index = 3;
-  if (has_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->index(), output);
-  }
-
-  // optional .TSP.Reference old_value = 4;
-  if (has_old_value()) {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->old_value(), output);
+      1, this->super(), output);
   }
 
-  // optional .TSP.Reference new_value = 5;
-  if (has_new_value()) {
+  // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
+  for (int i = 0; i < this->undo_tuples_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->new_value(), output);
+      2, this->undo_tuples(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -2345,38 +2578,20 @@ void StyleSwapUndoTupleArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* StyleSwapUndoTupleArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandStyleSwapArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional .TSP.Reference chart_info = 1;
-  if (has_chart_info()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->chart_info(), target);
-  }
-
-  // optional .TSCH.StyleSwapType swap_type = 2;
-  if (has_swap_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->swap_type(), target);
-  }
-
-  // optional uint32 index = 3;
-  if (has_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->index(), target);
-  }
-
-  // optional .TSP.Reference old_value = 4;
-  if (has_old_value()) {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->old_value(), target);
+        1, this->super(), target);
   }
 
-  // optional .TSP.Reference new_value = 5;
-  if (has_new_value()) {
+  // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
+  for (int i = 0; i < this->undo_tuples_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->new_value(), target);
+        2, this->undo_tuples(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -2386,45 +2601,26 @@ ::google::protobuf::uint8* StyleSwapUndoTupleArchive::SerializeWithCachedSizesTo
   return target;
 }
 
-int StyleSwapUndoTupleArchive::ByteSize() const {
+int CommandStyleSwapArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .TSP.Reference chart_info = 1;
-    if (has_chart_info()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->chart_info());
-    }
-
-    // optional .TSCH.StyleSwapType swap_type = 2;
-    if (has_swap_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->swap_type());
-    }
-
-    // optional uint32 index = 3;
-    if (has_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->index());
-    }
-
-    // optional .TSP.Reference old_value = 4;
-    if (has_old_value()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_value());
-    }
-
-    // optional .TSP.Reference new_value = 5;
-    if (has_new_value()) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_value());
+          this->super());
     }
 
   }
+  // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
+  total_size += 1 * this->undo_tuples_size();
+  for (int i = 0; i < this->undo_tuples_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->undo_tuples(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -2436,10 +2632,10 @@ int StyleSwapUndoTupleArchive::ByteSize() const {
   return total_size;
 }
 
-void StyleSwapUndoTupleArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandStyleSwapArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const StyleSwapUndoTupleArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const StyleSwapUndoTupleArchive*>(
+  const CommandStyleSwapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandStyleSwapArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -2448,72 +2644,56 @@ void StyleSwapUndoTupleArchive::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void StyleSwapUndoTupleArchive::MergeFrom(const StyleSwapUndoTupleArchive& from) {
+void CommandStyleSwapArchive::MergeFrom(const CommandStyleSwapArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  undo_tuples_.MergeFrom(from.undo_tuples_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_chart_info()) {
-      mutable_chart_info()->::TSP::Reference::MergeFrom(from.chart_info());
-    }
-    if (from.has_swap_type()) {
-      set_swap_type(from.swap_type());
-    }
-    if (from.has_index()) {
-      set_index(from.index());
-    }
-    if (from.has_old_value()) {
-      mutable_old_value()->::TSP::Reference::MergeFrom(from.old_value());
-    }
-    if (from.has_new_value()) {
-      mutable_new_value()->::TSP::Reference::MergeFrom(from.new_value());
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void StyleSwapUndoTupleArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandStyleSwapArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void StyleSwapUndoTupleArchive::CopyFrom(const StyleSwapUndoTupleArchive& from) {
+void CommandStyleSwapArchive::CopyFrom(const CommandStyleSwapArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool StyleSwapUndoTupleArchive::IsInitialized() const {
+bool CommandStyleSwapArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  if (has_chart_info()) {
-    if (!this->chart_info().IsInitialized()) return false;
-  }
-  if (has_old_value()) {
-    if (!this->old_value().IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
   }
-  if (has_new_value()) {
-    if (!this->new_value().IsInitialized()) return false;
+  for (int i = 0; i < undo_tuples_size(); i++) {
+    if (!this->undo_tuples(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void StyleSwapUndoTupleArchive::Swap(StyleSwapUndoTupleArchive* other) {
+void CommandStyleSwapArchive::Swap(CommandStyleSwapArchive* other) {
   if (other != this) {
-    std::swap(chart_info_, other->chart_info_);
-    std::swap(swap_type_, other->swap_type_);
-    std::swap(index_, other->index_);
-    std::swap(old_value_, other->old_value_);
-    std::swap(new_value_, other->new_value_);
+    std::swap(super_, other->super_);
+    undo_tuples_.Swap(&other->undo_tuples_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata StyleSwapUndoTupleArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandStyleSwapArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = StyleSwapUndoTupleArchive_descriptor_;
-  metadata.reflection = StyleSwapUndoTupleArchive_reflection_;
+  metadata.descriptor = CommandStyleSwapArchive_descriptor_;
+  metadata.reflection = CommandStyleSwapArchive_reflection_;
   return metadata;
 }
 
@@ -2521,103 +2701,149 @@ ::google::protobuf::Metadata StyleSwapUndoTupleArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandStyleSwapArchive::kSuperFieldNumber;
-const int CommandStyleSwapArchive::kUndoTuplesFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::kChartMapFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::kLegendMapFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::kAxisMapFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::kSeriesMapFieldNumber;
 #endif  // !_MSC_VER
 
-CommandStyleSwapArchive::CommandStyleSwapArchive()
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandStyleSwapArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::InitAsDefaultInstance() {
+  chart_map_ = const_cast< ::TSCH::Generated::ChartGenericPropertyMapArchive*>(&::TSCH::Generated::ChartGenericPropertyMapArchive::default_instance());
+  legend_map_ = const_cast< ::TSCH::Generated::LegendGenericPropertyMapArchive*>(&::TSCH::Generated::LegendGenericPropertyMapArchive::default_instance());
+  axis_map_ = const_cast< ::TSCH::Generated::ChartAxisGenericPropertyMapArchive*>(&::TSCH::Generated::ChartAxisGenericPropertyMapArchive::default_instance());
+  series_map_ = const_cast< ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive*>(&::TSCH::Generated::ChartSeriesGenericPropertyMapArchive::default_instance());
 }
 
-CommandStyleSwapArchive::CommandStyleSwapArchive(const CommandStyleSwapArchive& from)
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandStyleSwapArchive::SharedCtor() {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
+  chart_map_ = NULL;
+  legend_map_ = NULL;
+  axis_map_ = NULL;
+  series_map_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandStyleSwapArchive::~CommandStyleSwapArchive() {
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::~CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion() {
   SharedDtor();
 }
 
-void CommandStyleSwapArchive::SharedDtor() {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
+    delete chart_map_;
+    delete legend_map_;
+    delete axis_map_;
+    delete series_map_;
   }
 }
 
-void CommandStyleSwapArchive::SetCachedSize(int size) const {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandStyleSwapArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandStyleSwapArchive_descriptor_;
+  return CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_descriptor_;
 }
 
-const CommandStyleSwapArchive& CommandStyleSwapArchive::default_instance() {
+const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandStyleSwapArchive* CommandStyleSwapArchive::default_instance_ = NULL;
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance_ = NULL;
 
-CommandStyleSwapArchive* CommandStyleSwapArchive::New() const {
-  return new CommandStyleSwapArchive;
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::New() const {
+  return new CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion;
 }
 
-void CommandStyleSwapArchive::Clear() {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    if (has_chart_map()) {
+      if (chart_map_ != NULL) chart_map_->::TSCH::Generated::ChartGenericPropertyMapArchive::Clear();
+    }
+    if (has_legend_map()) {
+      if (legend_map_ != NULL) legend_map_->::TSCH::Generated::LegendGenericPropertyMapArchive::Clear();
+    }
+    if (has_axis_map()) {
+      if (axis_map_ != NULL) axis_map_->::TSCH::Generated::ChartAxisGenericPropertyMapArchive::Clear();
+    }
+    if (has_series_map()) {
+      if (series_map_ != NULL) series_map_->::TSCH::Generated::ChartSeriesGenericPropertyMapArchive::Clear();
     }
   }
-  undo_tuples_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandStyleSwapArchive::MergePartialFromCodedStream(
+bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
-      case 1: {
+      // optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_chart_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_undo_tuples;
+        if (input->ExpectTag(26)) goto parse_legend_map;
         break;
       }
 
-      // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
-      case 2: {
+      // optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_tuples:
+         parse_legend_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_undo_tuples()));
+               input, mutable_legend_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_axis_map;
+        break;
+      }
+
+      // optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_axis_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_axis_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_series_map;
+        break;
+      }
+
+      // optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_series_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_series_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_undo_tuples;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -2638,18 +2864,30 @@ bool CommandStyleSwapArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandStyleSwapArchive::SerializeWithCachedSizes(
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
+  // optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+  if (has_chart_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+      2, this->chart_map(), output);
   }
 
-  // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
-  for (int i = 0; i < this->undo_tuples_size(); i++) {
+  // optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+  if (has_legend_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->undo_tuples(i), output);
+      3, this->legend_map(), output);
+  }
+
+  // optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+  if (has_axis_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->axis_map(), output);
+  }
+
+  // optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+  if (has_series_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->series_map(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -2658,20 +2896,34 @@ void CommandStyleSwapArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandStyleSwapArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
+  // optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+  if (has_chart_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+        2, this->chart_map(), target);
   }
 
-  // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
-  for (int i = 0; i < this->undo_tuples_size(); i++) {
+  // optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+  if (has_legend_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->undo_tuples(i), target);
+        3, this->legend_map(), target);
+  }
+
+  // optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+  if (has_axis_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->axis_map(), target);
+  }
+
+  // optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+  if (has_series_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->series_map(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -2681,26 +2933,39 @@ ::google::protobuf::uint8* CommandStyleSwapArchive::SerializeWithCachedSizesToAr
   return target;
 }
 
-int CommandStyleSwapArchive::ByteSize() const {
+int CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
+    // optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+    if (has_chart_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+          this->chart_map());
     }
 
-  }
-  // repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
-  total_size += 1 * this->undo_tuples_size();
-  for (int i = 0; i < this->undo_tuples_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->undo_tuples(i));
-  }
+    // optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+    if (has_legend_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->legend_map());
+    }
+
+    // optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+    if (has_axis_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->axis_map());
+    }
+
+    // optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+    if (has_series_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->series_map());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -2712,10 +2977,10 @@ int CommandStyleSwapArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandStyleSwapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandStyleSwapArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandStyleSwapArchive*>(
+  const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -2724,213 +2989,219 @@ void CommandStyleSwapArchive::MergeFrom(const ::google::protobuf::Message& from)
   }
 }
 
-void CommandStyleSwapArchive::MergeFrom(const CommandStyleSwapArchive& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::MergeFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from) {
   GOOGLE_CHECK_NE(&from, this);
-  undo_tuples_.MergeFrom(from.undo_tuples_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    if (from.has_chart_map()) {
+      mutable_chart_map()->::TSCH::Generated::ChartGenericPropertyMapArchive::MergeFrom(from.chart_map());
+    }
+    if (from.has_legend_map()) {
+      mutable_legend_map()->::TSCH::Generated::LegendGenericPropertyMapArchive::MergeFrom(from.legend_map());
+    }
+    if (from.has_axis_map()) {
+      mutable_axis_map()->::TSCH::Generated::ChartAxisGenericPropertyMapArchive::MergeFrom(from.axis_map());
+    }
+    if (from.has_series_map()) {
+      mutable_series_map()->::TSCH::Generated::ChartSeriesGenericPropertyMapArchive::MergeFrom(from.series_map());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandStyleSwapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandStyleSwapArchive::CopyFrom(const CommandStyleSwapArchive& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::CopyFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandStyleSwapArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_chart_map()) {
+    if (!this->chart_map().IsInitialized()) return false;
   }
-  for (int i = 0; i < undo_tuples_size(); i++) {
-    if (!this->undo_tuples(i).IsInitialized()) return false;
+  if (has_legend_map()) {
+    if (!this->legend_map().IsInitialized()) return false;
+  }
+  if (has_axis_map()) {
+    if (!this->axis_map().IsInitialized()) return false;
+  }
+  if (has_series_map()) {
+    if (!this->series_map().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandStyleSwapArchive::Swap(CommandStyleSwapArchive* other) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::Swap(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    undo_tuples_.Swap(&other->undo_tuples_);
+    std::swap(chart_map_, other->chart_map_);
+    std::swap(legend_map_, other->legend_map_);
+    std::swap(axis_map_, other->axis_map_);
+    std::swap(series_map_, other->series_map_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandStyleSwapArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandStyleSwapArchive_descriptor_;
-  metadata.reflection = CommandStyleSwapArchive_reflection_;
+  metadata.descriptor = CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_descriptor_;
+  metadata.reflection = CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandSetSeriesNameArchive::kSuperFieldNumber;
-const int CommandSetSeriesNameArchive::kSeriesIndexFieldNumber;
-const int CommandSetSeriesNameArchive::kOldNameFieldNumber;
-const int CommandSetSeriesNameArchive::kNewNameFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap::kStyleOwnerTypeFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap::kStyleOwnerIndexFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap::kForwardMapFieldNumber;
+const int CommandMutatePropertiesArchive_GenericPropertyDeltaMap::kReverseMapFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetSeriesNameArchive::CommandSetSeriesNameArchive()
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap::CommandMutatePropertiesArchive_GenericPropertyDeltaMap()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetSeriesNameArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::InitAsDefaultInstance() {
+  forward_map_ = const_cast< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion*>(&::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance());
+  reverse_map_ = const_cast< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion*>(&::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::default_instance());
 }
 
-CommandSetSeriesNameArchive::CommandSetSeriesNameArchive(const CommandSetSeriesNameArchive& from)
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap::CommandMutatePropertiesArchive_GenericPropertyDeltaMap(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetSeriesNameArchive::SharedCtor() {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  seriesindex_ = 0u;
-  oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  style_owner_type_ = 1;
+  style_owner_index_ = 0u;
+  forward_map_ = NULL;
+  reverse_map_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetSeriesNameArchive::~CommandSetSeriesNameArchive() {
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap::~CommandMutatePropertiesArchive_GenericPropertyDeltaMap() {
   SharedDtor();
 }
 
-void CommandSetSeriesNameArchive::SharedDtor() {
-  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-    delete oldname_;
-  }
-  if (newname_ != &::google::protobuf::internal::kEmptyString) {
-    delete newname_;
-  }
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
+    delete forward_map_;
+    delete reverse_map_;
   }
 }
 
-void CommandSetSeriesNameArchive::SetCachedSize(int size) const {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetSeriesNameArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetSeriesNameArchive_descriptor_;
+  return CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_;
 }
 
-const CommandSetSeriesNameArchive& CommandSetSeriesNameArchive::default_instance() {
+const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetSeriesNameArchive* CommandSetSeriesNameArchive::default_instance_ = NULL;
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::default_instance_ = NULL;
 
-CommandSetSeriesNameArchive* CommandSetSeriesNameArchive::New() const {
-  return new CommandSetSeriesNameArchive;
+CommandMutatePropertiesArchive_GenericPropertyDeltaMap* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::New() const {
+  return new CommandMutatePropertiesArchive_GenericPropertyDeltaMap;
 }
 
-void CommandSetSeriesNameArchive::Clear() {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-    }
-    seriesindex_ = 0u;
-    if (has_oldname()) {
-      if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-        oldname_->clear();
-      }
+    style_owner_type_ = 1;
+    style_owner_index_ = 0u;
+    if (has_forward_map()) {
+      if (forward_map_ != NULL) forward_map_->::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::Clear();
     }
-    if (has_newname()) {
-      if (newname_ != &::google::protobuf::internal::kEmptyString) {
-        newname_->clear();
-      }
+    if (has_reverse_map()) {
+      if (reverse_map_ != NULL) reverse_map_->::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetSeriesNameArchive::MergePartialFromCodedStream(
+bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
+      // optional .TSCH.StyleOwnerType style_owner_type = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TSCH::StyleOwnerType_IsValid(value)) {
+            set_style_owner_type(static_cast< ::TSCH::StyleOwnerType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_seriesIndex;
+        if (input->ExpectTag(16)) goto parse_style_owner_index;
         break;
       }
 
-      // required uint32 seriesIndex = 2;
+      // optional uint32 style_owner_index = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_seriesIndex:
+         parse_style_owner_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &seriesindex_)));
-          set_has_seriesindex();
+                 input, &style_owner_index_)));
+          set_has_style_owner_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_oldName;
+        if (input->ExpectTag(26)) goto parse_forward_map;
         break;
       }
 
-      // required string oldName = 3;
+      // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_oldName:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_oldname()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->oldname().data(), this->oldname().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+         parse_forward_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_forward_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_newName;
+        if (input->ExpectTag(34)) goto parse_reverse_map;
         break;
       }
 
-      // required string newName = 4;
+      // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_newName:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_newname()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->newname().data(), this->newname().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+         parse_reverse_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_reverse_map()));
         } else {
           goto handle_uninterpreted;
         }
@@ -2954,35 +3225,29 @@ bool CommandSetSeriesNameArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetSeriesNameArchive::SerializeWithCachedSizes(
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  if (has_style_owner_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->style_owner_type(), output);
   }
 
-  // required uint32 seriesIndex = 2;
-  if (has_seriesindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->seriesindex(), output);
+  // optional uint32 style_owner_index = 2;
+  if (has_style_owner_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->style_owner_index(), output);
   }
 
-  // required string oldName = 3;
-  if (has_oldname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->oldname().data(), this->oldname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->oldname(), output);
+  // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
+  if (has_forward_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->forward_map(), output);
   }
 
-  // required string newName = 4;
-  if (has_newname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->newname().data(), this->newname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->newname(), output);
+  // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
+  if (has_reverse_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->reverse_map(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -2991,38 +3256,31 @@ void CommandSetSeriesNameArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetSeriesNameArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  if (has_style_owner_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->style_owner_type(), target);
   }
 
-  // required uint32 seriesIndex = 2;
-  if (has_seriesindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->seriesindex(), target);
+  // optional uint32 style_owner_index = 2;
+  if (has_style_owner_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->style_owner_index(), target);
   }
 
-  // required string oldName = 3;
-  if (has_oldname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->oldname().data(), this->oldname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->oldname(), target);
+  // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
+  if (has_forward_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->forward_map(), target);
   }
 
-  // required string newName = 4;
-  if (has_newname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->newname().data(), this->newname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->newname(), target);
+  // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
+  if (has_reverse_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->reverse_map(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -3032,36 +3290,35 @@ ::google::protobuf::uint8* CommandSetSeriesNameArchive::SerializeWithCachedSizes
   return target;
 }
 
-int CommandSetSeriesNameArchive::ByteSize() const {
+int CommandMutatePropertiesArchive_GenericPropertyDeltaMap::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
+    // optional .TSCH.StyleOwnerType style_owner_type = 1;
+    if (has_style_owner_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->style_owner_type());
     }
 
-    // required uint32 seriesIndex = 2;
-    if (has_seriesindex()) {
+    // optional uint32 style_owner_index = 2;
+    if (has_style_owner_index()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->seriesindex());
+          this->style_owner_index());
     }
 
-    // required string oldName = 3;
-    if (has_oldname()) {
+    // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
+    if (has_forward_map()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->oldname());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->forward_map());
     }
 
-    // required string newName = 4;
-    if (has_newname()) {
+    // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
+    if (has_reverse_map()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->newname());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->reverse_map());
     }
 
   }
@@ -3076,10 +3333,10 @@ int CommandSetSeriesNameArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetSeriesNameArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetSeriesNameArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSeriesNameArchive*>(
+  const CommandMutatePropertiesArchive_GenericPropertyDeltaMap* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutatePropertiesArchive_GenericPropertyDeltaMap*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -3088,239 +3345,170 @@ void CommandSetSeriesNameArchive::MergeFrom(const ::google::protobuf::Message& f
   }
 }
 
-void CommandSetSeriesNameArchive::MergeFrom(const CommandSetSeriesNameArchive& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::MergeFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    if (from.has_style_owner_type()) {
+      set_style_owner_type(from.style_owner_type());
     }
-    if (from.has_seriesindex()) {
-      set_seriesindex(from.seriesindex());
+    if (from.has_style_owner_index()) {
+      set_style_owner_index(from.style_owner_index());
     }
-    if (from.has_oldname()) {
-      set_oldname(from.oldname());
+    if (from.has_forward_map()) {
+      mutable_forward_map()->::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::MergeFrom(from.forward_map());
     }
-    if (from.has_newname()) {
-      set_newname(from.newname());
+    if (from.has_reverse_map()) {
+      mutable_reverse_map()->::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::MergeFrom(from.reverse_map());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetSeriesNameArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetSeriesNameArchive::CopyFrom(const CommandSetSeriesNameArchive& from) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::CopyFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetSeriesNameArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_forward_map()) {
+    if (!this->forward_map().IsInitialized()) return false;
+  }
+  if (has_reverse_map()) {
+    if (!this->reverse_map().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSetSeriesNameArchive::Swap(CommandSetSeriesNameArchive* other) {
+void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::Swap(CommandMutatePropertiesArchive_GenericPropertyDeltaMap* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(seriesindex_, other->seriesindex_);
-    std::swap(oldname_, other->oldname_);
-    std::swap(newname_, other->newname_);
+    std::swap(style_owner_type_, other->style_owner_type_);
+    std::swap(style_owner_index_, other->style_owner_index_);
+    std::swap(forward_map_, other->forward_map_);
+    std::swap(reverse_map_, other->reverse_map_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetSeriesNameArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMutatePropertiesArchive_GenericPropertyDeltaMap::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetSeriesNameArchive_descriptor_;
-  metadata.reflection = CommandSetSeriesNameArchive_reflection_;
+  metadata.descriptor = CommandMutatePropertiesArchive_GenericPropertyDeltaMap_descriptor_;
+  metadata.reflection = CommandMutatePropertiesArchive_GenericPropertyDeltaMap_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandSetCategoryNameArchive::kSuperFieldNumber;
-const int CommandSetCategoryNameArchive::kCategoryIndexFieldNumber;
-const int CommandSetCategoryNameArchive::kOldNameFieldNumber;
-const int CommandSetCategoryNameArchive::kNewNameFieldNumber;
-const int CommandSetCategoryNameArchive::kIsMultiDataIndexFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::kCharPropertiesFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::kParaPropertiesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetCategoryNameArchive::CommandSetCategoryNameArchive()
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetCategoryNameArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::InitAsDefaultInstance() {
+  char_properties_ = const_cast< ::TSWP::CharacterStylePropertiesArchive*>(&::TSWP::CharacterStylePropertiesArchive::default_instance());
+  para_properties_ = const_cast< ::TSWP::ParagraphStylePropertiesArchive*>(&::TSWP::ParagraphStylePropertiesArchive::default_instance());
 }
 
-CommandSetCategoryNameArchive::CommandSetCategoryNameArchive(const CommandSetCategoryNameArchive& from)
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetCategoryNameArchive::SharedCtor() {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  categoryindex_ = 0u;
-  oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  ismultidataindex_ = false;
+  char_properties_ = NULL;
+  para_properties_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetCategoryNameArchive::~CommandSetCategoryNameArchive() {
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::~CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive() {
   SharedDtor();
 }
 
-void CommandSetCategoryNameArchive::SharedDtor() {
-  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-    delete oldname_;
-  }
-  if (newname_ != &::google::protobuf::internal::kEmptyString) {
-    delete newname_;
-  }
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
+    delete char_properties_;
+    delete para_properties_;
   }
 }
 
-void CommandSetCategoryNameArchive::SetCachedSize(int size) const {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetCategoryNameArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetCategoryNameArchive_descriptor_;
+  return CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_descriptor_;
 }
 
-const CommandSetCategoryNameArchive& CommandSetCategoryNameArchive::default_instance() {
+const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetCategoryNameArchive* CommandSetCategoryNameArchive::default_instance_ = NULL;
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance_ = NULL;
 
-CommandSetCategoryNameArchive* CommandSetCategoryNameArchive::New() const {
-  return new CommandSetCategoryNameArchive;
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::New() const {
+  return new CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive;
 }
 
-void CommandSetCategoryNameArchive::Clear() {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-    }
-    categoryindex_ = 0u;
-    if (has_oldname()) {
-      if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-        oldname_->clear();
-      }
+    if (has_char_properties()) {
+      if (char_properties_ != NULL) char_properties_->::TSWP::CharacterStylePropertiesArchive::Clear();
     }
-    if (has_newname()) {
-      if (newname_ != &::google::protobuf::internal::kEmptyString) {
-        newname_->clear();
-      }
+    if (has_para_properties()) {
+      if (para_properties_ != NULL) para_properties_->::TSWP::ParagraphStylePropertiesArchive::Clear();
     }
-    ismultidataindex_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetCategoryNameArchive::MergePartialFromCodedStream(
+bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
+      // optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_char_properties()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_categoryIndex;
+        if (input->ExpectTag(18)) goto parse_para_properties;
         break;
       }
 
-      // required uint32 categoryIndex = 2;
+      // optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_categoryIndex:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &categoryindex_)));
-          set_has_categoryindex();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_oldName;
-        break;
-      }
-
-      // required string oldName = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_oldName:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_oldname()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->oldname().data(), this->oldname().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_newName;
-        break;
-      }
-
-      // required string newName = 4;
-      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_newName:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_newname()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->newname().data(), this->newname().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_isMultiDataIndex;
-        break;
-      }
-
-      // optional bool isMultiDataIndex = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_isMultiDataIndex:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &ismultidataindex_)));
-          set_has_ismultidataindex();
+         parse_para_properties:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_para_properties()));
         } else {
           goto handle_uninterpreted;
         }
@@ -3344,40 +3532,18 @@ bool CommandSetCategoryNameArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetCategoryNameArchive::SerializeWithCachedSizes(
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
+  // optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
+  if (has_char_properties()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required uint32 categoryIndex = 2;
-  if (has_categoryindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->categoryindex(), output);
-  }
-
-  // required string oldName = 3;
-  if (has_oldname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->oldname().data(), this->oldname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->oldname(), output);
-  }
-
-  // required string newName = 4;
-  if (has_newname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->newname().data(), this->newname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->newname(), output);
+      1, this->char_properties(), output);
   }
 
-  // optional bool isMultiDataIndex = 5;
-  if (has_ismultidataindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->ismultidataindex(), output);
+  // optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
+  if (has_para_properties()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->para_properties(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -3386,43 +3552,20 @@ void CommandSetCategoryNameArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetCategoryNameArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
+  // optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
+  if (has_char_properties()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+        1, this->char_properties(), target);
   }
 
-  // required uint32 categoryIndex = 2;
-  if (has_categoryindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->categoryindex(), target);
-  }
-
-  // required string oldName = 3;
-  if (has_oldname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->oldname().data(), this->oldname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->oldname(), target);
-  }
-
-  // required string newName = 4;
-  if (has_newname()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->newname().data(), this->newname().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->newname(), target);
-  }
-
-  // optional bool isMultiDataIndex = 5;
-  if (has_ismultidataindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->ismultidataindex(), target);
+  // optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
+  if (has_para_properties()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->para_properties(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -3432,41 +3575,22 @@ ::google::protobuf::uint8* CommandSetCategoryNameArchive::SerializeWithCachedSiz
   return target;
 }
 
-int CommandSetCategoryNameArchive::ByteSize() const {
+int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
+    // optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
+    if (has_char_properties()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // required uint32 categoryIndex = 2;
-    if (has_categoryindex()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->categoryindex());
-    }
-
-    // required string oldName = 3;
-    if (has_oldname()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->oldname());
+          this->char_properties());
     }
 
-    // required string newName = 4;
-    if (has_newname()) {
+    // optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
+    if (has_para_properties()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->newname());
-    }
-
-    // optional bool isMultiDataIndex = 5;
-    if (has_ismultidataindex()) {
-      total_size += 1 + 1;
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->para_properties());
     }
 
   }
@@ -3481,10 +3605,10 @@ int CommandSetCategoryNameArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetCategoryNameArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetCategoryNameArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetCategoryNameArchive*>(
+  const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -3493,213 +3617,227 @@ void CommandSetCategoryNameArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandSetCategoryNameArchive::MergeFrom(const CommandSetCategoryNameArchive& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::MergeFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_categoryindex()) {
-      set_categoryindex(from.categoryindex());
-    }
-    if (from.has_oldname()) {
-      set_oldname(from.oldname());
-    }
-    if (from.has_newname()) {
-      set_newname(from.newname());
+    if (from.has_char_properties()) {
+      mutable_char_properties()->::TSWP::CharacterStylePropertiesArchive::MergeFrom(from.char_properties());
     }
-    if (from.has_ismultidataindex()) {
-      set_ismultidataindex(from.ismultidataindex());
+    if (from.has_para_properties()) {
+      mutable_para_properties()->::TSWP::ParagraphStylePropertiesArchive::MergeFrom(from.para_properties());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetCategoryNameArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetCategoryNameArchive::CopyFrom(const CommandSetCategoryNameArchive& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::CopyFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetCategoryNameArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_char_properties()) {
+    if (!this->char_properties().IsInitialized()) return false;
+  }
+  if (has_para_properties()) {
+    if (!this->para_properties().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSetCategoryNameArchive::Swap(CommandSetCategoryNameArchive* other) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::Swap(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(categoryindex_, other->categoryindex_);
-    std::swap(oldname_, other->oldname_);
-    std::swap(newname_, other->newname_);
-    std::swap(ismultidataindex_, other->ismultidataindex_);
+    std::swap(char_properties_, other->char_properties_);
+    std::swap(para_properties_, other->para_properties_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetCategoryNameArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetCategoryNameArchive_descriptor_;
-  metadata.reflection = CommandSetCategoryNameArchive_reflection_;
+  metadata.descriptor = CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_descriptor_;
+  metadata.reflection = CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandAddGridRowsArchive::kSuperFieldNumber;
-const int CommandAddGridRowsArchive::kLocationFieldNumber;
-const int CommandAddGridRowsArchive::kLengthFieldNumber;
-const int CommandAddGridRowsArchive::kNameFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::kStyleOwnerTypeFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::kStyleOwnerIndexFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::kParagraphStyleIndexPropertyFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::kForwardMapFieldNumber;
+const int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::kReverseMapFieldNumber;
 #endif  // !_MSC_VER
 
-CommandAddGridRowsArchive::CommandAddGridRowsArchive()
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandAddGridRowsArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::InitAsDefaultInstance() {
+  forward_map_ = const_cast< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive*>(&::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance());
+  reverse_map_ = const_cast< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive*>(&::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::default_instance());
 }
 
-CommandAddGridRowsArchive::CommandAddGridRowsArchive(const CommandAddGridRowsArchive& from)
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandAddGridRowsArchive::SharedCtor() {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  location_ = 0u;
-  length_ = 0u;
+  style_owner_type_ = 1;
+  style_owner_index_ = 0u;
+  paragraph_style_index_property_ = 0u;
+  forward_map_ = NULL;
+  reverse_map_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandAddGridRowsArchive::~CommandAddGridRowsArchive() {
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::~CommandMutatePropertiesArchive_ParagraphStyleDeltaMap() {
   SharedDtor();
 }
 
-void CommandAddGridRowsArchive::SharedDtor() {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
+    delete forward_map_;
+    delete reverse_map_;
   }
 }
 
-void CommandAddGridRowsArchive::SetCachedSize(int size) const {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandAddGridRowsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandAddGridRowsArchive_descriptor_;
+  return CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_;
 }
 
-const CommandAddGridRowsArchive& CommandAddGridRowsArchive::default_instance() {
+const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandAddGridRowsArchive* CommandAddGridRowsArchive::default_instance_ = NULL;
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::default_instance_ = NULL;
 
-CommandAddGridRowsArchive* CommandAddGridRowsArchive::New() const {
-  return new CommandAddGridRowsArchive;
+CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::New() const {
+  return new CommandMutatePropertiesArchive_ParagraphStyleDeltaMap;
 }
 
-void CommandAddGridRowsArchive::Clear() {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    style_owner_type_ = 1;
+    style_owner_index_ = 0u;
+    paragraph_style_index_property_ = 0u;
+    if (has_forward_map()) {
+      if (forward_map_ != NULL) forward_map_->::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::Clear();
+    }
+    if (has_reverse_map()) {
+      if (reverse_map_ != NULL) reverse_map_->::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::Clear();
     }
-    location_ = 0u;
-    length_ = 0u;
   }
-  name_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandAddGridRowsArchive::MergePartialFromCodedStream(
+bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
+      // optional .TSCH.StyleOwnerType style_owner_type = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TSCH::StyleOwnerType_IsValid(value)) {
+            set_style_owner_type(static_cast< ::TSCH::StyleOwnerType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_location;
+        if (input->ExpectTag(16)) goto parse_style_owner_index;
         break;
       }
 
-      // required uint32 location = 2;
+      // optional uint32 style_owner_index = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_location:
+         parse_style_owner_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &location_)));
-          set_has_location();
+                 input, &style_owner_index_)));
+          set_has_style_owner_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_length;
+        if (input->ExpectTag(24)) goto parse_paragraph_style_index_property;
         break;
       }
 
-      // optional uint32 length = 3;
+      // optional uint32 paragraph_style_index_property = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_length:
+         parse_paragraph_style_index_property:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &length_)));
-          set_has_length();
+                 input, &paragraph_style_index_property_)));
+          set_has_paragraph_style_index_property();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_name;
+        if (input->ExpectTag(34)) goto parse_forward_map;
         break;
       }
 
-      // repeated string name = 4;
+      // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_name:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->name(this->name_size() - 1).data(),
-            this->name(this->name_size() - 1).length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+         parse_forward_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_forward_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_reverse_map;
+        break;
+      }
+
+      // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_reverse_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_reverse_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_name;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -3720,31 +3858,34 @@ bool CommandAddGridRowsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandAddGridRowsArchive::SerializeWithCachedSizes(
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  if (has_style_owner_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->style_owner_type(), output);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
+  // optional uint32 style_owner_index = 2;
+  if (has_style_owner_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->style_owner_index(), output);
   }
 
-  // optional uint32 length = 3;
-  if (has_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  // optional uint32 paragraph_style_index_property = 3;
+  if (has_paragraph_style_index_property()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->paragraph_style_index_property(), output);
   }
 
-  // repeated string name = 4;
-  for (int i = 0; i < this->name_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->name(i).data(), this->name(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->name(i), output);
+  // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
+  if (has_forward_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->forward_map(), output);
+  }
+
+  // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+  if (has_reverse_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->reverse_map(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -3753,32 +3894,36 @@ void CommandAddGridRowsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandAddGridRowsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  if (has_style_owner_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->style_owner_type(), target);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
+  // optional uint32 style_owner_index = 2;
+  if (has_style_owner_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->style_owner_index(), target);
   }
 
-  // optional uint32 length = 3;
-  if (has_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  // optional uint32 paragraph_style_index_property = 3;
+  if (has_paragraph_style_index_property()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->paragraph_style_index_property(), target);
   }
 
-  // repeated string name = 4;
-  for (int i = 0; i < this->name_size(); i++) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name(i).data(), this->name(i).length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
+  if (has_forward_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(4, this->name(i), target);
+      WriteMessageNoVirtualToArray(
+        4, this->forward_map(), target);
+  }
+
+  // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+  if (has_reverse_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->reverse_map(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -3788,39 +3933,45 @@ ::google::protobuf::uint8* CommandAddGridRowsArchive::SerializeWithCachedSizesTo
   return target;
 }
 
-int CommandAddGridRowsArchive::ByteSize() const {
+int CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
+    // optional .TSCH.StyleOwnerType style_owner_type = 1;
+    if (has_style_owner_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->style_owner_type());
     }
 
-    // required uint32 location = 2;
-    if (has_location()) {
+    // optional uint32 style_owner_index = 2;
+    if (has_style_owner_index()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->location());
+          this->style_owner_index());
     }
 
-    // optional uint32 length = 3;
-    if (has_length()) {
+    // optional uint32 paragraph_style_index_property = 3;
+    if (has_paragraph_style_index_property()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->length());
+          this->paragraph_style_index_property());
     }
 
-  }
-  // repeated string name = 4;
-  total_size += 1 * this->name_size();
-  for (int i = 0; i < this->name_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->name(i));
-  }
+    // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
+    if (has_forward_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->forward_map());
+    }
+
+    // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+    if (has_reverse_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->reverse_map());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -3832,10 +3983,10 @@ int CommandAddGridRowsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandAddGridRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandAddGridRowsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandAddGridRowsArchive*>(
+  const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -3844,142 +3995,153 @@ void CommandAddGridRowsArchive::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void CommandAddGridRowsArchive::MergeFrom(const CommandAddGridRowsArchive& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::MergeFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from) {
   GOOGLE_CHECK_NE(&from, this);
-  name_.MergeFrom(from.name_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    if (from.has_style_owner_type()) {
+      set_style_owner_type(from.style_owner_type());
     }
-    if (from.has_location()) {
-      set_location(from.location());
+    if (from.has_style_owner_index()) {
+      set_style_owner_index(from.style_owner_index());
     }
-    if (from.has_length()) {
-      set_length(from.length());
+    if (from.has_paragraph_style_index_property()) {
+      set_paragraph_style_index_property(from.paragraph_style_index_property());
+    }
+    if (from.has_forward_map()) {
+      mutable_forward_map()->::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::MergeFrom(from.forward_map());
+    }
+    if (from.has_reverse_map()) {
+      mutable_reverse_map()->::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::MergeFrom(from.reverse_map());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandAddGridRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandAddGridRowsArchive::CopyFrom(const CommandAddGridRowsArchive& from) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::CopyFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandAddGridRowsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_forward_map()) {
+    if (!this->forward_map().IsInitialized()) return false;
+  }
+  if (has_reverse_map()) {
+    if (!this->reverse_map().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandAddGridRowsArchive::Swap(CommandAddGridRowsArchive* other) {
+void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::Swap(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(location_, other->location_);
-    std::swap(length_, other->length_);
-    name_.Swap(&other->name_);
+    std::swap(style_owner_type_, other->style_owner_type_);
+    std::swap(style_owner_index_, other->style_owner_index_);
+    std::swap(paragraph_style_index_property_, other->paragraph_style_index_property_);
+    std::swap(forward_map_, other->forward_map_);
+    std::swap(reverse_map_, other->reverse_map_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandAddGridRowsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandAddGridRowsArchive_descriptor_;
-  metadata.reflection = CommandAddGridRowsArchive_reflection_;
+  metadata.descriptor = CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_descriptor_;
+  metadata.reflection = CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandAddGridColumnsArchive::kSuperFieldNumber;
-const int CommandAddGridColumnsArchive::kLocationFieldNumber;
-const int CommandAddGridColumnsArchive::kLengthFieldNumber;
-const int CommandAddGridColumnsArchive::kNameFieldNumber;
+const int CommandMutatePropertiesArchive::kSuperFieldNumber;
+const int CommandMutatePropertiesArchive::kRollbackCmdFieldNumber;
+const int CommandMutatePropertiesArchive::kGenericPropertyDeltaMapsFieldNumber;
+const int CommandMutatePropertiesArchive::kParagraphStyleDeltaMapsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandAddGridColumnsArchive::CommandAddGridColumnsArchive()
+CommandMutatePropertiesArchive::CommandMutatePropertiesArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandAddGridColumnsArchive::InitAsDefaultInstance() {
+void CommandMutatePropertiesArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  rollback_cmd_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandAddGridColumnsArchive::CommandAddGridColumnsArchive(const CommandAddGridColumnsArchive& from)
+CommandMutatePropertiesArchive::CommandMutatePropertiesArchive(const CommandMutatePropertiesArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandAddGridColumnsArchive::SharedCtor() {
+void CommandMutatePropertiesArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  location_ = 0u;
-  length_ = 0u;
+  rollback_cmd_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandAddGridColumnsArchive::~CommandAddGridColumnsArchive() {
+CommandMutatePropertiesArchive::~CommandMutatePropertiesArchive() {
   SharedDtor();
 }
 
-void CommandAddGridColumnsArchive::SharedDtor() {
+void CommandMutatePropertiesArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete rollback_cmd_;
   }
 }
 
-void CommandAddGridColumnsArchive::SetCachedSize(int size) const {
+void CommandMutatePropertiesArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandAddGridColumnsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMutatePropertiesArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandAddGridColumnsArchive_descriptor_;
+  return CommandMutatePropertiesArchive_descriptor_;
 }
 
-const CommandAddGridColumnsArchive& CommandAddGridColumnsArchive::default_instance() {
+const CommandMutatePropertiesArchive& CommandMutatePropertiesArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandAddGridColumnsArchive* CommandAddGridColumnsArchive::default_instance_ = NULL;
+CommandMutatePropertiesArchive* CommandMutatePropertiesArchive::default_instance_ = NULL;
 
-CommandAddGridColumnsArchive* CommandAddGridColumnsArchive::New() const {
-  return new CommandAddGridColumnsArchive;
+CommandMutatePropertiesArchive* CommandMutatePropertiesArchive::New() const {
+  return new CommandMutatePropertiesArchive;
 }
 
-void CommandAddGridColumnsArchive::Clear() {
+void CommandMutatePropertiesArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    location_ = 0u;
-    length_ = 0u;
+    if (has_rollback_cmd()) {
+      if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+    }
   }
-  name_.Clear();
+  generic_property_delta_maps_.Clear();
+  paragraph_style_delta_maps_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandAddGridColumnsArchive::MergePartialFromCodedStream(
+bool CommandMutatePropertiesArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -3994,57 +4156,50 @@ bool CommandAddGridColumnsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_location;
+        if (input->ExpectTag(18)) goto parse_rollback_cmd;
         break;
       }
 
-      // required uint32 location = 2;
+      // optional .TSP.Reference rollback_cmd = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_location:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &location_)));
-          set_has_location();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rollback_cmd:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rollback_cmd()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_length;
+        if (input->ExpectTag(26)) goto parse_generic_property_delta_maps;
         break;
       }
 
-      // optional uint32 length = 3;
+      // repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_length:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &length_)));
-          set_has_length();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_generic_property_delta_maps:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_generic_property_delta_maps()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_name;
+        if (input->ExpectTag(26)) goto parse_generic_property_delta_maps;
+        if (input->ExpectTag(34)) goto parse_paragraph_style_delta_maps;
         break;
       }
 
-      // repeated string name = 4;
+      // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_name:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->name(this->name_size() - 1).data(),
-            this->name(this->name_size() - 1).length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+         parse_paragraph_style_delta_maps:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_paragraph_style_delta_maps()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_name;
+        if (input->ExpectTag(34)) goto parse_paragraph_style_delta_maps;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -4065,7 +4220,7 @@ bool CommandAddGridColumnsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandAddGridColumnsArchive::SerializeWithCachedSizes(
+void CommandMutatePropertiesArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -4073,23 +4228,22 @@ void CommandAddGridColumnsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->rollback_cmd(), output);
   }
 
-  // optional uint32 length = 3;
-  if (has_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  // repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
+  for (int i = 0; i < this->generic_property_delta_maps_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->generic_property_delta_maps(i), output);
   }
 
-  // repeated string name = 4;
-  for (int i = 0; i < this->name_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->name(i).data(), this->name(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->name(i), output);
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
+  for (int i = 0; i < this->paragraph_style_delta_maps_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->paragraph_style_delta_maps(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -4098,7 +4252,7 @@ void CommandAddGridColumnsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandAddGridColumnsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMutatePropertiesArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -4107,23 +4261,25 @@ ::google::protobuf::uint8* CommandAddGridColumnsArchive::SerializeWithCachedSize
         1, this->super(), target);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->rollback_cmd(), target);
   }
 
-  // optional uint32 length = 3;
-  if (has_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  // repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
+  for (int i = 0; i < this->generic_property_delta_maps_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->generic_property_delta_maps(i), target);
   }
 
-  // repeated string name = 4;
-  for (int i = 0; i < this->name_size(); i++) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->name(i).data(), this->name(i).length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
+  for (int i = 0; i < this->paragraph_style_delta_maps_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(4, this->name(i), target);
+      WriteMessageNoVirtualToArray(
+        4, this->paragraph_style_delta_maps(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -4133,7 +4289,7 @@ ::google::protobuf::uint8* CommandAddGridColumnsArchive::SerializeWithCachedSize
   return target;
 }
 
-int CommandAddGridColumnsArchive::ByteSize() const {
+int CommandMutatePropertiesArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -4144,26 +4300,28 @@ int CommandAddGridColumnsArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 location = 2;
-    if (has_location()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->location());
-    }
-
-    // optional uint32 length = 3;
-    if (has_length()) {
+    // optional .TSP.Reference rollback_cmd = 2;
+    if (has_rollback_cmd()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->length());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->rollback_cmd());
     }
 
   }
-  // repeated string name = 4;
-  total_size += 1 * this->name_size();
-  for (int i = 0; i < this->name_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->name(i));
+  // repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
+  total_size += 1 * this->generic_property_delta_maps_size();
+  for (int i = 0; i < this->generic_property_delta_maps_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->generic_property_delta_maps(i));
+  }
+
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
+  total_size += 1 * this->paragraph_style_delta_maps_size();
+  for (int i = 0; i < this->paragraph_style_delta_maps_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->paragraph_style_delta_maps(i));
   }
 
   if (!unknown_fields().empty()) {
@@ -4177,10 +4335,10 @@ int CommandAddGridColumnsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandAddGridColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandAddGridColumnsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandAddGridColumnsArchive*>(
+  const CommandMutatePropertiesArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutatePropertiesArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -4189,61 +4347,68 @@ void CommandAddGridColumnsArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandAddGridColumnsArchive::MergeFrom(const CommandAddGridColumnsArchive& from) {
+void CommandMutatePropertiesArchive::MergeFrom(const CommandMutatePropertiesArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  name_.MergeFrom(from.name_);
+  generic_property_delta_maps_.MergeFrom(from.generic_property_delta_maps_);
+  paragraph_style_delta_maps_.MergeFrom(from.paragraph_style_delta_maps_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_location()) {
-      set_location(from.location());
-    }
-    if (from.has_length()) {
-      set_length(from.length());
+    if (from.has_rollback_cmd()) {
+      mutable_rollback_cmd()->::TSP::Reference::MergeFrom(from.rollback_cmd());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandAddGridColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMutatePropertiesArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandAddGridColumnsArchive::CopyFrom(const CommandAddGridColumnsArchive& from) {
+void CommandMutatePropertiesArchive::CopyFrom(const CommandMutatePropertiesArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandAddGridColumnsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandMutatePropertiesArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_rollback_cmd()) {
+    if (!this->rollback_cmd().IsInitialized()) return false;
+  }
+  for (int i = 0; i < generic_property_delta_maps_size(); i++) {
+    if (!this->generic_property_delta_maps(i).IsInitialized()) return false;
+  }
+  for (int i = 0; i < paragraph_style_delta_maps_size(); i++) {
+    if (!this->paragraph_style_delta_maps(i).IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandAddGridColumnsArchive::Swap(CommandAddGridColumnsArchive* other) {
+void CommandMutatePropertiesArchive::Swap(CommandMutatePropertiesArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(location_, other->location_);
-    std::swap(length_, other->length_);
-    name_.Swap(&other->name_);
+    std::swap(rollback_cmd_, other->rollback_cmd_);
+    generic_property_delta_maps_.Swap(&other->generic_property_delta_maps_);
+    paragraph_style_delta_maps_.Swap(&other->paragraph_style_delta_maps_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandAddGridColumnsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMutatePropertiesArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandAddGridColumnsArchive_descriptor_;
-  metadata.reflection = CommandAddGridColumnsArchive_reflection_;
+  metadata.descriptor = CommandMutatePropertiesArchive_descriptor_;
+  metadata.reflection = CommandMutatePropertiesArchive_reflection_;
   return metadata;
 }
 
@@ -4251,81 +4416,82 @@ ::google::protobuf::Metadata CommandAddGridColumnsArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandMoveGridRowsArchive::kSuperFieldNumber;
-const int CommandMoveGridRowsArchive::kLocationFieldNumber;
-const int CommandMoveGridRowsArchive::kLengthFieldNumber;
-const int CommandMoveGridRowsArchive::kAfterrowFieldNumber;
+const int CommandScaleAllTextArchive::kSuperFieldNumber;
+const int CommandScaleAllTextArchive::kRollbackCmdFieldNumber;
+const int CommandScaleAllTextArchive::kScaleFactorFieldNumber;
 #endif  // !_MSC_VER
 
-CommandMoveGridRowsArchive::CommandMoveGridRowsArchive()
+CommandScaleAllTextArchive::CommandScaleAllTextArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandMoveGridRowsArchive::InitAsDefaultInstance() {
+void CommandScaleAllTextArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  rollback_cmd_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandMoveGridRowsArchive::CommandMoveGridRowsArchive(const CommandMoveGridRowsArchive& from)
+CommandScaleAllTextArchive::CommandScaleAllTextArchive(const CommandScaleAllTextArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandMoveGridRowsArchive::SharedCtor() {
+void CommandScaleAllTextArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  location_ = 0u;
-  length_ = 0u;
-  afterrow_ = 0;
+  rollback_cmd_ = NULL;
+  scale_factor_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandMoveGridRowsArchive::~CommandMoveGridRowsArchive() {
+CommandScaleAllTextArchive::~CommandScaleAllTextArchive() {
   SharedDtor();
 }
 
-void CommandMoveGridRowsArchive::SharedDtor() {
+void CommandScaleAllTextArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete rollback_cmd_;
   }
 }
 
-void CommandMoveGridRowsArchive::SetCachedSize(int size) const {
+void CommandScaleAllTextArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandMoveGridRowsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandScaleAllTextArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandMoveGridRowsArchive_descriptor_;
+  return CommandScaleAllTextArchive_descriptor_;
 }
 
-const CommandMoveGridRowsArchive& CommandMoveGridRowsArchive::default_instance() {
+const CommandScaleAllTextArchive& CommandScaleAllTextArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandMoveGridRowsArchive* CommandMoveGridRowsArchive::default_instance_ = NULL;
+CommandScaleAllTextArchive* CommandScaleAllTextArchive::default_instance_ = NULL;
 
-CommandMoveGridRowsArchive* CommandMoveGridRowsArchive::New() const {
-  return new CommandMoveGridRowsArchive;
+CommandScaleAllTextArchive* CommandScaleAllTextArchive::New() const {
+  return new CommandScaleAllTextArchive;
 }
 
-void CommandMoveGridRowsArchive::Clear() {
+void CommandScaleAllTextArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    location_ = 0u;
-    length_ = 0u;
-    afterrow_ = 0;
+    if (has_rollback_cmd()) {
+      if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+    }
+    scale_factor_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandMoveGridRowsArchive::MergePartialFromCodedStream(
+bool CommandScaleAllTextArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -4340,51 +4506,33 @@ bool CommandMoveGridRowsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_location;
+        if (input->ExpectTag(18)) goto parse_rollback_cmd;
         break;
       }
 
-      // required uint32 location = 2;
+      // optional .TSP.Reference rollback_cmd = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_location:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &location_)));
-          set_has_location();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rollback_cmd:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rollback_cmd()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_length;
+        if (input->ExpectTag(25)) goto parse_scale_factor;
         break;
       }
 
-      // required uint32 length = 3;
+      // optional double scale_factor = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_length:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &length_)));
-          set_has_length();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_afterrow;
-        break;
-      }
-
-      // required int32 afterrow = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_afterrow:
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_scale_factor:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &afterrow_)));
-          set_has_afterrow();
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &scale_factor_)));
+          set_has_scale_factor();
         } else {
           goto handle_uninterpreted;
         }
@@ -4408,7 +4556,7 @@ bool CommandMoveGridRowsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandMoveGridRowsArchive::SerializeWithCachedSizes(
+void CommandScaleAllTextArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -4416,19 +4564,15 @@ void CommandMoveGridRowsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
-  }
-
-  // required uint32 length = 3;
-  if (has_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->rollback_cmd(), output);
   }
 
-  // required int32 afterrow = 4;
-  if (has_afterrow()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->afterrow(), output);
+  // optional double scale_factor = 3;
+  if (has_scale_factor()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->scale_factor(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -4437,7 +4581,7 @@ void CommandMoveGridRowsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandMoveGridRowsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandScaleAllTextArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -4446,19 +4590,16 @@ ::google::protobuf::uint8* CommandMoveGridRowsArchive::SerializeWithCachedSizesT
         1, this->super(), target);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
-  }
-
-  // required uint32 length = 3;
-  if (has_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->rollback_cmd(), target);
   }
 
-  // required int32 afterrow = 4;
-  if (has_afterrow()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->afterrow(), target);
+  // optional double scale_factor = 3;
+  if (has_scale_factor()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(3, this->scale_factor(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -4468,7 +4609,7 @@ ::google::protobuf::uint8* CommandMoveGridRowsArchive::SerializeWithCachedSizesT
   return target;
 }
 
-int CommandMoveGridRowsArchive::ByteSize() const {
+int CommandScaleAllTextArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -4479,25 +4620,16 @@ int CommandMoveGridRowsArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 location = 2;
-    if (has_location()) {
+    // optional .TSP.Reference rollback_cmd = 2;
+    if (has_rollback_cmd()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->location());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->rollback_cmd());
     }
 
-    // required uint32 length = 3;
-    if (has_length()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->length());
-    }
-
-    // required int32 afterrow = 4;
-    if (has_afterrow()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->afterrow());
+    // optional double scale_factor = 3;
+    if (has_scale_factor()) {
+      total_size += 1 + 8;
     }
 
   }
@@ -4512,10 +4644,10 @@ int CommandMoveGridRowsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandMoveGridRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandScaleAllTextArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandMoveGridRowsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveGridRowsArchive*>(
+  const CommandScaleAllTextArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandScaleAllTextArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -4524,63 +4656,62 @@ void CommandMoveGridRowsArchive::MergeFrom(const ::google::protobuf::Message& fr
   }
 }
 
-void CommandMoveGridRowsArchive::MergeFrom(const CommandMoveGridRowsArchive& from) {
+void CommandScaleAllTextArchive::MergeFrom(const CommandScaleAllTextArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_location()) {
-      set_location(from.location());
-    }
-    if (from.has_length()) {
-      set_length(from.length());
+    if (from.has_rollback_cmd()) {
+      mutable_rollback_cmd()->::TSP::Reference::MergeFrom(from.rollback_cmd());
     }
-    if (from.has_afterrow()) {
-      set_afterrow(from.afterrow());
+    if (from.has_scale_factor()) {
+      set_scale_factor(from.scale_factor());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandMoveGridRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandScaleAllTextArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandMoveGridRowsArchive::CopyFrom(const CommandMoveGridRowsArchive& from) {
+void CommandScaleAllTextArchive::CopyFrom(const CommandScaleAllTextArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandMoveGridRowsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandScaleAllTextArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_rollback_cmd()) {
+    if (!this->rollback_cmd().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandMoveGridRowsArchive::Swap(CommandMoveGridRowsArchive* other) {
+void CommandScaleAllTextArchive::Swap(CommandScaleAllTextArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(location_, other->location_);
-    std::swap(length_, other->length_);
-    std::swap(afterrow_, other->afterrow_);
+    std::swap(rollback_cmd_, other->rollback_cmd_);
+    std::swap(scale_factor_, other->scale_factor_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandMoveGridRowsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandScaleAllTextArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandMoveGridRowsArchive_descriptor_;
-  metadata.reflection = CommandMoveGridRowsArchive_reflection_;
+  metadata.descriptor = CommandScaleAllTextArchive_descriptor_;
+  metadata.reflection = CommandScaleAllTextArchive_reflection_;
   return metadata;
 }
 
@@ -4588,81 +4719,101 @@ ::google::protobuf::Metadata CommandMoveGridRowsArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandMoveGridColumnsArchive::kSuperFieldNumber;
-const int CommandMoveGridColumnsArchive::kLocationFieldNumber;
-const int CommandMoveGridColumnsArchive::kLengthFieldNumber;
-const int CommandMoveGridColumnsArchive::kAftercolumnFieldNumber;
+const int CommandSetFontFamilyArchive::kSuperFieldNumber;
+const int CommandSetFontFamilyArchive::kRollbackCmdFieldNumber;
+const int CommandSetFontFamilyArchive::kNewFontFamilyFieldNumber;
+const int CommandSetFontFamilyArchive::kOldFontFamilyFieldNumber;
+const int CommandSetFontFamilyArchive::kParagraphStyleDeltaMapsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandMoveGridColumnsArchive::CommandMoveGridColumnsArchive()
+CommandSetFontFamilyArchive::CommandSetFontFamilyArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandMoveGridColumnsArchive::InitAsDefaultInstance() {
+void CommandSetFontFamilyArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  rollback_cmd_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandMoveGridColumnsArchive::CommandMoveGridColumnsArchive(const CommandMoveGridColumnsArchive& from)
+CommandSetFontFamilyArchive::CommandSetFontFamilyArchive(const CommandSetFontFamilyArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandMoveGridColumnsArchive::SharedCtor() {
+void CommandSetFontFamilyArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  location_ = 0u;
-  length_ = 0u;
-  aftercolumn_ = 0;
+  rollback_cmd_ = NULL;
+  new_font_family_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  old_font_family_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandMoveGridColumnsArchive::~CommandMoveGridColumnsArchive() {
+CommandSetFontFamilyArchive::~CommandSetFontFamilyArchive() {
   SharedDtor();
 }
 
-void CommandMoveGridColumnsArchive::SharedDtor() {
+void CommandSetFontFamilyArchive::SharedDtor() {
+  if (new_font_family_ != &::google::protobuf::internal::kEmptyString) {
+    delete new_font_family_;
+  }
+  if (old_font_family_ != &::google::protobuf::internal::kEmptyString) {
+    delete old_font_family_;
+  }
   if (this != default_instance_) {
     delete super_;
+    delete rollback_cmd_;
   }
 }
 
-void CommandMoveGridColumnsArchive::SetCachedSize(int size) const {
+void CommandSetFontFamilyArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandMoveGridColumnsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetFontFamilyArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandMoveGridColumnsArchive_descriptor_;
+  return CommandSetFontFamilyArchive_descriptor_;
 }
 
-const CommandMoveGridColumnsArchive& CommandMoveGridColumnsArchive::default_instance() {
+const CommandSetFontFamilyArchive& CommandSetFontFamilyArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandMoveGridColumnsArchive* CommandMoveGridColumnsArchive::default_instance_ = NULL;
+CommandSetFontFamilyArchive* CommandSetFontFamilyArchive::default_instance_ = NULL;
 
-CommandMoveGridColumnsArchive* CommandMoveGridColumnsArchive::New() const {
-  return new CommandMoveGridColumnsArchive;
+CommandSetFontFamilyArchive* CommandSetFontFamilyArchive::New() const {
+  return new CommandSetFontFamilyArchive;
 }
 
-void CommandMoveGridColumnsArchive::Clear() {
+void CommandSetFontFamilyArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    location_ = 0u;
-    length_ = 0u;
-    aftercolumn_ = 0;
+    if (has_rollback_cmd()) {
+      if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+    }
+    if (has_new_font_family()) {
+      if (new_font_family_ != &::google::protobuf::internal::kEmptyString) {
+        new_font_family_->clear();
+      }
+    }
+    if (has_old_font_family()) {
+      if (old_font_family_ != &::google::protobuf::internal::kEmptyString) {
+        old_font_family_->clear();
+      }
+    }
   }
+  paragraph_style_delta_maps_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandMoveGridColumnsArchive::MergePartialFromCodedStream(
+bool CommandSetFontFamilyArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -4677,54 +4828,69 @@ bool CommandMoveGridColumnsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_location;
+        if (input->ExpectTag(18)) goto parse_rollback_cmd;
         break;
       }
 
-      // required uint32 location = 2;
+      // optional .TSP.Reference rollback_cmd = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_location:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &location_)));
-          set_has_location();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rollback_cmd:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rollback_cmd()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_length;
+        if (input->ExpectTag(26)) goto parse_new_font_family;
         break;
       }
 
-      // required uint32 length = 3;
+      // optional string new_font_family = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_length:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &length_)));
-          set_has_length();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_font_family:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_new_font_family()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->new_font_family().data(), this->new_font_family().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(32)) goto parse_aftercolumn;
+        if (input->ExpectTag(34)) goto parse_old_font_family;
         break;
       }
 
-      // required int32 aftercolumn = 4;
+      // optional string old_font_family = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_aftercolumn:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &aftercolumn_)));
-          set_has_aftercolumn();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_font_family:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_old_font_family()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->old_font_family().data(), this->old_font_family().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(42)) goto parse_paragraph_style_delta_maps;
+        break;
+      }
+
+      // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_paragraph_style_delta_maps:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_paragraph_style_delta_maps()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_paragraph_style_delta_maps;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -4745,7 +4911,7 @@ bool CommandMoveGridColumnsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandMoveGridColumnsArchive::SerializeWithCachedSizes(
+void CommandSetFontFamilyArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -4753,19 +4919,34 @@ void CommandMoveGridColumnsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->rollback_cmd(), output);
   }
 
-  // required uint32 length = 3;
-  if (has_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  // optional string new_font_family = 3;
+  if (has_new_font_family()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->new_font_family().data(), this->new_font_family().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->new_font_family(), output);
   }
 
-  // required int32 aftercolumn = 4;
-  if (has_aftercolumn()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->aftercolumn(), output);
+  // optional string old_font_family = 4;
+  if (has_old_font_family()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->old_font_family().data(), this->old_font_family().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->old_font_family(), output);
+  }
+
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+  for (int i = 0; i < this->paragraph_style_delta_maps_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->paragraph_style_delta_maps(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -4774,7 +4955,7 @@ void CommandMoveGridColumnsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandMoveGridColumnsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetFontFamilyArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -4783,19 +4964,38 @@ ::google::protobuf::uint8* CommandMoveGridColumnsArchive::SerializeWithCachedSiz
         1, this->super(), target);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->rollback_cmd(), target);
   }
 
-  // required uint32 length = 3;
-  if (has_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  // optional string new_font_family = 3;
+  if (has_new_font_family()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->new_font_family().data(), this->new_font_family().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->new_font_family(), target);
   }
 
-  // required int32 aftercolumn = 4;
-  if (has_aftercolumn()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->aftercolumn(), target);
+  // optional string old_font_family = 4;
+  if (has_old_font_family()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->old_font_family().data(), this->old_font_family().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->old_font_family(), target);
+  }
+
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+  for (int i = 0; i < this->paragraph_style_delta_maps_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->paragraph_style_delta_maps(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -4805,7 +5005,7 @@ ::google::protobuf::uint8* CommandMoveGridColumnsArchive::SerializeWithCachedSiz
   return target;
 }
 
-int CommandMoveGridColumnsArchive::ByteSize() const {
+int CommandSetFontFamilyArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -4816,28 +5016,36 @@ int CommandMoveGridColumnsArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 location = 2;
-    if (has_location()) {
+    // optional .TSP.Reference rollback_cmd = 2;
+    if (has_rollback_cmd()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->location());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->rollback_cmd());
     }
 
-    // required uint32 length = 3;
-    if (has_length()) {
+    // optional string new_font_family = 3;
+    if (has_new_font_family()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->length());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->new_font_family());
     }
 
-    // required int32 aftercolumn = 4;
-    if (has_aftercolumn()) {
+    // optional string old_font_family = 4;
+    if (has_old_font_family()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->aftercolumn());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->old_font_family());
     }
 
   }
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+  total_size += 1 * this->paragraph_style_delta_maps_size();
+  for (int i = 0; i < this->paragraph_style_delta_maps_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->paragraph_style_delta_maps(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -4849,10 +5057,10 @@ int CommandMoveGridColumnsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandMoveGridColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetFontFamilyArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandMoveGridColumnsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveGridColumnsArchive*>(
+  const CommandSetFontFamilyArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFontFamilyArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -4861,63 +5069,71 @@ void CommandMoveGridColumnsArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandMoveGridColumnsArchive::MergeFrom(const CommandMoveGridColumnsArchive& from) {
+void CommandSetFontFamilyArchive::MergeFrom(const CommandSetFontFamilyArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  paragraph_style_delta_maps_.MergeFrom(from.paragraph_style_delta_maps_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_location()) {
-      set_location(from.location());
+    if (from.has_rollback_cmd()) {
+      mutable_rollback_cmd()->::TSP::Reference::MergeFrom(from.rollback_cmd());
     }
-    if (from.has_length()) {
-      set_length(from.length());
+    if (from.has_new_font_family()) {
+      set_new_font_family(from.new_font_family());
     }
-    if (from.has_aftercolumn()) {
-      set_aftercolumn(from.aftercolumn());
+    if (from.has_old_font_family()) {
+      set_old_font_family(from.old_font_family());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandMoveGridColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetFontFamilyArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandMoveGridColumnsArchive::CopyFrom(const CommandMoveGridColumnsArchive& from) {
+void CommandSetFontFamilyArchive::CopyFrom(const CommandSetFontFamilyArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandMoveGridColumnsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandSetFontFamilyArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_rollback_cmd()) {
+    if (!this->rollback_cmd().IsInitialized()) return false;
+  }
+  for (int i = 0; i < paragraph_style_delta_maps_size(); i++) {
+    if (!this->paragraph_style_delta_maps(i).IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandMoveGridColumnsArchive::Swap(CommandMoveGridColumnsArchive* other) {
+void CommandSetFontFamilyArchive::Swap(CommandSetFontFamilyArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(location_, other->location_);
-    std::swap(length_, other->length_);
-    std::swap(aftercolumn_, other->aftercolumn_);
+    std::swap(rollback_cmd_, other->rollback_cmd_);
+    std::swap(new_font_family_, other->new_font_family_);
+    std::swap(old_font_family_, other->old_font_family_);
+    paragraph_style_delta_maps_.Swap(&other->paragraph_style_delta_maps_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandMoveGridColumnsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetFontFamilyArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandMoveGridColumnsArchive_descriptor_;
-  metadata.reflection = CommandMoveGridColumnsArchive_reflection_;
+  metadata.descriptor = CommandSetFontFamilyArchive_descriptor_;
+  metadata.reflection = CommandSetFontFamilyArchive_reflection_;
   return metadata;
 }
 
@@ -4925,100 +5141,140 @@ ::google::protobuf::Metadata CommandMoveGridColumnsArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandDeleteGridRowsArchive_ValueRow::kValueFieldNumber;
+const int CommandApplyFillSetArchive_CapturedFillSetArchive::kIdentifierFieldNumber;
+const int CommandApplyFillSetArchive_CapturedFillSetArchive::kNumberOfThemeSeriesStylesFieldNumber;
+const int CommandApplyFillSetArchive_CapturedFillSetArchive::kPropertyMapsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandDeleteGridRowsArchive_ValueRow::CommandDeleteGridRowsArchive_ValueRow()
+CommandApplyFillSetArchive_CapturedFillSetArchive::CommandApplyFillSetArchive_CapturedFillSetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::InitAsDefaultInstance() {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::InitAsDefaultInstance() {
 }
 
-CommandDeleteGridRowsArchive_ValueRow::CommandDeleteGridRowsArchive_ValueRow(const CommandDeleteGridRowsArchive_ValueRow& from)
+CommandApplyFillSetArchive_CapturedFillSetArchive::CommandApplyFillSetArchive_CapturedFillSetArchive(const CommandApplyFillSetArchive_CapturedFillSetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::SharedCtor() {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::SharedCtor() {
   _cached_size_ = 0;
+  identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  number_of_theme_series_styles_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandDeleteGridRowsArchive_ValueRow::~CommandDeleteGridRowsArchive_ValueRow() {
+CommandApplyFillSetArchive_CapturedFillSetArchive::~CommandApplyFillSetArchive_CapturedFillSetArchive() {
   SharedDtor();
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::SharedDtor() {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::SharedDtor() {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete identifier_;
+  }
   if (this != default_instance_) {
   }
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::SetCachedSize(int size) const {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandDeleteGridRowsArchive_ValueRow::descriptor() {
+const ::google::protobuf::Descriptor* CommandApplyFillSetArchive_CapturedFillSetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandDeleteGridRowsArchive_ValueRow_descriptor_;
+  return CommandApplyFillSetArchive_CapturedFillSetArchive_descriptor_;
 }
 
-const CommandDeleteGridRowsArchive_ValueRow& CommandDeleteGridRowsArchive_ValueRow::default_instance() {
+const CommandApplyFillSetArchive_CapturedFillSetArchive& CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive_ValueRow::default_instance_ = NULL;
+CommandApplyFillSetArchive_CapturedFillSetArchive* CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance_ = NULL;
 
-CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive_ValueRow::New() const {
-  return new CommandDeleteGridRowsArchive_ValueRow;
+CommandApplyFillSetArchive_CapturedFillSetArchive* CommandApplyFillSetArchive_CapturedFillSetArchive::New() const {
+  return new CommandApplyFillSetArchive_CapturedFillSetArchive;
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::Clear() {
-  value_.Clear();
+void CommandApplyFillSetArchive_CapturedFillSetArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_identifier()) {
+      if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+        identifier_->clear();
+      }
+    }
+    number_of_theme_series_styles_ = 0u;
+  }
+  property_maps_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandDeleteGridRowsArchive_ValueRow::MergePartialFromCodedStream(
+bool CommandApplyFillSetArchive_CapturedFillSetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated double value = 5;
-      case 5: {
+      // optional string identifier = 1;
+      case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_value:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 1, 41, input, this->mutable_value())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_LENGTH_DELIMITED) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, this->mutable_value())));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_identifier()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->identifier().data(), this->identifier().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(41)) goto parse_value;
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectTag(16)) goto parse_number_of_theme_series_styles;
         break;
       }
 
-      default: {
-      handle_uninterpreted:
+      // optional uint32 number_of_theme_series_styles = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_theme_series_styles:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_theme_series_styles_)));
+          set_has_number_of_theme_series_styles();
+        } else {
+          goto handle_uninterpreted;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        if (input->ExpectTag(26)) goto parse_property_maps;
+        break;
+      }
+
+      // repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_property_maps:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_property_maps()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_property_maps;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
     }
@@ -5027,12 +5283,26 @@ bool CommandDeleteGridRowsArchive_ValueRow::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::SerializeWithCachedSizes(
+void CommandApplyFillSetArchive_CapturedFillSetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated double value = 5;
-  for (int i = 0; i < this->value_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(
-      5, this->value(i), output);
+  // optional string identifier = 1;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->identifier().data(), this->identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->identifier(), output);
+  }
+
+  // optional uint32 number_of_theme_series_styles = 2;
+  if (has_number_of_theme_series_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->number_of_theme_series_styles(), output);
+  }
+
+  // repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+  for (int i = 0; i < this->property_maps_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->property_maps(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -5041,12 +5311,28 @@ void CommandDeleteGridRowsArchive_ValueRow::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandDeleteGridRowsArchive_ValueRow::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandApplyFillSetArchive_CapturedFillSetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // repeated double value = 5;
-  for (int i = 0; i < this->value_size(); i++) {
+  // optional string identifier = 1;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->identifier().data(), this->identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->identifier(), target);
+  }
+
+  // optional uint32 number_of_theme_series_styles = 2;
+  if (has_number_of_theme_series_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->number_of_theme_series_styles(), target);
+  }
+
+  // repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+  for (int i = 0; i < this->property_maps_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteDoubleToArray(5, this->value(i), target);
+      WriteMessageNoVirtualToArray(
+        3, this->property_maps(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -5056,14 +5342,31 @@ ::google::protobuf::uint8* CommandDeleteGridRowsArchive_ValueRow::SerializeWithC
   return target;
 }
 
-int CommandDeleteGridRowsArchive_ValueRow::ByteSize() const {
+int CommandApplyFillSetArchive_CapturedFillSetArchive::ByteSize() const {
   int total_size = 0;
 
-  // repeated double value = 5;
-  {
-    int data_size = 0;
-    data_size = 8 * this->value_size();
-    total_size += 1 * this->value_size() + data_size;
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional string identifier = 1;
+    if (has_identifier()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->identifier());
+    }
+
+    // optional uint32 number_of_theme_series_styles = 2;
+    if (has_number_of_theme_series_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_theme_series_styles());
+    }
+
+  }
+  // repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+  total_size += 1 * this->property_maps_size();
+  for (int i = 0; i < this->property_maps_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->property_maps(i));
   }
 
   if (!unknown_fields().empty()) {
@@ -5077,10 +5380,10 @@ int CommandDeleteGridRowsArchive_ValueRow::ByteSize() const {
   return total_size;
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandDeleteGridRowsArchive_ValueRow* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridRowsArchive_ValueRow*>(
+  const CommandApplyFillSetArchive_CapturedFillSetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyFillSetArchive_CapturedFillSetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -5089,43 +5392,56 @@ void CommandDeleteGridRowsArchive_ValueRow::MergeFrom(const ::google::protobuf::
   }
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::MergeFrom(const CommandDeleteGridRowsArchive_ValueRow& from) {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::MergeFrom(const CommandApplyFillSetArchive_CapturedFillSetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  value_.MergeFrom(from.value_);
+  property_maps_.MergeFrom(from.property_maps_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_identifier()) {
+      set_identifier(from.identifier());
+    }
+    if (from.has_number_of_theme_series_styles()) {
+      set_number_of_theme_series_styles(from.number_of_theme_series_styles());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::CopyFrom(const CommandDeleteGridRowsArchive_ValueRow& from) {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::CopyFrom(const CommandApplyFillSetArchive_CapturedFillSetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandDeleteGridRowsArchive_ValueRow::IsInitialized() const {
+bool CommandApplyFillSetArchive_CapturedFillSetArchive::IsInitialized() const {
 
+  for (int i = 0; i < property_maps_size(); i++) {
+    if (!this->property_maps(i).IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandDeleteGridRowsArchive_ValueRow::Swap(CommandDeleteGridRowsArchive_ValueRow* other) {
+void CommandApplyFillSetArchive_CapturedFillSetArchive::Swap(CommandApplyFillSetArchive_CapturedFillSetArchive* other) {
   if (other != this) {
-    value_.Swap(&other->value_);
+    std::swap(identifier_, other->identifier_);
+    std::swap(number_of_theme_series_styles_, other->number_of_theme_series_styles_);
+    property_maps_.Swap(&other->property_maps_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandDeleteGridRowsArchive_ValueRow::GetMetadata() const {
+::google::protobuf::Metadata CommandApplyFillSetArchive_CapturedFillSetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandDeleteGridRowsArchive_ValueRow_descriptor_;
-  metadata.reflection = CommandDeleteGridRowsArchive_ValueRow_reflection_;
+  metadata.descriptor = CommandApplyFillSetArchive_CapturedFillSetArchive_descriptor_;
+  metadata.reflection = CommandApplyFillSetArchive_CapturedFillSetArchive_reflection_;
   return metadata;
 }
 
@@ -5133,87 +5449,123 @@ ::google::protobuf::Metadata CommandDeleteGridRowsArchive_ValueRow::GetMetadata(
 // -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandDeleteGridRowsArchive::kSuperFieldNumber;
-const int CommandDeleteGridRowsArchive::kLocationFieldNumber;
-const int CommandDeleteGridRowsArchive::kLengthFieldNumber;
-const int CommandDeleteGridRowsArchive::kNamesFieldNumber;
-const int CommandDeleteGridRowsArchive::kValueRowFieldNumber;
-const int CommandDeleteGridRowsArchive::kRemovedAllRowsFieldNumber;
-const int CommandDeleteGridRowsArchive::kColumnNamesFieldNumber;
+const int CommandApplyFillSetArchive::kSuperFieldNumber;
+const int CommandApplyFillSetArchive::kRollbackCmdFieldNumber;
+const int CommandApplyFillSetArchive::kFwdFillSetLookupStringFieldNumber;
+const int CommandApplyFillSetArchive::kRevFillSetLookupStringFieldNumber;
+const int CommandApplyFillSetArchive::kFwdCapturedFillSetFieldNumber;
+const int CommandApplyFillSetArchive::kRevCapturedFillSetFieldNumber;
+const int CommandApplyFillSetArchive::kRevLastAppliedFillSetLookupStringFieldNumber;
 #endif  // !_MSC_VER
 
-CommandDeleteGridRowsArchive::CommandDeleteGridRowsArchive()
+CommandApplyFillSetArchive::CommandApplyFillSetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandDeleteGridRowsArchive::InitAsDefaultInstance() {
+void CommandApplyFillSetArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  rollback_cmd_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  fwd_captured_fill_set_ = const_cast< ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive*>(&::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance());
+  rev_captured_fill_set_ = const_cast< ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive*>(&::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::default_instance());
 }
 
-CommandDeleteGridRowsArchive::CommandDeleteGridRowsArchive(const CommandDeleteGridRowsArchive& from)
+CommandApplyFillSetArchive::CommandApplyFillSetArchive(const CommandApplyFillSetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandDeleteGridRowsArchive::SharedCtor() {
+void CommandApplyFillSetArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  location_ = 0u;
-  length_ = 0u;
-  removed_all_rows_ = false;
+  rollback_cmd_ = NULL;
+  fwd_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  rev_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  fwd_captured_fill_set_ = NULL;
+  rev_captured_fill_set_ = NULL;
+  rev_last_applied_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandDeleteGridRowsArchive::~CommandDeleteGridRowsArchive() {
+CommandApplyFillSetArchive::~CommandApplyFillSetArchive() {
   SharedDtor();
 }
 
-void CommandDeleteGridRowsArchive::SharedDtor() {
+void CommandApplyFillSetArchive::SharedDtor() {
+  if (fwd_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    delete fwd_fill_set_lookup_string_;
+  }
+  if (rev_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    delete rev_fill_set_lookup_string_;
+  }
+  if (rev_last_applied_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    delete rev_last_applied_fill_set_lookup_string_;
+  }
   if (this != default_instance_) {
     delete super_;
+    delete rollback_cmd_;
+    delete fwd_captured_fill_set_;
+    delete rev_captured_fill_set_;
   }
 }
 
-void CommandDeleteGridRowsArchive::SetCachedSize(int size) const {
+void CommandApplyFillSetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandDeleteGridRowsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandApplyFillSetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandDeleteGridRowsArchive_descriptor_;
+  return CommandApplyFillSetArchive_descriptor_;
 }
 
-const CommandDeleteGridRowsArchive& CommandDeleteGridRowsArchive::default_instance() {
+const CommandApplyFillSetArchive& CommandApplyFillSetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandDeleteGridRowsArchive* CommandDeleteGridRowsArchive::default_instance_ = NULL;
+CommandApplyFillSetArchive* CommandApplyFillSetArchive::default_instance_ = NULL;
 
-CommandDeleteGridRowsArchive* CommandDeleteGridRowsArchive::New() const {
-  return new CommandDeleteGridRowsArchive;
+CommandApplyFillSetArchive* CommandApplyFillSetArchive::New() const {
+  return new CommandApplyFillSetArchive;
 }
 
-void CommandDeleteGridRowsArchive::Clear() {
+void CommandApplyFillSetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    location_ = 0u;
-    length_ = 0u;
-    removed_all_rows_ = false;
+    if (has_rollback_cmd()) {
+      if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+    }
+    if (has_fwd_fill_set_lookup_string()) {
+      if (fwd_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+        fwd_fill_set_lookup_string_->clear();
+      }
+    }
+    if (has_rev_fill_set_lookup_string()) {
+      if (rev_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+        rev_fill_set_lookup_string_->clear();
+      }
+    }
+    if (has_fwd_captured_fill_set()) {
+      if (fwd_captured_fill_set_ != NULL) fwd_captured_fill_set_->::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::Clear();
+    }
+    if (has_rev_captured_fill_set()) {
+      if (rev_captured_fill_set_ != NULL) rev_captured_fill_set_->::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::Clear();
+    }
+    if (has_rev_last_applied_fill_set_lookup_string()) {
+      if (rev_last_applied_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+        rev_last_applied_fill_set_lookup_string_->clear();
+      }
+    }
   }
-  names_.Clear();
-  value_row_.Clear();
-  column_names_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandDeleteGridRowsArchive::MergePartialFromCodedStream(
+bool CommandApplyFillSetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -5228,107 +5580,99 @@ bool CommandDeleteGridRowsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_location;
+        if (input->ExpectTag(18)) goto parse_rollback_cmd;
         break;
       }
 
-      // required uint32 location = 2;
+      // optional .TSP.Reference rollback_cmd = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_location:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &location_)));
-          set_has_location();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rollback_cmd:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rollback_cmd()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_length;
+        if (input->ExpectTag(26)) goto parse_fwd_fill_set_lookup_string;
         break;
       }
 
-      // required uint32 length = 3;
+      // optional string fwd_fill_set_lookup_string = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_length:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &length_)));
-          set_has_length();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_fwd_fill_set_lookup_string:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_fwd_fill_set_lookup_string()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->fwd_fill_set_lookup_string().data(), this->fwd_fill_set_lookup_string().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_names;
+        if (input->ExpectTag(34)) goto parse_rev_fill_set_lookup_string;
         break;
       }
 
-      // repeated string names = 4;
+      // optional string rev_fill_set_lookup_string = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_names:
+         parse_rev_fill_set_lookup_string:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_names()));
+                input, this->mutable_rev_fill_set_lookup_string()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->names(this->names_size() - 1).data(),
-            this->names(this->names_size() - 1).length(),
+            this->rev_fill_set_lookup_string().data(), this->rev_fill_set_lookup_string().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_names;
-        if (input->ExpectTag(50)) goto parse_value_row;
+        if (input->ExpectTag(42)) goto parse_fwd_captured_fill_set;
         break;
       }
 
-      // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
-      case 6: {
+      // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_value_row:
+         parse_fwd_captured_fill_set:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_value_row()));
+               input, mutable_fwd_captured_fill_set()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_value_row;
-        if (input->ExpectTag(56)) goto parse_removed_all_rows;
+        if (input->ExpectTag(50)) goto parse_rev_captured_fill_set;
         break;
       }
 
-      // optional bool removed_all_rows = 7;
-      case 7: {
+      // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_removed_all_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &removed_all_rows_)));
-          set_has_removed_all_rows();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rev_captured_fill_set:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rev_captured_fill_set()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_column_names;
+        if (input->ExpectTag(58)) goto parse_rev_last_applied_fill_set_lookup_string;
         break;
       }
 
-      // repeated string column_names = 8;
-      case 8: {
+      // optional string rev_last_applied_fill_set_lookup_string = 7;
+      case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_column_names:
+         parse_rev_last_applied_fill_set_lookup_string:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_column_names()));
+                input, this->mutable_rev_last_applied_fill_set_lookup_string()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->column_names(this->column_names_size() - 1).data(),
-            this->column_names(this->column_names_size() - 1).length(),
+            this->rev_last_applied_fill_set_lookup_string().data(), this->rev_last_applied_fill_set_lookup_string().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_column_names;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -5349,7 +5693,7 @@ bool CommandDeleteGridRowsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandDeleteGridRowsArchive::SerializeWithCachedSizes(
+void CommandApplyFillSetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -5357,43 +5701,49 @@ void CommandDeleteGridRowsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->rollback_cmd(), output);
   }
 
-  // required uint32 length = 3;
-  if (has_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  // optional string fwd_fill_set_lookup_string = 3;
+  if (has_fwd_fill_set_lookup_string()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->fwd_fill_set_lookup_string().data(), this->fwd_fill_set_lookup_string().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->fwd_fill_set_lookup_string(), output);
   }
 
-  // repeated string names = 4;
-  for (int i = 0; i < this->names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->names(i).data(), this->names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // optional string rev_fill_set_lookup_string = 4;
+  if (has_rev_fill_set_lookup_string()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->rev_fill_set_lookup_string().data(), this->rev_fill_set_lookup_string().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->names(i), output);
+      4, this->rev_fill_set_lookup_string(), output);
   }
 
-  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
-  for (int i = 0; i < this->value_row_size(); i++) {
+  // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+  if (has_fwd_captured_fill_set()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->value_row(i), output);
+      5, this->fwd_captured_fill_set(), output);
   }
 
-  // optional bool removed_all_rows = 7;
-  if (has_removed_all_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->removed_all_rows(), output);
+  // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+  if (has_rev_captured_fill_set()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->rev_captured_fill_set(), output);
   }
 
-  // repeated string column_names = 8;
-  for (int i = 0; i < this->column_names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->column_names(i).data(), this->column_names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // optional string rev_last_applied_fill_set_lookup_string = 7;
+  if (has_rev_last_applied_fill_set_lookup_string()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->rev_last_applied_fill_set_lookup_string().data(), this->rev_last_applied_fill_set_lookup_string().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      8, this->column_names(i), output);
+      7, this->rev_last_applied_fill_set_lookup_string(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -5402,7 +5752,7 @@ void CommandDeleteGridRowsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandDeleteGridRowsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandApplyFillSetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -5411,44 +5761,55 @@ ::google::protobuf::uint8* CommandDeleteGridRowsArchive::SerializeWithCachedSize
         1, this->super(), target);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->rollback_cmd(), target);
   }
 
-  // required uint32 length = 3;
-  if (has_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  // optional string fwd_fill_set_lookup_string = 3;
+  if (has_fwd_fill_set_lookup_string()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->fwd_fill_set_lookup_string().data(), this->fwd_fill_set_lookup_string().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->fwd_fill_set_lookup_string(), target);
   }
 
-  // repeated string names = 4;
-  for (int i = 0; i < this->names_size(); i++) {
+  // optional string rev_fill_set_lookup_string = 4;
+  if (has_rev_fill_set_lookup_string()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->names(i).data(), this->names(i).length(),
+      this->rev_fill_set_lookup_string().data(), this->rev_fill_set_lookup_string().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(4, this->names(i), target);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->rev_fill_set_lookup_string(), target);
   }
 
-  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
-  for (int i = 0; i < this->value_row_size(); i++) {
+  // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+  if (has_fwd_captured_fill_set()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->value_row(i), target);
+        5, this->fwd_captured_fill_set(), target);
   }
 
-  // optional bool removed_all_rows = 7;
-  if (has_removed_all_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->removed_all_rows(), target);
+  // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+  if (has_rev_captured_fill_set()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->rev_captured_fill_set(), target);
   }
 
-  // repeated string column_names = 8;
-  for (int i = 0; i < this->column_names_size(); i++) {
+  // optional string rev_last_applied_fill_set_lookup_string = 7;
+  if (has_rev_last_applied_fill_set_lookup_string()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->column_names(i).data(), this->column_names(i).length(),
+      this->rev_last_applied_fill_set_lookup_string().data(), this->rev_last_applied_fill_set_lookup_string().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(8, this->column_names(i), target);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        7, this->rev_last_applied_fill_set_lookup_string(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -5458,7 +5819,7 @@ ::google::protobuf::uint8* CommandDeleteGridRowsArchive::SerializeWithCachedSize
   return target;
 }
 
-int CommandDeleteGridRowsArchive::ByteSize() const {
+int CommandApplyFillSetArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -5469,48 +5830,49 @@ int CommandDeleteGridRowsArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 location = 2;
-    if (has_location()) {
+    // optional .TSP.Reference rollback_cmd = 2;
+    if (has_rollback_cmd()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->location());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->rollback_cmd());
     }
 
-    // required uint32 length = 3;
-    if (has_length()) {
+    // optional string fwd_fill_set_lookup_string = 3;
+    if (has_fwd_fill_set_lookup_string()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->length());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->fwd_fill_set_lookup_string());
     }
 
-    // optional bool removed_all_rows = 7;
-    if (has_removed_all_rows()) {
-      total_size += 1 + 1;
+    // optional string rev_fill_set_lookup_string = 4;
+    if (has_rev_fill_set_lookup_string()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->rev_fill_set_lookup_string());
     }
 
-  }
-  // repeated string names = 4;
-  total_size += 1 * this->names_size();
-  for (int i = 0; i < this->names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->names(i));
-  }
+    // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+    if (has_fwd_captured_fill_set()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->fwd_captured_fill_set());
+    }
 
-  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
-  total_size += 1 * this->value_row_size();
-  for (int i = 0; i < this->value_row_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->value_row(i));
-  }
+    // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+    if (has_rev_captured_fill_set()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->rev_captured_fill_set());
+    }
 
-  // repeated string column_names = 8;
-  total_size += 1 * this->column_names_size();
-  for (int i = 0; i < this->column_names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->column_names(i));
-  }
+    // optional string rev_last_applied_fill_set_lookup_string = 7;
+    if (has_rev_last_applied_fill_set_lookup_string()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->rev_last_applied_fill_set_lookup_string());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -5522,10 +5884,10 @@ int CommandDeleteGridRowsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandDeleteGridRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandApplyFillSetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandDeleteGridRowsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridRowsArchive*>(
+  const CommandApplyFillSetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyFillSetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -5534,69 +5896,84 @@ void CommandDeleteGridRowsArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandDeleteGridRowsArchive::MergeFrom(const CommandDeleteGridRowsArchive& from) {
+void CommandApplyFillSetArchive::MergeFrom(const CommandApplyFillSetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  names_.MergeFrom(from.names_);
-  value_row_.MergeFrom(from.value_row_);
-  column_names_.MergeFrom(from.column_names_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_location()) {
-      set_location(from.location());
+    if (from.has_rollback_cmd()) {
+      mutable_rollback_cmd()->::TSP::Reference::MergeFrom(from.rollback_cmd());
     }
-    if (from.has_length()) {
-      set_length(from.length());
+    if (from.has_fwd_fill_set_lookup_string()) {
+      set_fwd_fill_set_lookup_string(from.fwd_fill_set_lookup_string());
     }
-    if (from.has_removed_all_rows()) {
-      set_removed_all_rows(from.removed_all_rows());
+    if (from.has_rev_fill_set_lookup_string()) {
+      set_rev_fill_set_lookup_string(from.rev_fill_set_lookup_string());
+    }
+    if (from.has_fwd_captured_fill_set()) {
+      mutable_fwd_captured_fill_set()->::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::MergeFrom(from.fwd_captured_fill_set());
+    }
+    if (from.has_rev_captured_fill_set()) {
+      mutable_rev_captured_fill_set()->::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::MergeFrom(from.rev_captured_fill_set());
+    }
+    if (from.has_rev_last_applied_fill_set_lookup_string()) {
+      set_rev_last_applied_fill_set_lookup_string(from.rev_last_applied_fill_set_lookup_string());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandDeleteGridRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandApplyFillSetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandDeleteGridRowsArchive::CopyFrom(const CommandDeleteGridRowsArchive& from) {
+void CommandApplyFillSetArchive::CopyFrom(const CommandApplyFillSetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandDeleteGridRowsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandApplyFillSetArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_rollback_cmd()) {
+    if (!this->rollback_cmd().IsInitialized()) return false;
+  }
+  if (has_fwd_captured_fill_set()) {
+    if (!this->fwd_captured_fill_set().IsInitialized()) return false;
+  }
+  if (has_rev_captured_fill_set()) {
+    if (!this->rev_captured_fill_set().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandDeleteGridRowsArchive::Swap(CommandDeleteGridRowsArchive* other) {
+void CommandApplyFillSetArchive::Swap(CommandApplyFillSetArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(location_, other->location_);
-    std::swap(length_, other->length_);
-    names_.Swap(&other->names_);
-    value_row_.Swap(&other->value_row_);
-    std::swap(removed_all_rows_, other->removed_all_rows_);
-    column_names_.Swap(&other->column_names_);
+    std::swap(rollback_cmd_, other->rollback_cmd_);
+    std::swap(fwd_fill_set_lookup_string_, other->fwd_fill_set_lookup_string_);
+    std::swap(rev_fill_set_lookup_string_, other->rev_fill_set_lookup_string_);
+    std::swap(fwd_captured_fill_set_, other->fwd_captured_fill_set_);
+    std::swap(rev_captured_fill_set_, other->rev_captured_fill_set_);
+    std::swap(rev_last_applied_fill_set_lookup_string_, other->rev_last_applied_fill_set_lookup_string_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandDeleteGridRowsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandApplyFillSetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandDeleteGridRowsArchive_descriptor_;
-  metadata.reflection = CommandDeleteGridRowsArchive_reflection_;
+  metadata.descriptor = CommandApplyFillSetArchive_descriptor_;
+  metadata.reflection = CommandApplyFillSetArchive_reflection_;
   return metadata;
 }
 
@@ -5604,88 +5981,159 @@ ::google::protobuf::Metadata CommandDeleteGridRowsArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandDeleteGridColumnsArchive_ValueRow::kValueFieldNumber;
+const int CommandSetSeriesNameArchive::kSuperFieldNumber;
+const int CommandSetSeriesNameArchive::kSeriesIndexFieldNumber;
+const int CommandSetSeriesNameArchive::kOldNameFieldNumber;
+const int CommandSetSeriesNameArchive::kNewNameFieldNumber;
 #endif  // !_MSC_VER
 
-CommandDeleteGridColumnsArchive_ValueRow::CommandDeleteGridColumnsArchive_ValueRow()
+CommandSetSeriesNameArchive::CommandSetSeriesNameArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::InitAsDefaultInstance() {
+void CommandSetSeriesNameArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandDeleteGridColumnsArchive_ValueRow::CommandDeleteGridColumnsArchive_ValueRow(const CommandDeleteGridColumnsArchive_ValueRow& from)
+CommandSetSeriesNameArchive::CommandSetSeriesNameArchive(const CommandSetSeriesNameArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::SharedCtor() {
+void CommandSetSeriesNameArchive::SharedCtor() {
   _cached_size_ = 0;
+  super_ = NULL;
+  seriesindex_ = 0u;
+  oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandDeleteGridColumnsArchive_ValueRow::~CommandDeleteGridColumnsArchive_ValueRow() {
+CommandSetSeriesNameArchive::~CommandSetSeriesNameArchive() {
   SharedDtor();
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::SharedDtor() {
+void CommandSetSeriesNameArchive::SharedDtor() {
+  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldname_;
+  }
+  if (newname_ != &::google::protobuf::internal::kEmptyString) {
+    delete newname_;
+  }
   if (this != default_instance_) {
+    delete super_;
   }
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::SetCachedSize(int size) const {
+void CommandSetSeriesNameArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandDeleteGridColumnsArchive_ValueRow::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetSeriesNameArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandDeleteGridColumnsArchive_ValueRow_descriptor_;
+  return CommandSetSeriesNameArchive_descriptor_;
 }
 
-const CommandDeleteGridColumnsArchive_ValueRow& CommandDeleteGridColumnsArchive_ValueRow::default_instance() {
+const CommandSetSeriesNameArchive& CommandSetSeriesNameArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive_ValueRow::default_instance_ = NULL;
+CommandSetSeriesNameArchive* CommandSetSeriesNameArchive::default_instance_ = NULL;
 
-CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive_ValueRow::New() const {
-  return new CommandDeleteGridColumnsArchive_ValueRow;
+CommandSetSeriesNameArchive* CommandSetSeriesNameArchive::New() const {
+  return new CommandSetSeriesNameArchive;
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::Clear() {
-  value_.Clear();
+void CommandSetSeriesNameArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    seriesindex_ = 0u;
+    if (has_oldname()) {
+      if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+        oldname_->clear();
+      }
+    }
+    if (has_newname()) {
+      if (newname_ != &::google::protobuf::internal::kEmptyString) {
+        newname_->clear();
+      }
+    }
+  }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandDeleteGridColumnsArchive_ValueRow::MergePartialFromCodedStream(
+bool CommandSetSeriesNameArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated double value = 5;
-      case 5: {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_value:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 1, 41, input, this->mutable_value())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_LENGTH_DELIMITED) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, this->mutable_value())));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_seriesIndex;
+        break;
+      }
+
+      // required uint32 seriesIndex = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_seriesIndex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &seriesindex_)));
+          set_has_seriesindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_oldName;
+        break;
+      }
+
+      // required string oldName = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_oldName:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_oldname()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->oldname().data(), this->oldname().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_newName;
+        break;
+      }
+
+      // required string newName = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_newName:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_newname()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->newname().data(), this->newname().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(41)) goto parse_value;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -5706,12 +6154,35 @@ bool CommandDeleteGridColumnsArchive_ValueRow::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::SerializeWithCachedSizes(
+void CommandSetSeriesNameArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated double value = 5;
-  for (int i = 0; i < this->value_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(
-      5, this->value(i), output);
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required uint32 seriesIndex = 2;
+  if (has_seriesindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->seriesindex(), output);
+  }
+
+  // required string oldName = 3;
+  if (has_oldname()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->oldname().data(), this->oldname().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->oldname(), output);
+  }
+
+  // required string newName = 4;
+  if (has_newname()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newname().data(), this->newname().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->newname(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -5720,12 +6191,38 @@ void CommandDeleteGridColumnsArchive_ValueRow::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandDeleteGridColumnsArchive_ValueRow::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetSeriesNameArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // repeated double value = 5;
-  for (int i = 0; i < this->value_size(); i++) {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteDoubleToArray(5, this->value(i), target);
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required uint32 seriesIndex = 2;
+  if (has_seriesindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->seriesindex(), target);
+  }
+
+  // required string oldName = 3;
+  if (has_oldname()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->oldname().data(), this->oldname().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->oldname(), target);
+  }
+
+  // required string newName = 4;
+  if (has_newname()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newname().data(), this->newname().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->newname(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -5735,16 +6232,39 @@ ::google::protobuf::uint8* CommandDeleteGridColumnsArchive_ValueRow::SerializeWi
   return target;
 }
 
-int CommandDeleteGridColumnsArchive_ValueRow::ByteSize() const {
+int CommandSetSeriesNameArchive::ByteSize() const {
   int total_size = 0;
 
-  // repeated double value = 5;
-  {
-    int data_size = 0;
-    data_size = 8 * this->value_size();
-    total_size += 1 * this->value_size() + data_size;
-  }
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required uint32 seriesIndex = 2;
+    if (has_seriesindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->seriesindex());
+    }
+
+    // required string oldName = 3;
+    if (has_oldname()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->oldname());
+    }
+
+    // required string newName = 4;
+    if (has_newname()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->newname());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -5756,10 +6276,10 @@ int CommandDeleteGridColumnsArchive_ValueRow::ByteSize() const {
   return total_size;
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetSeriesNameArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandDeleteGridColumnsArchive_ValueRow* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridColumnsArchive_ValueRow*>(
+  const CommandSetSeriesNameArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSeriesNameArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -5768,131 +6288,162 @@ void CommandDeleteGridColumnsArchive_ValueRow::MergeFrom(const ::google::protobu
   }
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::MergeFrom(const CommandDeleteGridColumnsArchive_ValueRow& from) {
+void CommandSetSeriesNameArchive::MergeFrom(const CommandSetSeriesNameArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  value_.MergeFrom(from.value_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_seriesindex()) {
+      set_seriesindex(from.seriesindex());
+    }
+    if (from.has_oldname()) {
+      set_oldname(from.oldname());
+    }
+    if (from.has_newname()) {
+      set_newname(from.newname());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetSeriesNameArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::CopyFrom(const CommandDeleteGridColumnsArchive_ValueRow& from) {
+void CommandSetSeriesNameArchive::CopyFrom(const CommandSetSeriesNameArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandDeleteGridColumnsArchive_ValueRow::IsInitialized() const {
+bool CommandSetSeriesNameArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandDeleteGridColumnsArchive_ValueRow::Swap(CommandDeleteGridColumnsArchive_ValueRow* other) {
+void CommandSetSeriesNameArchive::Swap(CommandSetSeriesNameArchive* other) {
   if (other != this) {
-    value_.Swap(&other->value_);
+    std::swap(super_, other->super_);
+    std::swap(seriesindex_, other->seriesindex_);
+    std::swap(oldname_, other->oldname_);
+    std::swap(newname_, other->newname_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandDeleteGridColumnsArchive_ValueRow::GetMetadata() const {
+::google::protobuf::Metadata CommandSetSeriesNameArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandDeleteGridColumnsArchive_ValueRow_descriptor_;
-  metadata.reflection = CommandDeleteGridColumnsArchive_ValueRow_reflection_;
+  metadata.descriptor = CommandSetSeriesNameArchive_descriptor_;
+  metadata.reflection = CommandSetSeriesNameArchive_reflection_;
   return metadata;
 }
 
 
-// -------------------------------------------------------------------
+// ===================================================================
 
 #ifndef _MSC_VER
-const int CommandDeleteGridColumnsArchive::kSuperFieldNumber;
-const int CommandDeleteGridColumnsArchive::kLocationFieldNumber;
-const int CommandDeleteGridColumnsArchive::kLengthFieldNumber;
-const int CommandDeleteGridColumnsArchive::kNamesFieldNumber;
-const int CommandDeleteGridColumnsArchive::kValueRowFieldNumber;
-const int CommandDeleteGridColumnsArchive::kRemovedAllColumnsFieldNumber;
-const int CommandDeleteGridColumnsArchive::kRowNamesFieldNumber;
+const int CommandSetCategoryNameArchive::kSuperFieldNumber;
+const int CommandSetCategoryNameArchive::kCategoryIndexFieldNumber;
+const int CommandSetCategoryNameArchive::kOldNameFieldNumber;
+const int CommandSetCategoryNameArchive::kNewNameFieldNumber;
+const int CommandSetCategoryNameArchive::kIsMultiDataIndexFieldNumber;
 #endif  // !_MSC_VER
 
-CommandDeleteGridColumnsArchive::CommandDeleteGridColumnsArchive()
+CommandSetCategoryNameArchive::CommandSetCategoryNameArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandDeleteGridColumnsArchive::InitAsDefaultInstance() {
+void CommandSetCategoryNameArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandDeleteGridColumnsArchive::CommandDeleteGridColumnsArchive(const CommandDeleteGridColumnsArchive& from)
+CommandSetCategoryNameArchive::CommandSetCategoryNameArchive(const CommandSetCategoryNameArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandDeleteGridColumnsArchive::SharedCtor() {
+void CommandSetCategoryNameArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  location_ = 0u;
-  length_ = 0u;
-  removed_all_columns_ = false;
+  categoryindex_ = 0u;
+  oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  ismultidataindex_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandDeleteGridColumnsArchive::~CommandDeleteGridColumnsArchive() {
+CommandSetCategoryNameArchive::~CommandSetCategoryNameArchive() {
   SharedDtor();
 }
 
-void CommandDeleteGridColumnsArchive::SharedDtor() {
+void CommandSetCategoryNameArchive::SharedDtor() {
+  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldname_;
+  }
+  if (newname_ != &::google::protobuf::internal::kEmptyString) {
+    delete newname_;
+  }
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandDeleteGridColumnsArchive::SetCachedSize(int size) const {
+void CommandSetCategoryNameArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandDeleteGridColumnsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetCategoryNameArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandDeleteGridColumnsArchive_descriptor_;
+  return CommandSetCategoryNameArchive_descriptor_;
 }
 
-const CommandDeleteGridColumnsArchive& CommandDeleteGridColumnsArchive::default_instance() {
+const CommandSetCategoryNameArchive& CommandSetCategoryNameArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandDeleteGridColumnsArchive* CommandDeleteGridColumnsArchive::default_instance_ = NULL;
+CommandSetCategoryNameArchive* CommandSetCategoryNameArchive::default_instance_ = NULL;
 
-CommandDeleteGridColumnsArchive* CommandDeleteGridColumnsArchive::New() const {
-  return new CommandDeleteGridColumnsArchive;
+CommandSetCategoryNameArchive* CommandSetCategoryNameArchive::New() const {
+  return new CommandSetCategoryNameArchive;
 }
 
-void CommandDeleteGridColumnsArchive::Clear() {
+void CommandSetCategoryNameArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    location_ = 0u;
-    length_ = 0u;
-    removed_all_columns_ = false;
+    categoryindex_ = 0u;
+    if (has_oldname()) {
+      if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+        oldname_->clear();
+      }
+    }
+    if (has_newname()) {
+      if (newname_ != &::google::protobuf::internal::kEmptyString) {
+        newname_->clear();
+      }
+    }
+    ismultidataindex_ = false;
   }
-  names_.Clear();
-  value_row_.Clear();
-  row_names_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandDeleteGridColumnsArchive::MergePartialFromCodedStream(
+bool CommandSetCategoryNameArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -5907,108 +6458,73 @@ bool CommandDeleteGridColumnsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_location;
+        if (input->ExpectTag(16)) goto parse_categoryIndex;
         break;
       }
 
-      // required uint32 location = 2;
+      // required uint32 categoryIndex = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_location:
+         parse_categoryIndex:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &location_)));
-          set_has_location();
+                 input, &categoryindex_)));
+          set_has_categoryindex();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_length;
+        if (input->ExpectTag(26)) goto parse_oldName;
         break;
       }
 
-      // required uint32 length = 3;
+      // required string oldName = 3;
       case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_length:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &length_)));
-          set_has_length();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_names;
-        break;
-      }
-
-      // repeated string names = 4;
-      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_names:
+         parse_oldName:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_names()));
+                input, this->mutable_oldname()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->names(this->names_size() - 1).data(),
-            this->names(this->names_size() - 1).length(),
+            this->oldname().data(), this->oldname().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_names;
-        if (input->ExpectTag(50)) goto parse_value_row;
+        if (input->ExpectTag(34)) goto parse_newName;
         break;
       }
 
-      // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
-      case 6: {
+      // required string newName = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_value_row:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_value_row()));
+         parse_newName:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_newname()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->newname().data(), this->newname().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_value_row;
-        if (input->ExpectTag(56)) goto parse_removed_all_columns;
+        if (input->ExpectTag(40)) goto parse_isMultiDataIndex;
         break;
       }
 
-      // optional bool removed_all_columns = 7;
-      case 7: {
+      // optional bool isMultiDataIndex = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_removed_all_columns:
+         parse_isMultiDataIndex:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &removed_all_columns_)));
-          set_has_removed_all_columns();
+                 input, &ismultidataindex_)));
+          set_has_ismultidataindex();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_row_names;
-        break;
-      }
-
-      // repeated string row_names = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_row_names:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_row_names()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->row_names(this->row_names_size() - 1).data(),
-            this->row_names(this->row_names_size() - 1).length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_row_names;
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
@@ -6028,7 +6544,7 @@ bool CommandDeleteGridColumnsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandDeleteGridColumnsArchive::SerializeWithCachedSizes(
+void CommandSetCategoryNameArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -6036,43 +6552,32 @@ void CommandDeleteGridColumnsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
-  }
-
-  // required uint32 length = 3;
-  if (has_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  // required uint32 categoryIndex = 2;
+  if (has_categoryindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->categoryindex(), output);
   }
 
-  // repeated string names = 4;
-  for (int i = 0; i < this->names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->names(i).data(), this->names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // required string oldName = 3;
+  if (has_oldname()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->oldname().data(), this->oldname().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->names(i), output);
-  }
-
-  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
-  for (int i = 0; i < this->value_row_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->value_row(i), output);
+      3, this->oldname(), output);
   }
 
-  // optional bool removed_all_columns = 7;
-  if (has_removed_all_columns()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->removed_all_columns(), output);
+  // required string newName = 4;
+  if (has_newname()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newname().data(), this->newname().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->newname(), output);
   }
 
-  // repeated string row_names = 8;
-  for (int i = 0; i < this->row_names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->row_names(i).data(), this->row_names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      8, this->row_names(i), output);
+  // optional bool isMultiDataIndex = 5;
+  if (has_ismultidataindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->ismultidataindex(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -6081,7 +6586,7 @@ void CommandDeleteGridColumnsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandDeleteGridColumnsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetCategoryNameArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -6090,44 +6595,34 @@ ::google::protobuf::uint8* CommandDeleteGridColumnsArchive::SerializeWithCachedS
         1, this->super(), target);
   }
 
-  // required uint32 location = 2;
-  if (has_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
-  }
-
-  // required uint32 length = 3;
-  if (has_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  // required uint32 categoryIndex = 2;
+  if (has_categoryindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->categoryindex(), target);
   }
 
-  // repeated string names = 4;
-  for (int i = 0; i < this->names_size(); i++) {
+  // required string oldName = 3;
+  if (has_oldname()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->names(i).data(), this->names(i).length(),
+      this->oldname().data(), this->oldname().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(4, this->names(i), target);
-  }
-
-  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
-  for (int i = 0; i < this->value_row_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->value_row(i), target);
-  }
-
-  // optional bool removed_all_columns = 7;
-  if (has_removed_all_columns()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->removed_all_columns(), target);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->oldname(), target);
   }
 
-  // repeated string row_names = 8;
-  for (int i = 0; i < this->row_names_size(); i++) {
+  // required string newName = 4;
+  if (has_newname()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->row_names(i).data(), this->row_names(i).length(),
+      this->newname().data(), this->newname().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(8, this->row_names(i), target);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->newname(), target);
+  }
+
+  // optional bool isMultiDataIndex = 5;
+  if (has_ismultidataindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->ismultidataindex(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -6137,7 +6632,7 @@ ::google::protobuf::uint8* CommandDeleteGridColumnsArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandDeleteGridColumnsArchive::ByteSize() const {
+int CommandSetCategoryNameArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -6148,48 +6643,33 @@ int CommandDeleteGridColumnsArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 location = 2;
-    if (has_location()) {
+    // required uint32 categoryIndex = 2;
+    if (has_categoryindex()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->location());
+          this->categoryindex());
     }
 
-    // required uint32 length = 3;
-    if (has_length()) {
+    // required string oldName = 3;
+    if (has_oldname()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->length());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->oldname());
     }
 
-    // optional bool removed_all_columns = 7;
-    if (has_removed_all_columns()) {
-      total_size += 1 + 1;
+    // required string newName = 4;
+    if (has_newname()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->newname());
     }
 
-  }
-  // repeated string names = 4;
-  total_size += 1 * this->names_size();
-  for (int i = 0; i < this->names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->names(i));
-  }
-
-  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
-  total_size += 1 * this->value_row_size();
-  for (int i = 0; i < this->value_row_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->value_row(i));
-  }
+    // optional bool isMultiDataIndex = 5;
+    if (has_ismultidataindex()) {
+      total_size += 1 + 1;
+    }
 
-  // repeated string row_names = 8;
-  total_size += 1 * this->row_names_size();
-  for (int i = 0; i < this->row_names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->row_names(i));
   }
-
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -6201,10 +6681,10 @@ int CommandDeleteGridColumnsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandDeleteGridColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetCategoryNameArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandDeleteGridColumnsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridColumnsArchive*>(
+  const CommandSetCategoryNameArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetCategoryNameArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -6213,42 +6693,42 @@ void CommandDeleteGridColumnsArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandDeleteGridColumnsArchive::MergeFrom(const CommandDeleteGridColumnsArchive& from) {
+void CommandSetCategoryNameArchive::MergeFrom(const CommandSetCategoryNameArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  names_.MergeFrom(from.names_);
-  value_row_.MergeFrom(from.value_row_);
-  row_names_.MergeFrom(from.row_names_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_location()) {
-      set_location(from.location());
+    if (from.has_categoryindex()) {
+      set_categoryindex(from.categoryindex());
     }
-    if (from.has_length()) {
-      set_length(from.length());
+    if (from.has_oldname()) {
+      set_oldname(from.oldname());
     }
-    if (from.has_removed_all_columns()) {
-      set_removed_all_columns(from.removed_all_columns());
+    if (from.has_newname()) {
+      set_newname(from.newname());
+    }
+    if (from.has_ismultidataindex()) {
+      set_ismultidataindex(from.ismultidataindex());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandDeleteGridColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetCategoryNameArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandDeleteGridColumnsArchive::CopyFrom(const CommandDeleteGridColumnsArchive& from) {
+void CommandSetCategoryNameArchive::CopyFrom(const CommandSetCategoryNameArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandDeleteGridColumnsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetCategoryNameArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -6256,26 +6736,24 @@ bool CommandDeleteGridColumnsArchive::IsInitialized() const {
   return true;
 }
 
-void CommandDeleteGridColumnsArchive::Swap(CommandDeleteGridColumnsArchive* other) {
+void CommandSetCategoryNameArchive::Swap(CommandSetCategoryNameArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(location_, other->location_);
-    std::swap(length_, other->length_);
-    names_.Swap(&other->names_);
-    value_row_.Swap(&other->value_row_);
-    std::swap(removed_all_columns_, other->removed_all_columns_);
-    row_names_.Swap(&other->row_names_);
+    std::swap(categoryindex_, other->categoryindex_);
+    std::swap(oldname_, other->oldname_);
+    std::swap(newname_, other->newname_);
+    std::swap(ismultidataindex_, other->ismultidataindex_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandDeleteGridColumnsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetCategoryNameArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandDeleteGridColumnsArchive_descriptor_;
-  metadata.reflection = CommandDeleteGridColumnsArchive_reflection_;
+  metadata.descriptor = CommandSetCategoryNameArchive_descriptor_;
+  metadata.reflection = CommandSetCategoryNameArchive_reflection_;
   return metadata;
 }
 
@@ -6283,86 +6761,82 @@ ::google::protobuf::Metadata CommandDeleteGridColumnsArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetPreviewLocArchive::kSuperFieldNumber;
-const int CommandSetPreviewLocArchive::kOldLocFieldNumber;
-const int CommandSetPreviewLocArchive::kNewLocFieldNumber;
+const int CommandAddGridRowsArchive::kSuperFieldNumber;
+const int CommandAddGridRowsArchive::kLocationFieldNumber;
+const int CommandAddGridRowsArchive::kLengthFieldNumber;
+const int CommandAddGridRowsArchive::kNameFieldNumber;
+const int CommandAddGridRowsArchive::kIdsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetPreviewLocArchive::CommandSetPreviewLocArchive()
+CommandAddGridRowsArchive::CommandAddGridRowsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetPreviewLocArchive::InitAsDefaultInstance() {
+void CommandAddGridRowsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
-  old_loc_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
-  new_loc_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
 }
 
-CommandSetPreviewLocArchive::CommandSetPreviewLocArchive(const CommandSetPreviewLocArchive& from)
+CommandAddGridRowsArchive::CommandAddGridRowsArchive(const CommandAddGridRowsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetPreviewLocArchive::SharedCtor() {
+void CommandAddGridRowsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  old_loc_ = NULL;
-  new_loc_ = NULL;
+  location_ = 0u;
+  length_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetPreviewLocArchive::~CommandSetPreviewLocArchive() {
+CommandAddGridRowsArchive::~CommandAddGridRowsArchive() {
   SharedDtor();
 }
 
-void CommandSetPreviewLocArchive::SharedDtor() {
+void CommandAddGridRowsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete old_loc_;
-    delete new_loc_;
   }
 }
 
-void CommandSetPreviewLocArchive::SetCachedSize(int size) const {
+void CommandAddGridRowsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetPreviewLocArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandAddGridRowsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetPreviewLocArchive_descriptor_;
+  return CommandAddGridRowsArchive_descriptor_;
 }
 
-const CommandSetPreviewLocArchive& CommandSetPreviewLocArchive::default_instance() {
+const CommandAddGridRowsArchive& CommandAddGridRowsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetPreviewLocArchive* CommandSetPreviewLocArchive::default_instance_ = NULL;
+CommandAddGridRowsArchive* CommandAddGridRowsArchive::default_instance_ = NULL;
 
-CommandSetPreviewLocArchive* CommandSetPreviewLocArchive::New() const {
-  return new CommandSetPreviewLocArchive;
+CommandAddGridRowsArchive* CommandAddGridRowsArchive::New() const {
+  return new CommandAddGridRowsArchive;
 }
 
-void CommandSetPreviewLocArchive::Clear() {
+void CommandAddGridRowsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    if (has_old_loc()) {
-      if (old_loc_ != NULL) old_loc_->::TSP::Point::Clear();
-    }
-    if (has_new_loc()) {
-      if (new_loc_ != NULL) new_loc_->::TSP::Point::Clear();
-    }
+    location_ = 0u;
+    length_ = 0u;
   }
+  name_.Clear();
+  ids_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetPreviewLocArchive::MergePartialFromCodedStream(
+bool CommandAddGridRowsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -6377,34 +6851,76 @@ bool CommandSetPreviewLocArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_old_loc;
+        if (input->ExpectTag(16)) goto parse_location;
         break;
       }
 
-      // required .TSP.Point old_loc = 2;
+      // required uint32 location = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_loc:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_loc()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_location:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &location_)));
+          set_has_location();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_new_loc;
+        if (input->ExpectTag(24)) goto parse_length;
         break;
       }
 
-      // required .TSP.Point new_loc = 3;
+      // optional uint32 length = 3;
       case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_length:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &length_)));
+          set_has_length();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_name;
+        break;
+      }
+
+      // repeated string name = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_loc:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_loc()));
+         parse_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->name(this->name_size() - 1).data(),
+            this->name(this->name_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_name;
+        if (input->ExpectTag(42)) goto parse_ids;
+        break;
+      }
+
+      // repeated string ids = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->ids(this->ids_size() - 1).data(),
+            this->ids(this->ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(42)) goto parse_ids;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -6425,7 +6941,7 @@ bool CommandSetPreviewLocArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetPreviewLocArchive::SerializeWithCachedSizes(
+void CommandAddGridRowsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -6433,16 +6949,32 @@ void CommandSetPreviewLocArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSP.Point old_loc = 2;
-  if (has_old_loc()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->old_loc(), output);
+  // required uint32 location = 2;
+  if (has_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
   }
 
-  // required .TSP.Point new_loc = 3;
-  if (has_new_loc()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->new_loc(), output);
+  // optional uint32 length = 3;
+  if (has_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  }
+
+  // repeated string name = 4;
+  for (int i = 0; i < this->name_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->name(i).data(), this->name(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->name(i), output);
+  }
+
+  // repeated string ids = 5;
+  for (int i = 0; i < this->ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->ids(i).data(), this->ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      5, this->ids(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -6451,7 +6983,7 @@ void CommandSetPreviewLocArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetPreviewLocArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandAddGridRowsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -6460,18 +6992,32 @@ ::google::protobuf::uint8* CommandSetPreviewLocArchive::SerializeWithCachedSizes
         1, this->super(), target);
   }
 
-  // required .TSP.Point old_loc = 2;
-  if (has_old_loc()) {
+  // required uint32 location = 2;
+  if (has_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
+  }
+
+  // optional uint32 length = 3;
+  if (has_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  }
+
+  // repeated string name = 4;
+  for (int i = 0; i < this->name_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->name(i).data(), this->name(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->old_loc(), target);
+      WriteStringToArray(4, this->name(i), target);
   }
 
-  // required .TSP.Point new_loc = 3;
-  if (has_new_loc()) {
+  // repeated string ids = 5;
+  for (int i = 0; i < this->ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->ids(i).data(), this->ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->new_loc(), target);
+      WriteStringToArray(5, this->ids(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -6481,7 +7027,7 @@ ::google::protobuf::uint8* CommandSetPreviewLocArchive::SerializeWithCachedSizes
   return target;
 }
 
-int CommandSetPreviewLocArchive::ByteSize() const {
+int CommandAddGridRowsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -6492,21 +7038,35 @@ int CommandSetPreviewLocArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSP.Point old_loc = 2;
-    if (has_old_loc()) {
+    // required uint32 location = 2;
+    if (has_location()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_loc());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->location());
     }
 
-    // required .TSP.Point new_loc = 3;
-    if (has_new_loc()) {
+    // optional uint32 length = 3;
+    if (has_length()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_loc());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->length());
     }
 
   }
+  // repeated string name = 4;
+  total_size += 1 * this->name_size();
+  for (int i = 0; i < this->name_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->name(i));
+  }
+
+  // repeated string ids = 5;
+  total_size += 1 * this->ids_size();
+  for (int i = 0; i < this->ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->ids(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -6518,10 +7078,10 @@ int CommandSetPreviewLocArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetPreviewLocArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandAddGridRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetPreviewLocArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetPreviewLocArchive*>(
+  const CommandAddGridRowsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandAddGridRowsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -6530,65 +7090,63 @@ void CommandSetPreviewLocArchive::MergeFrom(const ::google::protobuf::Message& f
   }
 }
 
-void CommandSetPreviewLocArchive::MergeFrom(const CommandSetPreviewLocArchive& from) {
+void CommandAddGridRowsArchive::MergeFrom(const CommandAddGridRowsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  name_.MergeFrom(from.name_);
+  ids_.MergeFrom(from.ids_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_old_loc()) {
-      mutable_old_loc()->::TSP::Point::MergeFrom(from.old_loc());
+    if (from.has_location()) {
+      set_location(from.location());
     }
-    if (from.has_new_loc()) {
-      mutable_new_loc()->::TSP::Point::MergeFrom(from.new_loc());
+    if (from.has_length()) {
+      set_length(from.length());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetPreviewLocArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandAddGridRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetPreviewLocArchive::CopyFrom(const CommandSetPreviewLocArchive& from) {
+void CommandAddGridRowsArchive::CopyFrom(const CommandAddGridRowsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetPreviewLocArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandAddGridRowsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_old_loc()) {
-    if (!this->old_loc().IsInitialized()) return false;
-  }
-  if (has_new_loc()) {
-    if (!this->new_loc().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetPreviewLocArchive::Swap(CommandSetPreviewLocArchive* other) {
+void CommandAddGridRowsArchive::Swap(CommandAddGridRowsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(old_loc_, other->old_loc_);
-    std::swap(new_loc_, other->new_loc_);
+    std::swap(location_, other->location_);
+    std::swap(length_, other->length_);
+    name_.Swap(&other->name_);
+    ids_.Swap(&other->ids_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetPreviewLocArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandAddGridRowsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetPreviewLocArchive_descriptor_;
-  metadata.reflection = CommandSetPreviewLocArchive_reflection_;
+  metadata.descriptor = CommandAddGridRowsArchive_descriptor_;
+  metadata.reflection = CommandAddGridRowsArchive_reflection_;
   return metadata;
 }
 
@@ -6596,84 +7154,82 @@ ::google::protobuf::Metadata CommandSetPreviewLocArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetGridValueArchive::kSuperFieldNumber;
-const int CommandSetGridValueArchive::kRowindexFieldNumber;
-const int CommandSetGridValueArchive::kColumnindexFieldNumber;
-const int CommandSetGridValueArchive::kOldvalueFieldNumber;
-const int CommandSetGridValueArchive::kNewvalueFieldNumber;
+const int CommandAddGridColumnsArchive::kSuperFieldNumber;
+const int CommandAddGridColumnsArchive::kLocationFieldNumber;
+const int CommandAddGridColumnsArchive::kLengthFieldNumber;
+const int CommandAddGridColumnsArchive::kNameFieldNumber;
+const int CommandAddGridColumnsArchive::kIdsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetGridValueArchive::CommandSetGridValueArchive()
+CommandAddGridColumnsArchive::CommandAddGridColumnsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetGridValueArchive::InitAsDefaultInstance() {
+void CommandAddGridColumnsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandSetGridValueArchive::CommandSetGridValueArchive(const CommandSetGridValueArchive& from)
+CommandAddGridColumnsArchive::CommandAddGridColumnsArchive(const CommandAddGridColumnsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetGridValueArchive::SharedCtor() {
+void CommandAddGridColumnsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  rowindex_ = 0u;
-  columnindex_ = 0u;
-  oldvalue_ = 0;
-  newvalue_ = 0;
+  location_ = 0u;
+  length_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetGridValueArchive::~CommandSetGridValueArchive() {
+CommandAddGridColumnsArchive::~CommandAddGridColumnsArchive() {
   SharedDtor();
 }
 
-void CommandSetGridValueArchive::SharedDtor() {
+void CommandAddGridColumnsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetGridValueArchive::SetCachedSize(int size) const {
+void CommandAddGridColumnsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetGridValueArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandAddGridColumnsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetGridValueArchive_descriptor_;
+  return CommandAddGridColumnsArchive_descriptor_;
 }
 
-const CommandSetGridValueArchive& CommandSetGridValueArchive::default_instance() {
+const CommandAddGridColumnsArchive& CommandAddGridColumnsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetGridValueArchive* CommandSetGridValueArchive::default_instance_ = NULL;
+CommandAddGridColumnsArchive* CommandAddGridColumnsArchive::default_instance_ = NULL;
 
-CommandSetGridValueArchive* CommandSetGridValueArchive::New() const {
-  return new CommandSetGridValueArchive;
+CommandAddGridColumnsArchive* CommandAddGridColumnsArchive::New() const {
+  return new CommandAddGridColumnsArchive;
 }
 
-void CommandSetGridValueArchive::Clear() {
+void CommandAddGridColumnsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    rowindex_ = 0u;
-    columnindex_ = 0u;
-    oldvalue_ = 0;
-    newvalue_ = 0;
-  }
+    location_ = 0u;
+    length_ = 0u;
+  }
+  name_.Clear();
+  ids_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetGridValueArchive::MergePartialFromCodedStream(
+bool CommandAddGridColumnsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -6688,70 +7244,76 @@ bool CommandSetGridValueArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_rowindex;
+        if (input->ExpectTag(16)) goto parse_location;
         break;
       }
 
-      // required uint32 rowindex = 2;
+      // required uint32 location = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_rowindex:
+         parse_location:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &rowindex_)));
-          set_has_rowindex();
+                 input, &location_)));
+          set_has_location();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_columnindex;
+        if (input->ExpectTag(24)) goto parse_length;
         break;
       }
 
-      // required uint32 columnindex = 3;
+      // optional uint32 length = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_columnindex:
+         parse_length:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &columnindex_)));
-          set_has_columnindex();
+                 input, &length_)));
+          set_has_length();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(33)) goto parse_oldvalue;
+        if (input->ExpectTag(34)) goto parse_name;
         break;
       }
 
-      // required double oldvalue = 4;
+      // repeated string name = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_oldvalue:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &oldvalue_)));
-          set_has_oldvalue();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->name(this->name_size() - 1).data(),
+            this->name(this->name_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(41)) goto parse_newvalue;
+        if (input->ExpectTag(34)) goto parse_name;
+        if (input->ExpectTag(42)) goto parse_ids;
         break;
       }
 
-      // required double newvalue = 5;
+      // repeated string ids = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_newvalue:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &newvalue_)));
-          set_has_newvalue();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->ids(this->ids_size() - 1).data(),
+            this->ids(this->ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(42)) goto parse_ids;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -6772,7 +7334,7 @@ bool CommandSetGridValueArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetGridValueArchive::SerializeWithCachedSizes(
+void CommandAddGridColumnsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -6780,24 +7342,32 @@ void CommandSetGridValueArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 rowindex = 2;
-  if (has_rowindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->rowindex(), output);
+  // required uint32 location = 2;
+  if (has_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
   }
 
-  // required uint32 columnindex = 3;
-  if (has_columnindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->columnindex(), output);
+  // optional uint32 length = 3;
+  if (has_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
   }
 
-  // required double oldvalue = 4;
-  if (has_oldvalue()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(4, this->oldvalue(), output);
+  // repeated string name = 4;
+  for (int i = 0; i < this->name_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->name(i).data(), this->name(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->name(i), output);
   }
 
-  // required double newvalue = 5;
-  if (has_newvalue()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->newvalue(), output);
+  // repeated string ids = 5;
+  for (int i = 0; i < this->ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->ids(i).data(), this->ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      5, this->ids(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -6806,7 +7376,7 @@ void CommandSetGridValueArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetGridValueArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandAddGridColumnsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -6815,24 +7385,32 @@ ::google::protobuf::uint8* CommandSetGridValueArchive::SerializeWithCachedSizesT
         1, this->super(), target);
   }
 
-  // required uint32 rowindex = 2;
-  if (has_rowindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->rowindex(), target);
+  // required uint32 location = 2;
+  if (has_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
   }
 
-  // required uint32 columnindex = 3;
-  if (has_columnindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->columnindex(), target);
+  // optional uint32 length = 3;
+  if (has_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
   }
 
-  // required double oldvalue = 4;
-  if (has_oldvalue()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(4, this->oldvalue(), target);
+  // repeated string name = 4;
+  for (int i = 0; i < this->name_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->name(i).data(), this->name(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(4, this->name(i), target);
   }
 
-  // required double newvalue = 5;
-  if (has_newvalue()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->newvalue(), target);
+  // repeated string ids = 5;
+  for (int i = 0; i < this->ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->ids(i).data(), this->ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(5, this->ids(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -6842,7 +7420,7 @@ ::google::protobuf::uint8* CommandSetGridValueArchive::SerializeWithCachedSizesT
   return target;
 }
 
-int CommandSetGridValueArchive::ByteSize() const {
+int CommandAddGridColumnsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -6853,31 +7431,35 @@ int CommandSetGridValueArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 rowindex = 2;
-    if (has_rowindex()) {
+    // required uint32 location = 2;
+    if (has_location()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->rowindex());
+          this->location());
     }
 
-    // required uint32 columnindex = 3;
-    if (has_columnindex()) {
+    // optional uint32 length = 3;
+    if (has_length()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->columnindex());
-    }
-
-    // required double oldvalue = 4;
-    if (has_oldvalue()) {
-      total_size += 1 + 8;
+          this->length());
     }
 
-    // required double newvalue = 5;
-    if (has_newvalue()) {
-      total_size += 1 + 8;
-    }
+  }
+  // repeated string name = 4;
+  total_size += 1 * this->name_size();
+  for (int i = 0; i < this->name_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->name(i));
+  }
 
+  // repeated string ids = 5;
+  total_size += 1 * this->ids_size();
+  for (int i = 0; i < this->ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->ids(i));
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -6889,10 +7471,10 @@ int CommandSetGridValueArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetGridValueArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandAddGridColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetGridValueArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetGridValueArchive*>(
+  const CommandAddGridColumnsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandAddGridColumnsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -6901,42 +7483,38 @@ void CommandSetGridValueArchive::MergeFrom(const ::google::protobuf::Message& fr
   }
 }
 
-void CommandSetGridValueArchive::MergeFrom(const CommandSetGridValueArchive& from) {
+void CommandAddGridColumnsArchive::MergeFrom(const CommandAddGridColumnsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  name_.MergeFrom(from.name_);
+  ids_.MergeFrom(from.ids_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_rowindex()) {
-      set_rowindex(from.rowindex());
-    }
-    if (from.has_columnindex()) {
-      set_columnindex(from.columnindex());
-    }
-    if (from.has_oldvalue()) {
-      set_oldvalue(from.oldvalue());
+    if (from.has_location()) {
+      set_location(from.location());
     }
-    if (from.has_newvalue()) {
-      set_newvalue(from.newvalue());
+    if (from.has_length()) {
+      set_length(from.length());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetGridValueArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandAddGridColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetGridValueArchive::CopyFrom(const CommandSetGridValueArchive& from) {
+void CommandAddGridColumnsArchive::CopyFrom(const CommandAddGridColumnsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetGridValueArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool CommandAddGridColumnsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -6944,24 +7522,24 @@ bool CommandSetGridValueArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetGridValueArchive::Swap(CommandSetGridValueArchive* other) {
+void CommandAddGridColumnsArchive::Swap(CommandAddGridColumnsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(rowindex_, other->rowindex_);
-    std::swap(columnindex_, other->columnindex_);
-    std::swap(oldvalue_, other->oldvalue_);
-    std::swap(newvalue_, other->newvalue_);
+    std::swap(location_, other->location_);
+    std::swap(length_, other->length_);
+    name_.Swap(&other->name_);
+    ids_.Swap(&other->ids_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetGridValueArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandAddGridColumnsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetGridValueArchive_descriptor_;
-  metadata.reflection = CommandSetGridValueArchive_reflection_;
+  metadata.descriptor = CommandAddGridColumnsArchive_descriptor_;
+  metadata.reflection = CommandAddGridColumnsArchive_reflection_;
   return metadata;
 }
 
@@ -6969,78 +7547,81 @@ ::google::protobuf::Metadata CommandSetGridValueArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetGridDirectionArchive::kSuperFieldNumber;
-const int CommandSetGridDirectionArchive::kOldDirectionFieldNumber;
-const int CommandSetGridDirectionArchive::kNewDirectionFieldNumber;
+const int CommandMoveGridRowsArchive::kSuperFieldNumber;
+const int CommandMoveGridRowsArchive::kLocationFieldNumber;
+const int CommandMoveGridRowsArchive::kLengthFieldNumber;
+const int CommandMoveGridRowsArchive::kAfterrowFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetGridDirectionArchive::CommandSetGridDirectionArchive()
+CommandMoveGridRowsArchive::CommandMoveGridRowsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetGridDirectionArchive::InitAsDefaultInstance() {
+void CommandMoveGridRowsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandSetGridDirectionArchive::CommandSetGridDirectionArchive(const CommandSetGridDirectionArchive& from)
+CommandMoveGridRowsArchive::CommandMoveGridRowsArchive(const CommandMoveGridRowsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetGridDirectionArchive::SharedCtor() {
+void CommandMoveGridRowsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  old_direction_ = 0u;
-  new_direction_ = 0u;
+  location_ = 0u;
+  length_ = 0u;
+  afterrow_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetGridDirectionArchive::~CommandSetGridDirectionArchive() {
+CommandMoveGridRowsArchive::~CommandMoveGridRowsArchive() {
   SharedDtor();
 }
 
-void CommandSetGridDirectionArchive::SharedDtor() {
+void CommandMoveGridRowsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetGridDirectionArchive::SetCachedSize(int size) const {
+void CommandMoveGridRowsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetGridDirectionArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMoveGridRowsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetGridDirectionArchive_descriptor_;
+  return CommandMoveGridRowsArchive_descriptor_;
 }
 
-const CommandSetGridDirectionArchive& CommandSetGridDirectionArchive::default_instance() {
+const CommandMoveGridRowsArchive& CommandMoveGridRowsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetGridDirectionArchive* CommandSetGridDirectionArchive::default_instance_ = NULL;
+CommandMoveGridRowsArchive* CommandMoveGridRowsArchive::default_instance_ = NULL;
 
-CommandSetGridDirectionArchive* CommandSetGridDirectionArchive::New() const {
-  return new CommandSetGridDirectionArchive;
+CommandMoveGridRowsArchive* CommandMoveGridRowsArchive::New() const {
+  return new CommandMoveGridRowsArchive;
 }
 
-void CommandSetGridDirectionArchive::Clear() {
+void CommandMoveGridRowsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    old_direction_ = 0u;
-    new_direction_ = 0u;
+    location_ = 0u;
+    length_ = 0u;
+    afterrow_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetGridDirectionArchive::MergePartialFromCodedStream(
+bool CommandMoveGridRowsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -7055,35 +7636,51 @@ bool CommandSetGridDirectionArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_old_direction;
+        if (input->ExpectTag(16)) goto parse_location;
         break;
       }
 
-      // required uint32 old_direction = 2;
+      // required uint32 location = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_old_direction:
+         parse_location:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &old_direction_)));
-          set_has_old_direction();
+                 input, &location_)));
+          set_has_location();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_new_direction;
+        if (input->ExpectTag(24)) goto parse_length;
         break;
       }
 
-      // required uint32 new_direction = 3;
+      // required uint32 length = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_new_direction:
+         parse_length:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &new_direction_)));
-          set_has_new_direction();
+                 input, &length_)));
+          set_has_length();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_afterrow;
+        break;
+      }
+
+      // required int32 afterrow = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_afterrow:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &afterrow_)));
+          set_has_afterrow();
         } else {
           goto handle_uninterpreted;
         }
@@ -7107,7 +7704,7 @@ bool CommandSetGridDirectionArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetGridDirectionArchive::SerializeWithCachedSizes(
+void CommandMoveGridRowsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -7115,14 +7712,19 @@ void CommandSetGridDirectionArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 old_direction = 2;
-  if (has_old_direction()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->old_direction(), output);
+  // required uint32 location = 2;
+  if (has_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
   }
 
-  // required uint32 new_direction = 3;
-  if (has_new_direction()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->new_direction(), output);
+  // required uint32 length = 3;
+  if (has_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  }
+
+  // required int32 afterrow = 4;
+  if (has_afterrow()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->afterrow(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -7131,7 +7733,7 @@ void CommandSetGridDirectionArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetGridDirectionArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMoveGridRowsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -7140,14 +7742,19 @@ ::google::protobuf::uint8* CommandSetGridDirectionArchive::SerializeWithCachedSi
         1, this->super(), target);
   }
 
-  // required uint32 old_direction = 2;
-  if (has_old_direction()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->old_direction(), target);
+  // required uint32 location = 2;
+  if (has_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
   }
 
-  // required uint32 new_direction = 3;
-  if (has_new_direction()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->new_direction(), target);
+  // required uint32 length = 3;
+  if (has_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  }
+
+  // required int32 afterrow = 4;
+  if (has_afterrow()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->afterrow(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -7157,7 +7764,7 @@ ::google::protobuf::uint8* CommandSetGridDirectionArchive::SerializeWithCachedSi
   return target;
 }
 
-int CommandSetGridDirectionArchive::ByteSize() const {
+int CommandMoveGridRowsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -7168,18 +7775,25 @@ int CommandSetGridDirectionArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 old_direction = 2;
-    if (has_old_direction()) {
+    // required uint32 location = 2;
+    if (has_location()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->old_direction());
+          this->location());
     }
 
-    // required uint32 new_direction = 3;
-    if (has_new_direction()) {
+    // required uint32 length = 3;
+    if (has_length()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->new_direction());
+          this->length());
+    }
+
+    // required int32 afterrow = 4;
+    if (has_afterrow()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->afterrow());
     }
 
   }
@@ -7194,10 +7808,10 @@ int CommandSetGridDirectionArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetGridDirectionArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMoveGridRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetGridDirectionArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetGridDirectionArchive*>(
+  const CommandMoveGridRowsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveGridRowsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -7206,36 +7820,39 @@ void CommandSetGridDirectionArchive::MergeFrom(const ::google::protobuf::Message
   }
 }
 
-void CommandSetGridDirectionArchive::MergeFrom(const CommandSetGridDirectionArchive& from) {
+void CommandMoveGridRowsArchive::MergeFrom(const CommandMoveGridRowsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_old_direction()) {
-      set_old_direction(from.old_direction());
+    if (from.has_location()) {
+      set_location(from.location());
     }
-    if (from.has_new_direction()) {
-      set_new_direction(from.new_direction());
+    if (from.has_length()) {
+      set_length(from.length());
+    }
+    if (from.has_afterrow()) {
+      set_afterrow(from.afterrow());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetGridDirectionArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMoveGridRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetGridDirectionArchive::CopyFrom(const CommandSetGridDirectionArchive& from) {
+void CommandMoveGridRowsArchive::CopyFrom(const CommandMoveGridRowsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetGridDirectionArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandMoveGridRowsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -7243,22 +7860,23 @@ bool CommandSetGridDirectionArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetGridDirectionArchive::Swap(CommandSetGridDirectionArchive* other) {
+void CommandMoveGridRowsArchive::Swap(CommandMoveGridRowsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(old_direction_, other->old_direction_);
-    std::swap(new_direction_, other->new_direction_);
+    std::swap(location_, other->location_);
+    std::swap(length_, other->length_);
+    std::swap(afterrow_, other->afterrow_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetGridDirectionArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMoveGridRowsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetGridDirectionArchive_descriptor_;
-  metadata.reflection = CommandSetGridDirectionArchive_reflection_;
+  metadata.descriptor = CommandMoveGridRowsArchive_descriptor_;
+  metadata.reflection = CommandMoveGridRowsArchive_reflection_;
   return metadata;
 }
 
@@ -7266,81 +7884,81 @@ ::google::protobuf::Metadata CommandSetGridDirectionArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetSeriesTypeArchive::kSuperFieldNumber;
-const int CommandSetSeriesTypeArchive::kSeriesindexFieldNumber;
-const int CommandSetSeriesTypeArchive::kOldtypeFieldNumber;
-const int CommandSetSeriesTypeArchive::kNewtypeFieldNumber;
+const int CommandMoveGridColumnsArchive::kSuperFieldNumber;
+const int CommandMoveGridColumnsArchive::kLocationFieldNumber;
+const int CommandMoveGridColumnsArchive::kLengthFieldNumber;
+const int CommandMoveGridColumnsArchive::kAftercolumnFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetSeriesTypeArchive::CommandSetSeriesTypeArchive()
+CommandMoveGridColumnsArchive::CommandMoveGridColumnsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetSeriesTypeArchive::InitAsDefaultInstance() {
+void CommandMoveGridColumnsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandSetSeriesTypeArchive::CommandSetSeriesTypeArchive(const CommandSetSeriesTypeArchive& from)
+CommandMoveGridColumnsArchive::CommandMoveGridColumnsArchive(const CommandMoveGridColumnsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetSeriesTypeArchive::SharedCtor() {
+void CommandMoveGridColumnsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  seriesindex_ = 0u;
-  oldtype_ = 0u;
-  newtype_ = 0u;
+  location_ = 0u;
+  length_ = 0u;
+  aftercolumn_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetSeriesTypeArchive::~CommandSetSeriesTypeArchive() {
+CommandMoveGridColumnsArchive::~CommandMoveGridColumnsArchive() {
   SharedDtor();
 }
 
-void CommandSetSeriesTypeArchive::SharedDtor() {
+void CommandMoveGridColumnsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetSeriesTypeArchive::SetCachedSize(int size) const {
+void CommandMoveGridColumnsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetSeriesTypeArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMoveGridColumnsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetSeriesTypeArchive_descriptor_;
+  return CommandMoveGridColumnsArchive_descriptor_;
 }
 
-const CommandSetSeriesTypeArchive& CommandSetSeriesTypeArchive::default_instance() {
+const CommandMoveGridColumnsArchive& CommandMoveGridColumnsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetSeriesTypeArchive* CommandSetSeriesTypeArchive::default_instance_ = NULL;
+CommandMoveGridColumnsArchive* CommandMoveGridColumnsArchive::default_instance_ = NULL;
 
-CommandSetSeriesTypeArchive* CommandSetSeriesTypeArchive::New() const {
-  return new CommandSetSeriesTypeArchive;
+CommandMoveGridColumnsArchive* CommandMoveGridColumnsArchive::New() const {
+  return new CommandMoveGridColumnsArchive;
 }
 
-void CommandSetSeriesTypeArchive::Clear() {
+void CommandMoveGridColumnsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    seriesindex_ = 0u;
-    oldtype_ = 0u;
-    newtype_ = 0u;
+    location_ = 0u;
+    length_ = 0u;
+    aftercolumn_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetSeriesTypeArchive::MergePartialFromCodedStream(
+bool CommandMoveGridColumnsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -7355,51 +7973,51 @@ bool CommandSetSeriesTypeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_seriesindex;
+        if (input->ExpectTag(16)) goto parse_location;
         break;
       }
 
-      // required uint32 seriesindex = 2;
+      // required uint32 location = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_seriesindex:
+         parse_location:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &seriesindex_)));
-          set_has_seriesindex();
+                 input, &location_)));
+          set_has_location();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_oldtype;
+        if (input->ExpectTag(24)) goto parse_length;
         break;
       }
 
-      // required uint32 oldtype = 3;
+      // required uint32 length = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_oldtype:
+         parse_length:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &oldtype_)));
-          set_has_oldtype();
+                 input, &length_)));
+          set_has_length();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(32)) goto parse_newtype;
+        if (input->ExpectTag(32)) goto parse_aftercolumn;
         break;
       }
 
-      // required uint32 newtype = 4;
+      // required int32 aftercolumn = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_newtype:
+         parse_aftercolumn:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &newtype_)));
-          set_has_newtype();
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &aftercolumn_)));
+          set_has_aftercolumn();
         } else {
           goto handle_uninterpreted;
         }
@@ -7423,7 +8041,7 @@ bool CommandSetSeriesTypeArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetSeriesTypeArchive::SerializeWithCachedSizes(
+void CommandMoveGridColumnsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -7431,19 +8049,19 @@ void CommandSetSeriesTypeArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 seriesindex = 2;
-  if (has_seriesindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->seriesindex(), output);
+  // required uint32 location = 2;
+  if (has_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
   }
 
-  // required uint32 oldtype = 3;
-  if (has_oldtype()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->oldtype(), output);
+  // required uint32 length = 3;
+  if (has_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
   }
 
-  // required uint32 newtype = 4;
-  if (has_newtype()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->newtype(), output);
+  // required int32 aftercolumn = 4;
+  if (has_aftercolumn()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->aftercolumn(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -7452,7 +8070,7 @@ void CommandSetSeriesTypeArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetSeriesTypeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMoveGridColumnsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -7461,19 +8079,19 @@ ::google::protobuf::uint8* CommandSetSeriesTypeArchive::SerializeWithCachedSizes
         1, this->super(), target);
   }
 
-  // required uint32 seriesindex = 2;
-  if (has_seriesindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->seriesindex(), target);
+  // required uint32 location = 2;
+  if (has_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
   }
 
-  // required uint32 oldtype = 3;
-  if (has_oldtype()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->oldtype(), target);
+  // required uint32 length = 3;
+  if (has_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
   }
 
-  // required uint32 newtype = 4;
-  if (has_newtype()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->newtype(), target);
+  // required int32 aftercolumn = 4;
+  if (has_aftercolumn()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->aftercolumn(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -7483,7 +8101,7 @@ ::google::protobuf::uint8* CommandSetSeriesTypeArchive::SerializeWithCachedSizes
   return target;
 }
 
-int CommandSetSeriesTypeArchive::ByteSize() const {
+int CommandMoveGridColumnsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -7494,25 +8112,25 @@ int CommandSetSeriesTypeArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 seriesindex = 2;
-    if (has_seriesindex()) {
+    // required uint32 location = 2;
+    if (has_location()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->seriesindex());
+          this->location());
     }
 
-    // required uint32 oldtype = 3;
-    if (has_oldtype()) {
+    // required uint32 length = 3;
+    if (has_length()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->oldtype());
+          this->length());
     }
 
-    // required uint32 newtype = 4;
-    if (has_newtype()) {
+    // required int32 aftercolumn = 4;
+    if (has_aftercolumn()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->newtype());
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->aftercolumn());
     }
 
   }
@@ -7527,10 +8145,10 @@ int CommandSetSeriesTypeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetSeriesTypeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMoveGridColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetSeriesTypeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSeriesTypeArchive*>(
+  const CommandMoveGridColumnsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveGridColumnsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -7539,38 +8157,38 @@ void CommandSetSeriesTypeArchive::MergeFrom(const ::google::protobuf::Message& f
   }
 }
 
-void CommandSetSeriesTypeArchive::MergeFrom(const CommandSetSeriesTypeArchive& from) {
+void CommandMoveGridColumnsArchive::MergeFrom(const CommandMoveGridColumnsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_seriesindex()) {
-      set_seriesindex(from.seriesindex());
+    if (from.has_location()) {
+      set_location(from.location());
     }
-    if (from.has_oldtype()) {
-      set_oldtype(from.oldtype());
+    if (from.has_length()) {
+      set_length(from.length());
     }
-    if (from.has_newtype()) {
-      set_newtype(from.newtype());
+    if (from.has_aftercolumn()) {
+      set_aftercolumn(from.aftercolumn());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetSeriesTypeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMoveGridColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetSeriesTypeArchive::CopyFrom(const CommandSetSeriesTypeArchive& from) {
+void CommandMoveGridColumnsArchive::CopyFrom(const CommandMoveGridColumnsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetSeriesTypeArchive::IsInitialized() const {
+bool CommandMoveGridColumnsArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
@@ -7579,23 +8197,23 @@ bool CommandSetSeriesTypeArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetSeriesTypeArchive::Swap(CommandSetSeriesTypeArchive* other) {
+void CommandMoveGridColumnsArchive::Swap(CommandMoveGridColumnsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(seriesindex_, other->seriesindex_);
-    std::swap(oldtype_, other->oldtype_);
-    std::swap(newtype_, other->newtype_);
+    std::swap(location_, other->location_);
+    std::swap(length_, other->length_);
+    std::swap(aftercolumn_, other->aftercolumn_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetSeriesTypeArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMoveGridColumnsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetSeriesTypeArchive_descriptor_;
-  metadata.reflection = CommandSetSeriesTypeArchive_reflection_;
+  metadata.descriptor = CommandMoveGridColumnsArchive_descriptor_;
+  metadata.reflection = CommandMoveGridColumnsArchive_reflection_;
   return metadata;
 }
 
@@ -7603,124 +8221,88 @@ ::google::protobuf::Metadata CommandSetSeriesTypeArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetScatterFormatArchive::kSuperFieldNumber;
-const int CommandSetScatterFormatArchive::kOldformatFieldNumber;
-const int CommandSetScatterFormatArchive::kNewformatFieldNumber;
+const int CommandDeleteGridRowsArchive_ValueRow::kValueFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetScatterFormatArchive::CommandSetScatterFormatArchive()
+CommandDeleteGridRowsArchive_ValueRow::CommandDeleteGridRowsArchive_ValueRow()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetScatterFormatArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+void CommandDeleteGridRowsArchive_ValueRow::InitAsDefaultInstance() {
 }
 
-CommandSetScatterFormatArchive::CommandSetScatterFormatArchive(const CommandSetScatterFormatArchive& from)
+CommandDeleteGridRowsArchive_ValueRow::CommandDeleteGridRowsArchive_ValueRow(const CommandDeleteGridRowsArchive_ValueRow& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetScatterFormatArchive::SharedCtor() {
+void CommandDeleteGridRowsArchive_ValueRow::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  oldformat_ = 0u;
-  newformat_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetScatterFormatArchive::~CommandSetScatterFormatArchive() {
+CommandDeleteGridRowsArchive_ValueRow::~CommandDeleteGridRowsArchive_ValueRow() {
   SharedDtor();
 }
 
-void CommandSetScatterFormatArchive::SharedDtor() {
+void CommandDeleteGridRowsArchive_ValueRow::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
   }
 }
 
-void CommandSetScatterFormatArchive::SetCachedSize(int size) const {
+void CommandDeleteGridRowsArchive_ValueRow::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetScatterFormatArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandDeleteGridRowsArchive_ValueRow::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetScatterFormatArchive_descriptor_;
+  return CommandDeleteGridRowsArchive_ValueRow_descriptor_;
 }
 
-const CommandSetScatterFormatArchive& CommandSetScatterFormatArchive::default_instance() {
+const CommandDeleteGridRowsArchive_ValueRow& CommandDeleteGridRowsArchive_ValueRow::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetScatterFormatArchive* CommandSetScatterFormatArchive::default_instance_ = NULL;
+CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive_ValueRow::default_instance_ = NULL;
 
-CommandSetScatterFormatArchive* CommandSetScatterFormatArchive::New() const {
-  return new CommandSetScatterFormatArchive;
+CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive_ValueRow::New() const {
+  return new CommandDeleteGridRowsArchive_ValueRow;
 }
 
-void CommandSetScatterFormatArchive::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-    }
-    oldformat_ = 0u;
-    newformat_ = 0u;
-  }
+void CommandDeleteGridRowsArchive_ValueRow::Clear() {
+  value_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetScatterFormatArchive::MergePartialFromCodedStream(
+bool CommandDeleteGridRowsArchive_ValueRow::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_oldformat;
-        break;
-      }
-
-      // required uint32 oldformat = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_oldformat:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &oldformat_)));
-          set_has_oldformat();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_newformat;
-        break;
-      }
-
-      // required uint32 newformat = 4;
-      case 4: {
+      // repeated double value = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_newformat:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &newformat_)));
-          set_has_newformat();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 1, 41, input, this->mutable_value())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, this->mutable_value())));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(41)) goto parse_value;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -7741,22 +8323,12 @@ bool CommandSetScatterFormatArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetScatterFormatArchive::SerializeWithCachedSizes(
+void CommandDeleteGridRowsArchive_ValueRow::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required uint32 oldformat = 3;
-  if (has_oldformat()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->oldformat(), output);
-  }
-
-  // required uint32 newformat = 4;
-  if (has_newformat()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->newformat(), output);
+  // repeated double value = 5;
+  for (int i = 0; i < this->value_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(
+      5, this->value(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -7765,23 +8337,12 @@ void CommandSetScatterFormatArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetScatterFormatArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandDeleteGridRowsArchive_ValueRow::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
+  // repeated double value = 5;
+  for (int i = 0; i < this->value_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required uint32 oldformat = 3;
-  if (has_oldformat()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->oldformat(), target);
-  }
-
-  // required uint32 newformat = 4;
-  if (has_newformat()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->newformat(), target);
+      WriteDoubleToArray(5, this->value(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -7791,32 +8352,16 @@ ::google::protobuf::uint8* CommandSetScatterFormatArchive::SerializeWithCachedSi
   return target;
 }
 
-int CommandSetScatterFormatArchive::ByteSize() const {
+int CommandDeleteGridRowsArchive_ValueRow::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // required uint32 oldformat = 3;
-    if (has_oldformat()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->oldformat());
-    }
-
-    // required uint32 newformat = 4;
-    if (has_newformat()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->newformat());
-    }
-
+  // repeated double value = 5;
+  {
+    int data_size = 0;
+    data_size = 8 * this->value_size();
+    total_size += 1 * this->value_size() + data_size;
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -7828,10 +8373,10 @@ int CommandSetScatterFormatArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetScatterFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridRowsArchive_ValueRow::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetScatterFormatArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetScatterFormatArchive*>(
+  const CommandDeleteGridRowsArchive_ValueRow* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridRowsArchive_ValueRow*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -7840,138 +8385,140 @@ void CommandSetScatterFormatArchive::MergeFrom(const ::google::protobuf::Message
   }
 }
 
-void CommandSetScatterFormatArchive::MergeFrom(const CommandSetScatterFormatArchive& from) {
+void CommandDeleteGridRowsArchive_ValueRow::MergeFrom(const CommandDeleteGridRowsArchive_ValueRow& from) {
   GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_oldformat()) {
-      set_oldformat(from.oldformat());
-    }
-    if (from.has_newformat()) {
-      set_newformat(from.newformat());
-    }
-  }
+  value_.MergeFrom(from.value_);
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetScatterFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridRowsArchive_ValueRow::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetScatterFormatArchive::CopyFrom(const CommandSetScatterFormatArchive& from) {
+void CommandDeleteGridRowsArchive_ValueRow::CopyFrom(const CommandDeleteGridRowsArchive_ValueRow& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetScatterFormatArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandDeleteGridRowsArchive_ValueRow::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetScatterFormatArchive::Swap(CommandSetScatterFormatArchive* other) {
+void CommandDeleteGridRowsArchive_ValueRow::Swap(CommandDeleteGridRowsArchive_ValueRow* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(oldformat_, other->oldformat_);
-    std::swap(newformat_, other->newformat_);
+    value_.Swap(&other->value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetScatterFormatArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandDeleteGridRowsArchive_ValueRow::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetScatterFormatArchive_descriptor_;
-  metadata.reflection = CommandSetScatterFormatArchive_reflection_;
+  metadata.descriptor = CommandDeleteGridRowsArchive_ValueRow_descriptor_;
+  metadata.reflection = CommandDeleteGridRowsArchive_ValueRow_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandSetMultiDataSetIndexArchive::kSuperFieldNumber;
-const int CommandSetMultiDataSetIndexArchive::kOldindexFieldNumber;
-const int CommandSetMultiDataSetIndexArchive::kNewindexFieldNumber;
+const int CommandDeleteGridRowsArchive::kSuperFieldNumber;
+const int CommandDeleteGridRowsArchive::kLocationFieldNumber;
+const int CommandDeleteGridRowsArchive::kLengthFieldNumber;
+const int CommandDeleteGridRowsArchive::kNamesFieldNumber;
+const int CommandDeleteGridRowsArchive::kValueRowFieldNumber;
+const int CommandDeleteGridRowsArchive::kRemovedAllRowsFieldNumber;
+const int CommandDeleteGridRowsArchive::kColumnNamesFieldNumber;
+const int CommandDeleteGridRowsArchive::kRowIdsFieldNumber;
+const int CommandDeleteGridRowsArchive::kColumnIdsFieldNumber;
+const int CommandDeleteGridRowsArchive::kAddDummyDataOnDeleteAllFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetMultiDataSetIndexArchive::CommandSetMultiDataSetIndexArchive()
+CommandDeleteGridRowsArchive::CommandDeleteGridRowsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetMultiDataSetIndexArchive::InitAsDefaultInstance() {
+void CommandDeleteGridRowsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandSetMultiDataSetIndexArchive::CommandSetMultiDataSetIndexArchive(const CommandSetMultiDataSetIndexArchive& from)
+CommandDeleteGridRowsArchive::CommandDeleteGridRowsArchive(const CommandDeleteGridRowsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetMultiDataSetIndexArchive::SharedCtor() {
+void CommandDeleteGridRowsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  oldindex_ = 0u;
-  newindex_ = 0u;
+  location_ = 0u;
+  length_ = 0u;
+  removed_all_rows_ = false;
+  add_dummy_data_on_delete_all_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetMultiDataSetIndexArchive::~CommandSetMultiDataSetIndexArchive() {
+CommandDeleteGridRowsArchive::~CommandDeleteGridRowsArchive() {
   SharedDtor();
 }
 
-void CommandSetMultiDataSetIndexArchive::SharedDtor() {
+void CommandDeleteGridRowsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetMultiDataSetIndexArchive::SetCachedSize(int size) const {
+void CommandDeleteGridRowsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetMultiDataSetIndexArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandDeleteGridRowsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetMultiDataSetIndexArchive_descriptor_;
+  return CommandDeleteGridRowsArchive_descriptor_;
 }
 
-const CommandSetMultiDataSetIndexArchive& CommandSetMultiDataSetIndexArchive::default_instance() {
+const CommandDeleteGridRowsArchive& CommandDeleteGridRowsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetMultiDataSetIndexArchive* CommandSetMultiDataSetIndexArchive::default_instance_ = NULL;
+CommandDeleteGridRowsArchive* CommandDeleteGridRowsArchive::default_instance_ = NULL;
 
-CommandSetMultiDataSetIndexArchive* CommandSetMultiDataSetIndexArchive::New() const {
-  return new CommandSetMultiDataSetIndexArchive;
+CommandDeleteGridRowsArchive* CommandDeleteGridRowsArchive::New() const {
+  return new CommandDeleteGridRowsArchive;
 }
 
-void CommandSetMultiDataSetIndexArchive::Clear() {
+void CommandDeleteGridRowsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    oldindex_ = 0u;
-    newindex_ = 0u;
+    location_ = 0u;
+    length_ = 0u;
+    removed_all_rows_ = false;
   }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    add_dummy_data_on_delete_all_ = false;
+  }
+  names_.Clear();
+  value_row_.Clear();
+  column_names_.Clear();
+  row_ids_.Clear();
+  column_ids_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetMultiDataSetIndexArchive::MergePartialFromCodedStream(
+bool CommandDeleteGridRowsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -7986,35 +8533,158 @@ bool CommandSetMultiDataSetIndexArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_oldindex;
+        if (input->ExpectTag(16)) goto parse_location;
         break;
       }
 
-      // required uint32 oldindex = 2;
+      // required uint32 location = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_oldindex:
+         parse_location:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &oldindex_)));
-          set_has_oldindex();
+                 input, &location_)));
+          set_has_location();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_newindex;
+        if (input->ExpectTag(24)) goto parse_length;
         break;
       }
 
-      // required uint32 newindex = 3;
+      // required uint32 length = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_newindex:
+         parse_length:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &newindex_)));
-          set_has_newindex();
+                 input, &length_)));
+          set_has_length();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_names;
+        break;
+      }
+
+      // repeated string names = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->names(this->names_size() - 1).data(),
+            this->names(this->names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_names;
+        if (input->ExpectTag(50)) goto parse_value_row;
+        break;
+      }
+
+      // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_value_row:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_value_row()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_value_row;
+        if (input->ExpectTag(56)) goto parse_removed_all_rows;
+        break;
+      }
+
+      // optional bool removed_all_rows = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_removed_all_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &removed_all_rows_)));
+          set_has_removed_all_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_column_names;
+        break;
+      }
+
+      // repeated string column_names = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_column_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_column_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->column_names(this->column_names_size() - 1).data(),
+            this->column_names(this->column_names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_column_names;
+        if (input->ExpectTag(74)) goto parse_row_ids;
+        break;
+      }
+
+      // repeated string row_ids = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_row_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_row_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->row_ids(this->row_ids_size() - 1).data(),
+            this->row_ids(this->row_ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_row_ids;
+        if (input->ExpectTag(82)) goto parse_column_ids;
+        break;
+      }
+
+      // repeated string column_ids = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_column_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_column_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->column_ids(this->column_ids_size() - 1).data(),
+            this->column_ids(this->column_ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(82)) goto parse_column_ids;
+        if (input->ExpectTag(88)) goto parse_add_dummy_data_on_delete_all;
+        break;
+      }
+
+      // required bool add_dummy_data_on_delete_all = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_add_dummy_data_on_delete_all:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &add_dummy_data_on_delete_all_)));
+          set_has_add_dummy_data_on_delete_all();
         } else {
           goto handle_uninterpreted;
         }
@@ -8038,7 +8708,7 @@ bool CommandSetMultiDataSetIndexArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetMultiDataSetIndexArchive::SerializeWithCachedSizes(
+void CommandDeleteGridRowsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -8046,14 +8716,66 @@ void CommandSetMultiDataSetIndexArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 oldindex = 2;
-  if (has_oldindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->oldindex(), output);
+  // required uint32 location = 2;
+  if (has_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
   }
 
-  // required uint32 newindex = 3;
-  if (has_newindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->newindex(), output);
+  // required uint32 length = 3;
+  if (has_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
+  }
+
+  // repeated string names = 4;
+  for (int i = 0; i < this->names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->names(i).data(), this->names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->names(i), output);
+  }
+
+  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
+  for (int i = 0; i < this->value_row_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->value_row(i), output);
+  }
+
+  // optional bool removed_all_rows = 7;
+  if (has_removed_all_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->removed_all_rows(), output);
+  }
+
+  // repeated string column_names = 8;
+  for (int i = 0; i < this->column_names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->column_names(i).data(), this->column_names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      8, this->column_names(i), output);
+  }
+
+  // repeated string row_ids = 9;
+  for (int i = 0; i < this->row_ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->row_ids(i).data(), this->row_ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      9, this->row_ids(i), output);
+  }
+
+  // repeated string column_ids = 10;
+  for (int i = 0; i < this->column_ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->column_ids(i).data(), this->column_ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      10, this->column_ids(i), output);
+  }
+
+  // required bool add_dummy_data_on_delete_all = 11;
+  if (has_add_dummy_data_on_delete_all()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->add_dummy_data_on_delete_all(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -8062,7 +8784,7 @@ void CommandSetMultiDataSetIndexArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetMultiDataSetIndexArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandDeleteGridRowsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -8071,24 +8793,77 @@ ::google::protobuf::uint8* CommandSetMultiDataSetIndexArchive::SerializeWithCach
         1, this->super(), target);
   }
 
-  // required uint32 oldindex = 2;
-  if (has_oldindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->oldindex(), target);
+  // required uint32 location = 2;
+  if (has_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
   }
 
-  // required uint32 newindex = 3;
-  if (has_newindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->newindex(), target);
+  // required uint32 length = 3;
+  if (has_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
   }
 
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
+  // repeated string names = 4;
+  for (int i = 0; i < this->names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->names(i).data(), this->names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(4, this->names(i), target);
+  }
+
+  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
+  for (int i = 0; i < this->value_row_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->value_row(i), target);
+  }
+
+  // optional bool removed_all_rows = 7;
+  if (has_removed_all_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->removed_all_rows(), target);
+  }
+
+  // repeated string column_names = 8;
+  for (int i = 0; i < this->column_names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->column_names(i).data(), this->column_names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(8, this->column_names(i), target);
+  }
+
+  // repeated string row_ids = 9;
+  for (int i = 0; i < this->row_ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->row_ids(i).data(), this->row_ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(9, this->row_ids(i), target);
+  }
+
+  // repeated string column_ids = 10;
+  for (int i = 0; i < this->column_ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->column_ids(i).data(), this->column_ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(10, this->column_ids(i), target);
+  }
+
+  // required bool add_dummy_data_on_delete_all = 11;
+  if (has_add_dummy_data_on_delete_all()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->add_dummy_data_on_delete_all(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
   return target;
 }
 
-int CommandSetMultiDataSetIndexArchive::ByteSize() const {
+int CommandDeleteGridRowsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -8099,21 +8874,69 @@ int CommandSetMultiDataSetIndexArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 oldindex = 2;
-    if (has_oldindex()) {
+    // required uint32 location = 2;
+    if (has_location()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->oldindex());
+          this->location());
     }
 
-    // required uint32 newindex = 3;
-    if (has_newindex()) {
+    // required uint32 length = 3;
+    if (has_length()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->newindex());
+          this->length());
+    }
+
+    // optional bool removed_all_rows = 7;
+    if (has_removed_all_rows()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    // required bool add_dummy_data_on_delete_all = 11;
+    if (has_add_dummy_data_on_delete_all()) {
+      total_size += 1 + 1;
     }
 
   }
+  // repeated string names = 4;
+  total_size += 1 * this->names_size();
+  for (int i = 0; i < this->names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->names(i));
+  }
+
+  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
+  total_size += 1 * this->value_row_size();
+  for (int i = 0; i < this->value_row_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->value_row(i));
+  }
+
+  // repeated string column_names = 8;
+  total_size += 1 * this->column_names_size();
+  for (int i = 0; i < this->column_names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->column_names(i));
+  }
+
+  // repeated string row_ids = 9;
+  total_size += 1 * this->row_ids_size();
+  for (int i = 0; i < this->row_ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->row_ids(i));
+  }
+
+  // repeated string column_ids = 10;
+  total_size += 1 * this->column_ids_size();
+  for (int i = 0; i < this->column_ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->column_ids(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -8125,10 +8948,10 @@ int CommandSetMultiDataSetIndexArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetMultiDataSetIndexArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetMultiDataSetIndexArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultiDataSetIndexArchive*>(
+  const CommandDeleteGridRowsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridRowsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -8137,36 +8960,49 @@ void CommandSetMultiDataSetIndexArchive::MergeFrom(const ::google::protobuf::Mes
   }
 }
 
-void CommandSetMultiDataSetIndexArchive::MergeFrom(const CommandSetMultiDataSetIndexArchive& from) {
+void CommandDeleteGridRowsArchive::MergeFrom(const CommandDeleteGridRowsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  names_.MergeFrom(from.names_);
+  value_row_.MergeFrom(from.value_row_);
+  column_names_.MergeFrom(from.column_names_);
+  row_ids_.MergeFrom(from.row_ids_);
+  column_ids_.MergeFrom(from.column_ids_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_oldindex()) {
-      set_oldindex(from.oldindex());
+    if (from.has_location()) {
+      set_location(from.location());
     }
-    if (from.has_newindex()) {
-      set_newindex(from.newindex());
+    if (from.has_length()) {
+      set_length(from.length());
+    }
+    if (from.has_removed_all_rows()) {
+      set_removed_all_rows(from.removed_all_rows());
+    }
+  }
+  if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    if (from.has_add_dummy_data_on_delete_all()) {
+      set_add_dummy_data_on_delete_all(from.add_dummy_data_on_delete_all());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetMultiDataSetIndexArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetMultiDataSetIndexArchive::CopyFrom(const CommandSetMultiDataSetIndexArchive& from) {
+void CommandDeleteGridRowsArchive::CopyFrom(const CommandDeleteGridRowsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetMultiDataSetIndexArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandDeleteGridRowsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000207) != 0x00000207) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -8174,22 +9010,29 @@ bool CommandSetMultiDataSetIndexArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetMultiDataSetIndexArchive::Swap(CommandSetMultiDataSetIndexArchive* other) {
+void CommandDeleteGridRowsArchive::Swap(CommandDeleteGridRowsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(oldindex_, other->oldindex_);
-    std::swap(newindex_, other->newindex_);
+    std::swap(location_, other->location_);
+    std::swap(length_, other->length_);
+    names_.Swap(&other->names_);
+    value_row_.Swap(&other->value_row_);
+    std::swap(removed_all_rows_, other->removed_all_rows_);
+    column_names_.Swap(&other->column_names_);
+    row_ids_.Swap(&other->row_ids_);
+    column_ids_.Swap(&other->column_ids_);
+    std::swap(add_dummy_data_on_delete_all_, other->add_dummy_data_on_delete_all_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetMultiDataSetIndexArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandDeleteGridRowsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetMultiDataSetIndexArchive_descriptor_;
-  metadata.reflection = CommandSetMultiDataSetIndexArchive_reflection_;
+  metadata.descriptor = CommandDeleteGridRowsArchive_descriptor_;
+  metadata.reflection = CommandDeleteGridRowsArchive_reflection_;
   return metadata;
 }
 
@@ -8197,128 +9040,88 @@ ::google::protobuf::Metadata CommandSetMultiDataSetIndexArchive::GetMetadata() c
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetLegendFrameArchive::kSuperFieldNumber;
-const int CommandSetLegendFrameArchive::kOldLegendFrameFieldNumber;
-const int CommandSetLegendFrameArchive::kNewLegendFrameFieldNumber;
+const int CommandDeleteGridColumnsArchive_ValueRow::kValueFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetLegendFrameArchive::CommandSetLegendFrameArchive()
+CommandDeleteGridColumnsArchive_ValueRow::CommandDeleteGridColumnsArchive_ValueRow()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetLegendFrameArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
-  old_legend_frame_ = const_cast< ::TSCH::RectArchive*>(&::TSCH::RectArchive::default_instance());
-  new_legend_frame_ = const_cast< ::TSCH::RectArchive*>(&::TSCH::RectArchive::default_instance());
+void CommandDeleteGridColumnsArchive_ValueRow::InitAsDefaultInstance() {
 }
 
-CommandSetLegendFrameArchive::CommandSetLegendFrameArchive(const CommandSetLegendFrameArchive& from)
+CommandDeleteGridColumnsArchive_ValueRow::CommandDeleteGridColumnsArchive_ValueRow(const CommandDeleteGridColumnsArchive_ValueRow& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetLegendFrameArchive::SharedCtor() {
+void CommandDeleteGridColumnsArchive_ValueRow::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  old_legend_frame_ = NULL;
-  new_legend_frame_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetLegendFrameArchive::~CommandSetLegendFrameArchive() {
+CommandDeleteGridColumnsArchive_ValueRow::~CommandDeleteGridColumnsArchive_ValueRow() {
   SharedDtor();
 }
 
-void CommandSetLegendFrameArchive::SharedDtor() {
+void CommandDeleteGridColumnsArchive_ValueRow::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete old_legend_frame_;
-    delete new_legend_frame_;
   }
 }
 
-void CommandSetLegendFrameArchive::SetCachedSize(int size) const {
+void CommandDeleteGridColumnsArchive_ValueRow::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetLegendFrameArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandDeleteGridColumnsArchive_ValueRow::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetLegendFrameArchive_descriptor_;
+  return CommandDeleteGridColumnsArchive_ValueRow_descriptor_;
 }
 
-const CommandSetLegendFrameArchive& CommandSetLegendFrameArchive::default_instance() {
+const CommandDeleteGridColumnsArchive_ValueRow& CommandDeleteGridColumnsArchive_ValueRow::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetLegendFrameArchive* CommandSetLegendFrameArchive::default_instance_ = NULL;
+CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive_ValueRow::default_instance_ = NULL;
 
-CommandSetLegendFrameArchive* CommandSetLegendFrameArchive::New() const {
-  return new CommandSetLegendFrameArchive;
+CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive_ValueRow::New() const {
+  return new CommandDeleteGridColumnsArchive_ValueRow;
 }
 
-void CommandSetLegendFrameArchive::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-    }
-    if (has_old_legend_frame()) {
-      if (old_legend_frame_ != NULL) old_legend_frame_->::TSCH::RectArchive::Clear();
-    }
-    if (has_new_legend_frame()) {
-      if (new_legend_frame_ != NULL) new_legend_frame_->::TSCH::RectArchive::Clear();
-    }
-  }
+void CommandDeleteGridColumnsArchive_ValueRow::Clear() {
+  value_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetLegendFrameArchive::MergePartialFromCodedStream(
+bool CommandDeleteGridColumnsArchive_ValueRow::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_old_legend_frame;
-        break;
-      }
-
-      // required .TSCH.RectArchive old_legend_frame = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_legend_frame:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_legend_frame()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_new_legend_frame;
-        break;
-      }
-
-      // required .TSCH.RectArchive new_legend_frame = 3;
-      case 3: {
+      // repeated double value = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_legend_frame:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_legend_frame()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 1, 41, input, this->mutable_value())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, this->mutable_value())));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(41)) goto parse_value;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -8339,24 +9142,12 @@ bool CommandSetLegendFrameArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetLegendFrameArchive::SerializeWithCachedSizes(
+void CommandDeleteGridColumnsArchive_ValueRow::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required .TSCH.RectArchive old_legend_frame = 2;
-  if (has_old_legend_frame()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->old_legend_frame(), output);
-  }
-
-  // required .TSCH.RectArchive new_legend_frame = 3;
-  if (has_new_legend_frame()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->new_legend_frame(), output);
+  // repeated double value = 5;
+  for (int i = 0; i < this->value_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(
+      5, this->value(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -8365,27 +9156,12 @@ void CommandSetLegendFrameArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetLegendFrameArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandDeleteGridColumnsArchive_ValueRow::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required .TSCH.RectArchive old_legend_frame = 2;
-  if (has_old_legend_frame()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->old_legend_frame(), target);
-  }
-
-  // required .TSCH.RectArchive new_legend_frame = 3;
-  if (has_new_legend_frame()) {
+  // repeated double value = 5;
+  for (int i = 0; i < this->value_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->new_legend_frame(), target);
+      WriteDoubleToArray(5, this->value(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -8395,32 +9171,16 @@ ::google::protobuf::uint8* CommandSetLegendFrameArchive::SerializeWithCachedSize
   return target;
 }
 
-int CommandSetLegendFrameArchive::ByteSize() const {
+int CommandDeleteGridColumnsArchive_ValueRow::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // required .TSCH.RectArchive old_legend_frame = 2;
-    if (has_old_legend_frame()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_legend_frame());
-    }
-
-    // required .TSCH.RectArchive new_legend_frame = 3;
-    if (has_new_legend_frame()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_legend_frame());
-    }
-
+  // repeated double value = 5;
+  {
+    int data_size = 0;
+    data_size = 8 * this->value_size();
+    total_size += 1 * this->value_size() + data_size;
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -8432,10 +9192,10 @@ int CommandSetLegendFrameArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetLegendFrameArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridColumnsArchive_ValueRow::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetLegendFrameArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetLegendFrameArchive*>(
+  const CommandDeleteGridColumnsArchive_ValueRow* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridColumnsArchive_ValueRow*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -8444,159 +9204,140 @@ void CommandSetLegendFrameArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandSetLegendFrameArchive::MergeFrom(const CommandSetLegendFrameArchive& from) {
+void CommandDeleteGridColumnsArchive_ValueRow::MergeFrom(const CommandDeleteGridColumnsArchive_ValueRow& from) {
   GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_old_legend_frame()) {
-      mutable_old_legend_frame()->::TSCH::RectArchive::MergeFrom(from.old_legend_frame());
-    }
-    if (from.has_new_legend_frame()) {
-      mutable_new_legend_frame()->::TSCH::RectArchive::MergeFrom(from.new_legend_frame());
-    }
-  }
+  value_.MergeFrom(from.value_);
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetLegendFrameArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridColumnsArchive_ValueRow::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetLegendFrameArchive::CopyFrom(const CommandSetLegendFrameArchive& from) {
+void CommandDeleteGridColumnsArchive_ValueRow::CopyFrom(const CommandDeleteGridColumnsArchive_ValueRow& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetLegendFrameArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandDeleteGridColumnsArchive_ValueRow::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_old_legend_frame()) {
-    if (!this->old_legend_frame().IsInitialized()) return false;
-  }
-  if (has_new_legend_frame()) {
-    if (!this->new_legend_frame().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetLegendFrameArchive::Swap(CommandSetLegendFrameArchive* other) {
+void CommandDeleteGridColumnsArchive_ValueRow::Swap(CommandDeleteGridColumnsArchive_ValueRow* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(old_legend_frame_, other->old_legend_frame_);
-    std::swap(new_legend_frame_, other->new_legend_frame_);
+    value_.Swap(&other->value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetLegendFrameArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandDeleteGridColumnsArchive_ValueRow::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetLegendFrameArchive_descriptor_;
-  metadata.reflection = CommandSetLegendFrameArchive_reflection_;
+  metadata.descriptor = CommandDeleteGridColumnsArchive_ValueRow_descriptor_;
+  metadata.reflection = CommandDeleteGridColumnsArchive_ValueRow_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandSetPieWedgeExplosion::kSuperFieldNumber;
-const int CommandSetPieWedgeExplosion::kInfoGeometryCommandFieldNumber;
-const int CommandSetPieWedgeExplosion::kStyleMutationCommandFieldNumber;
-const int CommandSetPieWedgeExplosion::kAnchorAttachmentCommandFieldNumber;
+const int CommandDeleteGridColumnsArchive::kSuperFieldNumber;
+const int CommandDeleteGridColumnsArchive::kLocationFieldNumber;
+const int CommandDeleteGridColumnsArchive::kLengthFieldNumber;
+const int CommandDeleteGridColumnsArchive::kNamesFieldNumber;
+const int CommandDeleteGridColumnsArchive::kValueRowFieldNumber;
+const int CommandDeleteGridColumnsArchive::kRemovedAllColumnsFieldNumber;
+const int CommandDeleteGridColumnsArchive::kRowNamesFieldNumber;
+const int CommandDeleteGridColumnsArchive::kRowIdsFieldNumber;
+const int CommandDeleteGridColumnsArchive::kColumnIdsFieldNumber;
+const int CommandDeleteGridColumnsArchive::kAddDummyDataOnDeleteAllFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetPieWedgeExplosion::CommandSetPieWedgeExplosion()
+CommandDeleteGridColumnsArchive::CommandDeleteGridColumnsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetPieWedgeExplosion::InitAsDefaultInstance() {
+void CommandDeleteGridColumnsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
-  info_geometry_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  style_mutation_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  anchor_attachment_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSetPieWedgeExplosion::CommandSetPieWedgeExplosion(const CommandSetPieWedgeExplosion& from)
+CommandDeleteGridColumnsArchive::CommandDeleteGridColumnsArchive(const CommandDeleteGridColumnsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetPieWedgeExplosion::SharedCtor() {
+void CommandDeleteGridColumnsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  info_geometry_command_ = NULL;
-  style_mutation_command_ = NULL;
-  anchor_attachment_command_ = NULL;
+  location_ = 0u;
+  length_ = 0u;
+  removed_all_columns_ = false;
+  add_dummy_data_on_delete_all_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetPieWedgeExplosion::~CommandSetPieWedgeExplosion() {
+CommandDeleteGridColumnsArchive::~CommandDeleteGridColumnsArchive() {
   SharedDtor();
 }
 
-void CommandSetPieWedgeExplosion::SharedDtor() {
+void CommandDeleteGridColumnsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete info_geometry_command_;
-    delete style_mutation_command_;
-    delete anchor_attachment_command_;
   }
 }
 
-void CommandSetPieWedgeExplosion::SetCachedSize(int size) const {
+void CommandDeleteGridColumnsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetPieWedgeExplosion::descriptor() {
+const ::google::protobuf::Descriptor* CommandDeleteGridColumnsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetPieWedgeExplosion_descriptor_;
+  return CommandDeleteGridColumnsArchive_descriptor_;
 }
 
-const CommandSetPieWedgeExplosion& CommandSetPieWedgeExplosion::default_instance() {
+const CommandDeleteGridColumnsArchive& CommandDeleteGridColumnsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetPieWedgeExplosion* CommandSetPieWedgeExplosion::default_instance_ = NULL;
+CommandDeleteGridColumnsArchive* CommandDeleteGridColumnsArchive::default_instance_ = NULL;
 
-CommandSetPieWedgeExplosion* CommandSetPieWedgeExplosion::New() const {
-  return new CommandSetPieWedgeExplosion;
+CommandDeleteGridColumnsArchive* CommandDeleteGridColumnsArchive::New() const {
+  return new CommandDeleteGridColumnsArchive;
 }
 
-void CommandSetPieWedgeExplosion::Clear() {
+void CommandDeleteGridColumnsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    if (has_info_geometry_command()) {
-      if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
-    }
-    if (has_style_mutation_command()) {
-      if (style_mutation_command_ != NULL) style_mutation_command_->::TSP::Reference::Clear();
-    }
-    if (has_anchor_attachment_command()) {
-      if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
-    }
+    location_ = 0u;
+    length_ = 0u;
+    removed_all_columns_ = false;
   }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    add_dummy_data_on_delete_all_ = false;
+  }
+  names_.Clear();
+  value_row_.Clear();
+  row_names_.Clear();
+  row_ids_.Clear();
+  column_ids_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetPieWedgeExplosion::MergePartialFromCodedStream(
+bool CommandDeleteGridColumnsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -8611,92 +9352,249 @@ bool CommandSetPieWedgeExplosion::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_info_geometry_command;
+        if (input->ExpectTag(16)) goto parse_location;
         break;
       }
 
-      // optional .TSP.Reference info_geometry_command = 2;
+      // required uint32 location = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_info_geometry_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_info_geometry_command()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_location:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &location_)));
+          set_has_location();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_style_mutation_command;
+        if (input->ExpectTag(24)) goto parse_length;
         break;
       }
 
-      // optional .TSP.Reference style_mutation_command = 3;
+      // required uint32 length = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_style_mutation_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_style_mutation_command()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_length:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &length_)));
+          set_has_length();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_anchor_attachment_command;
+        if (input->ExpectTag(34)) goto parse_names;
         break;
       }
 
-      // optional .TSP.Reference anchor_attachment_command = 4;
+      // repeated string names = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_anchor_attachment_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_anchor_attachment_command()));
+         parse_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->names(this->names_size() - 1).data(),
+            this->names(this->names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectTag(34)) goto parse_names;
+        if (input->ExpectTag(50)) goto parse_value_row;
         break;
       }
 
-      default: {
-      handle_uninterpreted:
+      // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_value_row:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_value_row()));
+        } else {
+          goto handle_uninterpreted;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        if (input->ExpectTag(50)) goto parse_value_row;
+        if (input->ExpectTag(56)) goto parse_removed_all_columns;
         break;
       }
-    }
-  }
-  return true;
-#undef DO_
-}
 
-void CommandSetPieWedgeExplosion::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
+      // optional bool removed_all_columns = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_removed_all_columns:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &removed_all_columns_)));
+          set_has_removed_all_columns();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_row_names;
+        break;
+      }
+
+      // repeated string row_names = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_row_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_row_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->row_names(this->row_names_size() - 1).data(),
+            this->row_names(this->row_names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_row_names;
+        if (input->ExpectTag(74)) goto parse_row_ids;
+        break;
+      }
+
+      // repeated string row_ids = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_row_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_row_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->row_ids(this->row_ids_size() - 1).data(),
+            this->row_ids(this->row_ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_row_ids;
+        if (input->ExpectTag(82)) goto parse_column_ids;
+        break;
+      }
+
+      // repeated string column_ids = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_column_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_column_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->column_ids(this->column_ids_size() - 1).data(),
+            this->column_ids(this->column_ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(82)) goto parse_column_ids;
+        if (input->ExpectTag(88)) goto parse_add_dummy_data_on_delete_all;
+        break;
+      }
+
+      // required bool add_dummy_data_on_delete_all = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_add_dummy_data_on_delete_all:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &add_dummy_data_on_delete_all_)));
+          set_has_add_dummy_data_on_delete_all();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandDeleteGridColumnsArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // optional .TSP.Reference info_geometry_command = 2;
-  if (has_info_geometry_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->info_geometry_command(), output);
+  // required uint32 location = 2;
+  if (has_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->location(), output);
   }
 
-  // optional .TSP.Reference style_mutation_command = 3;
-  if (has_style_mutation_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->style_mutation_command(), output);
+  // required uint32 length = 3;
+  if (has_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->length(), output);
   }
 
-  // optional .TSP.Reference anchor_attachment_command = 4;
-  if (has_anchor_attachment_command()) {
+  // repeated string names = 4;
+  for (int i = 0; i < this->names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->names(i).data(), this->names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->names(i), output);
+  }
+
+  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
+  for (int i = 0; i < this->value_row_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->anchor_attachment_command(), output);
+      6, this->value_row(i), output);
+  }
+
+  // optional bool removed_all_columns = 7;
+  if (has_removed_all_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->removed_all_columns(), output);
+  }
+
+  // repeated string row_names = 8;
+  for (int i = 0; i < this->row_names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->row_names(i).data(), this->row_names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      8, this->row_names(i), output);
+  }
+
+  // repeated string row_ids = 9;
+  for (int i = 0; i < this->row_ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->row_ids(i).data(), this->row_ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      9, this->row_ids(i), output);
+  }
+
+  // repeated string column_ids = 10;
+  for (int i = 0; i < this->column_ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->column_ids(i).data(), this->column_ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      10, this->column_ids(i), output);
+  }
+
+  // required bool add_dummy_data_on_delete_all = 11;
+  if (has_add_dummy_data_on_delete_all()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->add_dummy_data_on_delete_all(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -8705,7 +9603,7 @@ void CommandSetPieWedgeExplosion::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetPieWedgeExplosion::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandDeleteGridColumnsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -8714,25 +9612,67 @@ ::google::protobuf::uint8* CommandSetPieWedgeExplosion::SerializeWithCachedSizes
         1, this->super(), target);
   }
 
-  // optional .TSP.Reference info_geometry_command = 2;
-  if (has_info_geometry_command()) {
+  // required uint32 location = 2;
+  if (has_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->location(), target);
+  }
+
+  // required uint32 length = 3;
+  if (has_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->length(), target);
+  }
+
+  // repeated string names = 4;
+  for (int i = 0; i < this->names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->names(i).data(), this->names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->info_geometry_command(), target);
+      WriteStringToArray(4, this->names(i), target);
   }
 
-  // optional .TSP.Reference style_mutation_command = 3;
-  if (has_style_mutation_command()) {
+  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
+  for (int i = 0; i < this->value_row_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->style_mutation_command(), target);
+        6, this->value_row(i), target);
   }
 
-  // optional .TSP.Reference anchor_attachment_command = 4;
-  if (has_anchor_attachment_command()) {
+  // optional bool removed_all_columns = 7;
+  if (has_removed_all_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->removed_all_columns(), target);
+  }
+
+  // repeated string row_names = 8;
+  for (int i = 0; i < this->row_names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->row_names(i).data(), this->row_names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->anchor_attachment_command(), target);
+      WriteStringToArray(8, this->row_names(i), target);
+  }
+
+  // repeated string row_ids = 9;
+  for (int i = 0; i < this->row_ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->row_ids(i).data(), this->row_ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(9, this->row_ids(i), target);
+  }
+
+  // repeated string column_ids = 10;
+  for (int i = 0; i < this->column_ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->column_ids(i).data(), this->column_ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(10, this->column_ids(i), target);
+  }
+
+  // required bool add_dummy_data_on_delete_all = 11;
+  if (has_add_dummy_data_on_delete_all()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->add_dummy_data_on_delete_all(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -8742,7 +9682,7 @@ ::google::protobuf::uint8* CommandSetPieWedgeExplosion::SerializeWithCachedSizes
   return target;
 }
 
-int CommandSetPieWedgeExplosion::ByteSize() const {
+int CommandDeleteGridColumnsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -8753,117 +9693,165 @@ int CommandSetPieWedgeExplosion::ByteSize() const {
           this->super());
     }
 
-    // optional .TSP.Reference info_geometry_command = 2;
-    if (has_info_geometry_command()) {
+    // required uint32 location = 2;
+    if (has_location()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->info_geometry_command());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->location());
     }
 
-    // optional .TSP.Reference style_mutation_command = 3;
-    if (has_style_mutation_command()) {
+    // required uint32 length = 3;
+    if (has_length()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->style_mutation_command());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->length());
     }
 
-    // optional .TSP.Reference anchor_attachment_command = 4;
-    if (has_anchor_attachment_command()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->anchor_attachment_command());
+    // optional bool removed_all_columns = 7;
+    if (has_removed_all_columns()) {
+      total_size += 1 + 1;
     }
 
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    // required bool add_dummy_data_on_delete_all = 11;
+    if (has_add_dummy_data_on_delete_all()) {
+      total_size += 1 + 1;
+    }
 
-void CommandSetPieWedgeExplosion::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const CommandSetPieWedgeExplosion* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetPieWedgeExplosion*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
   }
-}
+  // repeated string names = 4;
+  total_size += 1 * this->names_size();
+  for (int i = 0; i < this->names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->names(i));
+  }
 
-void CommandSetPieWedgeExplosion::MergeFrom(const CommandSetPieWedgeExplosion& from) {
-  GOOGLE_CHECK_NE(&from, this);
+  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
+  total_size += 1 * this->value_row_size();
+  for (int i = 0; i < this->value_row_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->value_row(i));
+  }
+
+  // repeated string row_names = 8;
+  total_size += 1 * this->row_names_size();
+  for (int i = 0; i < this->row_names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->row_names(i));
+  }
+
+  // repeated string row_ids = 9;
+  total_size += 1 * this->row_ids_size();
+  for (int i = 0; i < this->row_ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->row_ids(i));
+  }
+
+  // repeated string column_ids = 10;
+  total_size += 1 * this->column_ids_size();
+  for (int i = 0; i < this->column_ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->column_ids(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandDeleteGridColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandDeleteGridColumnsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDeleteGridColumnsArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandDeleteGridColumnsArchive::MergeFrom(const CommandDeleteGridColumnsArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  names_.MergeFrom(from.names_);
+  value_row_.MergeFrom(from.value_row_);
+  row_names_.MergeFrom(from.row_names_);
+  row_ids_.MergeFrom(from.row_ids_);
+  column_ids_.MergeFrom(from.column_ids_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_info_geometry_command()) {
-      mutable_info_geometry_command()->::TSP::Reference::MergeFrom(from.info_geometry_command());
+    if (from.has_location()) {
+      set_location(from.location());
     }
-    if (from.has_style_mutation_command()) {
-      mutable_style_mutation_command()->::TSP::Reference::MergeFrom(from.style_mutation_command());
+    if (from.has_length()) {
+      set_length(from.length());
     }
-    if (from.has_anchor_attachment_command()) {
-      mutable_anchor_attachment_command()->::TSP::Reference::MergeFrom(from.anchor_attachment_command());
+    if (from.has_removed_all_columns()) {
+      set_removed_all_columns(from.removed_all_columns());
+    }
+  }
+  if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    if (from.has_add_dummy_data_on_delete_all()) {
+      set_add_dummy_data_on_delete_all(from.add_dummy_data_on_delete_all());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetPieWedgeExplosion::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandDeleteGridColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetPieWedgeExplosion::CopyFrom(const CommandSetPieWedgeExplosion& from) {
+void CommandDeleteGridColumnsArchive::CopyFrom(const CommandDeleteGridColumnsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetPieWedgeExplosion::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandDeleteGridColumnsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000207) != 0x00000207) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_info_geometry_command()) {
-    if (!this->info_geometry_command().IsInitialized()) return false;
-  }
-  if (has_style_mutation_command()) {
-    if (!this->style_mutation_command().IsInitialized()) return false;
-  }
-  if (has_anchor_attachment_command()) {
-    if (!this->anchor_attachment_command().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetPieWedgeExplosion::Swap(CommandSetPieWedgeExplosion* other) {
+void CommandDeleteGridColumnsArchive::Swap(CommandDeleteGridColumnsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(info_geometry_command_, other->info_geometry_command_);
-    std::swap(style_mutation_command_, other->style_mutation_command_);
-    std::swap(anchor_attachment_command_, other->anchor_attachment_command_);
+    std::swap(location_, other->location_);
+    std::swap(length_, other->length_);
+    names_.Swap(&other->names_);
+    value_row_.Swap(&other->value_row_);
+    std::swap(removed_all_columns_, other->removed_all_columns_);
+    row_names_.Swap(&other->row_names_);
+    row_ids_.Swap(&other->row_ids_);
+    column_ids_.Swap(&other->column_ids_);
+    std::swap(add_dummy_data_on_delete_all_, other->add_dummy_data_on_delete_all_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetPieWedgeExplosion::GetMetadata() const {
+::google::protobuf::Metadata CommandDeleteGridColumnsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetPieWedgeExplosion_descriptor_;
-  metadata.reflection = CommandSetPieWedgeExplosion_reflection_;
+  metadata.descriptor = CommandDeleteGridColumnsArchive_descriptor_;
+  metadata.reflection = CommandDeleteGridColumnsArchive_reflection_;
   return metadata;
 }
 
@@ -8871,85 +9859,92 @@ ::google::protobuf::Metadata CommandSetPieWedgeExplosion::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int SynchronousCommandArchive::kSuperFieldNumber;
-const int SynchronousCommandArchive::kCommandFieldNumber;
+const int CommandSetPreviewLocArchive::kSuperFieldNumber;
+const int CommandSetPreviewLocArchive::kOldLocFieldNumber;
+const int CommandSetPreviewLocArchive::kNewLocFieldNumber;
 #endif  // !_MSC_VER
 
-SynchronousCommandArchive::SynchronousCommandArchive()
+CommandSetPreviewLocArchive::CommandSetPreviewLocArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void SynchronousCommandArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetPreviewLocArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  old_loc_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
+  new_loc_ = const_cast< ::TSP::Point*>(&::TSP::Point::default_instance());
 }
 
-SynchronousCommandArchive::SynchronousCommandArchive(const SynchronousCommandArchive& from)
+CommandSetPreviewLocArchive::CommandSetPreviewLocArchive(const CommandSetPreviewLocArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void SynchronousCommandArchive::SharedCtor() {
+void CommandSetPreviewLocArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  command_ = NULL;
+  old_loc_ = NULL;
+  new_loc_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-SynchronousCommandArchive::~SynchronousCommandArchive() {
+CommandSetPreviewLocArchive::~CommandSetPreviewLocArchive() {
   SharedDtor();
 }
 
-void SynchronousCommandArchive::SharedDtor() {
+void CommandSetPreviewLocArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete command_;
+    delete old_loc_;
+    delete new_loc_;
   }
 }
 
-void SynchronousCommandArchive::SetCachedSize(int size) const {
+void CommandSetPreviewLocArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* SynchronousCommandArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetPreviewLocArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return SynchronousCommandArchive_descriptor_;
+  return CommandSetPreviewLocArchive_descriptor_;
 }
 
-const SynchronousCommandArchive& SynchronousCommandArchive::default_instance() {
+const CommandSetPreviewLocArchive& CommandSetPreviewLocArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-SynchronousCommandArchive* SynchronousCommandArchive::default_instance_ = NULL;
+CommandSetPreviewLocArchive* CommandSetPreviewLocArchive::default_instance_ = NULL;
 
-SynchronousCommandArchive* SynchronousCommandArchive::New() const {
-  return new SynchronousCommandArchive;
+CommandSetPreviewLocArchive* CommandSetPreviewLocArchive::New() const {
+  return new CommandSetPreviewLocArchive;
 }
 
-void SynchronousCommandArchive::Clear() {
+void CommandSetPreviewLocArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    if (has_command()) {
-      if (command_ != NULL) command_->::TSP::Reference::Clear();
+    if (has_old_loc()) {
+      if (old_loc_ != NULL) old_loc_->::TSP::Point::Clear();
+    }
+    if (has_new_loc()) {
+      if (new_loc_ != NULL) new_loc_->::TSP::Point::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool SynchronousCommandArchive::MergePartialFromCodedStream(
+bool CommandSetPreviewLocArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // required .TSCH.ChartCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -8958,17 +9953,31 @@ bool SynchronousCommandArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_command;
+        if (input->ExpectTag(18)) goto parse_old_loc;
         break;
       }
 
-      // required .TSP.Reference command = 2;
+      // required .TSP.Point old_loc = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_command:
+         parse_old_loc:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_command()));
+               input, mutable_old_loc()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_new_loc;
+        break;
+      }
+
+      // required .TSP.Point new_loc = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_loc:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_loc()));
         } else {
           goto handle_uninterpreted;
         }
@@ -8992,18 +10001,24 @@ bool SynchronousCommandArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void SynchronousCommandArchive::SerializeWithCachedSizes(
+void CommandSetPreviewLocArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference command = 2;
-  if (has_command()) {
+  // required .TSP.Point old_loc = 2;
+  if (has_old_loc()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->command(), output);
+      2, this->old_loc(), output);
+  }
+
+  // required .TSP.Point new_loc = 3;
+  if (has_new_loc()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->new_loc(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -9012,20 +10027,27 @@ void SynchronousCommandArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* SynchronousCommandArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetPreviewLocArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference command = 2;
-  if (has_command()) {
+  // required .TSP.Point old_loc = 2;
+  if (has_old_loc()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->command(), target);
+        2, this->old_loc(), target);
+  }
+
+  // required .TSP.Point new_loc = 3;
+  if (has_new_loc()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->new_loc(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -9035,22 +10057,29 @@ ::google::protobuf::uint8* SynchronousCommandArchive::SerializeWithCachedSizesTo
   return target;
 }
 
-int SynchronousCommandArchive::ByteSize() const {
+int CommandSetPreviewLocArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
+    // required .TSCH.ChartCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSP.Reference command = 2;
-    if (has_command()) {
+    // required .TSP.Point old_loc = 2;
+    if (has_old_loc()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->command());
+          this->old_loc());
+    }
+
+    // required .TSP.Point new_loc = 3;
+    if (has_new_loc()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_loc());
     }
 
   }
@@ -9065,10 +10094,10 @@ int SynchronousCommandArchive::ByteSize() const {
   return total_size;
 }
 
-void SynchronousCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetPreviewLocArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const SynchronousCommandArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const SynchronousCommandArchive*>(
+  const CommandSetPreviewLocArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetPreviewLocArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -9077,58 +10106,65 @@ void SynchronousCommandArchive::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void SynchronousCommandArchive::MergeFrom(const SynchronousCommandArchive& from) {
+void CommandSetPreviewLocArchive::MergeFrom(const CommandSetPreviewLocArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_command()) {
-      mutable_command()->::TSP::Reference::MergeFrom(from.command());
+    if (from.has_old_loc()) {
+      mutable_old_loc()->::TSP::Point::MergeFrom(from.old_loc());
+    }
+    if (from.has_new_loc()) {
+      mutable_new_loc()->::TSP::Point::MergeFrom(from.new_loc());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void SynchronousCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetPreviewLocArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void SynchronousCommandArchive::CopyFrom(const SynchronousCommandArchive& from) {
+void CommandSetPreviewLocArchive::CopyFrom(const CommandSetPreviewLocArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool SynchronousCommandArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetPreviewLocArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_command()) {
-    if (!this->command().IsInitialized()) return false;
+  if (has_old_loc()) {
+    if (!this->old_loc().IsInitialized()) return false;
   }
-  return true;
+  if (has_new_loc()) {
+    if (!this->new_loc().IsInitialized()) return false;
+  }
+  return true;
 }
 
-void SynchronousCommandArchive::Swap(SynchronousCommandArchive* other) {
+void CommandSetPreviewLocArchive::Swap(CommandSetPreviewLocArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(command_, other->command_);
+    std::swap(old_loc_, other->old_loc_);
+    std::swap(new_loc_, other->new_loc_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata SynchronousCommandArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetPreviewLocArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = SynchronousCommandArchive_descriptor_;
-  metadata.reflection = SynchronousCommandArchive_reflection_;
+  metadata.descriptor = CommandSetPreviewLocArchive_descriptor_;
+  metadata.reflection = CommandSetPreviewLocArchive_reflection_;
   return metadata;
 }
 
@@ -9136,87 +10172,90 @@ ::google::protobuf::Metadata SynchronousCommandArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandReplaceAllArchive::kSuperFieldNumber;
-const int CommandReplaceAllArchive::kInfoFieldNumber;
-const int CommandReplaceAllArchive::kCommandsFieldNumber;
+const int CommandSetGridValueArchive::kSuperFieldNumber;
+const int CommandSetGridValueArchive::kRowindexFieldNumber;
+const int CommandSetGridValueArchive::kColumnindexFieldNumber;
+const int CommandSetGridValueArchive::kOldvalueFieldNumber;
+const int CommandSetGridValueArchive::kNewvalueFieldNumber;
 #endif  // !_MSC_VER
 
-CommandReplaceAllArchive::CommandReplaceAllArchive()
+CommandSetGridValueArchive::CommandSetGridValueArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandReplaceAllArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::ReplaceAllChildCommandArchive*>(&::TSK::ReplaceAllChildCommandArchive::default_instance());
-  info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetGridValueArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandReplaceAllArchive::CommandReplaceAllArchive(const CommandReplaceAllArchive& from)
+CommandSetGridValueArchive::CommandSetGridValueArchive(const CommandSetGridValueArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandReplaceAllArchive::SharedCtor() {
+void CommandSetGridValueArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  info_ = NULL;
+  rowindex_ = 0u;
+  columnindex_ = 0u;
+  oldvalue_ = 0;
+  newvalue_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandReplaceAllArchive::~CommandReplaceAllArchive() {
+CommandSetGridValueArchive::~CommandSetGridValueArchive() {
   SharedDtor();
 }
 
-void CommandReplaceAllArchive::SharedDtor() {
+void CommandSetGridValueArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete info_;
   }
 }
 
-void CommandReplaceAllArchive::SetCachedSize(int size) const {
+void CommandSetGridValueArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandReplaceAllArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetGridValueArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandReplaceAllArchive_descriptor_;
+  return CommandSetGridValueArchive_descriptor_;
 }
 
-const CommandReplaceAllArchive& CommandReplaceAllArchive::default_instance() {
+const CommandSetGridValueArchive& CommandSetGridValueArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandReplaceAllArchive* CommandReplaceAllArchive::default_instance_ = NULL;
+CommandSetGridValueArchive* CommandSetGridValueArchive::default_instance_ = NULL;
 
-CommandReplaceAllArchive* CommandReplaceAllArchive::New() const {
-  return new CommandReplaceAllArchive;
+CommandSetGridValueArchive* CommandSetGridValueArchive::New() const {
+  return new CommandSetGridValueArchive;
 }
 
-void CommandReplaceAllArchive::Clear() {
+void CommandSetGridValueArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::ReplaceAllChildCommandArchive::Clear();
-    }
-    if (has_info()) {
-      if (info_ != NULL) info_->::TSP::Reference::Clear();
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
+    rowindex_ = 0u;
+    columnindex_ = 0u;
+    oldvalue_ = 0;
+    newvalue_ = 0;
   }
-  commands_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandReplaceAllArchive::MergePartialFromCodedStream(
+bool CommandSetGridValueArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.ReplaceAllChildCommandArchive super = 1;
+      // required .TSCH.ChartCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -9225,35 +10264,70 @@ bool CommandReplaceAllArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_info;
+        if (input->ExpectTag(16)) goto parse_rowindex;
         break;
       }
 
-      // required .TSP.Reference info = 2;
+      // required uint32 rowindex = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_info:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_info()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_rowindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &rowindex_)));
+          set_has_rowindex();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_commands;
+        if (input->ExpectTag(24)) goto parse_columnindex;
         break;
       }
 
-      // repeated .TSP.Reference commands = 3;
+      // required uint32 columnindex = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_commands:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_commands()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_columnindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &columnindex_)));
+          set_has_columnindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(33)) goto parse_oldvalue;
+        break;
+      }
+
+      // required double oldvalue = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_oldvalue:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &oldvalue_)));
+          set_has_oldvalue();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(41)) goto parse_newvalue;
+        break;
+      }
+
+      // required double newvalue = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_newvalue:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &newvalue_)));
+          set_has_newvalue();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_commands;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -9274,24 +10348,32 @@ bool CommandReplaceAllArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandReplaceAllArchive::SerializeWithCachedSizes(
+void CommandSetGridValueArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.ReplaceAllChildCommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference info = 2;
-  if (has_info()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->info(), output);
+  // required uint32 rowindex = 2;
+  if (has_rowindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->rowindex(), output);
   }
 
-  // repeated .TSP.Reference commands = 3;
-  for (int i = 0; i < this->commands_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->commands(i), output);
+  // required uint32 columnindex = 3;
+  if (has_columnindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->columnindex(), output);
+  }
+
+  // required double oldvalue = 4;
+  if (has_oldvalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(4, this->oldvalue(), output);
+  }
+
+  // required double newvalue = 5;
+  if (has_newvalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->newvalue(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -9300,27 +10382,33 @@ void CommandReplaceAllArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandReplaceAllArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetGridValueArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.ReplaceAllChildCommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference info = 2;
-  if (has_info()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->info(), target);
+  // required uint32 rowindex = 2;
+  if (has_rowindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->rowindex(), target);
   }
 
-  // repeated .TSP.Reference commands = 3;
-  for (int i = 0; i < this->commands_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->commands(i), target);
+  // required uint32 columnindex = 3;
+  if (has_columnindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->columnindex(), target);
+  }
+
+  // required double oldvalue = 4;
+  if (has_oldvalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(4, this->oldvalue(), target);
+  }
+
+  // required double newvalue = 5;
+  if (has_newvalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->newvalue(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -9330,33 +10418,42 @@ ::google::protobuf::uint8* CommandReplaceAllArchive::SerializeWithCachedSizesToA
   return target;
 }
 
-int CommandReplaceAllArchive::ByteSize() const {
+int CommandSetGridValueArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.ReplaceAllChildCommandArchive super = 1;
+    // required .TSCH.ChartCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSP.Reference info = 2;
-    if (has_info()) {
+    // required uint32 rowindex = 2;
+    if (has_rowindex()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->info());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->rowindex());
     }
 
-  }
-  // repeated .TSP.Reference commands = 3;
-  total_size += 1 * this->commands_size();
-  for (int i = 0; i < this->commands_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->commands(i));
-  }
+    // required uint32 columnindex = 3;
+    if (has_columnindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->columnindex());
+    }
+
+    // required double oldvalue = 4;
+    if (has_oldvalue()) {
+      total_size += 1 + 8;
+    }
 
+    // required double newvalue = 5;
+    if (has_newvalue()) {
+      total_size += 1 + 8;
+    }
+
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -9368,10 +10465,10 @@ int CommandReplaceAllArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandReplaceAllArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridValueArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandReplaceAllArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceAllArchive*>(
+  const CommandSetGridValueArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetGridValueArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -9380,63 +10477,67 @@ void CommandReplaceAllArchive::MergeFrom(const ::google::protobuf::Message& from
   }
 }
 
-void CommandReplaceAllArchive::MergeFrom(const CommandReplaceAllArchive& from) {
+void CommandSetGridValueArchive::MergeFrom(const CommandSetGridValueArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  commands_.MergeFrom(from.commands_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::ReplaceAllChildCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_info()) {
-      mutable_info()->::TSP::Reference::MergeFrom(from.info());
+    if (from.has_rowindex()) {
+      set_rowindex(from.rowindex());
+    }
+    if (from.has_columnindex()) {
+      set_columnindex(from.columnindex());
+    }
+    if (from.has_oldvalue()) {
+      set_oldvalue(from.oldvalue());
+    }
+    if (from.has_newvalue()) {
+      set_newvalue(from.newvalue());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandReplaceAllArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridValueArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandReplaceAllArchive::CopyFrom(const CommandReplaceAllArchive& from) {
+void CommandSetGridValueArchive::CopyFrom(const CommandSetGridValueArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandReplaceAllArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetGridValueArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_info()) {
-    if (!this->info().IsInitialized()) return false;
-  }
-  for (int i = 0; i < commands_size(); i++) {
-    if (!this->commands(i).IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandReplaceAllArchive::Swap(CommandReplaceAllArchive* other) {
+void CommandSetGridValueArchive::Swap(CommandSetGridValueArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(info_, other->info_);
-    commands_.Swap(&other->commands_);
+    std::swap(rowindex_, other->rowindex_);
+    std::swap(columnindex_, other->columnindex_);
+    std::swap(oldvalue_, other->oldvalue_);
+    std::swap(newvalue_, other->newvalue_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandReplaceAllArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetGridValueArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandReplaceAllArchive_descriptor_;
-  metadata.reflection = CommandReplaceAllArchive_reflection_;
+  metadata.descriptor = CommandSetGridValueArchive_descriptor_;
+  metadata.reflection = CommandSetGridValueArchive_reflection_;
   return metadata;
 }
 
@@ -9444,99 +10545,84 @@ ::google::protobuf::Metadata CommandReplaceAllArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandChartApplyTheme::kSuperFieldNumber;
-const int CommandChartApplyTheme::kInfoFieldNumber;
-const int CommandChartApplyTheme::kSwapCommandFieldNumber;
-const int CommandChartApplyTheme::kPresetFieldNumber;
+const int CommandSetGridDirectionArchive::kSuperFieldNumber;
+const int CommandSetGridDirectionArchive::kOldDirectionFieldNumber;
+const int CommandSetGridDirectionArchive::kNewDirectionFieldNumber;
 #endif  // !_MSC_VER
 
-CommandChartApplyTheme::CommandChartApplyTheme()
+CommandSetGridDirectionArchive::CommandSetGridDirectionArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandChartApplyTheme::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSS::ApplyThemeChildCommandArchive*>(&::TSS::ApplyThemeChildCommandArchive::default_instance());
-  info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  swap_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetGridDirectionArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandChartApplyTheme::CommandChartApplyTheme(const CommandChartApplyTheme& from)
+CommandSetGridDirectionArchive::CommandSetGridDirectionArchive(const CommandSetGridDirectionArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandChartApplyTheme::SharedCtor() {
+void CommandSetGridDirectionArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  info_ = NULL;
-  swap_command_ = NULL;
-  preset_ = NULL;
+  old_direction_ = 0u;
+  new_direction_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandChartApplyTheme::~CommandChartApplyTheme() {
+CommandSetGridDirectionArchive::~CommandSetGridDirectionArchive() {
   SharedDtor();
 }
 
-void CommandChartApplyTheme::SharedDtor() {
+void CommandSetGridDirectionArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete info_;
-    delete swap_command_;
-    delete preset_;
   }
 }
 
-void CommandChartApplyTheme::SetCachedSize(int size) const {
+void CommandSetGridDirectionArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandChartApplyTheme::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetGridDirectionArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandChartApplyTheme_descriptor_;
+  return CommandSetGridDirectionArchive_descriptor_;
 }
 
-const CommandChartApplyTheme& CommandChartApplyTheme::default_instance() {
+const CommandSetGridDirectionArchive& CommandSetGridDirectionArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandChartApplyTheme* CommandChartApplyTheme::default_instance_ = NULL;
+CommandSetGridDirectionArchive* CommandSetGridDirectionArchive::default_instance_ = NULL;
 
-CommandChartApplyTheme* CommandChartApplyTheme::New() const {
-  return new CommandChartApplyTheme;
+CommandSetGridDirectionArchive* CommandSetGridDirectionArchive::New() const {
+  return new CommandSetGridDirectionArchive;
 }
 
-void CommandChartApplyTheme::Clear() {
+void CommandSetGridDirectionArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
-    }
-    if (has_info()) {
-      if (info_ != NULL) info_->::TSP::Reference::Clear();
-    }
-    if (has_swap_command()) {
-      if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
-    }
-    if (has_preset()) {
-      if (preset_ != NULL) preset_->::TSP::Reference::Clear();
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
+    old_direction_ = 0u;
+    new_direction_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandChartApplyTheme::MergePartialFromCodedStream(
+bool CommandSetGridDirectionArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSS.ApplyThemeChildCommandArchive super = 1;
+      // required .TSCH.ChartCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -9545,45 +10631,35 @@ bool CommandChartApplyTheme::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_info;
+        if (input->ExpectTag(16)) goto parse_old_direction;
         break;
       }
 
-      // required .TSP.Reference info = 2;
+      // required uint32 old_direction = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_info:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_info()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_old_direction:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &old_direction_)));
+          set_has_old_direction();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_swap_command;
+        if (input->ExpectTag(24)) goto parse_new_direction;
         break;
       }
 
-      // optional .TSP.Reference swap_command = 3;
+      // required uint32 new_direction = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_swap_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_swap_command()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_preset;
-        break;
-      }
-
-      // optional .TSP.Reference preset = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_preset:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_preset()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_new_direction:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &new_direction_)));
+          set_has_new_direction();
         } else {
           goto handle_uninterpreted;
         }
@@ -9607,30 +10683,22 @@ bool CommandChartApplyTheme::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandChartApplyTheme::SerializeWithCachedSizes(
+void CommandSetGridDirectionArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference info = 2;
-  if (has_info()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->info(), output);
-  }
-
-  // optional .TSP.Reference swap_command = 3;
-  if (has_swap_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->swap_command(), output);
+  // required uint32 old_direction = 2;
+  if (has_old_direction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->old_direction(), output);
   }
 
-  // optional .TSP.Reference preset = 4;
-  if (has_preset()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->preset(), output);
+  // required uint32 new_direction = 3;
+  if (has_new_direction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->new_direction(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -9639,34 +10707,23 @@ void CommandChartApplyTheme::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandChartApplyTheme::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetGridDirectionArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference info = 2;
-  if (has_info()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->info(), target);
-  }
-
-  // optional .TSP.Reference swap_command = 3;
-  if (has_swap_command()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->swap_command(), target);
+  // required uint32 old_direction = 2;
+  if (has_old_direction()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->old_direction(), target);
   }
 
-  // optional .TSP.Reference preset = 4;
-  if (has_preset()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->preset(), target);
+  // required uint32 new_direction = 3;
+  if (has_new_direction()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->new_direction(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -9676,36 +10733,29 @@ ::google::protobuf::uint8* CommandChartApplyTheme::SerializeWithCachedSizesToArr
   return target;
 }
 
-int CommandChartApplyTheme::ByteSize() const {
+int CommandSetGridDirectionArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSS.ApplyThemeChildCommandArchive super = 1;
+    // required .TSCH.ChartCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSP.Reference info = 2;
-    if (has_info()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->info());
-    }
-
-    // optional .TSP.Reference swap_command = 3;
-    if (has_swap_command()) {
+    // required uint32 old_direction = 2;
+    if (has_old_direction()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->swap_command());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->old_direction());
     }
 
-    // optional .TSP.Reference preset = 4;
-    if (has_preset()) {
+    // required uint32 new_direction = 3;
+    if (has_new_direction()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->preset());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->new_direction());
     }
 
   }
@@ -9720,10 +10770,10 @@ int CommandChartApplyTheme::ByteSize() const {
   return total_size;
 }
 
-void CommandChartApplyTheme::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridDirectionArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandChartApplyTheme* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandChartApplyTheme*>(
+  const CommandSetGridDirectionArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetGridDirectionArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -9732,72 +10782,59 @@ void CommandChartApplyTheme::MergeFrom(const ::google::protobuf::Message& from)
   }
 }
 
-void CommandChartApplyTheme::MergeFrom(const CommandChartApplyTheme& from) {
+void CommandSetGridDirectionArchive::MergeFrom(const CommandSetGridDirectionArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSS::ApplyThemeChildCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_info()) {
-      mutable_info()->::TSP::Reference::MergeFrom(from.info());
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_swap_command()) {
-      mutable_swap_command()->::TSP::Reference::MergeFrom(from.swap_command());
+    if (from.has_old_direction()) {
+      set_old_direction(from.old_direction());
     }
-    if (from.has_preset()) {
-      mutable_preset()->::TSP::Reference::MergeFrom(from.preset());
+    if (from.has_new_direction()) {
+      set_new_direction(from.new_direction());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandChartApplyTheme::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridDirectionArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandChartApplyTheme::CopyFrom(const CommandChartApplyTheme& from) {
+void CommandSetGridDirectionArchive::CopyFrom(const CommandSetGridDirectionArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandChartApplyTheme::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetGridDirectionArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_info()) {
-    if (!this->info().IsInitialized()) return false;
-  }
-  if (has_swap_command()) {
-    if (!this->swap_command().IsInitialized()) return false;
-  }
-  if (has_preset()) {
-    if (!this->preset().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandChartApplyTheme::Swap(CommandChartApplyTheme* other) {
+void CommandSetGridDirectionArchive::Swap(CommandSetGridDirectionArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(info_, other->info_);
-    std::swap(swap_command_, other->swap_command_);
-    std::swap(preset_, other->preset_);
+    std::swap(old_direction_, other->old_direction_);
+    std::swap(new_direction_, other->new_direction_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandChartApplyTheme::GetMetadata() const {
+::google::protobuf::Metadata CommandSetGridDirectionArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandChartApplyTheme_descriptor_;
-  metadata.reflection = CommandChartApplyTheme_reflection_;
+  metadata.descriptor = CommandSetGridDirectionArchive_descriptor_;
+  metadata.reflection = CommandSetGridDirectionArchive_reflection_;
   return metadata;
 }
 
@@ -9805,89 +10842,81 @@ ::google::protobuf::Metadata CommandChartApplyTheme::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandChartApplyPreset::kSuperFieldNumber;
-const int CommandChartApplyPreset::kSwapCommandFieldNumber;
-const int CommandChartApplyPreset::kPresetFieldNumber;
-const int CommandChartApplyPreset::kBehaviorFieldNumber;
+const int CommandSetSeriesTypeArchive::kSuperFieldNumber;
+const int CommandSetSeriesTypeArchive::kSeriesindexFieldNumber;
+const int CommandSetSeriesTypeArchive::kOldtypeFieldNumber;
+const int CommandSetSeriesTypeArchive::kNewtypeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandChartApplyPreset::CommandChartApplyPreset()
+CommandSetSeriesTypeArchive::CommandSetSeriesTypeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandChartApplyPreset::InitAsDefaultInstance() {
+void CommandSetSeriesTypeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
-  swap_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandChartApplyPreset::CommandChartApplyPreset(const CommandChartApplyPreset& from)
+CommandSetSeriesTypeArchive::CommandSetSeriesTypeArchive(const CommandSetSeriesTypeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandChartApplyPreset::SharedCtor() {
+void CommandSetSeriesTypeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  swap_command_ = NULL;
-  preset_ = NULL;
-  behavior_ = 1;
+  seriesindex_ = 0u;
+  oldtype_ = 0u;
+  newtype_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandChartApplyPreset::~CommandChartApplyPreset() {
+CommandSetSeriesTypeArchive::~CommandSetSeriesTypeArchive() {
   SharedDtor();
 }
 
-void CommandChartApplyPreset::SharedDtor() {
+void CommandSetSeriesTypeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete swap_command_;
-    delete preset_;
   }
 }
 
-void CommandChartApplyPreset::SetCachedSize(int size) const {
+void CommandSetSeriesTypeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandChartApplyPreset::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetSeriesTypeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandChartApplyPreset_descriptor_;
+  return CommandSetSeriesTypeArchive_descriptor_;
 }
 
-const CommandChartApplyPreset& CommandChartApplyPreset::default_instance() {
+const CommandSetSeriesTypeArchive& CommandSetSeriesTypeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandChartApplyPreset* CommandChartApplyPreset::default_instance_ = NULL;
+CommandSetSeriesTypeArchive* CommandSetSeriesTypeArchive::default_instance_ = NULL;
 
-CommandChartApplyPreset* CommandChartApplyPreset::New() const {
-  return new CommandChartApplyPreset;
+CommandSetSeriesTypeArchive* CommandSetSeriesTypeArchive::New() const {
+  return new CommandSetSeriesTypeArchive;
 }
 
-void CommandChartApplyPreset::Clear() {
+void CommandSetSeriesTypeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    if (has_swap_command()) {
-      if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
-    }
-    if (has_preset()) {
-      if (preset_ != NULL) preset_->::TSP::Reference::Clear();
-    }
-    behavior_ = 1;
+    seriesindex_ = 0u;
+    oldtype_ = 0u;
+    newtype_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandChartApplyPreset::MergePartialFromCodedStream(
+bool CommandSetSeriesTypeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -9902,52 +10931,51 @@ bool CommandChartApplyPreset::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_swap_command;
+        if (input->ExpectTag(16)) goto parse_seriesindex;
         break;
       }
 
-      // optional .TSP.Reference swap_command = 2;
+      // required uint32 seriesindex = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_swap_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_swap_command()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_seriesindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &seriesindex_)));
+          set_has_seriesindex();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_preset;
+        if (input->ExpectTag(24)) goto parse_oldtype;
         break;
       }
 
-      // optional .TSP.Reference preset = 3;
+      // required uint32 oldtype = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_preset:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_preset()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_oldtype:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &oldtype_)));
+          set_has_oldtype();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(32)) goto parse_behavior;
+        if (input->ExpectTag(32)) goto parse_newtype;
         break;
       }
 
-      // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+      // required uint32 newtype = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_behavior:
-          int value;
+         parse_newtype:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TSCH::ApplyPresetBehavior_IsValid(value)) {
-            set_behavior(static_cast< ::TSCH::ApplyPresetBehavior >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(4, value);
-          }
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &newtype_)));
+          set_has_newtype();
         } else {
           goto handle_uninterpreted;
         }
@@ -9967,34 +10995,4053 @@ bool CommandChartApplyPreset::MergePartialFromCodedStream(
       }
     }
   }
-  return true;
-#undef DO_
-}
+  return true;
+#undef DO_
+}
+
+void CommandSetSeriesTypeArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required uint32 seriesindex = 2;
+  if (has_seriesindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->seriesindex(), output);
+  }
+
+  // required uint32 oldtype = 3;
+  if (has_oldtype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->oldtype(), output);
+  }
+
+  // required uint32 newtype = 4;
+  if (has_newtype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->newtype(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetSeriesTypeArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required uint32 seriesindex = 2;
+  if (has_seriesindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->seriesindex(), target);
+  }
+
+  // required uint32 oldtype = 3;
+  if (has_oldtype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->oldtype(), target);
+  }
+
+  // required uint32 newtype = 4;
+  if (has_newtype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->newtype(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetSeriesTypeArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required uint32 seriesindex = 2;
+    if (has_seriesindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->seriesindex());
+    }
+
+    // required uint32 oldtype = 3;
+    if (has_oldtype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->oldtype());
+    }
+
+    // required uint32 newtype = 4;
+    if (has_newtype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->newtype());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetSeriesTypeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetSeriesTypeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSeriesTypeArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetSeriesTypeArchive::MergeFrom(const CommandSetSeriesTypeArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_seriesindex()) {
+      set_seriesindex(from.seriesindex());
+    }
+    if (from.has_oldtype()) {
+      set_oldtype(from.oldtype());
+    }
+    if (from.has_newtype()) {
+      set_newtype(from.newtype());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetSeriesTypeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetSeriesTypeArchive::CopyFrom(const CommandSetSeriesTypeArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetSeriesTypeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetSeriesTypeArchive::Swap(CommandSetSeriesTypeArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(seriesindex_, other->seriesindex_);
+    std::swap(oldtype_, other->oldtype_);
+    std::swap(newtype_, other->newtype_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetSeriesTypeArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetSeriesTypeArchive_descriptor_;
+  metadata.reflection = CommandSetSeriesTypeArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetScatterFormatArchive::kSuperFieldNumber;
+const int CommandSetScatterFormatArchive::kOldformatFieldNumber;
+const int CommandSetScatterFormatArchive::kNewformatFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetScatterFormatArchive::CommandSetScatterFormatArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetScatterFormatArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+}
+
+CommandSetScatterFormatArchive::CommandSetScatterFormatArchive(const CommandSetScatterFormatArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetScatterFormatArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  oldformat_ = 0u;
+  newformat_ = 0u;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetScatterFormatArchive::~CommandSetScatterFormatArchive() {
+  SharedDtor();
+}
+
+void CommandSetScatterFormatArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+  }
+}
+
+void CommandSetScatterFormatArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetScatterFormatArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetScatterFormatArchive_descriptor_;
+}
+
+const CommandSetScatterFormatArchive& CommandSetScatterFormatArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetScatterFormatArchive* CommandSetScatterFormatArchive::default_instance_ = NULL;
+
+CommandSetScatterFormatArchive* CommandSetScatterFormatArchive::New() const {
+  return new CommandSetScatterFormatArchive;
+}
+
+void CommandSetScatterFormatArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    oldformat_ = 0u;
+    newformat_ = 0u;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetScatterFormatArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_oldformat;
+        break;
+      }
+
+      // required uint32 oldformat = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_oldformat:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &oldformat_)));
+          set_has_oldformat();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_newformat;
+        break;
+      }
+
+      // required uint32 newformat = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_newformat:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &newformat_)));
+          set_has_newformat();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSetScatterFormatArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required uint32 oldformat = 3;
+  if (has_oldformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->oldformat(), output);
+  }
+
+  // required uint32 newformat = 4;
+  if (has_newformat()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->newformat(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetScatterFormatArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required uint32 oldformat = 3;
+  if (has_oldformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->oldformat(), target);
+  }
+
+  // required uint32 newformat = 4;
+  if (has_newformat()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->newformat(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetScatterFormatArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required uint32 oldformat = 3;
+    if (has_oldformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->oldformat());
+    }
+
+    // required uint32 newformat = 4;
+    if (has_newformat()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->newformat());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetScatterFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetScatterFormatArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetScatterFormatArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetScatterFormatArchive::MergeFrom(const CommandSetScatterFormatArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_oldformat()) {
+      set_oldformat(from.oldformat());
+    }
+    if (from.has_newformat()) {
+      set_newformat(from.newformat());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetScatterFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetScatterFormatArchive::CopyFrom(const CommandSetScatterFormatArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetScatterFormatArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetScatterFormatArchive::Swap(CommandSetScatterFormatArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(oldformat_, other->oldformat_);
+    std::swap(newformat_, other->newformat_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetScatterFormatArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetScatterFormatArchive_descriptor_;
+  metadata.reflection = CommandSetScatterFormatArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetMultiDataSetIndexArchive::kSuperFieldNumber;
+const int CommandSetMultiDataSetIndexArchive::kOldindexFieldNumber;
+const int CommandSetMultiDataSetIndexArchive::kNewindexFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetMultiDataSetIndexArchive::CommandSetMultiDataSetIndexArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetMultiDataSetIndexArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+}
+
+CommandSetMultiDataSetIndexArchive::CommandSetMultiDataSetIndexArchive(const CommandSetMultiDataSetIndexArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetMultiDataSetIndexArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  oldindex_ = 0u;
+  newindex_ = 0u;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetMultiDataSetIndexArchive::~CommandSetMultiDataSetIndexArchive() {
+  SharedDtor();
+}
+
+void CommandSetMultiDataSetIndexArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+  }
+}
+
+void CommandSetMultiDataSetIndexArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetMultiDataSetIndexArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetMultiDataSetIndexArchive_descriptor_;
+}
+
+const CommandSetMultiDataSetIndexArchive& CommandSetMultiDataSetIndexArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetMultiDataSetIndexArchive* CommandSetMultiDataSetIndexArchive::default_instance_ = NULL;
+
+CommandSetMultiDataSetIndexArchive* CommandSetMultiDataSetIndexArchive::New() const {
+  return new CommandSetMultiDataSetIndexArchive;
+}
+
+void CommandSetMultiDataSetIndexArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    oldindex_ = 0u;
+    newindex_ = 0u;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetMultiDataSetIndexArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_oldindex;
+        break;
+      }
+
+      // required uint32 oldindex = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_oldindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &oldindex_)));
+          set_has_oldindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_newindex;
+        break;
+      }
+
+      // required uint32 newindex = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_newindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &newindex_)));
+          set_has_newindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSetMultiDataSetIndexArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required uint32 oldindex = 2;
+  if (has_oldindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->oldindex(), output);
+  }
+
+  // required uint32 newindex = 3;
+  if (has_newindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->newindex(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetMultiDataSetIndexArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required uint32 oldindex = 2;
+  if (has_oldindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->oldindex(), target);
+  }
+
+  // required uint32 newindex = 3;
+  if (has_newindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->newindex(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetMultiDataSetIndexArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required uint32 oldindex = 2;
+    if (has_oldindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->oldindex());
+    }
+
+    // required uint32 newindex = 3;
+    if (has_newindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->newindex());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetMultiDataSetIndexArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetMultiDataSetIndexArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultiDataSetIndexArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetMultiDataSetIndexArchive::MergeFrom(const CommandSetMultiDataSetIndexArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_oldindex()) {
+      set_oldindex(from.oldindex());
+    }
+    if (from.has_newindex()) {
+      set_newindex(from.newindex());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetMultiDataSetIndexArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetMultiDataSetIndexArchive::CopyFrom(const CommandSetMultiDataSetIndexArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetMultiDataSetIndexArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetMultiDataSetIndexArchive::Swap(CommandSetMultiDataSetIndexArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(oldindex_, other->oldindex_);
+    std::swap(newindex_, other->newindex_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetMultiDataSetIndexArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetMultiDataSetIndexArchive_descriptor_;
+  metadata.reflection = CommandSetMultiDataSetIndexArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetLegendFrameArchive::kSuperFieldNumber;
+const int CommandSetLegendFrameArchive::kOldLegendFrameFieldNumber;
+const int CommandSetLegendFrameArchive::kNewLegendFrameFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetLegendFrameArchive::CommandSetLegendFrameArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetLegendFrameArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  old_legend_frame_ = const_cast< ::TSCH::RectArchive*>(&::TSCH::RectArchive::default_instance());
+  new_legend_frame_ = const_cast< ::TSCH::RectArchive*>(&::TSCH::RectArchive::default_instance());
+}
+
+CommandSetLegendFrameArchive::CommandSetLegendFrameArchive(const CommandSetLegendFrameArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetLegendFrameArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  old_legend_frame_ = NULL;
+  new_legend_frame_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetLegendFrameArchive::~CommandSetLegendFrameArchive() {
+  SharedDtor();
+}
+
+void CommandSetLegendFrameArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete old_legend_frame_;
+    delete new_legend_frame_;
+  }
+}
+
+void CommandSetLegendFrameArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetLegendFrameArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetLegendFrameArchive_descriptor_;
+}
+
+const CommandSetLegendFrameArchive& CommandSetLegendFrameArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetLegendFrameArchive* CommandSetLegendFrameArchive::default_instance_ = NULL;
+
+CommandSetLegendFrameArchive* CommandSetLegendFrameArchive::New() const {
+  return new CommandSetLegendFrameArchive;
+}
+
+void CommandSetLegendFrameArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    if (has_old_legend_frame()) {
+      if (old_legend_frame_ != NULL) old_legend_frame_->::TSCH::RectArchive::Clear();
+    }
+    if (has_new_legend_frame()) {
+      if (new_legend_frame_ != NULL) new_legend_frame_->::TSCH::RectArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetLegendFrameArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_old_legend_frame;
+        break;
+      }
+
+      // required .TSCH.RectArchive old_legend_frame = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_legend_frame:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_legend_frame()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_new_legend_frame;
+        break;
+      }
+
+      // required .TSCH.RectArchive new_legend_frame = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_legend_frame:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_legend_frame()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSetLegendFrameArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TSCH.RectArchive old_legend_frame = 2;
+  if (has_old_legend_frame()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->old_legend_frame(), output);
+  }
+
+  // required .TSCH.RectArchive new_legend_frame = 3;
+  if (has_new_legend_frame()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->new_legend_frame(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetLegendFrameArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSCH.RectArchive old_legend_frame = 2;
+  if (has_old_legend_frame()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->old_legend_frame(), target);
+  }
+
+  // required .TSCH.RectArchive new_legend_frame = 3;
+  if (has_new_legend_frame()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->new_legend_frame(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetLegendFrameArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSCH.RectArchive old_legend_frame = 2;
+    if (has_old_legend_frame()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_legend_frame());
+    }
+
+    // required .TSCH.RectArchive new_legend_frame = 3;
+    if (has_new_legend_frame()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_legend_frame());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetLegendFrameArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetLegendFrameArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetLegendFrameArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetLegendFrameArchive::MergeFrom(const CommandSetLegendFrameArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_old_legend_frame()) {
+      mutable_old_legend_frame()->::TSCH::RectArchive::MergeFrom(from.old_legend_frame());
+    }
+    if (from.has_new_legend_frame()) {
+      mutable_new_legend_frame()->::TSCH::RectArchive::MergeFrom(from.new_legend_frame());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetLegendFrameArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetLegendFrameArchive::CopyFrom(const CommandSetLegendFrameArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetLegendFrameArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_old_legend_frame()) {
+    if (!this->old_legend_frame().IsInitialized()) return false;
+  }
+  if (has_new_legend_frame()) {
+    if (!this->new_legend_frame().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetLegendFrameArchive::Swap(CommandSetLegendFrameArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(old_legend_frame_, other->old_legend_frame_);
+    std::swap(new_legend_frame_, other->new_legend_frame_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetLegendFrameArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetLegendFrameArchive_descriptor_;
+  metadata.reflection = CommandSetLegendFrameArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetPieWedgeExplosion::kSuperFieldNumber;
+const int CommandSetPieWedgeExplosion::kInfoGeometryCommandFieldNumber;
+const int CommandSetPieWedgeExplosion::kStyleMutationCommandFieldNumber;
+const int CommandSetPieWedgeExplosion::kAnchorAttachmentCommandFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetPieWedgeExplosion::CommandSetPieWedgeExplosion()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetPieWedgeExplosion::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  info_geometry_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  style_mutation_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  anchor_attachment_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandSetPieWedgeExplosion::CommandSetPieWedgeExplosion(const CommandSetPieWedgeExplosion& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetPieWedgeExplosion::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  info_geometry_command_ = NULL;
+  style_mutation_command_ = NULL;
+  anchor_attachment_command_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetPieWedgeExplosion::~CommandSetPieWedgeExplosion() {
+  SharedDtor();
+}
+
+void CommandSetPieWedgeExplosion::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete info_geometry_command_;
+    delete style_mutation_command_;
+    delete anchor_attachment_command_;
+  }
+}
+
+void CommandSetPieWedgeExplosion::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetPieWedgeExplosion::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetPieWedgeExplosion_descriptor_;
+}
+
+const CommandSetPieWedgeExplosion& CommandSetPieWedgeExplosion::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetPieWedgeExplosion* CommandSetPieWedgeExplosion::default_instance_ = NULL;
+
+CommandSetPieWedgeExplosion* CommandSetPieWedgeExplosion::New() const {
+  return new CommandSetPieWedgeExplosion;
+}
+
+void CommandSetPieWedgeExplosion::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    if (has_info_geometry_command()) {
+      if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
+    }
+    if (has_style_mutation_command()) {
+      if (style_mutation_command_ != NULL) style_mutation_command_->::TSP::Reference::Clear();
+    }
+    if (has_anchor_attachment_command()) {
+      if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetPieWedgeExplosion::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_info_geometry_command;
+        break;
+      }
+
+      // optional .TSP.Reference info_geometry_command = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_info_geometry_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_info_geometry_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_style_mutation_command;
+        break;
+      }
+
+      // optional .TSP.Reference style_mutation_command = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_style_mutation_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_style_mutation_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_anchor_attachment_command;
+        break;
+      }
+
+      // optional .TSP.Reference anchor_attachment_command = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_anchor_attachment_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_anchor_attachment_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSetPieWedgeExplosion::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSP.Reference info_geometry_command = 2;
+  if (has_info_geometry_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->info_geometry_command(), output);
+  }
+
+  // optional .TSP.Reference style_mutation_command = 3;
+  if (has_style_mutation_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->style_mutation_command(), output);
+  }
+
+  // optional .TSP.Reference anchor_attachment_command = 4;
+  if (has_anchor_attachment_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->anchor_attachment_command(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetPieWedgeExplosion::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSP.Reference info_geometry_command = 2;
+  if (has_info_geometry_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->info_geometry_command(), target);
+  }
+
+  // optional .TSP.Reference style_mutation_command = 3;
+  if (has_style_mutation_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->style_mutation_command(), target);
+  }
+
+  // optional .TSP.Reference anchor_attachment_command = 4;
+  if (has_anchor_attachment_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->anchor_attachment_command(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetPieWedgeExplosion::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSP.Reference info_geometry_command = 2;
+    if (has_info_geometry_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->info_geometry_command());
+    }
+
+    // optional .TSP.Reference style_mutation_command = 3;
+    if (has_style_mutation_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->style_mutation_command());
+    }
+
+    // optional .TSP.Reference anchor_attachment_command = 4;
+    if (has_anchor_attachment_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->anchor_attachment_command());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetPieWedgeExplosion::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetPieWedgeExplosion* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetPieWedgeExplosion*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetPieWedgeExplosion::MergeFrom(const CommandSetPieWedgeExplosion& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_info_geometry_command()) {
+      mutable_info_geometry_command()->::TSP::Reference::MergeFrom(from.info_geometry_command());
+    }
+    if (from.has_style_mutation_command()) {
+      mutable_style_mutation_command()->::TSP::Reference::MergeFrom(from.style_mutation_command());
+    }
+    if (from.has_anchor_attachment_command()) {
+      mutable_anchor_attachment_command()->::TSP::Reference::MergeFrom(from.anchor_attachment_command());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetPieWedgeExplosion::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetPieWedgeExplosion::CopyFrom(const CommandSetPieWedgeExplosion& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetPieWedgeExplosion::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_info_geometry_command()) {
+    if (!this->info_geometry_command().IsInitialized()) return false;
+  }
+  if (has_style_mutation_command()) {
+    if (!this->style_mutation_command().IsInitialized()) return false;
+  }
+  if (has_anchor_attachment_command()) {
+    if (!this->anchor_attachment_command().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetPieWedgeExplosion::Swap(CommandSetPieWedgeExplosion* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(info_geometry_command_, other->info_geometry_command_);
+    std::swap(style_mutation_command_, other->style_mutation_command_);
+    std::swap(anchor_attachment_command_, other->anchor_attachment_command_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetPieWedgeExplosion::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetPieWedgeExplosion_descriptor_;
+  metadata.reflection = CommandSetPieWedgeExplosion_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int SynchronousCommandArchive::kSuperFieldNumber;
+const int SynchronousCommandArchive::kCommandFieldNumber;
+#endif  // !_MSC_VER
+
+SynchronousCommandArchive::SynchronousCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void SynchronousCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+SynchronousCommandArchive::SynchronousCommandArchive(const SynchronousCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void SynchronousCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  command_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+SynchronousCommandArchive::~SynchronousCommandArchive() {
+  SharedDtor();
+}
+
+void SynchronousCommandArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete command_;
+  }
+}
+
+void SynchronousCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* SynchronousCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return SynchronousCommandArchive_descriptor_;
+}
+
+const SynchronousCommandArchive& SynchronousCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+SynchronousCommandArchive* SynchronousCommandArchive::default_instance_ = NULL;
+
+SynchronousCommandArchive* SynchronousCommandArchive::New() const {
+  return new SynchronousCommandArchive;
+}
+
+void SynchronousCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_command()) {
+      if (command_ != NULL) command_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool SynchronousCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_command;
+        break;
+      }
+
+      // required .TSP.Reference command = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void SynchronousCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TSP.Reference command = 2;
+  if (has_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->command(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* SynchronousCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSP.Reference command = 2;
+  if (has_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->command(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int SynchronousCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference command = 2;
+    if (has_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->command());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void SynchronousCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const SynchronousCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const SynchronousCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void SynchronousCommandArchive::MergeFrom(const SynchronousCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_command()) {
+      mutable_command()->::TSP::Reference::MergeFrom(from.command());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void SynchronousCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void SynchronousCommandArchive::CopyFrom(const SynchronousCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool SynchronousCommandArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_command()) {
+    if (!this->command().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void SynchronousCommandArchive::Swap(SynchronousCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(command_, other->command_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata SynchronousCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = SynchronousCommandArchive_descriptor_;
+  metadata.reflection = SynchronousCommandArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandReplaceAllArchive::kSuperFieldNumber;
+const int CommandReplaceAllArchive::kInfoFieldNumber;
+const int CommandReplaceAllArchive::kCommandsFieldNumber;
+#endif  // !_MSC_VER
+
+CommandReplaceAllArchive::CommandReplaceAllArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandReplaceAllArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::ReplaceAllChildCommandArchive*>(&::TSK::ReplaceAllChildCommandArchive::default_instance());
+  info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandReplaceAllArchive::CommandReplaceAllArchive(const CommandReplaceAllArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandReplaceAllArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  info_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandReplaceAllArchive::~CommandReplaceAllArchive() {
+  SharedDtor();
+}
+
+void CommandReplaceAllArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete info_;
+  }
+}
+
+void CommandReplaceAllArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandReplaceAllArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandReplaceAllArchive_descriptor_;
+}
+
+const CommandReplaceAllArchive& CommandReplaceAllArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandReplaceAllArchive* CommandReplaceAllArchive::default_instance_ = NULL;
+
+CommandReplaceAllArchive* CommandReplaceAllArchive::New() const {
+  return new CommandReplaceAllArchive;
+}
+
+void CommandReplaceAllArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::ReplaceAllChildCommandArchive::Clear();
+    }
+    if (has_info()) {
+      if (info_ != NULL) info_->::TSP::Reference::Clear();
+    }
+  }
+  commands_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandReplaceAllArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSK.ReplaceAllChildCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_info;
+        break;
+      }
+
+      // required .TSP.Reference info = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_info:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_info()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_commands;
+        break;
+      }
+
+      // repeated .TSP.Reference commands = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_commands:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_commands()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_commands;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandReplaceAllArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSK.ReplaceAllChildCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TSP.Reference info = 2;
+  if (has_info()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->info(), output);
+  }
+
+  // repeated .TSP.Reference commands = 3;
+  for (int i = 0; i < this->commands_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->commands(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandReplaceAllArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSK.ReplaceAllChildCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSP.Reference info = 2;
+  if (has_info()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->info(), target);
+  }
+
+  // repeated .TSP.Reference commands = 3;
+  for (int i = 0; i < this->commands_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->commands(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandReplaceAllArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.ReplaceAllChildCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference info = 2;
+    if (has_info()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->info());
+    }
+
+  }
+  // repeated .TSP.Reference commands = 3;
+  total_size += 1 * this->commands_size();
+  for (int i = 0; i < this->commands_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->commands(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandReplaceAllArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandReplaceAllArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceAllArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandReplaceAllArchive::MergeFrom(const CommandReplaceAllArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  commands_.MergeFrom(from.commands_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::ReplaceAllChildCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_info()) {
+      mutable_info()->::TSP::Reference::MergeFrom(from.info());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandReplaceAllArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandReplaceAllArchive::CopyFrom(const CommandReplaceAllArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandReplaceAllArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_info()) {
+    if (!this->info().IsInitialized()) return false;
+  }
+  for (int i = 0; i < commands_size(); i++) {
+    if (!this->commands(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandReplaceAllArchive::Swap(CommandReplaceAllArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(info_, other->info_);
+    commands_.Swap(&other->commands_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandReplaceAllArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandReplaceAllArchive_descriptor_;
+  metadata.reflection = CommandReplaceAllArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandChartApplyTheme::kSuperFieldNumber;
+const int CommandChartApplyTheme::kInfoFieldNumber;
+const int CommandChartApplyTheme::kSwapCommandFieldNumber;
+const int CommandChartApplyTheme::kPresetFieldNumber;
+#endif  // !_MSC_VER
+
+CommandChartApplyTheme::CommandChartApplyTheme()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandChartApplyTheme::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSS::ApplyThemeChildCommandArchive*>(&::TSS::ApplyThemeChildCommandArchive::default_instance());
+  info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  swap_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandChartApplyTheme::CommandChartApplyTheme(const CommandChartApplyTheme& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandChartApplyTheme::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  info_ = NULL;
+  swap_command_ = NULL;
+  preset_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandChartApplyTheme::~CommandChartApplyTheme() {
+  SharedDtor();
+}
+
+void CommandChartApplyTheme::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete info_;
+    delete swap_command_;
+    delete preset_;
+  }
+}
+
+void CommandChartApplyTheme::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandChartApplyTheme::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandChartApplyTheme_descriptor_;
+}
+
+const CommandChartApplyTheme& CommandChartApplyTheme::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandChartApplyTheme* CommandChartApplyTheme::default_instance_ = NULL;
+
+CommandChartApplyTheme* CommandChartApplyTheme::New() const {
+  return new CommandChartApplyTheme;
+}
+
+void CommandChartApplyTheme::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
+    }
+    if (has_info()) {
+      if (info_ != NULL) info_->::TSP::Reference::Clear();
+    }
+    if (has_swap_command()) {
+      if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
+    }
+    if (has_preset()) {
+      if (preset_ != NULL) preset_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandChartApplyTheme::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSS.ApplyThemeChildCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_info;
+        break;
+      }
+
+      // required .TSP.Reference info = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_info:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_info()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_swap_command;
+        break;
+      }
+
+      // optional .TSP.Reference swap_command = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_swap_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_swap_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_preset;
+        break;
+      }
+
+      // optional .TSP.Reference preset = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_preset:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_preset()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandChartApplyTheme::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TSP.Reference info = 2;
+  if (has_info()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->info(), output);
+  }
+
+  // optional .TSP.Reference swap_command = 3;
+  if (has_swap_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->swap_command(), output);
+  }
+
+  // optional .TSP.Reference preset = 4;
+  if (has_preset()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->preset(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandChartApplyTheme::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSP.Reference info = 2;
+  if (has_info()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->info(), target);
+  }
+
+  // optional .TSP.Reference swap_command = 3;
+  if (has_swap_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->swap_command(), target);
+  }
+
+  // optional .TSP.Reference preset = 4;
+  if (has_preset()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->preset(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandChartApplyTheme::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSS.ApplyThemeChildCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference info = 2;
+    if (has_info()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->info());
+    }
+
+    // optional .TSP.Reference swap_command = 3;
+    if (has_swap_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->swap_command());
+    }
+
+    // optional .TSP.Reference preset = 4;
+    if (has_preset()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->preset());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandChartApplyTheme::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandChartApplyTheme* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandChartApplyTheme*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandChartApplyTheme::MergeFrom(const CommandChartApplyTheme& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSS::ApplyThemeChildCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_info()) {
+      mutable_info()->::TSP::Reference::MergeFrom(from.info());
+    }
+    if (from.has_swap_command()) {
+      mutable_swap_command()->::TSP::Reference::MergeFrom(from.swap_command());
+    }
+    if (from.has_preset()) {
+      mutable_preset()->::TSP::Reference::MergeFrom(from.preset());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandChartApplyTheme::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandChartApplyTheme::CopyFrom(const CommandChartApplyTheme& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandChartApplyTheme::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_info()) {
+    if (!this->info().IsInitialized()) return false;
+  }
+  if (has_swap_command()) {
+    if (!this->swap_command().IsInitialized()) return false;
+  }
+  if (has_preset()) {
+    if (!this->preset().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandChartApplyTheme::Swap(CommandChartApplyTheme* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(info_, other->info_);
+    std::swap(swap_command_, other->swap_command_);
+    std::swap(preset_, other->preset_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandChartApplyTheme::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandChartApplyTheme_descriptor_;
+  metadata.reflection = CommandChartApplyTheme_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandChartApplyPreset::kSuperFieldNumber;
+const int CommandChartApplyPreset::kSwapCommandFieldNumber;
+const int CommandChartApplyPreset::kPresetFieldNumber;
+const int CommandChartApplyPreset::kBehaviorFieldNumber;
+#endif  // !_MSC_VER
+
+CommandChartApplyPreset::CommandChartApplyPreset()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandChartApplyPreset::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  swap_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandChartApplyPreset::CommandChartApplyPreset(const CommandChartApplyPreset& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandChartApplyPreset::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  swap_command_ = NULL;
+  preset_ = NULL;
+  behavior_ = 1;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandChartApplyPreset::~CommandChartApplyPreset() {
+  SharedDtor();
+}
+
+void CommandChartApplyPreset::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete swap_command_;
+    delete preset_;
+  }
+}
+
+void CommandChartApplyPreset::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandChartApplyPreset::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandChartApplyPreset_descriptor_;
+}
+
+const CommandChartApplyPreset& CommandChartApplyPreset::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandChartApplyPreset* CommandChartApplyPreset::default_instance_ = NULL;
+
+CommandChartApplyPreset* CommandChartApplyPreset::New() const {
+  return new CommandChartApplyPreset;
+}
+
+void CommandChartApplyPreset::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    if (has_swap_command()) {
+      if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
+    }
+    if (has_preset()) {
+      if (preset_ != NULL) preset_->::TSP::Reference::Clear();
+    }
+    behavior_ = 1;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandChartApplyPreset::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_swap_command;
+        break;
+      }
+
+      // optional .TSP.Reference swap_command = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_swap_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_swap_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_preset;
+        break;
+      }
+
+      // optional .TSP.Reference preset = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_preset:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_preset()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_behavior;
+        break;
+      }
+
+      // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_behavior:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TSCH::ApplyPresetBehavior_IsValid(value)) {
+            set_behavior(static_cast< ::TSCH::ApplyPresetBehavior >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(4, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandChartApplyPreset::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSP.Reference swap_command = 2;
+  if (has_swap_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->swap_command(), output);
+  }
+
+  // optional .TSP.Reference preset = 3;
+  if (has_preset()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->preset(), output);
+  }
+
+  // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+  if (has_behavior()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      4, this->behavior(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandChartApplyPreset::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSP.Reference swap_command = 2;
+  if (has_swap_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->swap_command(), target);
+  }
+
+  // optional .TSP.Reference preset = 3;
+  if (has_preset()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->preset(), target);
+  }
+
+  // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+  if (has_behavior()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      4, this->behavior(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandChartApplyPreset::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSP.Reference swap_command = 2;
+    if (has_swap_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->swap_command());
+    }
+
+    // optional .TSP.Reference preset = 3;
+    if (has_preset()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->preset());
+    }
+
+    // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+    if (has_behavior()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->behavior());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandChartApplyPreset::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandChartApplyPreset* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandChartApplyPreset*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandChartApplyPreset::MergeFrom(const CommandChartApplyPreset& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_swap_command()) {
+      mutable_swap_command()->::TSP::Reference::MergeFrom(from.swap_command());
+    }
+    if (from.has_preset()) {
+      mutable_preset()->::TSP::Reference::MergeFrom(from.preset());
+    }
+    if (from.has_behavior()) {
+      set_behavior(from.behavior());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandChartApplyPreset::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandChartApplyPreset::CopyFrom(const CommandChartApplyPreset& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandChartApplyPreset::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_swap_command()) {
+    if (!this->swap_command().IsInitialized()) return false;
+  }
+  if (has_preset()) {
+    if (!this->preset().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandChartApplyPreset::Swap(CommandChartApplyPreset* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(swap_command_, other->swap_command_);
+    std::swap(preset_, other->preset_);
+    std::swap(behavior_, other->behavior_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandChartApplyPreset::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandChartApplyPreset_descriptor_;
+  metadata.reflection = CommandChartApplyPreset_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandCleanupGeometryArchive::kSuperFieldNumber;
+const int CommandCleanupGeometryArchive::kInfoGeometryCommandFieldNumber;
+const int CommandCleanupGeometryArchive::kAnchorAttachmentCommandFieldNumber;
+const int CommandCleanupGeometryArchive::kOriginalLegendRectFieldNumber;
+#endif  // !_MSC_VER
+
+CommandCleanupGeometryArchive::CommandCleanupGeometryArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandCleanupGeometryArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  info_geometry_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  anchor_attachment_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  original_legend_rect_ = const_cast< ::TSCH::RectArchive*>(&::TSCH::RectArchive::default_instance());
+}
+
+CommandCleanupGeometryArchive::CommandCleanupGeometryArchive(const CommandCleanupGeometryArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandCleanupGeometryArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  info_geometry_command_ = NULL;
+  anchor_attachment_command_ = NULL;
+  original_legend_rect_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandCleanupGeometryArchive::~CommandCleanupGeometryArchive() {
+  SharedDtor();
+}
+
+void CommandCleanupGeometryArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete info_geometry_command_;
+    delete anchor_attachment_command_;
+    delete original_legend_rect_;
+  }
+}
+
+void CommandCleanupGeometryArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandCleanupGeometryArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandCleanupGeometryArchive_descriptor_;
+}
+
+const CommandCleanupGeometryArchive& CommandCleanupGeometryArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandCleanupGeometryArchive* CommandCleanupGeometryArchive::default_instance_ = NULL;
+
+CommandCleanupGeometryArchive* CommandCleanupGeometryArchive::New() const {
+  return new CommandCleanupGeometryArchive;
+}
+
+void CommandCleanupGeometryArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    if (has_info_geometry_command()) {
+      if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
+    }
+    if (has_anchor_attachment_command()) {
+      if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
+    }
+    if (has_original_legend_rect()) {
+      if (original_legend_rect_ != NULL) original_legend_rect_->::TSCH::RectArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandCleanupGeometryArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_info_geometry_command;
+        break;
+      }
+
+      // optional .TSP.Reference info_geometry_command = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_info_geometry_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_info_geometry_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_anchor_attachment_command;
+        break;
+      }
+
+      // optional .TSP.Reference anchor_attachment_command = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_anchor_attachment_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_anchor_attachment_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_original_legend_rect;
+        break;
+      }
+
+      // optional .TSCH.RectArchive original_legend_rect = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_original_legend_rect:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_original_legend_rect()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandCleanupGeometryArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSP.Reference info_geometry_command = 2;
+  if (has_info_geometry_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->info_geometry_command(), output);
+  }
+
+  // optional .TSP.Reference anchor_attachment_command = 3;
+  if (has_anchor_attachment_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->anchor_attachment_command(), output);
+  }
+
+  // optional .TSCH.RectArchive original_legend_rect = 4;
+  if (has_original_legend_rect()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->original_legend_rect(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandCleanupGeometryArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSP.Reference info_geometry_command = 2;
+  if (has_info_geometry_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->info_geometry_command(), target);
+  }
+
+  // optional .TSP.Reference anchor_attachment_command = 3;
+  if (has_anchor_attachment_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->anchor_attachment_command(), target);
+  }
+
+  // optional .TSCH.RectArchive original_legend_rect = 4;
+  if (has_original_legend_rect()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->original_legend_rect(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandCleanupGeometryArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSP.Reference info_geometry_command = 2;
+    if (has_info_geometry_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->info_geometry_command());
+    }
+
+    // optional .TSP.Reference anchor_attachment_command = 3;
+    if (has_anchor_attachment_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->anchor_attachment_command());
+    }
+
+    // optional .TSCH.RectArchive original_legend_rect = 4;
+    if (has_original_legend_rect()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->original_legend_rect());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandCleanupGeometryArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandCleanupGeometryArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandCleanupGeometryArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandCleanupGeometryArchive::MergeFrom(const CommandCleanupGeometryArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_info_geometry_command()) {
+      mutable_info_geometry_command()->::TSP::Reference::MergeFrom(from.info_geometry_command());
+    }
+    if (from.has_anchor_attachment_command()) {
+      mutable_anchor_attachment_command()->::TSP::Reference::MergeFrom(from.anchor_attachment_command());
+    }
+    if (from.has_original_legend_rect()) {
+      mutable_original_legend_rect()->::TSCH::RectArchive::MergeFrom(from.original_legend_rect());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandCleanupGeometryArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandCleanupGeometryArchive::CopyFrom(const CommandCleanupGeometryArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandCleanupGeometryArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_info_geometry_command()) {
+    if (!this->info_geometry_command().IsInitialized()) return false;
+  }
+  if (has_anchor_attachment_command()) {
+    if (!this->anchor_attachment_command().IsInitialized()) return false;
+  }
+  if (has_original_legend_rect()) {
+    if (!this->original_legend_rect().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandCleanupGeometryArchive::Swap(CommandCleanupGeometryArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(info_geometry_command_, other->info_geometry_command_);
+    std::swap(anchor_attachment_command_, other->anchor_attachment_command_);
+    std::swap(original_legend_rect_, other->original_legend_rect_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandCleanupGeometryArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandCleanupGeometryArchive_descriptor_;
+  metadata.reflection = CommandCleanupGeometryArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ChartCommandArchive::kSuperFieldNumber;
+const int ChartCommandArchive::kInfoFieldNumber;
+const int ChartCommandArchive::kOriginalDirtyStateFieldNumber;
+#endif  // !_MSC_VER
+
+ChartCommandArchive::ChartCommandArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ChartCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+ChartCommandArchive::ChartCommandArchive(const ChartCommandArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ChartCommandArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  info_ = NULL;
+  original_dirty_state_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ChartCommandArchive::~ChartCommandArchive() {
+  SharedDtor();
+}
+
+void ChartCommandArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete info_;
+  }
+}
+
+void ChartCommandArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ChartCommandArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ChartCommandArchive_descriptor_;
+}
+
+const ChartCommandArchive& ChartCommandArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+ChartCommandArchive* ChartCommandArchive::default_instance_ = NULL;
+
+ChartCommandArchive* ChartCommandArchive::New() const {
+  return new ChartCommandArchive;
+}
+
+void ChartCommandArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_info()) {
+      if (info_ != NULL) info_->::TSP::Reference::Clear();
+    }
+    original_dirty_state_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ChartCommandArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSK.CommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_info;
+        break;
+      }
+
+      // required .TSP.Reference info = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_info:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_info()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_original_dirty_state;
+        break;
+      }
+
+      // optional bool original_dirty_state = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_original_dirty_state:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &original_dirty_state_)));
+          set_has_original_dirty_state();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ChartCommandArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TSP.Reference info = 2;
+  if (has_info()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->info(), output);
+  }
+
+  // optional bool original_dirty_state = 3;
+  if (has_original_dirty_state()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->original_dirty_state(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ChartCommandArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSP.Reference info = 2;
+  if (has_info()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->info(), target);
+  }
+
+  // optional bool original_dirty_state = 3;
+  if (has_original_dirty_state()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->original_dirty_state(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ChartCommandArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference info = 2;
+    if (has_info()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->info());
+    }
+
+    // optional bool original_dirty_state = 3;
+    if (has_original_dirty_state()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ChartCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ChartCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ChartCommandArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ChartCommandArchive::MergeFrom(const ChartCommandArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_info()) {
+      mutable_info()->::TSP::Reference::MergeFrom(from.info());
+    }
+    if (from.has_original_dirty_state()) {
+      set_original_dirty_state(from.original_dirty_state());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ChartCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ChartCommandArchive::CopyFrom(const ChartCommandArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ChartCommandArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_info()) {
+    if (!this->info().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ChartCommandArchive::Swap(ChartCommandArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(info_, other->info_);
+    std::swap(original_dirty_state_, other->original_dirty_state_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ChartCommandArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ChartCommandArchive_descriptor_;
+  metadata.reflection = ChartCommandArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandReplaceGridValuesArchive_ValueRow::kValueFieldNumber;
+#endif  // !_MSC_VER
+
+CommandReplaceGridValuesArchive_ValueRow::CommandReplaceGridValuesArchive_ValueRow()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::InitAsDefaultInstance() {
+}
+
+CommandReplaceGridValuesArchive_ValueRow::CommandReplaceGridValuesArchive_ValueRow(const CommandReplaceGridValuesArchive_ValueRow& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandReplaceGridValuesArchive_ValueRow::~CommandReplaceGridValuesArchive_ValueRow() {
+  SharedDtor();
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandReplaceGridValuesArchive_ValueRow::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandReplaceGridValuesArchive_ValueRow_descriptor_;
+}
+
+const CommandReplaceGridValuesArchive_ValueRow& CommandReplaceGridValuesArchive_ValueRow::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive_ValueRow::default_instance_ = NULL;
+
+CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive_ValueRow::New() const {
+  return new CommandReplaceGridValuesArchive_ValueRow;
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::Clear() {
+  value_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandReplaceGridValuesArchive_ValueRow::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated double value = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 1, 9, input, this->mutable_value())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, this->mutable_value())));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(9)) goto parse_value;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated double value = 1;
+  for (int i = 0; i < this->value_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(
+      1, this->value(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandReplaceGridValuesArchive_ValueRow::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated double value = 1;
+  for (int i = 0; i < this->value_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteDoubleToArray(1, this->value(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandReplaceGridValuesArchive_ValueRow::ByteSize() const {
+  int total_size = 0;
+
+  // repeated double value = 1;
+  {
+    int data_size = 0;
+    data_size = 8 * this->value_size();
+    total_size += 1 * this->value_size() + data_size;
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandReplaceGridValuesArchive_ValueRow* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceGridValuesArchive_ValueRow*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::MergeFrom(const CommandReplaceGridValuesArchive_ValueRow& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  value_.MergeFrom(from.value_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::CopyFrom(const CommandReplaceGridValuesArchive_ValueRow& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandReplaceGridValuesArchive_ValueRow::IsInitialized() const {
+
+  return true;
+}
+
+void CommandReplaceGridValuesArchive_ValueRow::Swap(CommandReplaceGridValuesArchive_ValueRow* other) {
+  if (other != this) {
+    value_.Swap(&other->value_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandReplaceGridValuesArchive_ValueRow::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandReplaceGridValuesArchive_ValueRow_descriptor_;
+  metadata.reflection = CommandReplaceGridValuesArchive_ValueRow_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int CommandReplaceGridValuesArchive::kSuperFieldNumber;
+const int CommandReplaceGridValuesArchive::kRowindexFieldNumber;
+const int CommandReplaceGridValuesArchive::kColumnindexFieldNumber;
+const int CommandReplaceGridValuesArchive::kOldDataRowsFieldNumber;
+const int CommandReplaceGridValuesArchive::kNewDataRowsFieldNumber;
+const int CommandReplaceGridValuesArchive::kOldRowNamesFieldNumber;
+const int CommandReplaceGridValuesArchive::kNewRowNamesFieldNumber;
+const int CommandReplaceGridValuesArchive::kOldColNamesFieldNumber;
+const int CommandReplaceGridValuesArchive::kNewColNamesFieldNumber;
+const int CommandReplaceGridValuesArchive::kRowsToAddFieldNumber;
+const int CommandReplaceGridValuesArchive::kColsToAddFieldNumber;
+const int CommandReplaceGridValuesArchive::kRowIdsFieldNumber;
+const int CommandReplaceGridValuesArchive::kColumnIdsFieldNumber;
+#endif  // !_MSC_VER
+
+CommandReplaceGridValuesArchive::CommandReplaceGridValuesArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandReplaceGridValuesArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+}
+
+CommandReplaceGridValuesArchive::CommandReplaceGridValuesArchive(const CommandReplaceGridValuesArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandReplaceGridValuesArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  rowindex_ = 0u;
+  columnindex_ = 0u;
+  rows_to_add_ = 0u;
+  cols_to_add_ = 0u;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandReplaceGridValuesArchive::~CommandReplaceGridValuesArchive() {
+  SharedDtor();
+}
+
+void CommandReplaceGridValuesArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+  }
+}
+
+void CommandReplaceGridValuesArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandReplaceGridValuesArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandReplaceGridValuesArchive_descriptor_;
+}
+
+const CommandReplaceGridValuesArchive& CommandReplaceGridValuesArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandReplaceGridValuesArchive* CommandReplaceGridValuesArchive::default_instance_ = NULL;
+
+CommandReplaceGridValuesArchive* CommandReplaceGridValuesArchive::New() const {
+  return new CommandReplaceGridValuesArchive;
+}
+
+void CommandReplaceGridValuesArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    rowindex_ = 0u;
+    columnindex_ = 0u;
+  }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    rows_to_add_ = 0u;
+    cols_to_add_ = 0u;
+  }
+  old_data_rows_.Clear();
+  new_data_rows_.Clear();
+  old_row_names_.Clear();
+  new_row_names_.Clear();
+  old_col_names_.Clear();
+  new_col_names_.Clear();
+  row_ids_.Clear();
+  column_ids_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandReplaceGridValuesArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSCH.ChartCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_rowindex;
+        break;
+      }
+
+      // required uint32 rowindex = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_rowindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &rowindex_)));
+          set_has_rowindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_columnindex;
+        break;
+      }
+
+      // required uint32 columnindex = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_columnindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &columnindex_)));
+          set_has_columnindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_old_data_rows;
+        break;
+      }
+
+      // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_data_rows:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_old_data_rows()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_old_data_rows;
+        if (input->ExpectTag(42)) goto parse_new_data_rows;
+        break;
+      }
+
+      // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_data_rows:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_new_data_rows()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_new_data_rows;
+        if (input->ExpectTag(50)) goto parse_old_row_names;
+        break;
+      }
+
+      // repeated string old_row_names = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_row_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_old_row_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->old_row_names(this->old_row_names_size() - 1).data(),
+            this->old_row_names(this->old_row_names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_old_row_names;
+        if (input->ExpectTag(58)) goto parse_new_row_names;
+        break;
+      }
+
+      // repeated string new_row_names = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_row_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_new_row_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->new_row_names(this->new_row_names_size() - 1).data(),
+            this->new_row_names(this->new_row_names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_new_row_names;
+        if (input->ExpectTag(66)) goto parse_old_col_names;
+        break;
+      }
+
+      // repeated string old_col_names = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_col_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_old_col_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->old_col_names(this->old_col_names_size() - 1).data(),
+            this->old_col_names(this->old_col_names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_old_col_names;
+        if (input->ExpectTag(74)) goto parse_new_col_names;
+        break;
+      }
+
+      // repeated string new_col_names = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_col_names:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_new_col_names()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->new_col_names(this->new_col_names_size() - 1).data(),
+            this->new_col_names(this->new_col_names_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_new_col_names;
+        if (input->ExpectTag(80)) goto parse_rows_to_add;
+        break;
+      }
+
+      // optional uint32 rows_to_add = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_rows_to_add:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &rows_to_add_)));
+          set_has_rows_to_add();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_cols_to_add;
+        break;
+      }
+
+      // optional uint32 cols_to_add = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cols_to_add:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &cols_to_add_)));
+          set_has_cols_to_add();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(98)) goto parse_row_ids;
+        break;
+      }
+
+      // repeated string row_ids = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_row_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_row_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->row_ids(this->row_ids_size() - 1).data(),
+            this->row_ids(this->row_ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(98)) goto parse_row_ids;
+        if (input->ExpectTag(106)) goto parse_column_ids;
+        break;
+      }
+
+      // repeated string column_ids = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_column_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->add_column_ids()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->column_ids(this->column_ids_size() - 1).data(),
+            this->column_ids(this->column_ids_size() - 1).length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(106)) goto parse_column_ids;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandReplaceGridValuesArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required uint32 rowindex = 2;
+  if (has_rowindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->rowindex(), output);
+  }
+
+  // required uint32 columnindex = 3;
+  if (has_columnindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->columnindex(), output);
+  }
+
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
+  for (int i = 0; i < this->old_data_rows_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->old_data_rows(i), output);
+  }
+
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
+  for (int i = 0; i < this->new_data_rows_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->new_data_rows(i), output);
+  }
+
+  // repeated string old_row_names = 6;
+  for (int i = 0; i < this->old_row_names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->old_row_names(i).data(), this->old_row_names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      6, this->old_row_names(i), output);
+  }
+
+  // repeated string new_row_names = 7;
+  for (int i = 0; i < this->new_row_names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->new_row_names(i).data(), this->new_row_names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      7, this->new_row_names(i), output);
+  }
+
+  // repeated string old_col_names = 8;
+  for (int i = 0; i < this->old_col_names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->old_col_names(i).data(), this->old_col_names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      8, this->old_col_names(i), output);
+  }
 
-void CommandChartApplyPreset::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+  // repeated string new_col_names = 9;
+  for (int i = 0; i < this->new_col_names_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->new_col_names(i).data(), this->new_col_names(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      9, this->new_col_names(i), output);
   }
 
-  // optional .TSP.Reference swap_command = 2;
-  if (has_swap_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->swap_command(), output);
+  // optional uint32 rows_to_add = 10;
+  if (has_rows_to_add()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(10, this->rows_to_add(), output);
   }
 
-  // optional .TSP.Reference preset = 3;
-  if (has_preset()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->preset(), output);
+  // optional uint32 cols_to_add = 11;
+  if (has_cols_to_add()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(11, this->cols_to_add(), output);
   }
 
-  // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
-  if (has_behavior()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      4, this->behavior(), output);
+  // repeated string row_ids = 12;
+  for (int i = 0; i < this->row_ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->row_ids(i).data(), this->row_ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      12, this->row_ids(i), output);
+  }
+
+  // repeated string column_ids = 13;
+  for (int i = 0; i < this->column_ids_size(); i++) {
+  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+    this->column_ids(i).data(), this->column_ids(i).length(),
+    ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      13, this->column_ids(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -10003,7 +15050,7 @@ void CommandChartApplyPreset::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandChartApplyPreset::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandReplaceGridValuesArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -10012,24 +15059,92 @@ ::google::protobuf::uint8* CommandChartApplyPreset::SerializeWithCachedSizesToAr
         1, this->super(), target);
   }
 
-  // optional .TSP.Reference swap_command = 2;
-  if (has_swap_command()) {
+  // required uint32 rowindex = 2;
+  if (has_rowindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->rowindex(), target);
+  }
+
+  // required uint32 columnindex = 3;
+  if (has_columnindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->columnindex(), target);
+  }
+
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
+  for (int i = 0; i < this->old_data_rows_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->swap_command(), target);
+        4, this->old_data_rows(i), target);
   }
 
-  // optional .TSP.Reference preset = 3;
-  if (has_preset()) {
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
+  for (int i = 0; i < this->new_data_rows_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->preset(), target);
+        5, this->new_data_rows(i), target);
   }
 
-  // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
-  if (has_behavior()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      4, this->behavior(), target);
+  // repeated string old_row_names = 6;
+  for (int i = 0; i < this->old_row_names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->old_row_names(i).data(), this->old_row_names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(6, this->old_row_names(i), target);
+  }
+
+  // repeated string new_row_names = 7;
+  for (int i = 0; i < this->new_row_names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->new_row_names(i).data(), this->new_row_names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(7, this->new_row_names(i), target);
+  }
+
+  // repeated string old_col_names = 8;
+  for (int i = 0; i < this->old_col_names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->old_col_names(i).data(), this->old_col_names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(8, this->old_col_names(i), target);
+  }
+
+  // repeated string new_col_names = 9;
+  for (int i = 0; i < this->new_col_names_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->new_col_names(i).data(), this->new_col_names(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(9, this->new_col_names(i), target);
+  }
+
+  // optional uint32 rows_to_add = 10;
+  if (has_rows_to_add()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(10, this->rows_to_add(), target);
+  }
+
+  // optional uint32 cols_to_add = 11;
+  if (has_cols_to_add()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(11, this->cols_to_add(), target);
+  }
+
+  // repeated string row_ids = 12;
+  for (int i = 0; i < this->row_ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->row_ids(i).data(), this->row_ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(12, this->row_ids(i), target);
+  }
+
+  // repeated string column_ids = 13;
+  for (int i = 0; i < this->column_ids_size(); i++) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->column_ids(i).data(), this->column_ids(i).length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteStringToArray(13, this->column_ids(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -10039,7 +15154,7 @@ ::google::protobuf::uint8* CommandChartApplyPreset::SerializeWithCachedSizesToAr
   return target;
 }
 
-int CommandChartApplyPreset::ByteSize() const {
+int CommandReplaceGridValuesArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -10050,27 +15165,95 @@ int CommandChartApplyPreset::ByteSize() const {
           this->super());
     }
 
-    // optional .TSP.Reference swap_command = 2;
-    if (has_swap_command()) {
+    // required uint32 rowindex = 2;
+    if (has_rowindex()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->swap_command());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->rowindex());
     }
 
-    // optional .TSP.Reference preset = 3;
-    if (has_preset()) {
+    // required uint32 columnindex = 3;
+    if (has_columnindex()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->preset());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->columnindex());
     }
 
-    // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
-    if (has_behavior()) {
+  }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    // optional uint32 rows_to_add = 10;
+    if (has_rows_to_add()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->behavior());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->rows_to_add());
+    }
+
+    // optional uint32 cols_to_add = 11;
+    if (has_cols_to_add()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->cols_to_add());
     }
 
   }
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
+  total_size += 1 * this->old_data_rows_size();
+  for (int i = 0; i < this->old_data_rows_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->old_data_rows(i));
+  }
+
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
+  total_size += 1 * this->new_data_rows_size();
+  for (int i = 0; i < this->new_data_rows_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->new_data_rows(i));
+  }
+
+  // repeated string old_row_names = 6;
+  total_size += 1 * this->old_row_names_size();
+  for (int i = 0; i < this->old_row_names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->old_row_names(i));
+  }
+
+  // repeated string new_row_names = 7;
+  total_size += 1 * this->new_row_names_size();
+  for (int i = 0; i < this->new_row_names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->new_row_names(i));
+  }
+
+  // repeated string old_col_names = 8;
+  total_size += 1 * this->old_col_names_size();
+  for (int i = 0; i < this->old_col_names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->old_col_names(i));
+  }
+
+  // repeated string new_col_names = 9;
+  total_size += 1 * this->new_col_names_size();
+  for (int i = 0; i < this->new_col_names_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->new_col_names(i));
+  }
+
+  // repeated string row_ids = 12;
+  total_size += 1 * this->row_ids_size();
+  for (int i = 0; i < this->row_ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->row_ids(i));
+  }
+
+  // repeated string column_ids = 13;
+  total_size += 1 * this->column_ids_size();
+  for (int i = 0; i < this->column_ids_size(); i++) {
+    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
+      this->column_ids(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -10082,10 +15265,10 @@ int CommandChartApplyPreset::ByteSize() const {
   return total_size;
 }
 
-void CommandChartApplyPreset::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceGridValuesArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandChartApplyPreset* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandChartApplyPreset*>(
+  const CommandReplaceGridValuesArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceGridValuesArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -10094,69 +15277,85 @@ void CommandChartApplyPreset::MergeFrom(const ::google::protobuf::Message& from)
   }
 }
 
-void CommandChartApplyPreset::MergeFrom(const CommandChartApplyPreset& from) {
+void CommandReplaceGridValuesArchive::MergeFrom(const CommandReplaceGridValuesArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  old_data_rows_.MergeFrom(from.old_data_rows_);
+  new_data_rows_.MergeFrom(from.new_data_rows_);
+  old_row_names_.MergeFrom(from.old_row_names_);
+  new_row_names_.MergeFrom(from.new_row_names_);
+  old_col_names_.MergeFrom(from.old_col_names_);
+  new_col_names_.MergeFrom(from.new_col_names_);
+  row_ids_.MergeFrom(from.row_ids_);
+  column_ids_.MergeFrom(from.column_ids_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_swap_command()) {
-      mutable_swap_command()->::TSP::Reference::MergeFrom(from.swap_command());
+    if (from.has_rowindex()) {
+      set_rowindex(from.rowindex());
     }
-    if (from.has_preset()) {
-      mutable_preset()->::TSP::Reference::MergeFrom(from.preset());
+    if (from.has_columnindex()) {
+      set_columnindex(from.columnindex());
     }
-    if (from.has_behavior()) {
-      set_behavior(from.behavior());
+  }
+  if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    if (from.has_rows_to_add()) {
+      set_rows_to_add(from.rows_to_add());
+    }
+    if (from.has_cols_to_add()) {
+      set_cols_to_add(from.cols_to_add());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandChartApplyPreset::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceGridValuesArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandChartApplyPreset::CopyFrom(const CommandChartApplyPreset& from) {
+void CommandReplaceGridValuesArchive::CopyFrom(const CommandReplaceGridValuesArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandChartApplyPreset::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_swap_command()) {
-    if (!this->swap_command().IsInitialized()) return false;
-  }
-  if (has_preset()) {
-    if (!this->preset().IsInitialized()) return false;
+bool CommandReplaceGridValuesArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandChartApplyPreset::Swap(CommandChartApplyPreset* other) {
+void CommandReplaceGridValuesArchive::Swap(CommandReplaceGridValuesArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(swap_command_, other->swap_command_);
-    std::swap(preset_, other->preset_);
-    std::swap(behavior_, other->behavior_);
+    std::swap(rowindex_, other->rowindex_);
+    std::swap(columnindex_, other->columnindex_);
+    old_data_rows_.Swap(&other->old_data_rows_);
+    new_data_rows_.Swap(&other->new_data_rows_);
+    old_row_names_.Swap(&other->old_row_names_);
+    new_row_names_.Swap(&other->new_row_names_);
+    old_col_names_.Swap(&other->old_col_names_);
+    new_col_names_.Swap(&other->new_col_names_);
+    std::swap(rows_to_add_, other->rows_to_add_);
+    std::swap(cols_to_add_, other->cols_to_add_);
+    row_ids_.Swap(&other->row_ids_);
+    column_ids_.Swap(&other->column_ids_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandChartApplyPreset::GetMetadata() const {
+::google::protobuf::Metadata CommandReplaceGridValuesArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandChartApplyPreset_descriptor_;
-  metadata.reflection = CommandChartApplyPreset_reflection_;
+  metadata.descriptor = CommandReplaceGridValuesArchive_descriptor_;
+  metadata.reflection = CommandReplaceGridValuesArchive_reflection_;
   return metadata;
 }
 
@@ -10164,146 +15363,110 @@ ::google::protobuf::Metadata CommandChartApplyPreset::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandCleanupGeometryArchive::kSuperFieldNumber;
-const int CommandCleanupGeometryArchive::kInfoGeometryCommandFieldNumber;
-const int CommandCleanupGeometryArchive::kAnchorAttachmentCommandFieldNumber;
-const int CommandCleanupGeometryArchive::kOriginalLegendRectFieldNumber;
+const int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::kStyleFieldNumber;
+const int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::kIdentifierFieldNumber;
 #endif  // !_MSC_VER
 
-CommandCleanupGeometryArchive::CommandCleanupGeometryArchive()
+CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CommandReplaceThemePresetArchive_StyleAndIdentifierPair()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandCleanupGeometryArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
-  info_geometry_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  anchor_attachment_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  original_legend_rect_ = const_cast< ::TSCH::RectArchive*>(&::TSCH::RectArchive::default_instance());
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::InitAsDefaultInstance() {
+  style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandCleanupGeometryArchive::CommandCleanupGeometryArchive(const CommandCleanupGeometryArchive& from)
+CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CommandReplaceThemePresetArchive_StyleAndIdentifierPair(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandCleanupGeometryArchive::SharedCtor() {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  info_geometry_command_ = NULL;
-  anchor_attachment_command_ = NULL;
-  original_legend_rect_ = NULL;
+  style_ = NULL;
+  identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandCleanupGeometryArchive::~CommandCleanupGeometryArchive() {
+CommandReplaceThemePresetArchive_StyleAndIdentifierPair::~CommandReplaceThemePresetArchive_StyleAndIdentifierPair() {
   SharedDtor();
 }
 
-void CommandCleanupGeometryArchive::SharedDtor() {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SharedDtor() {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete identifier_;
+  }
   if (this != default_instance_) {
-    delete super_;
-    delete info_geometry_command_;
-    delete anchor_attachment_command_;
-    delete original_legend_rect_;
+    delete style_;
   }
 }
 
-void CommandCleanupGeometryArchive::SetCachedSize(int size) const {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandCleanupGeometryArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandCleanupGeometryArchive_descriptor_;
+  return CommandReplaceThemePresetArchive_StyleAndIdentifierPair_descriptor_;
 }
 
-const CommandCleanupGeometryArchive& CommandCleanupGeometryArchive::default_instance() {
+const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandCleanupGeometryArchive* CommandCleanupGeometryArchive::default_instance_ = NULL;
+CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance_ = NULL;
 
-CommandCleanupGeometryArchive* CommandCleanupGeometryArchive::New() const {
-  return new CommandCleanupGeometryArchive;
+CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::New() const {
+  return new CommandReplaceThemePresetArchive_StyleAndIdentifierPair;
 }
 
-void CommandCleanupGeometryArchive::Clear() {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-    }
-    if (has_info_geometry_command()) {
-      if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
-    }
-    if (has_anchor_attachment_command()) {
-      if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
+    if (has_style()) {
+      if (style_ != NULL) style_->::TSP::Reference::Clear();
     }
-    if (has_original_legend_rect()) {
-      if (original_legend_rect_ != NULL) original_legend_rect_->::TSCH::RectArchive::Clear();
+    if (has_identifier()) {
+      if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+        identifier_->clear();
+      }
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandCleanupGeometryArchive::MergePartialFromCodedStream(
+bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSCH.ChartCommandArchive super = 1;
+      // required .TSP.Reference style = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_info_geometry_command;
+        if (input->ExpectTag(18)) goto parse_identifier;
         break;
       }
 
-      // optional .TSP.Reference info_geometry_command = 2;
+      // required string identifier = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_info_geometry_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_info_geometry_command()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_anchor_attachment_command;
-        break;
-      }
-
-      // optional .TSP.Reference anchor_attachment_command = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_anchor_attachment_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_anchor_attachment_command()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_original_legend_rect;
-        break;
-      }
-
-      // optional .TSCH.RectArchive original_legend_rect = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_original_legend_rect:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_original_legend_rect()));
+         parse_identifier:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_identifier()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->identifier().data(), this->identifier().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
@@ -10327,30 +15490,21 @@ bool CommandCleanupGeometryArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandCleanupGeometryArchive::SerializeWithCachedSizes(
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // optional .TSP.Reference info_geometry_command = 2;
-  if (has_info_geometry_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->info_geometry_command(), output);
-  }
-
-  // optional .TSP.Reference anchor_attachment_command = 3;
-  if (has_anchor_attachment_command()) {
+  // required .TSP.Reference style = 1;
+  if (has_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->anchor_attachment_command(), output);
+      1, this->style(), output);
   }
 
-  // optional .TSCH.RectArchive original_legend_rect = 4;
-  if (has_original_legend_rect()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->original_legend_rect(), output);
+  // required string identifier = 2;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->identifier().data(), this->identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      2, this->identifier(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -10359,34 +15513,23 @@ void CommandCleanupGeometryArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandCleanupGeometryArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // optional .TSP.Reference info_geometry_command = 2;
-  if (has_info_geometry_command()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->info_geometry_command(), target);
-  }
-
-  // optional .TSP.Reference anchor_attachment_command = 3;
-  if (has_anchor_attachment_command()) {
+  // required .TSP.Reference style = 1;
+  if (has_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->anchor_attachment_command(), target);
+        1, this->style(), target);
   }
 
-  // optional .TSCH.RectArchive original_legend_rect = 4;
-  if (has_original_legend_rect()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->original_legend_rect(), target);
+  // required string identifier = 2;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->identifier().data(), this->identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->identifier(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -10396,36 +15539,22 @@ ::google::protobuf::uint8* CommandCleanupGeometryArchive::SerializeWithCachedSiz
   return target;
 }
 
-int CommandCleanupGeometryArchive::ByteSize() const {
+int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSCH.ChartCommandArchive super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // optional .TSP.Reference info_geometry_command = 2;
-    if (has_info_geometry_command()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->info_geometry_command());
-    }
-
-    // optional .TSP.Reference anchor_attachment_command = 3;
-    if (has_anchor_attachment_command()) {
+    // required .TSP.Reference style = 1;
+    if (has_style()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->anchor_attachment_command());
+          this->style());
     }
 
-    // optional .TSCH.RectArchive original_legend_rect = 4;
-    if (has_original_legend_rect()) {
+    // required string identifier = 2;
+    if (has_identifier()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->original_legend_rect());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->identifier());
     }
 
   }
@@ -10440,10 +15569,10 @@ int CommandCleanupGeometryArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandCleanupGeometryArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandCleanupGeometryArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandCleanupGeometryArchive*>(
+  const CommandReplaceThemePresetArchive_StyleAndIdentifierPair* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceThemePresetArchive_StyleAndIdentifierPair*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -10452,155 +15581,154 @@ void CommandCleanupGeometryArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandCleanupGeometryArchive::MergeFrom(const CommandCleanupGeometryArchive& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_info_geometry_command()) {
-      mutable_info_geometry_command()->::TSP::Reference::MergeFrom(from.info_geometry_command());
-    }
-    if (from.has_anchor_attachment_command()) {
-      mutable_anchor_attachment_command()->::TSP::Reference::MergeFrom(from.anchor_attachment_command());
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergeFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_style()) {
+      mutable_style()->::TSP::Reference::MergeFrom(from.style());
     }
-    if (from.has_original_legend_rect()) {
-      mutable_original_legend_rect()->::TSCH::RectArchive::MergeFrom(from.original_legend_rect());
+    if (from.has_identifier()) {
+      set_identifier(from.identifier());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandCleanupGeometryArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandCleanupGeometryArchive::CopyFrom(const CommandCleanupGeometryArchive& from) {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CopyFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandCleanupGeometryArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_info_geometry_command()) {
-    if (!this->info_geometry_command().IsInitialized()) return false;
-  }
-  if (has_anchor_attachment_command()) {
-    if (!this->anchor_attachment_command().IsInitialized()) return false;
-  }
-  if (has_original_legend_rect()) {
-    if (!this->original_legend_rect().IsInitialized()) return false;
+  if (has_style()) {
+    if (!this->style().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandCleanupGeometryArchive::Swap(CommandCleanupGeometryArchive* other) {
+void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::Swap(CommandReplaceThemePresetArchive_StyleAndIdentifierPair* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(info_geometry_command_, other->info_geometry_command_);
-    std::swap(anchor_attachment_command_, other->anchor_attachment_command_);
-    std::swap(original_legend_rect_, other->original_legend_rect_);
+    std::swap(style_, other->style_);
+    std::swap(identifier_, other->identifier_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandCleanupGeometryArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandReplaceThemePresetArchive_StyleAndIdentifierPair::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandCleanupGeometryArchive_descriptor_;
-  metadata.reflection = CommandCleanupGeometryArchive_reflection_;
+  metadata.descriptor = CommandReplaceThemePresetArchive_StyleAndIdentifierPair_descriptor_;
+  metadata.reflection = CommandReplaceThemePresetArchive_StyleAndIdentifierPair_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int ChartCommandArchive::kSuperFieldNumber;
-const int ChartCommandArchive::kInfoFieldNumber;
-const int ChartCommandArchive::kOriginalDirtyStateFieldNumber;
+const int CommandReplaceThemePresetArchive::kSuperFieldNumber;
+const int CommandReplaceThemePresetArchive::kThemeFieldNumber;
+const int CommandReplaceThemePresetArchive::kOldPresetFieldNumber;
+const int CommandReplaceThemePresetArchive::kNewPresetFieldNumber;
+const int CommandReplaceThemePresetArchive::kIdentifiersFieldNumber;
+const int CommandReplaceThemePresetArchive::kOldPresetIndexFieldNumber;
 #endif  // !_MSC_VER
 
-ChartCommandArchive::ChartCommandArchive()
+CommandReplaceThemePresetArchive::CommandReplaceThemePresetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void ChartCommandArchive::InitAsDefaultInstance() {
+void CommandReplaceThemePresetArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  theme_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  new_preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-ChartCommandArchive::ChartCommandArchive(const ChartCommandArchive& from)
+CommandReplaceThemePresetArchive::CommandReplaceThemePresetArchive(const CommandReplaceThemePresetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void ChartCommandArchive::SharedCtor() {
+void CommandReplaceThemePresetArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  info_ = NULL;
-  original_dirty_state_ = false;
+  theme_ = NULL;
+  old_preset_ = NULL;
+  new_preset_ = NULL;
+  old_preset_index_ = GOOGLE_ULONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-ChartCommandArchive::~ChartCommandArchive() {
+CommandReplaceThemePresetArchive::~CommandReplaceThemePresetArchive() {
   SharedDtor();
 }
 
-void ChartCommandArchive::SharedDtor() {
+void CommandReplaceThemePresetArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete info_;
+    delete theme_;
+    delete old_preset_;
+    delete new_preset_;
   }
 }
 
-void ChartCommandArchive::SetCachedSize(int size) const {
+void CommandReplaceThemePresetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* ChartCommandArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandReplaceThemePresetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return ChartCommandArchive_descriptor_;
+  return CommandReplaceThemePresetArchive_descriptor_;
 }
 
-const ChartCommandArchive& ChartCommandArchive::default_instance() {
+const CommandReplaceThemePresetArchive& CommandReplaceThemePresetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-ChartCommandArchive* ChartCommandArchive::default_instance_ = NULL;
+CommandReplaceThemePresetArchive* CommandReplaceThemePresetArchive::default_instance_ = NULL;
 
-ChartCommandArchive* ChartCommandArchive::New() const {
-  return new ChartCommandArchive;
+CommandReplaceThemePresetArchive* CommandReplaceThemePresetArchive::New() const {
+  return new CommandReplaceThemePresetArchive;
 }
 
-void ChartCommandArchive::Clear() {
+void CommandReplaceThemePresetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_info()) {
-      if (info_ != NULL) info_->::TSP::Reference::Clear();
+    if (has_theme()) {
+      if (theme_ != NULL) theme_->::TSP::Reference::Clear();
     }
-    original_dirty_state_ = false;
+    if (has_old_preset()) {
+      if (old_preset_ != NULL) old_preset_->::TSP::Reference::Clear();
+    }
+    if (has_new_preset()) {
+      if (new_preset_ != NULL) new_preset_->::TSP::Reference::Clear();
+    }
+    old_preset_index_ = GOOGLE_ULONGLONG(0);
   }
+  identifiers_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool ChartCommandArchive::MergePartialFromCodedStream(
+bool CommandReplaceThemePresetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -10615,33 +15743,76 @@ bool ChartCommandArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_info;
+        if (input->ExpectTag(18)) goto parse_theme;
         break;
       }
 
-      // required .TSP.Reference info = 2;
+      // required .TSP.Reference theme = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_info:
+         parse_theme:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_info()));
+               input, mutable_theme()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_original_dirty_state;
+        if (input->ExpectTag(26)) goto parse_old_preset;
         break;
       }
 
-      // optional bool original_dirty_state = 3;
+      // optional .TSP.Reference old_preset = 3;
       case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_preset:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_preset()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_new_preset;
+        break;
+      }
+
+      // optional .TSP.Reference new_preset = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_preset:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_preset()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_identifiers;
+        break;
+      }
+
+      // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_identifiers:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_identifiers()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_identifiers;
+        if (input->ExpectTag(48)) goto parse_old_preset_index;
+        break;
+      }
+
+      // optional uint64 old_preset_index = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_original_dirty_state:
+         parse_old_preset_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &original_dirty_state_)));
-          set_has_original_dirty_state();
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &old_preset_index_)));
+          set_has_old_preset_index();
         } else {
           goto handle_uninterpreted;
         }
@@ -10665,7 +15836,7 @@ bool ChartCommandArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void ChartCommandArchive::SerializeWithCachedSizes(
+void CommandReplaceThemePresetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -10673,15 +15844,33 @@ void ChartCommandArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference info = 2;
-  if (has_info()) {
+  // required .TSP.Reference theme = 2;
+  if (has_theme()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->info(), output);
+      2, this->theme(), output);
   }
 
-  // optional bool original_dirty_state = 3;
-  if (has_original_dirty_state()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->original_dirty_state(), output);
+  // optional .TSP.Reference old_preset = 3;
+  if (has_old_preset()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->old_preset(), output);
+  }
+
+  // optional .TSP.Reference new_preset = 4;
+  if (has_new_preset()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->new_preset(), output);
+  }
+
+  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
+  for (int i = 0; i < this->identifiers_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->identifiers(i), output);
+  }
+
+  // optional uint64 old_preset_index = 6;
+  if (has_old_preset_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(6, this->old_preset_index(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -10690,7 +15879,7 @@ void ChartCommandArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* ChartCommandArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandReplaceThemePresetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TSK.CommandArchive super = 1;
   if (has_super()) {
@@ -10699,16 +15888,37 @@ ::google::protobuf::uint8* ChartCommandArchive::SerializeWithCachedSizesToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference info = 2;
-  if (has_info()) {
+  // required .TSP.Reference theme = 2;
+  if (has_theme()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->info(), target);
+        2, this->theme(), target);
   }
 
-  // optional bool original_dirty_state = 3;
-  if (has_original_dirty_state()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->original_dirty_state(), target);
+  // optional .TSP.Reference old_preset = 3;
+  if (has_old_preset()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->old_preset(), target);
+  }
+
+  // optional .TSP.Reference new_preset = 4;
+  if (has_new_preset()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->new_preset(), target);
+  }
+
+  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
+  for (int i = 0; i < this->identifiers_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->identifiers(i), target);
+  }
+
+  // optional uint64 old_preset_index = 6;
+  if (has_old_preset_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(6, this->old_preset_index(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -10718,30 +15928,54 @@ ::google::protobuf::uint8* ChartCommandArchive::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int ChartCommandArchive::ByteSize() const {
+int CommandReplaceThemePresetArchive::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
-    if (has_super()) {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference theme = 2;
+    if (has_theme()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->theme());
+    }
+
+    // optional .TSP.Reference old_preset = 3;
+    if (has_old_preset()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+          this->old_preset());
     }
 
-    // required .TSP.Reference info = 2;
-    if (has_info()) {
+    // optional .TSP.Reference new_preset = 4;
+    if (has_new_preset()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->info());
+          this->new_preset());
     }
 
-    // optional bool original_dirty_state = 3;
-    if (has_original_dirty_state()) {
-      total_size += 1 + 1;
+    // optional uint64 old_preset_index = 6;
+    if (has_old_preset_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->old_preset_index());
     }
 
   }
+  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
+  total_size += 1 * this->identifiers_size();
+  for (int i = 0; i < this->identifiers_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->identifiers(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -10753,10 +15987,10 @@ int ChartCommandArchive::ByteSize() const {
   return total_size;
 }
 
-void ChartCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceThemePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const ChartCommandArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ChartCommandArchive*>(
+  const CommandReplaceThemePresetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceThemePresetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -10765,62 +15999,81 @@ void ChartCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void ChartCommandArchive::MergeFrom(const ChartCommandArchive& from) {
+void CommandReplaceThemePresetArchive::MergeFrom(const CommandReplaceThemePresetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  identifiers_.MergeFrom(from.identifiers_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_info()) {
-      mutable_info()->::TSP::Reference::MergeFrom(from.info());
+    if (from.has_theme()) {
+      mutable_theme()->::TSP::Reference::MergeFrom(from.theme());
     }
-    if (from.has_original_dirty_state()) {
-      set_original_dirty_state(from.original_dirty_state());
+    if (from.has_old_preset()) {
+      mutable_old_preset()->::TSP::Reference::MergeFrom(from.old_preset());
+    }
+    if (from.has_new_preset()) {
+      mutable_new_preset()->::TSP::Reference::MergeFrom(from.new_preset());
+    }
+    if (from.has_old_preset_index()) {
+      set_old_preset_index(from.old_preset_index());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void ChartCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceThemePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void ChartCommandArchive::CopyFrom(const ChartCommandArchive& from) {
+void CommandReplaceThemePresetArchive::CopyFrom(const CommandReplaceThemePresetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool ChartCommandArchive::IsInitialized() const {
+bool CommandReplaceThemePresetArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_info()) {
-    if (!this->info().IsInitialized()) return false;
+  if (has_theme()) {
+    if (!this->theme().IsInitialized()) return false;
+  }
+  if (has_old_preset()) {
+    if (!this->old_preset().IsInitialized()) return false;
+  }
+  if (has_new_preset()) {
+    if (!this->new_preset().IsInitialized()) return false;
+  }
+  for (int i = 0; i < identifiers_size(); i++) {
+    if (!this->identifiers(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void ChartCommandArchive::Swap(ChartCommandArchive* other) {
+void CommandReplaceThemePresetArchive::Swap(CommandReplaceThemePresetArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(info_, other->info_);
-    std::swap(original_dirty_state_, other->original_dirty_state_);
+    std::swap(theme_, other->theme_);
+    std::swap(old_preset_, other->old_preset_);
+    std::swap(new_preset_, other->new_preset_);
+    identifiers_.Swap(&other->identifiers_);
+    std::swap(old_preset_index_, other->old_preset_index_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata ChartCommandArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandReplaceThemePresetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = ChartCommandArchive_descriptor_;
-  metadata.reflection = ChartCommandArchive_reflection_;
+  metadata.descriptor = CommandReplaceThemePresetArchive_descriptor_;
+  metadata.reflection = CommandReplaceThemePresetArchive_reflection_;
   return metadata;
 }
 
@@ -10828,88 +16081,86 @@ ::google::protobuf::Metadata ChartCommandArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandReplaceGridValuesArchive_ValueRow::kValueFieldNumber;
+const int CommandInvalidateWPCaches::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandReplaceGridValuesArchive_ValueRow::CommandReplaceGridValuesArchive_ValueRow()
+CommandInvalidateWPCaches::CommandInvalidateWPCaches()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::InitAsDefaultInstance() {
+void CommandInvalidateWPCaches::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
 }
 
-CommandReplaceGridValuesArchive_ValueRow::CommandReplaceGridValuesArchive_ValueRow(const CommandReplaceGridValuesArchive_ValueRow& from)
+CommandInvalidateWPCaches::CommandInvalidateWPCaches(const CommandInvalidateWPCaches& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::SharedCtor() {
+void CommandInvalidateWPCaches::SharedCtor() {
   _cached_size_ = 0;
+  super_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandReplaceGridValuesArchive_ValueRow::~CommandReplaceGridValuesArchive_ValueRow() {
+CommandInvalidateWPCaches::~CommandInvalidateWPCaches() {
   SharedDtor();
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::SharedDtor() {
+void CommandInvalidateWPCaches::SharedDtor() {
   if (this != default_instance_) {
+    delete super_;
   }
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::SetCachedSize(int size) const {
+void CommandInvalidateWPCaches::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandReplaceGridValuesArchive_ValueRow::descriptor() {
+const ::google::protobuf::Descriptor* CommandInvalidateWPCaches::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandReplaceGridValuesArchive_ValueRow_descriptor_;
+  return CommandInvalidateWPCaches_descriptor_;
 }
 
-const CommandReplaceGridValuesArchive_ValueRow& CommandReplaceGridValuesArchive_ValueRow::default_instance() {
+const CommandInvalidateWPCaches& CommandInvalidateWPCaches::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive_ValueRow::default_instance_ = NULL;
+CommandInvalidateWPCaches* CommandInvalidateWPCaches::default_instance_ = NULL;
 
-CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive_ValueRow::New() const {
-  return new CommandReplaceGridValuesArchive_ValueRow;
+CommandInvalidateWPCaches* CommandInvalidateWPCaches::New() const {
+  return new CommandInvalidateWPCaches;
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::Clear() {
-  value_.Clear();
+void CommandInvalidateWPCaches::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+  }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandReplaceGridValuesArchive_ValueRow::MergePartialFromCodedStream(
+bool CommandInvalidateWPCaches::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated double value = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_value:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 1, 9, input, this->mutable_value())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_LENGTH_DELIMITED) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, this->mutable_value())));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(9)) goto parse_value;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -10930,12 +16181,12 @@ bool CommandReplaceGridValuesArchive_ValueRow::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::SerializeWithCachedSizes(
+void CommandInvalidateWPCaches::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated double value = 1;
-  for (int i = 0; i < this->value_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(
-      1, this->value(i), output);
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -10944,12 +16195,13 @@ void CommandReplaceGridValuesArchive_ValueRow::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandReplaceGridValuesArchive_ValueRow::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandInvalidateWPCaches::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // repeated double value = 1;
-  for (int i = 0; i < this->value_size(); i++) {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteDoubleToArray(1, this->value(i), target);
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -10959,16 +16211,18 @@ ::google::protobuf::uint8* CommandReplaceGridValuesArchive_ValueRow::SerializeWi
   return target;
 }
 
-int CommandReplaceGridValuesArchive_ValueRow::ByteSize() const {
+int CommandInvalidateWPCaches::ByteSize() const {
   int total_size = 0;
 
-  // repeated double value = 1;
-  {
-    int data_size = 0;
-    data_size = 8 * this->value_size();
-    total_size += 1 * this->value_size() + data_size;
-  }
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -10980,10 +16234,10 @@ int CommandReplaceGridValuesArchive_ValueRow::ByteSize() const {
   return total_size;
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandInvalidateWPCaches::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandReplaceGridValuesArchive_ValueRow* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceGridValuesArchive_ValueRow*>(
+  const CommandInvalidateWPCaches* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandInvalidateWPCaches*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -10992,142 +16246,147 @@ void CommandReplaceGridValuesArchive_ValueRow::MergeFrom(const ::google::protobu
   }
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::MergeFrom(const CommandReplaceGridValuesArchive_ValueRow& from) {
+void CommandInvalidateWPCaches::MergeFrom(const CommandInvalidateWPCaches& from) {
   GOOGLE_CHECK_NE(&from, this);
-  value_.MergeFrom(from.value_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandInvalidateWPCaches::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::CopyFrom(const CommandReplaceGridValuesArchive_ValueRow& from) {
+void CommandInvalidateWPCaches::CopyFrom(const CommandInvalidateWPCaches& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandReplaceGridValuesArchive_ValueRow::IsInitialized() const {
+bool CommandInvalidateWPCaches::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandReplaceGridValuesArchive_ValueRow::Swap(CommandReplaceGridValuesArchive_ValueRow* other) {
+void CommandInvalidateWPCaches::Swap(CommandInvalidateWPCaches* other) {
   if (other != this) {
-    value_.Swap(&other->value_);
+    std::swap(super_, other->super_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandReplaceGridValuesArchive_ValueRow::GetMetadata() const {
+::google::protobuf::Metadata CommandInvalidateWPCaches::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandReplaceGridValuesArchive_ValueRow_descriptor_;
-  metadata.reflection = CommandReplaceGridValuesArchive_ValueRow_reflection_;
+  metadata.descriptor = CommandInvalidateWPCaches_descriptor_;
+  metadata.reflection = CommandInvalidateWPCaches_reflection_;
   return metadata;
 }
 
 
-// -------------------------------------------------------------------
+// ===================================================================
 
 #ifndef _MSC_VER
-const int CommandReplaceGridValuesArchive::kSuperFieldNumber;
-const int CommandReplaceGridValuesArchive::kRowindexFieldNumber;
-const int CommandReplaceGridValuesArchive::kColumnindexFieldNumber;
-const int CommandReplaceGridValuesArchive::kOldDataRowsFieldNumber;
-const int CommandReplaceGridValuesArchive::kNewDataRowsFieldNumber;
-const int CommandReplaceGridValuesArchive::kOldRowNamesFieldNumber;
-const int CommandReplaceGridValuesArchive::kNewRowNamesFieldNumber;
-const int CommandReplaceGridValuesArchive::kOldColNamesFieldNumber;
-const int CommandReplaceGridValuesArchive::kNewColNamesFieldNumber;
-const int CommandReplaceGridValuesArchive::kRowsToAddFieldNumber;
-const int CommandReplaceGridValuesArchive::kColsToAddFieldNumber;
+const int CommandSetGridColumnNameArchive::kSuperFieldNumber;
+const int CommandSetGridColumnNameArchive::kColumnindexFieldNumber;
+const int CommandSetGridColumnNameArchive::kOldvalueFieldNumber;
+const int CommandSetGridColumnNameArchive::kNewvalueFieldNumber;
 #endif  // !_MSC_VER
 
-CommandReplaceGridValuesArchive::CommandReplaceGridValuesArchive()
+CommandSetGridColumnNameArchive::CommandSetGridColumnNameArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandReplaceGridValuesArchive::InitAsDefaultInstance() {
+void CommandSetGridColumnNameArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandReplaceGridValuesArchive::CommandReplaceGridValuesArchive(const CommandReplaceGridValuesArchive& from)
+CommandSetGridColumnNameArchive::CommandSetGridColumnNameArchive(const CommandSetGridColumnNameArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandReplaceGridValuesArchive::SharedCtor() {
+void CommandSetGridColumnNameArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  rowindex_ = 0u;
   columnindex_ = 0u;
-  rows_to_add_ = 0u;
-  cols_to_add_ = 0u;
+  oldvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  newvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandReplaceGridValuesArchive::~CommandReplaceGridValuesArchive() {
+CommandSetGridColumnNameArchive::~CommandSetGridColumnNameArchive() {
   SharedDtor();
 }
 
-void CommandReplaceGridValuesArchive::SharedDtor() {
+void CommandSetGridColumnNameArchive::SharedDtor() {
+  if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldvalue_;
+  }
+  if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete newvalue_;
+  }
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandReplaceGridValuesArchive::SetCachedSize(int size) const {
+void CommandSetGridColumnNameArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandReplaceGridValuesArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetGridColumnNameArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandReplaceGridValuesArchive_descriptor_;
+  return CommandSetGridColumnNameArchive_descriptor_;
 }
 
-const CommandReplaceGridValuesArchive& CommandReplaceGridValuesArchive::default_instance() {
+const CommandSetGridColumnNameArchive& CommandSetGridColumnNameArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandReplaceGridValuesArchive* CommandReplaceGridValuesArchive::default_instance_ = NULL;
+CommandSetGridColumnNameArchive* CommandSetGridColumnNameArchive::default_instance_ = NULL;
 
-CommandReplaceGridValuesArchive* CommandReplaceGridValuesArchive::New() const {
-  return new CommandReplaceGridValuesArchive;
+CommandSetGridColumnNameArchive* CommandSetGridColumnNameArchive::New() const {
+  return new CommandSetGridColumnNameArchive;
 }
 
-void CommandReplaceGridValuesArchive::Clear() {
+void CommandSetGridColumnNameArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    rowindex_ = 0u;
     columnindex_ = 0u;
+    if (has_oldvalue()) {
+      if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+        oldvalue_->clear();
+      }
+    }
+    if (has_newvalue()) {
+      if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+        newvalue_->clear();
+      }
+    }
   }
-  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
-    rows_to_add_ = 0u;
-    cols_to_add_ = 0u;
-  }
-  old_data_rows_.Clear();
-  new_data_rows_.Clear();
-  old_row_names_.Clear();
-  new_row_names_.Clear();
-  old_col_names_.Clear();
-  new_col_names_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandReplaceGridValuesArchive::MergePartialFromCodedStream(
+bool CommandSetGridColumnNameArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -11142,28 +16401,12 @@ bool CommandReplaceGridValuesArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_rowindex;
+        if (input->ExpectTag(16)) goto parse_columnindex;
         break;
       }
 
-      // required uint32 rowindex = 2;
+      // required uint32 columnindex = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_rowindex:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &rowindex_)));
-          set_has_rowindex();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_columnindex;
-        break;
-      }
-
-      // required uint32 columnindex = 3;
-      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
          parse_columnindex:
@@ -11174,144 +16417,40 @@ bool CommandReplaceGridValuesArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_old_data_rows;
-        break;
-      }
-
-      // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_data_rows:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_old_data_rows()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_old_data_rows;
-        if (input->ExpectTag(42)) goto parse_new_data_rows;
-        break;
-      }
-
-      // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_data_rows:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_new_data_rows()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_new_data_rows;
-        if (input->ExpectTag(50)) goto parse_old_row_names;
-        break;
-      }
-
-      // repeated string old_row_names = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_row_names:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_old_row_names()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->old_row_names(this->old_row_names_size() - 1).data(),
-            this->old_row_names(this->old_row_names_size() - 1).length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_old_row_names;
-        if (input->ExpectTag(58)) goto parse_new_row_names;
-        break;
-      }
-
-      // repeated string new_row_names = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_row_names:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_new_row_names()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->new_row_names(this->new_row_names_size() - 1).data(),
-            this->new_row_names(this->new_row_names_size() - 1).length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_new_row_names;
-        if (input->ExpectTag(66)) goto parse_old_col_names;
+        if (input->ExpectTag(26)) goto parse_oldvalue;
         break;
       }
 
-      // repeated string old_col_names = 8;
-      case 8: {
+      // required string oldvalue = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_col_names:
+         parse_oldvalue:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_old_col_names()));
+                input, this->mutable_oldvalue()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->old_col_names(this->old_col_names_size() - 1).data(),
-            this->old_col_names(this->old_col_names_size() - 1).length(),
+            this->oldvalue().data(), this->oldvalue().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_old_col_names;
-        if (input->ExpectTag(74)) goto parse_new_col_names;
+        if (input->ExpectTag(34)) goto parse_newvalue;
         break;
       }
 
-      // repeated string new_col_names = 9;
-      case 9: {
+      // required string newvalue = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_col_names:
+         parse_newvalue:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->add_new_col_names()));
+                input, this->mutable_newvalue()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->new_col_names(this->new_col_names_size() - 1).data(),
-            this->new_col_names(this->new_col_names_size() - 1).length(),
+            this->newvalue().data(), this->newvalue().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(74)) goto parse_new_col_names;
-        if (input->ExpectTag(80)) goto parse_rows_to_add;
-        break;
-      }
-
-      // optional uint32 rows_to_add = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_rows_to_add:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &rows_to_add_)));
-          set_has_rows_to_add();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(88)) goto parse_cols_to_add;
-        break;
-      }
-
-      // optional uint32 cols_to_add = 11;
-      case 11: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_cols_to_add:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &cols_to_add_)));
-          set_has_cols_to_add();
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -11332,7 +16471,7 @@ bool CommandReplaceGridValuesArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandReplaceGridValuesArchive::SerializeWithCachedSizes(
+void CommandSetGridColumnNameArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
@@ -11340,157 +16479,67 @@ void CommandReplaceGridValuesArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 rowindex = 2;
-  if (has_rowindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->rowindex(), output);
-  }
-
-  // required uint32 columnindex = 3;
+  // required uint32 columnindex = 2;
   if (has_columnindex()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->columnindex(), output);
-  }
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
-  for (int i = 0; i < this->old_data_rows_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->old_data_rows(i), output);
-  }
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
-  for (int i = 0; i < this->new_data_rows_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->new_data_rows(i), output);
-  }
-
-  // repeated string old_row_names = 6;
-  for (int i = 0; i < this->old_row_names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->old_row_names(i).data(), this->old_row_names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      6, this->old_row_names(i), output);
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->columnindex(), output);
   }
 
-  // repeated string new_row_names = 7;
-  for (int i = 0; i < this->new_row_names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->new_row_names(i).data(), this->new_row_names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      7, this->new_row_names(i), output);
-  }
-
-  // repeated string old_col_names = 8;
-  for (int i = 0; i < this->old_col_names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->old_col_names(i).data(), this->old_col_names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // required string oldvalue = 3;
+  if (has_oldvalue()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->oldvalue().data(), this->oldvalue().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      8, this->old_col_names(i), output);
+      3, this->oldvalue(), output);
   }
 
-  // repeated string new_col_names = 9;
-  for (int i = 0; i < this->new_col_names_size(); i++) {
-  ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-    this->new_col_names(i).data(), this->new_col_names(i).length(),
-    ::google::protobuf::internal::WireFormat::SERIALIZE);
+  // required string newvalue = 4;
+  if (has_newvalue()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newvalue().data(), this->newvalue().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      9, this->new_col_names(i), output);
-  }
-
-  // optional uint32 rows_to_add = 10;
-  if (has_rows_to_add()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(10, this->rows_to_add(), output);
-  }
-
-  // optional uint32 cols_to_add = 11;
-  if (has_cols_to_add()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(11, this->cols_to_add(), output);
+      4, this->newvalue(), output);
   }
 
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
-}
-
-::google::protobuf::uint8* CommandReplaceGridValuesArchive::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .TSCH.ChartCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required uint32 rowindex = 2;
-  if (has_rowindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->rowindex(), target);
-  }
-
-  // required uint32 columnindex = 3;
-  if (has_columnindex()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->columnindex(), target);
-  }
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
-  for (int i = 0; i < this->old_data_rows_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->old_data_rows(i), target);
-  }
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
-  for (int i = 0; i < this->new_data_rows_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->new_data_rows(i), target);
-  }
-
-  // repeated string old_row_names = 6;
-  for (int i = 0; i < this->old_row_names_size(); i++) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->old_row_names(i).data(), this->old_row_names(i).length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(6, this->old_row_names(i), target);
-  }
+}
 
-  // repeated string new_row_names = 7;
-  for (int i = 0; i < this->new_row_names_size(); i++) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->new_row_names(i).data(), this->new_row_names(i).length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
+::google::protobuf::uint8* CommandSetGridColumnNameArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(7, this->new_row_names(i), target);
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
   }
 
-  // repeated string old_col_names = 8;
-  for (int i = 0; i < this->old_col_names_size(); i++) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->old_col_names(i).data(), this->old_col_names(i).length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(8, this->old_col_names(i), target);
+  // required uint32 columnindex = 2;
+  if (has_columnindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->columnindex(), target);
   }
 
-  // repeated string new_col_names = 9;
-  for (int i = 0; i < this->new_col_names_size(); i++) {
+  // required string oldvalue = 3;
+  if (has_oldvalue()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->new_col_names(i).data(), this->new_col_names(i).length(),
+      this->oldvalue().data(), this->oldvalue().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteStringToArray(9, this->new_col_names(i), target);
-  }
-
-  // optional uint32 rows_to_add = 10;
-  if (has_rows_to_add()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(10, this->rows_to_add(), target);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->oldvalue(), target);
   }
 
-  // optional uint32 cols_to_add = 11;
-  if (has_cols_to_add()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(11, this->cols_to_add(), target);
+  // required string newvalue = 4;
+  if (has_newvalue()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newvalue().data(), this->newvalue().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->newvalue(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -11500,7 +16549,7 @@ ::google::protobuf::uint8* CommandReplaceGridValuesArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandReplaceGridValuesArchive::ByteSize() const {
+int CommandSetGridColumnNameArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -11511,81 +16560,28 @@ int CommandReplaceGridValuesArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 rowindex = 2;
-    if (has_rowindex()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->rowindex());
-    }
-
-    // required uint32 columnindex = 3;
+    // required uint32 columnindex = 2;
     if (has_columnindex()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
           this->columnindex());
     }
 
-  }
-  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
-    // optional uint32 rows_to_add = 10;
-    if (has_rows_to_add()) {
+    // required string oldvalue = 3;
+    if (has_oldvalue()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->rows_to_add());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->oldvalue());
     }
 
-    // optional uint32 cols_to_add = 11;
-    if (has_cols_to_add()) {
+    // required string newvalue = 4;
+    if (has_newvalue()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->cols_to_add());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->newvalue());
     }
 
   }
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
-  total_size += 1 * this->old_data_rows_size();
-  for (int i = 0; i < this->old_data_rows_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->old_data_rows(i));
-  }
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
-  total_size += 1 * this->new_data_rows_size();
-  for (int i = 0; i < this->new_data_rows_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->new_data_rows(i));
-  }
-
-  // repeated string old_row_names = 6;
-  total_size += 1 * this->old_row_names_size();
-  for (int i = 0; i < this->old_row_names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->old_row_names(i));
-  }
-
-  // repeated string new_row_names = 7;
-  total_size += 1 * this->new_row_names_size();
-  for (int i = 0; i < this->new_row_names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->new_row_names(i));
-  }
-
-  // repeated string old_col_names = 8;
-  total_size += 1 * this->old_col_names_size();
-  for (int i = 0; i < this->old_col_names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->old_col_names(i));
-  }
-
-  // repeated string new_col_names = 9;
-  total_size += 1 * this->new_col_names_size();
-  for (int i = 0; i < this->new_col_names_size(); i++) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-      this->new_col_names(i));
-  }
-
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -11597,10 +16593,10 @@ int CommandReplaceGridValuesArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandReplaceGridValuesArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridColumnNameArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandReplaceGridValuesArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceGridValuesArchive*>(
+  const CommandSetGridColumnNameArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetGridColumnNameArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -11609,50 +16605,39 @@ void CommandReplaceGridValuesArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandReplaceGridValuesArchive::MergeFrom(const CommandReplaceGridValuesArchive& from) {
+void CommandSetGridColumnNameArchive::MergeFrom(const CommandSetGridColumnNameArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  old_data_rows_.MergeFrom(from.old_data_rows_);
-  new_data_rows_.MergeFrom(from.new_data_rows_);
-  old_row_names_.MergeFrom(from.old_row_names_);
-  new_row_names_.MergeFrom(from.new_row_names_);
-  old_col_names_.MergeFrom(from.old_col_names_);
-  new_col_names_.MergeFrom(from.new_col_names_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_rowindex()) {
-      set_rowindex(from.rowindex());
-    }
     if (from.has_columnindex()) {
       set_columnindex(from.columnindex());
     }
-  }
-  if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
-    if (from.has_rows_to_add()) {
-      set_rows_to_add(from.rows_to_add());
+    if (from.has_oldvalue()) {
+      set_oldvalue(from.oldvalue());
     }
-    if (from.has_cols_to_add()) {
-      set_cols_to_add(from.cols_to_add());
+    if (from.has_newvalue()) {
+      set_newvalue(from.newvalue());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandReplaceGridValuesArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridColumnNameArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandReplaceGridValuesArchive::CopyFrom(const CommandReplaceGridValuesArchive& from) {
+void CommandSetGridColumnNameArchive::CopyFrom(const CommandSetGridColumnNameArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandReplaceGridValuesArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetGridColumnNameArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -11660,30 +16645,23 @@ bool CommandReplaceGridValuesArchive::IsInitialized() const {
   return true;
 }
 
-void CommandReplaceGridValuesArchive::Swap(CommandReplaceGridValuesArchive* other) {
+void CommandSetGridColumnNameArchive::Swap(CommandSetGridColumnNameArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(rowindex_, other->rowindex_);
     std::swap(columnindex_, other->columnindex_);
-    old_data_rows_.Swap(&other->old_data_rows_);
-    new_data_rows_.Swap(&other->new_data_rows_);
-    old_row_names_.Swap(&other->old_row_names_);
-    new_row_names_.Swap(&other->new_row_names_);
-    old_col_names_.Swap(&other->old_col_names_);
-    new_col_names_.Swap(&other->new_col_names_);
-    std::swap(rows_to_add_, other->rows_to_add_);
-    std::swap(cols_to_add_, other->cols_to_add_);
+    std::swap(oldvalue_, other->oldvalue_);
+    std::swap(newvalue_, other->newvalue_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandReplaceGridValuesArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetGridColumnNameArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandReplaceGridValuesArchive_descriptor_;
-  metadata.reflection = CommandReplaceGridValuesArchive_reflection_;
+  metadata.descriptor = CommandSetGridColumnNameArchive_descriptor_;
+  metadata.reflection = CommandSetGridColumnNameArchive_reflection_;
   return metadata;
 }
 
@@ -11691,74 +16669,87 @@ ::google::protobuf::Metadata CommandReplaceGridValuesArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::kStyleFieldNumber;
-const int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::kIdentifierFieldNumber;
+const int CommandSetGridRowNameArchive::kSuperFieldNumber;
+const int CommandSetGridRowNameArchive::kRowindexFieldNumber;
+const int CommandSetGridRowNameArchive::kOldvalueFieldNumber;
+const int CommandSetGridRowNameArchive::kNewvalueFieldNumber;
 #endif  // !_MSC_VER
 
-CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CommandReplaceThemePresetArchive_StyleAndIdentifierPair()
+CommandSetGridRowNameArchive::CommandSetGridRowNameArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::InitAsDefaultInstance() {
-  style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetGridRowNameArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
 }
 
-CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CommandReplaceThemePresetArchive_StyleAndIdentifierPair(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from)
+CommandSetGridRowNameArchive::CommandSetGridRowNameArchive(const CommandSetGridRowNameArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SharedCtor() {
+void CommandSetGridRowNameArchive::SharedCtor() {
   _cached_size_ = 0;
-  style_ = NULL;
-  identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  super_ = NULL;
+  rowindex_ = 0u;
+  oldvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  newvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandReplaceThemePresetArchive_StyleAndIdentifierPair::~CommandReplaceThemePresetArchive_StyleAndIdentifierPair() {
+CommandSetGridRowNameArchive::~CommandSetGridRowNameArchive() {
   SharedDtor();
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SharedDtor() {
-  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
-    delete identifier_;
+void CommandSetGridRowNameArchive::SharedDtor() {
+  if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldvalue_;
+  }
+  if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete newvalue_;
   }
   if (this != default_instance_) {
-    delete style_;
+    delete super_;
   }
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SetCachedSize(int size) const {
+void CommandSetGridRowNameArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetGridRowNameArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandReplaceThemePresetArchive_StyleAndIdentifierPair_descriptor_;
+  return CommandSetGridRowNameArchive_descriptor_;
 }
 
-const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance() {
+const CommandSetGridRowNameArchive& CommandSetGridRowNameArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::default_instance_ = NULL;
+CommandSetGridRowNameArchive* CommandSetGridRowNameArchive::default_instance_ = NULL;
 
-CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::New() const {
-  return new CommandReplaceThemePresetArchive_StyleAndIdentifierPair;
+CommandSetGridRowNameArchive* CommandSetGridRowNameArchive::New() const {
+  return new CommandSetGridRowNameArchive;
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::Clear() {
+void CommandSetGridRowNameArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_style()) {
-      if (style_ != NULL) style_->::TSP::Reference::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
     }
-    if (has_identifier()) {
-      if (identifier_ != &::google::protobuf::internal::kEmptyString) {
-        identifier_->clear();
+    rowindex_ = 0u;
+    if (has_oldvalue()) {
+      if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+        oldvalue_->clear();
+      }
+    }
+    if (has_newvalue()) {
+      if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+        newvalue_->clear();
       }
     }
   }
@@ -11766,34 +16757,67 @@ void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::Clear() {
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergePartialFromCodedStream(
+bool CommandSetGridRowNameArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSP.Reference style = 1;
+      // required .TSCH.ChartCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_style()));
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_identifier;
+        if (input->ExpectTag(16)) goto parse_rowindex;
         break;
       }
 
-      // required string identifier = 2;
+      // required uint32 rowindex = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_rowindex:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &rowindex_)));
+          set_has_rowindex();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_oldvalue;
+        break;
+      }
+
+      // required string oldvalue = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_identifier:
+         parse_oldvalue:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_identifier()));
+                input, this->mutable_oldvalue()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->identifier().data(), this->identifier().length(),
+            this->oldvalue().data(), this->oldvalue().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_newvalue;
+        break;
+      }
+
+      // required string newvalue = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_newvalue:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_newvalue()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->newvalue().data(), this->newvalue().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
@@ -11818,21 +16842,35 @@ bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergePartialFromCo
 #undef DO_
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SerializeWithCachedSizes(
+void CommandSetGridRowNameArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSP.Reference style = 1;
-  if (has_style()) {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->style(), output);
+      1, this->super(), output);
   }
 
-  // required string identifier = 2;
-  if (has_identifier()) {
+  // required uint32 rowindex = 2;
+  if (has_rowindex()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->rowindex(), output);
+  }
+
+  // required string oldvalue = 3;
+  if (has_oldvalue()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->identifier().data(), this->identifier().length(),
+      this->oldvalue().data(), this->oldvalue().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      2, this->identifier(), output);
+      3, this->oldvalue(), output);
+  }
+
+  // required string newvalue = 4;
+  if (has_newvalue()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newvalue().data(), this->newvalue().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->newvalue(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -11841,23 +16879,38 @@ void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SerializeWithCache
   }
 }
 
-::google::protobuf::uint8* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetGridRowNameArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSP.Reference style = 1;
-  if (has_style()) {
+  // required .TSCH.ChartCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->style(), target);
+        1, this->super(), target);
   }
 
-  // required string identifier = 2;
-  if (has_identifier()) {
+  // required uint32 rowindex = 2;
+  if (has_rowindex()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->rowindex(), target);
+  }
+
+  // required string oldvalue = 3;
+  if (has_oldvalue()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->identifier().data(), this->identifier().length(),
+      this->oldvalue().data(), this->oldvalue().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->identifier(), target);
+        3, this->oldvalue(), target);
+  }
+
+  // required string newvalue = 4;
+  if (has_newvalue()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->newvalue().data(), this->newvalue().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->newvalue(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -11867,22 +16920,36 @@ ::google::protobuf::uint8* CommandReplaceThemePresetArchive_StyleAndIdentifierPa
   return target;
 }
 
-int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::ByteSize() const {
+int CommandSetGridRowNameArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSP.Reference style = 1;
-    if (has_style()) {
+    // required .TSCH.ChartCommandArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->style());
+          this->super());
     }
 
-    // required string identifier = 2;
-    if (has_identifier()) {
+    // required uint32 rowindex = 2;
+    if (has_rowindex()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->rowindex());
+    }
+
+    // required string oldvalue = 3;
+    if (has_oldvalue()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->identifier());
+          this->oldvalue());
+    }
+
+    // required string newvalue = 4;
+    if (has_newvalue()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->newvalue());
     }
 
   }
@@ -11897,10 +16964,10 @@ int CommandReplaceThemePresetArchive_StyleAndIdentifierPair::ByteSize() const {
   return total_size;
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridRowNameArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandReplaceThemePresetArchive_StyleAndIdentifierPair* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceThemePresetArchive_StyleAndIdentifierPair*>(
+  const CommandSetGridRowNameArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetGridRowNameArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -11909,238 +16976,209 @@ void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergeFrom(const ::
   }
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::MergeFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from) {
+void CommandSetGridRowNameArchive::MergeFrom(const CommandSetGridRowNameArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_style()) {
-      mutable_style()->::TSP::Reference::MergeFrom(from.style());
+    if (from.has_super()) {
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_identifier()) {
-      set_identifier(from.identifier());
+    if (from.has_rowindex()) {
+      set_rowindex(from.rowindex());
+    }
+    if (from.has_oldvalue()) {
+      set_oldvalue(from.oldvalue());
+    }
+    if (from.has_newvalue()) {
+      set_newvalue(from.newvalue());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetGridRowNameArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::CopyFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from) {
+void CommandSetGridRowNameArchive::CopyFrom(const CommandSetGridRowNameArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetGridRowNameArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
-  if (has_style()) {
-    if (!this->style().IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::Swap(CommandReplaceThemePresetArchive_StyleAndIdentifierPair* other) {
+void CommandSetGridRowNameArchive::Swap(CommandSetGridRowNameArchive* other) {
   if (other != this) {
-    std::swap(style_, other->style_);
-    std::swap(identifier_, other->identifier_);
+    std::swap(super_, other->super_);
+    std::swap(rowindex_, other->rowindex_);
+    std::swap(oldvalue_, other->oldvalue_);
+    std::swap(newvalue_, other->newvalue_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandReplaceThemePresetArchive_StyleAndIdentifierPair::GetMetadata() const {
+::google::protobuf::Metadata CommandSetGridRowNameArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandReplaceThemePresetArchive_StyleAndIdentifierPair_descriptor_;
-  metadata.reflection = CommandReplaceThemePresetArchive_StyleAndIdentifierPair_reflection_;
+  metadata.descriptor = CommandSetGridRowNameArchive_descriptor_;
+  metadata.reflection = CommandSetGridRowNameArchive_reflection_;
   return metadata;
 }
 
 
-// -------------------------------------------------------------------
+// ===================================================================
 
 #ifndef _MSC_VER
-const int CommandReplaceThemePresetArchive::kSuperFieldNumber;
-const int CommandReplaceThemePresetArchive::kThemeFieldNumber;
-const int CommandReplaceThemePresetArchive::kOldPresetFieldNumber;
-const int CommandReplaceThemePresetArchive::kNewPresetFieldNumber;
-const int CommandReplaceThemePresetArchive::kIdentifiersFieldNumber;
-const int CommandReplaceThemePresetArchive::kOldPresetIndexFieldNumber;
+const int CommandReplaceCustomFormatArchive_FormatObjectMutation::kStyleOwnerTypeFieldNumber;
+const int CommandReplaceCustomFormatArchive_FormatObjectMutation::kStyleOwnerIndexFieldNumber;
+const int CommandReplaceCustomFormatArchive_FormatObjectMutation::kFormatObjectPropertyFieldNumber;
+const int CommandReplaceCustomFormatArchive_FormatObjectMutation::kFormatObjectFieldNumber;
 #endif  // !_MSC_VER
 
-CommandReplaceThemePresetArchive::CommandReplaceThemePresetArchive()
+CommandReplaceCustomFormatArchive_FormatObjectMutation::CommandReplaceCustomFormatArchive_FormatObjectMutation()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandReplaceThemePresetArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  theme_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  old_preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  new_preset_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::InitAsDefaultInstance() {
+  format_object_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
 }
 
-CommandReplaceThemePresetArchive::CommandReplaceThemePresetArchive(const CommandReplaceThemePresetArchive& from)
+CommandReplaceCustomFormatArchive_FormatObjectMutation::CommandReplaceCustomFormatArchive_FormatObjectMutation(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandReplaceThemePresetArchive::SharedCtor() {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  theme_ = NULL;
-  old_preset_ = NULL;
-  new_preset_ = NULL;
-  old_preset_index_ = GOOGLE_ULONGLONG(0);
+  style_owner_type_ = 1;
+  style_owner_index_ = 0u;
+  format_object_property_ = 0u;
+  format_object_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandReplaceThemePresetArchive::~CommandReplaceThemePresetArchive() {
+CommandReplaceCustomFormatArchive_FormatObjectMutation::~CommandReplaceCustomFormatArchive_FormatObjectMutation() {
   SharedDtor();
 }
 
-void CommandReplaceThemePresetArchive::SharedDtor() {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete theme_;
-    delete old_preset_;
-    delete new_preset_;
+    delete format_object_;
   }
 }
 
-void CommandReplaceThemePresetArchive::SetCachedSize(int size) const {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandReplaceThemePresetArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandReplaceCustomFormatArchive_FormatObjectMutation::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandReplaceThemePresetArchive_descriptor_;
+  return CommandReplaceCustomFormatArchive_FormatObjectMutation_descriptor_;
 }
 
-const CommandReplaceThemePresetArchive& CommandReplaceThemePresetArchive::default_instance() {
+const CommandReplaceCustomFormatArchive_FormatObjectMutation& CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandReplaceThemePresetArchive* CommandReplaceThemePresetArchive::default_instance_ = NULL;
+CommandReplaceCustomFormatArchive_FormatObjectMutation* CommandReplaceCustomFormatArchive_FormatObjectMutation::default_instance_ = NULL;
 
-CommandReplaceThemePresetArchive* CommandReplaceThemePresetArchive::New() const {
-  return new CommandReplaceThemePresetArchive;
+CommandReplaceCustomFormatArchive_FormatObjectMutation* CommandReplaceCustomFormatArchive_FormatObjectMutation::New() const {
+  return new CommandReplaceCustomFormatArchive_FormatObjectMutation;
 }
 
-void CommandReplaceThemePresetArchive::Clear() {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
-    }
-    if (has_theme()) {
-      if (theme_ != NULL) theme_->::TSP::Reference::Clear();
-    }
-    if (has_old_preset()) {
-      if (old_preset_ != NULL) old_preset_->::TSP::Reference::Clear();
-    }
-    if (has_new_preset()) {
-      if (new_preset_ != NULL) new_preset_->::TSP::Reference::Clear();
+    style_owner_type_ = 1;
+    style_owner_index_ = 0u;
+    format_object_property_ = 0u;
+    if (has_format_object()) {
+      if (format_object_ != NULL) format_object_->::TSK::FormatStructArchive::Clear();
     }
-    old_preset_index_ = GOOGLE_ULONGLONG(0);
   }
-  identifiers_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandReplaceThemePresetArchive::MergePartialFromCodedStream(
+bool CommandReplaceCustomFormatArchive_FormatObjectMutation::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // optional .TSCH.StyleOwnerType style_owner_type = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TSCH::StyleOwnerType_IsValid(value)) {
+            set_style_owner_type(static_cast< ::TSCH::StyleOwnerType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_theme;
+        if (input->ExpectTag(16)) goto parse_style_owner_index;
         break;
       }
 
-      // required .TSP.Reference theme = 2;
+      // optional uint32 style_owner_index = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_theme:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_theme()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_style_owner_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &style_owner_index_)));
+          set_has_style_owner_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_old_preset;
+        if (input->ExpectTag(24)) goto parse_format_object_property;
         break;
       }
 
-      // optional .TSP.Reference old_preset = 3;
+      // optional uint32 format_object_property = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_preset:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_preset()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_format_object_property:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &format_object_property_)));
+          set_has_format_object_property();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_new_preset;
+        if (input->ExpectTag(34)) goto parse_format_object;
         break;
       }
 
-      // optional .TSP.Reference new_preset = 4;
+      // optional .TSK.FormatStructArchive format_object = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_preset:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_preset()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_identifiers;
-        break;
-      }
-
-      // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_identifiers:
+         parse_format_object:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_identifiers()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_identifiers;
-        if (input->ExpectTag(48)) goto parse_old_preset_index;
-        break;
-      }
-
-      // optional uint64 old_preset_index = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_old_preset_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &old_preset_index_)));
-          set_has_old_preset_index();
+               input, mutable_format_object()));
         } else {
           goto handle_uninterpreted;
         }
@@ -12164,41 +17202,28 @@ bool CommandReplaceThemePresetArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandReplaceThemePresetArchive::SerializeWithCachedSizes(
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required .TSP.Reference theme = 2;
-  if (has_theme()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->theme(), output);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  if (has_style_owner_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->style_owner_type(), output);
   }
 
-  // optional .TSP.Reference old_preset = 3;
-  if (has_old_preset()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->old_preset(), output);
+  // optional uint32 style_owner_index = 2;
+  if (has_style_owner_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->style_owner_index(), output);
   }
 
-  // optional .TSP.Reference new_preset = 4;
-  if (has_new_preset()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->new_preset(), output);
+  // optional uint32 format_object_property = 3;
+  if (has_format_object_property()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_object_property(), output);
   }
 
-  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
-  for (int i = 0; i < this->identifiers_size(); i++) {
+  // optional .TSK.FormatStructArchive format_object = 4;
+  if (has_format_object()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->identifiers(i), output);
-  }
-
-  // optional uint64 old_preset_index = 6;
-  if (has_old_preset_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(6, this->old_preset_index(), output);
+      4, this->format_object(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -12207,46 +17232,29 @@ void CommandReplaceThemePresetArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandReplaceThemePresetArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandReplaceCustomFormatArchive_FormatObjectMutation::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required .TSP.Reference theme = 2;
-  if (has_theme()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->theme(), target);
-  }
-
-  // optional .TSP.Reference old_preset = 3;
-  if (has_old_preset()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->old_preset(), target);
-  }
-
-  // optional .TSP.Reference new_preset = 4;
-  if (has_new_preset()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->new_preset(), target);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  if (has_style_owner_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->style_owner_type(), target);
   }
 
-  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
-  for (int i = 0; i < this->identifiers_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->identifiers(i), target);
+  // optional uint32 style_owner_index = 2;
+  if (has_style_owner_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->style_owner_index(), target);
   }
 
-  // optional uint64 old_preset_index = 6;
-  if (has_old_preset_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(6, this->old_preset_index(), target);
+  // optional uint32 format_object_property = 3;
+  if (has_format_object_property()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_object_property(), target);
+  }
+
+  // optional .TSK.FormatStructArchive format_object = 4;
+  if (has_format_object()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->format_object(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -12256,54 +17264,38 @@ ::google::protobuf::uint8* CommandReplaceThemePresetArchive::SerializeWithCached
   return target;
 }
 
-int CommandReplaceThemePresetArchive::ByteSize() const {
+int CommandReplaceCustomFormatArchive_FormatObjectMutation::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
-    if (has_super()) {
+    // optional .TSCH.StyleOwnerType style_owner_type = 1;
+    if (has_style_owner_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->style_owner_type());
     }
 
-    // required .TSP.Reference theme = 2;
-    if (has_theme()) {
+    // optional uint32 style_owner_index = 2;
+    if (has_style_owner_index()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->theme());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->style_owner_index());
     }
 
-    // optional .TSP.Reference old_preset = 3;
-    if (has_old_preset()) {
+    // optional uint32 format_object_property = 3;
+    if (has_format_object_property()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_preset());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->format_object_property());
     }
 
-    // optional .TSP.Reference new_preset = 4;
-    if (has_new_preset()) {
+    // optional .TSK.FormatStructArchive format_object = 4;
+    if (has_format_object()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_preset());
+          this->format_object());
     }
 
-    // optional uint64 old_preset_index = 6;
-    if (has_old_preset_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt64Size(
-          this->old_preset_index());
-    }
-
-  }
-  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
-  total_size += 1 * this->identifiers_size();
-  for (int i = 0; i < this->identifiers_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->identifiers(i));
   }
-
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -12315,10 +17307,10 @@ int CommandReplaceThemePresetArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandReplaceThemePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandReplaceThemePresetArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceThemePresetArchive*>(
+  const CommandReplaceCustomFormatArchive_FormatObjectMutation* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceCustomFormatArchive_FormatObjectMutation*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -12327,160 +17319,166 @@ void CommandReplaceThemePresetArchive::MergeFrom(const ::google::protobuf::Messa
   }
 }
 
-void CommandReplaceThemePresetArchive::MergeFrom(const CommandReplaceThemePresetArchive& from) {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::MergeFrom(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from) {
   GOOGLE_CHECK_NE(&from, this);
-  identifiers_.MergeFrom(from.identifiers_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_theme()) {
-      mutable_theme()->::TSP::Reference::MergeFrom(from.theme());
+    if (from.has_style_owner_type()) {
+      set_style_owner_type(from.style_owner_type());
     }
-    if (from.has_old_preset()) {
-      mutable_old_preset()->::TSP::Reference::MergeFrom(from.old_preset());
+    if (from.has_style_owner_index()) {
+      set_style_owner_index(from.style_owner_index());
     }
-    if (from.has_new_preset()) {
-      mutable_new_preset()->::TSP::Reference::MergeFrom(from.new_preset());
+    if (from.has_format_object_property()) {
+      set_format_object_property(from.format_object_property());
     }
-    if (from.has_old_preset_index()) {
-      set_old_preset_index(from.old_preset_index());
+    if (from.has_format_object()) {
+      mutable_format_object()->::TSK::FormatStructArchive::MergeFrom(from.format_object());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandReplaceThemePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandReplaceThemePresetArchive::CopyFrom(const CommandReplaceThemePresetArchive& from) {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::CopyFrom(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandReplaceThemePresetArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandReplaceCustomFormatArchive_FormatObjectMutation::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_theme()) {
-    if (!this->theme().IsInitialized()) return false;
-  }
-  if (has_old_preset()) {
-    if (!this->old_preset().IsInitialized()) return false;
-  }
-  if (has_new_preset()) {
-    if (!this->new_preset().IsInitialized()) return false;
-  }
-  for (int i = 0; i < identifiers_size(); i++) {
-    if (!this->identifiers(i).IsInitialized()) return false;
+  if (has_format_object()) {
+    if (!this->format_object().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandReplaceThemePresetArchive::Swap(CommandReplaceThemePresetArchive* other) {
+void CommandReplaceCustomFormatArchive_FormatObjectMutation::Swap(CommandReplaceCustomFormatArchive_FormatObjectMutation* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(theme_, other->theme_);
-    std::swap(old_preset_, other->old_preset_);
-    std::swap(new_preset_, other->new_preset_);
-    identifiers_.Swap(&other->identifiers_);
-    std::swap(old_preset_index_, other->old_preset_index_);
+    std::swap(style_owner_type_, other->style_owner_type_);
+    std::swap(style_owner_index_, other->style_owner_index_);
+    std::swap(format_object_property_, other->format_object_property_);
+    std::swap(format_object_, other->format_object_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandReplaceThemePresetArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandReplaceCustomFormatArchive_FormatObjectMutation::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandReplaceThemePresetArchive_descriptor_;
-  metadata.reflection = CommandReplaceThemePresetArchive_reflection_;
+  metadata.descriptor = CommandReplaceCustomFormatArchive_FormatObjectMutation_descriptor_;
+  metadata.reflection = CommandReplaceCustomFormatArchive_FormatObjectMutation_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int CommandInvalidateWPCaches::kSuperFieldNumber;
+const int CommandReplaceCustomFormatArchive::kSuperFieldNumber;
+const int CommandReplaceCustomFormatArchive::kRollbackCmdFieldNumber;
+const int CommandReplaceCustomFormatArchive::kOldFormatObjectFieldNumber;
+const int CommandReplaceCustomFormatArchive::kNewFormatObjectFieldNumber;
+const int CommandReplaceCustomFormatArchive::kForwardMutationsFieldNumber;
+const int CommandReplaceCustomFormatArchive::kReverseMutationsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandInvalidateWPCaches::CommandInvalidateWPCaches()
+CommandReplaceCustomFormatArchive::CommandReplaceCustomFormatArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandInvalidateWPCaches::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+void CommandReplaceCustomFormatArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSCH::ChartCommandArchive*>(&::TSCH::ChartCommandArchive::default_instance());
+  rollback_cmd_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_format_object_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  new_format_object_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
 }
 
-CommandInvalidateWPCaches::CommandInvalidateWPCaches(const CommandInvalidateWPCaches& from)
+CommandReplaceCustomFormatArchive::CommandReplaceCustomFormatArchive(const CommandReplaceCustomFormatArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandInvalidateWPCaches::SharedCtor() {
+void CommandReplaceCustomFormatArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  rollback_cmd_ = NULL;
+  old_format_object_ = NULL;
+  new_format_object_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandInvalidateWPCaches::~CommandInvalidateWPCaches() {
+CommandReplaceCustomFormatArchive::~CommandReplaceCustomFormatArchive() {
   SharedDtor();
 }
 
-void CommandInvalidateWPCaches::SharedDtor() {
+void CommandReplaceCustomFormatArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete rollback_cmd_;
+    delete old_format_object_;
+    delete new_format_object_;
   }
 }
 
-void CommandInvalidateWPCaches::SetCachedSize(int size) const {
+void CommandReplaceCustomFormatArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandInvalidateWPCaches::descriptor() {
+const ::google::protobuf::Descriptor* CommandReplaceCustomFormatArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandInvalidateWPCaches_descriptor_;
+  return CommandReplaceCustomFormatArchive_descriptor_;
 }
 
-const CommandInvalidateWPCaches& CommandInvalidateWPCaches::default_instance() {
+const CommandReplaceCustomFormatArchive& CommandReplaceCustomFormatArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSCHCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandInvalidateWPCaches* CommandInvalidateWPCaches::default_instance_ = NULL;
+CommandReplaceCustomFormatArchive* CommandReplaceCustomFormatArchive::default_instance_ = NULL;
 
-CommandInvalidateWPCaches* CommandInvalidateWPCaches::New() const {
-  return new CommandInvalidateWPCaches;
+CommandReplaceCustomFormatArchive* CommandReplaceCustomFormatArchive::New() const {
+  return new CommandReplaceCustomFormatArchive;
 }
 
-void CommandInvalidateWPCaches::Clear() {
+void CommandReplaceCustomFormatArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+      if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+    }
+    if (has_rollback_cmd()) {
+      if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+    }
+    if (has_old_format_object()) {
+      if (old_format_object_ != NULL) old_format_object_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_new_format_object()) {
+      if (new_format_object_ != NULL) new_format_object_->::TSK::FormatStructArchive::Clear();
     }
   }
+  forward_mutations_.Clear();
+  reverse_mutations_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandInvalidateWPCaches::MergePartialFromCodedStream(
+bool CommandReplaceCustomFormatArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // required .TSCH.ChartCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -12489,6 +17487,78 @@ bool CommandInvalidateWPCaches::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_rollback_cmd;
+        break;
+      }
+
+      // optional .TSP.Reference rollback_cmd = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rollback_cmd:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rollback_cmd()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_old_format_object;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive old_format_object = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_format_object:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_format_object()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_new_format_object;
+        break;
+      }
+
+      // optional .TSK.FormatStructArchive new_format_object = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_format_object:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_format_object()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_forward_mutations;
+        break;
+      }
+
+      // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_forward_mutations:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_forward_mutations()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_forward_mutations;
+        if (input->ExpectTag(50)) goto parse_reverse_mutations;
+        break;
+      }
+
+      // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_reverse_mutations:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_reverse_mutations()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_reverse_mutations;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -12509,29 +17579,94 @@ bool CommandInvalidateWPCaches::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandInvalidateWPCaches::SerializeWithCachedSizes(
+void CommandReplaceCustomFormatArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->rollback_cmd(), output);
+  }
+
+  // optional .TSK.FormatStructArchive old_format_object = 3;
+  if (has_old_format_object()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->old_format_object(), output);
+  }
+
+  // optional .TSK.FormatStructArchive new_format_object = 4;
+  if (has_new_format_object()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->new_format_object(), output);
+  }
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+  for (int i = 0; i < this->forward_mutations_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->forward_mutations(i), output);
+  }
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+  for (int i = 0; i < this->reverse_mutations_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->reverse_mutations(i), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandInvalidateWPCaches::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandReplaceCustomFormatArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
+  // optional .TSP.Reference rollback_cmd = 2;
+  if (has_rollback_cmd()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->rollback_cmd(), target);
+  }
+
+  // optional .TSK.FormatStructArchive old_format_object = 3;
+  if (has_old_format_object()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->old_format_object(), target);
+  }
+
+  // optional .TSK.FormatStructArchive new_format_object = 4;
+  if (has_new_format_object()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->new_format_object(), target);
+  }
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+  for (int i = 0; i < this->forward_mutations_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->forward_mutations(i), target);
+  }
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+  for (int i = 0; i < this->reverse_mutations_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->reverse_mutations(i), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -12539,18 +17674,55 @@ ::google::protobuf::uint8* CommandInvalidateWPCaches::SerializeWithCachedSizesTo
   return target;
 }
 
-int CommandInvalidateWPCaches::ByteSize() const {
+int CommandReplaceCustomFormatArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
+    // required .TSCH.ChartCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
+    // optional .TSP.Reference rollback_cmd = 2;
+    if (has_rollback_cmd()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->rollback_cmd());
+    }
+
+    // optional .TSK.FormatStructArchive old_format_object = 3;
+    if (has_old_format_object()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_format_object());
+    }
+
+    // optional .TSK.FormatStructArchive new_format_object = 4;
+    if (has_new_format_object()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_format_object());
+    }
+
+  }
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+  total_size += 1 * this->forward_mutations_size();
+  for (int i = 0; i < this->forward_mutations_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->forward_mutations(i));
+  }
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+  total_size += 1 * this->reverse_mutations_size();
+  for (int i = 0; i < this->reverse_mutations_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->reverse_mutations(i));
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -12562,10 +17734,10 @@ int CommandInvalidateWPCaches::ByteSize() const {
   return total_size;
 }
 
-void CommandInvalidateWPCaches::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceCustomFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandInvalidateWPCaches* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandInvalidateWPCaches*>(
+  const CommandReplaceCustomFormatArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceCustomFormatArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -12574,51 +17746,82 @@ void CommandInvalidateWPCaches::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void CommandInvalidateWPCaches::MergeFrom(const CommandInvalidateWPCaches& from) {
+void CommandReplaceCustomFormatArchive::MergeFrom(const CommandReplaceCustomFormatArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  forward_mutations_.MergeFrom(from.forward_mutations_);
+  reverse_mutations_.MergeFrom(from.reverse_mutations_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSCH::ChartCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_rollback_cmd()) {
+      mutable_rollback_cmd()->::TSP::Reference::MergeFrom(from.rollback_cmd());
+    }
+    if (from.has_old_format_object()) {
+      mutable_old_format_object()->::TSK::FormatStructArchive::MergeFrom(from.old_format_object());
+    }
+    if (from.has_new_format_object()) {
+      mutable_new_format_object()->::TSK::FormatStructArchive::MergeFrom(from.new_format_object());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandInvalidateWPCaches::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceCustomFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandInvalidateWPCaches::CopyFrom(const CommandInvalidateWPCaches& from) {
+void CommandReplaceCustomFormatArchive::CopyFrom(const CommandReplaceCustomFormatArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandInvalidateWPCaches::IsInitialized() const {
+bool CommandReplaceCustomFormatArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_rollback_cmd()) {
+    if (!this->rollback_cmd().IsInitialized()) return false;
+  }
+  if (has_old_format_object()) {
+    if (!this->old_format_object().IsInitialized()) return false;
+  }
+  if (has_new_format_object()) {
+    if (!this->new_format_object().IsInitialized()) return false;
+  }
+  for (int i = 0; i < forward_mutations_size(); i++) {
+    if (!this->forward_mutations(i).IsInitialized()) return false;
+  }
+  for (int i = 0; i < reverse_mutations_size(); i++) {
+    if (!this->reverse_mutations(i).IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandInvalidateWPCaches::Swap(CommandInvalidateWPCaches* other) {
+void CommandReplaceCustomFormatArchive::Swap(CommandReplaceCustomFormatArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(rollback_cmd_, other->rollback_cmd_);
+    std::swap(old_format_object_, other->old_format_object_);
+    std::swap(new_format_object_, other->new_format_object_);
+    forward_mutations_.Swap(&other->forward_mutations_);
+    reverse_mutations_.Swap(&other->reverse_mutations_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandInvalidateWPCaches::GetMetadata() const {
+::google::protobuf::Metadata CommandReplaceCustomFormatArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandInvalidateWPCaches_descriptor_;
-  metadata.reflection = CommandInvalidateWPCaches_reflection_;
+  metadata.descriptor = CommandReplaceCustomFormatArchive_descriptor_;
+  metadata.reflection = CommandReplaceCustomFormatArchive_reflection_;
   return metadata;
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.h
index cee53c6..b38c743 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSCHCommandArchives.pb.h
@@ -33,6 +33,7 @@
 #include "TSCHArchives.GEN.pb.h"
 #include "TSCH3DArchives.pb.h"
 #include "TSCHArchives.pb.h"
+#include "TSWPArchives.pb.h"
 // @@protoc_insertion_point(includes)
 
 namespace TSCH {
@@ -43,9 +44,17 @@ void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
 void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
 class CommandSetChartTypeArchive;
-class PropertyMutationUndoTupleArchive;
 class StyleSwapUndoTupleArchive;
 class CommandStyleSwapArchive;
+class CommandMutatePropertiesArchive;
+class CommandMutatePropertiesArchive_GenericPropertyDeltaMap;
+class CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion;
+class CommandMutatePropertiesArchive_ParagraphStyleDeltaMap;
+class CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive;
+class CommandScaleAllTextArchive;
+class CommandSetFontFamilyArchive;
+class CommandApplyFillSetArchive;
+class CommandApplyFillSetArchive_CapturedFillSetArchive;
 class CommandSetSeriesNameArchive;
 class CommandSetCategoryNameArchive;
 class CommandAddGridRowsArchive;
@@ -75,6 +84,10 @@ class CommandReplaceGridValuesArchive_ValueRow;
 class CommandReplaceThemePresetArchive;
 class CommandReplaceThemePresetArchive_StyleAndIdentifierPair;
 class CommandInvalidateWPCaches;
+class CommandSetGridColumnNameArchive;
+class CommandSetGridRowNameArchive;
+class CommandReplaceCustomFormatArchive;
+class CommandReplaceCustomFormatArchive_FormatObjectMutation;
 
 enum StyleOwnerType {
   chart_info = 1,
@@ -288,158 +301,6 @@ class CommandSetChartTypeArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class PropertyMutationUndoTupleArchive : public ::google::protobuf::Message {
- public:
-  PropertyMutationUndoTupleArchive();
-  virtual ~PropertyMutationUndoTupleArchive();
-
-  PropertyMutationUndoTupleArchive(const PropertyMutationUndoTupleArchive& from);
-
-  inline PropertyMutationUndoTupleArchive& operator=(const PropertyMutationUndoTupleArchive& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const PropertyMutationUndoTupleArchive& default_instance();
-
-  void Swap(PropertyMutationUndoTupleArchive* other);
-
-  // implements Message ----------------------------------------------
-
-  PropertyMutationUndoTupleArchive* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const PropertyMutationUndoTupleArchive& from);
-  void MergeFrom(const PropertyMutationUndoTupleArchive& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional .TSP.Reference chart_info = 1;
-  inline bool has_chart_info() const;
-  inline void clear_chart_info();
-  static const int kChartInfoFieldNumber = 1;
-  inline const ::TSP::Reference& chart_info() const;
-  inline ::TSP::Reference* mutable_chart_info();
-  inline ::TSP::Reference* release_chart_info();
-  inline void set_allocated_chart_info(::TSP::Reference* chart_info);
-
-  // optional .TSCH.StyleOwnerType style_owner_type = 2;
-  inline bool has_style_owner_type() const;
-  inline void clear_style_owner_type();
-  static const int kStyleOwnerTypeFieldNumber = 2;
-  inline ::TSCH::StyleOwnerType style_owner_type() const;
-  inline void set_style_owner_type(::TSCH::StyleOwnerType value);
-
-  // optional uint32 index = 3;
-  inline bool has_index() const;
-  inline void clear_index();
-  static const int kIndexFieldNumber = 3;
-  inline ::google::protobuf::uint32 index() const;
-  inline void set_index(::google::protobuf::uint32 value);
-
-  // optional .TSP.Reference old_style = 4;
-  inline bool has_old_style() const;
-  inline void clear_old_style();
-  static const int kOldStyleFieldNumber = 4;
-  inline const ::TSP::Reference& old_style() const;
-  inline ::TSP::Reference* mutable_old_style();
-  inline ::TSP::Reference* release_old_style();
-  inline void set_allocated_old_style(::TSP::Reference* old_style);
-
-  // optional .TSP.Reference new_style = 5;
-  inline bool has_new_style() const;
-  inline void clear_new_style();
-  static const int kNewStyleFieldNumber = 5;
-  inline const ::TSP::Reference& new_style() const;
-  inline ::TSP::Reference* mutable_new_style();
-  inline ::TSP::Reference* release_new_style();
-  inline void set_allocated_new_style(::TSP::Reference* new_style);
-
-  // optional .TSP.Reference old_non_style = 6;
-  inline bool has_old_non_style() const;
-  inline void clear_old_non_style();
-  static const int kOldNonStyleFieldNumber = 6;
-  inline const ::TSP::Reference& old_non_style() const;
-  inline ::TSP::Reference* mutable_old_non_style();
-  inline ::TSP::Reference* release_old_non_style();
-  inline void set_allocated_old_non_style(::TSP::Reference* old_non_style);
-
-  // optional .TSP.Reference new_non_style = 7;
-  inline bool has_new_non_style() const;
-  inline void clear_new_non_style();
-  static const int kNewNonStyleFieldNumber = 7;
-  inline const ::TSP::Reference& new_non_style() const;
-  inline ::TSP::Reference* mutable_new_non_style();
-  inline ::TSP::Reference* release_new_non_style();
-  inline void set_allocated_new_non_style(::TSP::Reference* new_non_style);
-
-  // @@protoc_insertion_point(class_scope:TSCH.PropertyMutationUndoTupleArchive)
- private:
-  inline void set_has_chart_info();
-  inline void clear_has_chart_info();
-  inline void set_has_style_owner_type();
-  inline void clear_has_style_owner_type();
-  inline void set_has_index();
-  inline void clear_has_index();
-  inline void set_has_old_style();
-  inline void clear_has_old_style();
-  inline void set_has_new_style();
-  inline void clear_has_new_style();
-  inline void set_has_old_non_style();
-  inline void clear_has_old_non_style();
-  inline void set_has_new_non_style();
-  inline void clear_has_new_non_style();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::TSP::Reference* chart_info_;
-  int style_owner_type_;
-  ::google::protobuf::uint32 index_;
-  ::TSP::Reference* old_style_;
-  ::TSP::Reference* new_style_;
-  ::TSP::Reference* old_non_style_;
-  ::TSP::Reference* new_non_style_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
-
-  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
-  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
-  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
-
-  void InitAsDefaultInstance();
-  static PropertyMutationUndoTupleArchive* default_instance_;
-};
-// -------------------------------------------------------------------
-
 class StyleSwapUndoTupleArchive : public ::google::protobuf::Message {
  public:
   StyleSwapUndoTupleArchive();
@@ -665,14 +526,14 @@ class CommandStyleSwapArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class CommandSetSeriesNameArchive : public ::google::protobuf::Message {
+class CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion : public ::google::protobuf::Message {
  public:
-  CommandSetSeriesNameArchive();
-  virtual ~CommandSetSeriesNameArchive();
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion();
+  virtual ~CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion();
 
-  CommandSetSeriesNameArchive(const CommandSetSeriesNameArchive& from);
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from);
 
-  inline CommandSetSeriesNameArchive& operator=(const CommandSetSeriesNameArchive& from) {
+  inline CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& operator=(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from) {
     CopyFrom(from);
     return *this;
   }
@@ -686,17 +547,17 @@ class CommandSetSeriesNameArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetSeriesNameArchive& default_instance();
+  static const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& default_instance();
 
-  void Swap(CommandSetSeriesNameArchive* other);
+  void Swap(CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetSeriesNameArchive* New() const;
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetSeriesNameArchive& from);
-  void MergeFrom(const CommandSetSeriesNameArchive& from);
+  void CopyFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from);
+  void MergeFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -719,63 +580,59 @@ class CommandSetSeriesNameArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // required uint32 seriesIndex = 2;
-  inline bool has_seriesindex() const;
-  inline void clear_seriesindex();
-  static const int kSeriesIndexFieldNumber = 2;
-  inline ::google::protobuf::uint32 seriesindex() const;
-  inline void set_seriesindex(::google::protobuf::uint32 value);
-
-  // required string oldName = 3;
-  inline bool has_oldname() const;
-  inline void clear_oldname();
-  static const int kOldNameFieldNumber = 3;
-  inline const ::std::string& oldname() const;
-  inline void set_oldname(const ::std::string& value);
-  inline void set_oldname(const char* value);
-  inline void set_oldname(const char* value, size_t size);
-  inline ::std::string* mutable_oldname();
-  inline ::std::string* release_oldname();
-  inline void set_allocated_oldname(::std::string* oldname);
-
-  // required string newName = 4;
-  inline bool has_newname() const;
-  inline void clear_newname();
-  static const int kNewNameFieldNumber = 4;
-  inline const ::std::string& newname() const;
-  inline void set_newname(const ::std::string& value);
-  inline void set_newname(const char* value);
-  inline void set_newname(const char* value, size_t size);
-  inline ::std::string* mutable_newname();
-  inline ::std::string* release_newname();
-  inline void set_allocated_newname(::std::string* newname);
-
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetSeriesNameArchive)
+  // optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+  inline bool has_chart_map() const;
+  inline void clear_chart_map();
+  static const int kChartMapFieldNumber = 2;
+  inline const ::TSCH::Generated::ChartGenericPropertyMapArchive& chart_map() const;
+  inline ::TSCH::Generated::ChartGenericPropertyMapArchive* mutable_chart_map();
+  inline ::TSCH::Generated::ChartGenericPropertyMapArchive* release_chart_map();
+  inline void set_allocated_chart_map(::TSCH::Generated::ChartGenericPropertyMapArchive* chart_map);
+
+  // optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+  inline bool has_legend_map() const;
+  inline void clear_legend_map();
+  static const int kLegendMapFieldNumber = 3;
+  inline const ::TSCH::Generated::LegendGenericPropertyMapArchive& legend_map() const;
+  inline ::TSCH::Generated::LegendGenericPropertyMapArchive* mutable_legend_map();
+  inline ::TSCH::Generated::LegendGenericPropertyMapArchive* release_legend_map();
+  inline void set_allocated_legend_map(::TSCH::Generated::LegendGenericPropertyMapArchive* legend_map);
+
+  // optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+  inline bool has_axis_map() const;
+  inline void clear_axis_map();
+  static const int kAxisMapFieldNumber = 4;
+  inline const ::TSCH::Generated::ChartAxisGenericPropertyMapArchive& axis_map() const;
+  inline ::TSCH::Generated::ChartAxisGenericPropertyMapArchive* mutable_axis_map();
+  inline ::TSCH::Generated::ChartAxisGenericPropertyMapArchive* release_axis_map();
+  inline void set_allocated_axis_map(::TSCH::Generated::ChartAxisGenericPropertyMapArchive* axis_map);
+
+  // optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+  inline bool has_series_map() const;
+  inline void clear_series_map();
+  static const int kSeriesMapFieldNumber = 5;
+  inline const ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive& series_map() const;
+  inline ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* mutable_series_map();
+  inline ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* release_series_map();
+  inline void set_allocated_series_map(::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* series_map);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_seriesindex();
-  inline void clear_has_seriesindex();
-  inline void set_has_oldname();
-  inline void clear_has_oldname();
-  inline void set_has_newname();
-  inline void clear_has_newname();
+  inline void set_has_chart_map();
+  inline void clear_has_chart_map();
+  inline void set_has_legend_map();
+  inline void clear_has_legend_map();
+  inline void set_has_axis_map();
+  inline void clear_has_axis_map();
+  inline void set_has_series_map();
+  inline void clear_has_series_map();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::std::string* oldname_;
-  ::std::string* newname_;
-  ::google::protobuf::uint32 seriesindex_;
+  ::TSCH::Generated::ChartGenericPropertyMapArchive* chart_map_;
+  ::TSCH::Generated::LegendGenericPropertyMapArchive* legend_map_;
+  ::TSCH::Generated::ChartAxisGenericPropertyMapArchive* axis_map_;
+  ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* series_map_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
@@ -785,18 +642,18 @@ class CommandSetSeriesNameArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetSeriesNameArchive* default_instance_;
+  static CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetCategoryNameArchive : public ::google::protobuf::Message {
+class CommandMutatePropertiesArchive_GenericPropertyDeltaMap : public ::google::protobuf::Message {
  public:
-  CommandSetCategoryNameArchive();
-  virtual ~CommandSetCategoryNameArchive();
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap();
+  virtual ~CommandMutatePropertiesArchive_GenericPropertyDeltaMap();
 
-  CommandSetCategoryNameArchive(const CommandSetCategoryNameArchive& from);
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from);
 
-  inline CommandSetCategoryNameArchive& operator=(const CommandSetCategoryNameArchive& from) {
+  inline CommandMutatePropertiesArchive_GenericPropertyDeltaMap& operator=(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from) {
     CopyFrom(from);
     return *this;
   }
@@ -810,17 +667,17 @@ class CommandSetCategoryNameArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetCategoryNameArchive& default_instance();
+  static const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& default_instance();
 
-  void Swap(CommandSetCategoryNameArchive* other);
+  void Swap(CommandMutatePropertiesArchive_GenericPropertyDeltaMap* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetCategoryNameArchive* New() const;
+  CommandMutatePropertiesArchive_GenericPropertyDeltaMap* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetCategoryNameArchive& from);
-  void MergeFrom(const CommandSetCategoryNameArchive& from);
+  void CopyFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from);
+  void MergeFrom(const CommandMutatePropertiesArchive_GenericPropertyDeltaMap& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -841,96 +698,80 @@ class CommandSetCategoryNameArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  // accessors -------------------------------------------------------
-
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // required uint32 categoryIndex = 2;
-  inline bool has_categoryindex() const;
-  inline void clear_categoryindex();
-  static const int kCategoryIndexFieldNumber = 2;
-  inline ::google::protobuf::uint32 categoryindex() const;
-  inline void set_categoryindex(::google::protobuf::uint32 value);
-
-  // required string oldName = 3;
-  inline bool has_oldname() const;
-  inline void clear_oldname();
-  static const int kOldNameFieldNumber = 3;
-  inline const ::std::string& oldname() const;
-  inline void set_oldname(const ::std::string& value);
-  inline void set_oldname(const char* value);
-  inline void set_oldname(const char* value, size_t size);
-  inline ::std::string* mutable_oldname();
-  inline ::std::string* release_oldname();
-  inline void set_allocated_oldname(::std::string* oldname);
+  typedef CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion GenericMapUnion;
 
-  // required string newName = 4;
-  inline bool has_newname() const;
-  inline void clear_newname();
-  static const int kNewNameFieldNumber = 4;
-  inline const ::std::string& newname() const;
-  inline void set_newname(const ::std::string& value);
-  inline void set_newname(const char* value);
-  inline void set_newname(const char* value, size_t size);
-  inline ::std::string* mutable_newname();
-  inline ::std::string* release_newname();
-  inline void set_allocated_newname(::std::string* newname);
+  // accessors -------------------------------------------------------
 
-  // optional bool isMultiDataIndex = 5;
-  inline bool has_ismultidataindex() const;
-  inline void clear_ismultidataindex();
-  static const int kIsMultiDataIndexFieldNumber = 5;
-  inline bool ismultidataindex() const;
-  inline void set_ismultidataindex(bool value);
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  inline bool has_style_owner_type() const;
+  inline void clear_style_owner_type();
+  static const int kStyleOwnerTypeFieldNumber = 1;
+  inline ::TSCH::StyleOwnerType style_owner_type() const;
+  inline void set_style_owner_type(::TSCH::StyleOwnerType value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetCategoryNameArchive)
+  // optional uint32 style_owner_index = 2;
+  inline bool has_style_owner_index() const;
+  inline void clear_style_owner_index();
+  static const int kStyleOwnerIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 style_owner_index() const;
+  inline void set_style_owner_index(::google::protobuf::uint32 value);
+
+  // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
+  inline bool has_forward_map() const;
+  inline void clear_forward_map();
+  static const int kForwardMapFieldNumber = 3;
+  inline const ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& forward_map() const;
+  inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* mutable_forward_map();
+  inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* release_forward_map();
+  inline void set_allocated_forward_map(::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* forward_map);
+
+  // optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
+  inline bool has_reverse_map() const;
+  inline void clear_reverse_map();
+  static const int kReverseMapFieldNumber = 4;
+  inline const ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& reverse_map() const;
+  inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* mutable_reverse_map();
+  inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* release_reverse_map();
+  inline void set_allocated_reverse_map(::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* reverse_map);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_categoryindex();
-  inline void clear_has_categoryindex();
-  inline void set_has_oldname();
-  inline void clear_has_oldname();
-  inline void set_has_newname();
-  inline void clear_has_newname();
-  inline void set_has_ismultidataindex();
-  inline void clear_has_ismultidataindex();
+  inline void set_has_style_owner_type();
+  inline void clear_has_style_owner_type();
+  inline void set_has_style_owner_index();
+  inline void clear_has_style_owner_index();
+  inline void set_has_forward_map();
+  inline void clear_has_forward_map();
+  inline void set_has_reverse_map();
+  inline void clear_has_reverse_map();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::std::string* oldname_;
-  ::google::protobuf::uint32 categoryindex_;
-  bool ismultidataindex_;
-  ::std::string* newname_;
+  int style_owner_type_;
+  ::google::protobuf::uint32 style_owner_index_;
+  ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* forward_map_;
+  ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* reverse_map_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetCategoryNameArchive* default_instance_;
+  static CommandMutatePropertiesArchive_GenericPropertyDeltaMap* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandAddGridRowsArchive : public ::google::protobuf::Message {
+class CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive : public ::google::protobuf::Message {
  public:
-  CommandAddGridRowsArchive();
-  virtual ~CommandAddGridRowsArchive();
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive();
+  virtual ~CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive();
 
-  CommandAddGridRowsArchive(const CommandAddGridRowsArchive& from);
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from);
 
-  inline CommandAddGridRowsArchive& operator=(const CommandAddGridRowsArchive& from) {
+  inline CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& operator=(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -944,17 +785,17 @@ class CommandAddGridRowsArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandAddGridRowsArchive& default_instance();
+  static const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& default_instance();
 
-  void Swap(CommandAddGridRowsArchive* other);
+  void Swap(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandAddGridRowsArchive* New() const;
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandAddGridRowsArchive& from);
-  void MergeFrom(const CommandAddGridRowsArchive& from);
+  void CopyFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from);
+  void MergeFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -977,81 +818,56 @@ class CommandAddGridRowsArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // required uint32 location = 2;
-  inline bool has_location() const;
-  inline void clear_location();
-  static const int kLocationFieldNumber = 2;
-  inline ::google::protobuf::uint32 location() const;
-  inline void set_location(::google::protobuf::uint32 value);
-
-  // optional uint32 length = 3;
-  inline bool has_length() const;
-  inline void clear_length();
-  static const int kLengthFieldNumber = 3;
-  inline ::google::protobuf::uint32 length() const;
-  inline void set_length(::google::protobuf::uint32 value);
-
-  // repeated string name = 4;
-  inline int name_size() const;
-  inline void clear_name();
-  static const int kNameFieldNumber = 4;
-  inline const ::std::string& name(int index) const;
-  inline ::std::string* mutable_name(int index);
-  inline void set_name(int index, const ::std::string& value);
-  inline void set_name(int index, const char* value);
-  inline void set_name(int index, const char* value, size_t size);
-  inline ::std::string* add_name();
-  inline void add_name(const ::std::string& value);
-  inline void add_name(const char* value);
-  inline void add_name(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& name() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_name();
-
-  // @@protoc_insertion_point(class_scope:TSCH.CommandAddGridRowsArchive)
- private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_location();
-  inline void clear_has_location();
-  inline void set_has_length();
-  inline void clear_has_length();
+  // optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
+  inline bool has_char_properties() const;
+  inline void clear_char_properties();
+  static const int kCharPropertiesFieldNumber = 1;
+  inline const ::TSWP::CharacterStylePropertiesArchive& char_properties() const;
+  inline ::TSWP::CharacterStylePropertiesArchive* mutable_char_properties();
+  inline ::TSWP::CharacterStylePropertiesArchive* release_char_properties();
+  inline void set_allocated_char_properties(::TSWP::CharacterStylePropertiesArchive* char_properties);
+
+  // optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
+  inline bool has_para_properties() const;
+  inline void clear_para_properties();
+  static const int kParaPropertiesFieldNumber = 2;
+  inline const ::TSWP::ParagraphStylePropertiesArchive& para_properties() const;
+  inline ::TSWP::ParagraphStylePropertiesArchive* mutable_para_properties();
+  inline ::TSWP::ParagraphStylePropertiesArchive* release_para_properties();
+  inline void set_allocated_para_properties(::TSWP::ParagraphStylePropertiesArchive* para_properties);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive)
+ private:
+  inline void set_has_char_properties();
+  inline void clear_has_char_properties();
+  inline void set_has_para_properties();
+  inline void clear_has_para_properties();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 location_;
-  ::google::protobuf::uint32 length_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> name_;
+  ::TSWP::CharacterStylePropertiesArchive* char_properties_;
+  ::TSWP::ParagraphStylePropertiesArchive* para_properties_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandAddGridRowsArchive* default_instance_;
+  static CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandAddGridColumnsArchive : public ::google::protobuf::Message {
+class CommandMutatePropertiesArchive_ParagraphStyleDeltaMap : public ::google::protobuf::Message {
  public:
-  CommandAddGridColumnsArchive();
-  virtual ~CommandAddGridColumnsArchive();
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap();
+  virtual ~CommandMutatePropertiesArchive_ParagraphStyleDeltaMap();
 
-  CommandAddGridColumnsArchive(const CommandAddGridColumnsArchive& from);
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from);
 
-  inline CommandAddGridColumnsArchive& operator=(const CommandAddGridColumnsArchive& from) {
+  inline CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& operator=(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1065,17 +881,17 @@ class CommandAddGridColumnsArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandAddGridColumnsArchive& default_instance();
+  static const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& default_instance();
 
-  void Swap(CommandAddGridColumnsArchive* other);
+  void Swap(CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* other);
 
   // implements Message ----------------------------------------------
 
-  CommandAddGridColumnsArchive* New() const;
+  CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandAddGridColumnsArchive& from);
-  void MergeFrom(const CommandAddGridColumnsArchive& from);
+  void CopyFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from);
+  void MergeFrom(const CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1096,83 +912,90 @@ class CommandAddGridColumnsArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  // accessors -------------------------------------------------------
-
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // required uint32 location = 2;
-  inline bool has_location() const;
-  inline void clear_location();
-  static const int kLocationFieldNumber = 2;
-  inline ::google::protobuf::uint32 location() const;
-  inline void set_location(::google::protobuf::uint32 value);
+  typedef CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive ParagraphStylePropertyMapArchive;
 
-  // optional uint32 length = 3;
-  inline bool has_length() const;
-  inline void clear_length();
-  static const int kLengthFieldNumber = 3;
-  inline ::google::protobuf::uint32 length() const;
-  inline void set_length(::google::protobuf::uint32 value);
+  // accessors -------------------------------------------------------
 
-  // repeated string name = 4;
-  inline int name_size() const;
-  inline void clear_name();
-  static const int kNameFieldNumber = 4;
-  inline const ::std::string& name(int index) const;
-  inline ::std::string* mutable_name(int index);
-  inline void set_name(int index, const ::std::string& value);
-  inline void set_name(int index, const char* value);
-  inline void set_name(int index, const char* value, size_t size);
-  inline ::std::string* add_name();
-  inline void add_name(const ::std::string& value);
-  inline void add_name(const char* value);
-  inline void add_name(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& name() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_name();
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  inline bool has_style_owner_type() const;
+  inline void clear_style_owner_type();
+  static const int kStyleOwnerTypeFieldNumber = 1;
+  inline ::TSCH::StyleOwnerType style_owner_type() const;
+  inline void set_style_owner_type(::TSCH::StyleOwnerType value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandAddGridColumnsArchive)
+  // optional uint32 style_owner_index = 2;
+  inline bool has_style_owner_index() const;
+  inline void clear_style_owner_index();
+  static const int kStyleOwnerIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 style_owner_index() const;
+  inline void set_style_owner_index(::google::protobuf::uint32 value);
+
+  // optional uint32 paragraph_style_index_property = 3;
+  inline bool has_paragraph_style_index_property() const;
+  inline void clear_paragraph_style_index_property();
+  static const int kParagraphStyleIndexPropertyFieldNumber = 3;
+  inline ::google::protobuf::uint32 paragraph_style_index_property() const;
+  inline void set_paragraph_style_index_property(::google::protobuf::uint32 value);
+
+  // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
+  inline bool has_forward_map() const;
+  inline void clear_forward_map();
+  static const int kForwardMapFieldNumber = 4;
+  inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& forward_map() const;
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* mutable_forward_map();
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* release_forward_map();
+  inline void set_allocated_forward_map(::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* forward_map);
+
+  // optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+  inline bool has_reverse_map() const;
+  inline void clear_reverse_map();
+  static const int kReverseMapFieldNumber = 5;
+  inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& reverse_map() const;
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* mutable_reverse_map();
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* release_reverse_map();
+  inline void set_allocated_reverse_map(::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* reverse_map);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_location();
-  inline void clear_has_location();
-  inline void set_has_length();
-  inline void clear_has_length();
+  inline void set_has_style_owner_type();
+  inline void clear_has_style_owner_type();
+  inline void set_has_style_owner_index();
+  inline void clear_has_style_owner_index();
+  inline void set_has_paragraph_style_index_property();
+  inline void clear_has_paragraph_style_index_property();
+  inline void set_has_forward_map();
+  inline void clear_has_forward_map();
+  inline void set_has_reverse_map();
+  inline void clear_has_reverse_map();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 location_;
-  ::google::protobuf::uint32 length_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> name_;
+  int style_owner_type_;
+  ::google::protobuf::uint32 style_owner_index_;
+  ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* forward_map_;
+  ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* reverse_map_;
+  ::google::protobuf::uint32 paragraph_style_index_property_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandAddGridColumnsArchive* default_instance_;
+  static CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandMoveGridRowsArchive : public ::google::protobuf::Message {
+class CommandMutatePropertiesArchive : public ::google::protobuf::Message {
  public:
-  CommandMoveGridRowsArchive();
-  virtual ~CommandMoveGridRowsArchive();
+  CommandMutatePropertiesArchive();
+  virtual ~CommandMutatePropertiesArchive();
 
-  CommandMoveGridRowsArchive(const CommandMoveGridRowsArchive& from);
+  CommandMutatePropertiesArchive(const CommandMutatePropertiesArchive& from);
 
-  inline CommandMoveGridRowsArchive& operator=(const CommandMoveGridRowsArchive& from) {
+  inline CommandMutatePropertiesArchive& operator=(const CommandMutatePropertiesArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1186,17 +1009,17 @@ class CommandMoveGridRowsArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandMoveGridRowsArchive& default_instance();
+  static const CommandMutatePropertiesArchive& default_instance();
 
-  void Swap(CommandMoveGridRowsArchive* other);
+  void Swap(CommandMutatePropertiesArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandMoveGridRowsArchive* New() const;
+  CommandMutatePropertiesArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandMoveGridRowsArchive& from);
-  void MergeFrom(const CommandMoveGridRowsArchive& from);
+  void CopyFrom(const CommandMutatePropertiesArchive& from);
+  void MergeFrom(const CommandMutatePropertiesArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1217,6 +1040,9 @@ class CommandMoveGridRowsArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef CommandMutatePropertiesArchive_GenericPropertyDeltaMap GenericPropertyDeltaMap;
+  typedef CommandMutatePropertiesArchive_ParagraphStyleDeltaMap ParagraphStyleDeltaMap;
+
   // accessors -------------------------------------------------------
 
   // required .TSCH.ChartCommandArchive super = 1;
@@ -1228,44 +1054,52 @@ class CommandMoveGridRowsArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 location = 2;
-  inline bool has_location() const;
-  inline void clear_location();
-  static const int kLocationFieldNumber = 2;
-  inline ::google::protobuf::uint32 location() const;
-  inline void set_location(::google::protobuf::uint32 value);
-
-  // required uint32 length = 3;
-  inline bool has_length() const;
-  inline void clear_length();
-  static const int kLengthFieldNumber = 3;
-  inline ::google::protobuf::uint32 length() const;
-  inline void set_length(::google::protobuf::uint32 value);
-
-  // required int32 afterrow = 4;
-  inline bool has_afterrow() const;
-  inline void clear_afterrow();
-  static const int kAfterrowFieldNumber = 4;
-  inline ::google::protobuf::int32 afterrow() const;
-  inline void set_afterrow(::google::protobuf::int32 value);
-
-  // @@protoc_insertion_point(class_scope:TSCH.CommandMoveGridRowsArchive)
+  // optional .TSP.Reference rollback_cmd = 2;
+  inline bool has_rollback_cmd() const;
+  inline void clear_rollback_cmd();
+  static const int kRollbackCmdFieldNumber = 2;
+  inline const ::TSP::Reference& rollback_cmd() const;
+  inline ::TSP::Reference* mutable_rollback_cmd();
+  inline ::TSP::Reference* release_rollback_cmd();
+  inline void set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd);
+
+  // repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
+  inline int generic_property_delta_maps_size() const;
+  inline void clear_generic_property_delta_maps();
+  static const int kGenericPropertyDeltaMapsFieldNumber = 3;
+  inline const ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap& generic_property_delta_maps(int index) const;
+  inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap* mutable_generic_property_delta_maps(int index);
+  inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap* add_generic_property_delta_maps();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap >&
+      generic_property_delta_maps() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap >*
+      mutable_generic_property_delta_maps();
+
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
+  inline int paragraph_style_delta_maps_size() const;
+  inline void clear_paragraph_style_delta_maps();
+  static const int kParagraphStyleDeltaMapsFieldNumber = 4;
+  inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& paragraph_style_delta_maps(int index) const;
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* mutable_paragraph_style_delta_maps(int index);
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* add_paragraph_style_delta_maps();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >&
+      paragraph_style_delta_maps() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >*
+      mutable_paragraph_style_delta_maps();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMutatePropertiesArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_location();
-  inline void clear_has_location();
-  inline void set_has_length();
-  inline void clear_has_length();
-  inline void set_has_afterrow();
-  inline void clear_has_afterrow();
+  inline void set_has_rollback_cmd();
+  inline void clear_has_rollback_cmd();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 location_;
-  ::google::protobuf::uint32 length_;
-  ::google::protobuf::int32 afterrow_;
+  ::TSP::Reference* rollback_cmd_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap > generic_property_delta_maps_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap > paragraph_style_delta_maps_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
@@ -1275,18 +1109,18 @@ class CommandMoveGridRowsArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandMoveGridRowsArchive* default_instance_;
+  static CommandMutatePropertiesArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandMoveGridColumnsArchive : public ::google::protobuf::Message {
+class CommandScaleAllTextArchive : public ::google::protobuf::Message {
  public:
-  CommandMoveGridColumnsArchive();
-  virtual ~CommandMoveGridColumnsArchive();
+  CommandScaleAllTextArchive();
+  virtual ~CommandScaleAllTextArchive();
 
-  CommandMoveGridColumnsArchive(const CommandMoveGridColumnsArchive& from);
+  CommandScaleAllTextArchive(const CommandScaleAllTextArchive& from);
 
-  inline CommandMoveGridColumnsArchive& operator=(const CommandMoveGridColumnsArchive& from) {
+  inline CommandScaleAllTextArchive& operator=(const CommandScaleAllTextArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1300,17 +1134,17 @@ class CommandMoveGridColumnsArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandMoveGridColumnsArchive& default_instance();
+  static const CommandScaleAllTextArchive& default_instance();
 
-  void Swap(CommandMoveGridColumnsArchive* other);
+  void Swap(CommandScaleAllTextArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandMoveGridColumnsArchive* New() const;
+  CommandScaleAllTextArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandMoveGridColumnsArchive& from);
-  void MergeFrom(const CommandMoveGridColumnsArchive& from);
+  void CopyFrom(const CommandScaleAllTextArchive& from);
+  void MergeFrom(const CommandScaleAllTextArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1342,65 +1176,57 @@ class CommandMoveGridColumnsArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 location = 2;
-  inline bool has_location() const;
-  inline void clear_location();
-  static const int kLocationFieldNumber = 2;
-  inline ::google::protobuf::uint32 location() const;
-  inline void set_location(::google::protobuf::uint32 value);
-
-  // required uint32 length = 3;
-  inline bool has_length() const;
-  inline void clear_length();
-  static const int kLengthFieldNumber = 3;
-  inline ::google::protobuf::uint32 length() const;
-  inline void set_length(::google::protobuf::uint32 value);
-
-  // required int32 aftercolumn = 4;
-  inline bool has_aftercolumn() const;
-  inline void clear_aftercolumn();
-  static const int kAftercolumnFieldNumber = 4;
-  inline ::google::protobuf::int32 aftercolumn() const;
-  inline void set_aftercolumn(::google::protobuf::int32 value);
-
-  // @@protoc_insertion_point(class_scope:TSCH.CommandMoveGridColumnsArchive)
+  // optional .TSP.Reference rollback_cmd = 2;
+  inline bool has_rollback_cmd() const;
+  inline void clear_rollback_cmd();
+  static const int kRollbackCmdFieldNumber = 2;
+  inline const ::TSP::Reference& rollback_cmd() const;
+  inline ::TSP::Reference* mutable_rollback_cmd();
+  inline ::TSP::Reference* release_rollback_cmd();
+  inline void set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd);
+
+  // optional double scale_factor = 3;
+  inline bool has_scale_factor() const;
+  inline void clear_scale_factor();
+  static const int kScaleFactorFieldNumber = 3;
+  inline double scale_factor() const;
+  inline void set_scale_factor(double value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandScaleAllTextArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_location();
-  inline void clear_has_location();
-  inline void set_has_length();
-  inline void clear_has_length();
-  inline void set_has_aftercolumn();
-  inline void clear_has_aftercolumn();
+  inline void set_has_rollback_cmd();
+  inline void clear_has_rollback_cmd();
+  inline void set_has_scale_factor();
+  inline void clear_has_scale_factor();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 location_;
-  ::google::protobuf::uint32 length_;
-  ::google::protobuf::int32 aftercolumn_;
+  ::TSP::Reference* rollback_cmd_;
+  double scale_factor_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandMoveGridColumnsArchive* default_instance_;
+  static CommandScaleAllTextArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandDeleteGridRowsArchive_ValueRow : public ::google::protobuf::Message {
+class CommandSetFontFamilyArchive : public ::google::protobuf::Message {
  public:
-  CommandDeleteGridRowsArchive_ValueRow();
-  virtual ~CommandDeleteGridRowsArchive_ValueRow();
+  CommandSetFontFamilyArchive();
+  virtual ~CommandSetFontFamilyArchive();
 
-  CommandDeleteGridRowsArchive_ValueRow(const CommandDeleteGridRowsArchive_ValueRow& from);
+  CommandSetFontFamilyArchive(const CommandSetFontFamilyArchive& from);
 
-  inline CommandDeleteGridRowsArchive_ValueRow& operator=(const CommandDeleteGridRowsArchive_ValueRow& from) {
+  inline CommandSetFontFamilyArchive& operator=(const CommandSetFontFamilyArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1414,17 +1240,17 @@ class CommandDeleteGridRowsArchive_ValueRow : public ::google::protobuf::Message
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandDeleteGridRowsArchive_ValueRow& default_instance();
+  static const CommandSetFontFamilyArchive& default_instance();
 
-  void Swap(CommandDeleteGridRowsArchive_ValueRow* other);
+  void Swap(CommandSetFontFamilyArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandDeleteGridRowsArchive_ValueRow* New() const;
+  CommandSetFontFamilyArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandDeleteGridRowsArchive_ValueRow& from);
-  void MergeFrom(const CommandDeleteGridRowsArchive_ValueRow& from);
+  void CopyFrom(const CommandSetFontFamilyArchive& from);
+  void MergeFrom(const CommandSetFontFamilyArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1447,45 +1273,99 @@ class CommandDeleteGridRowsArchive_ValueRow : public ::google::protobuf::Message
 
   // accessors -------------------------------------------------------
 
-  // repeated double value = 5;
-  inline int value_size() const;
-  inline void clear_value();
-  static const int kValueFieldNumber = 5;
-  inline double value(int index) const;
-  inline void set_value(int index, double value);
-  inline void add_value(double value);
-  inline const ::google::protobuf::RepeatedField< double >&
-      value() const;
-  inline ::google::protobuf::RepeatedField< double >*
-      mutable_value();
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridRowsArchive.ValueRow)
+  // optional .TSP.Reference rollback_cmd = 2;
+  inline bool has_rollback_cmd() const;
+  inline void clear_rollback_cmd();
+  static const int kRollbackCmdFieldNumber = 2;
+  inline const ::TSP::Reference& rollback_cmd() const;
+  inline ::TSP::Reference* mutable_rollback_cmd();
+  inline ::TSP::Reference* release_rollback_cmd();
+  inline void set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd);
+
+  // optional string new_font_family = 3;
+  inline bool has_new_font_family() const;
+  inline void clear_new_font_family();
+  static const int kNewFontFamilyFieldNumber = 3;
+  inline const ::std::string& new_font_family() const;
+  inline void set_new_font_family(const ::std::string& value);
+  inline void set_new_font_family(const char* value);
+  inline void set_new_font_family(const char* value, size_t size);
+  inline ::std::string* mutable_new_font_family();
+  inline ::std::string* release_new_font_family();
+  inline void set_allocated_new_font_family(::std::string* new_font_family);
+
+  // optional string old_font_family = 4;
+  inline bool has_old_font_family() const;
+  inline void clear_old_font_family();
+  static const int kOldFontFamilyFieldNumber = 4;
+  inline const ::std::string& old_font_family() const;
+  inline void set_old_font_family(const ::std::string& value);
+  inline void set_old_font_family(const char* value);
+  inline void set_old_font_family(const char* value, size_t size);
+  inline ::std::string* mutable_old_font_family();
+  inline ::std::string* release_old_font_family();
+  inline void set_allocated_old_font_family(::std::string* old_font_family);
+
+  // repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+  inline int paragraph_style_delta_maps_size() const;
+  inline void clear_paragraph_style_delta_maps();
+  static const int kParagraphStyleDeltaMapsFieldNumber = 5;
+  inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& paragraph_style_delta_maps(int index) const;
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* mutable_paragraph_style_delta_maps(int index);
+  inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* add_paragraph_style_delta_maps();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >&
+      paragraph_style_delta_maps() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >*
+      mutable_paragraph_style_delta_maps();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetFontFamilyArchive)
  private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_rollback_cmd();
+  inline void clear_has_rollback_cmd();
+  inline void set_has_new_font_family();
+  inline void clear_has_new_font_family();
+  inline void set_has_old_font_family();
+  inline void clear_has_old_font_family();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedField< double > value_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Reference* rollback_cmd_;
+  ::std::string* new_font_family_;
+  ::std::string* old_font_family_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap > paragraph_style_delta_maps_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandDeleteGridRowsArchive_ValueRow* default_instance_;
+  static CommandSetFontFamilyArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandDeleteGridRowsArchive : public ::google::protobuf::Message {
+class CommandApplyFillSetArchive_CapturedFillSetArchive : public ::google::protobuf::Message {
  public:
-  CommandDeleteGridRowsArchive();
-  virtual ~CommandDeleteGridRowsArchive();
+  CommandApplyFillSetArchive_CapturedFillSetArchive();
+  virtual ~CommandApplyFillSetArchive_CapturedFillSetArchive();
 
-  CommandDeleteGridRowsArchive(const CommandDeleteGridRowsArchive& from);
+  CommandApplyFillSetArchive_CapturedFillSetArchive(const CommandApplyFillSetArchive_CapturedFillSetArchive& from);
 
-  inline CommandDeleteGridRowsArchive& operator=(const CommandDeleteGridRowsArchive& from) {
+  inline CommandApplyFillSetArchive_CapturedFillSetArchive& operator=(const CommandApplyFillSetArchive_CapturedFillSetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1499,17 +1379,17 @@ class CommandDeleteGridRowsArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandDeleteGridRowsArchive& default_instance();
+  static const CommandApplyFillSetArchive_CapturedFillSetArchive& default_instance();
 
-  void Swap(CommandDeleteGridRowsArchive* other);
+  void Swap(CommandApplyFillSetArchive_CapturedFillSetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandDeleteGridRowsArchive* New() const;
+  CommandApplyFillSetArchive_CapturedFillSetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandDeleteGridRowsArchive& from);
-  void MergeFrom(const CommandDeleteGridRowsArchive& from);
+  void CopyFrom(const CommandApplyFillSetArchive_CapturedFillSetArchive& from);
+  void MergeFrom(const CommandApplyFillSetArchive_CapturedFillSetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1530,125 +1410,72 @@ class CommandDeleteGridRowsArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef CommandDeleteGridRowsArchive_ValueRow ValueRow;
-
   // accessors -------------------------------------------------------
 
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // required uint32 location = 2;
-  inline bool has_location() const;
-  inline void clear_location();
-  static const int kLocationFieldNumber = 2;
-  inline ::google::protobuf::uint32 location() const;
-  inline void set_location(::google::protobuf::uint32 value);
-
-  // required uint32 length = 3;
-  inline bool has_length() const;
-  inline void clear_length();
-  static const int kLengthFieldNumber = 3;
-  inline ::google::protobuf::uint32 length() const;
-  inline void set_length(::google::protobuf::uint32 value);
-
-  // repeated string names = 4;
-  inline int names_size() const;
-  inline void clear_names();
-  static const int kNamesFieldNumber = 4;
-  inline const ::std::string& names(int index) const;
-  inline ::std::string* mutable_names(int index);
-  inline void set_names(int index, const ::std::string& value);
-  inline void set_names(int index, const char* value);
-  inline void set_names(int index, const char* value, size_t size);
-  inline ::std::string* add_names();
-  inline void add_names(const ::std::string& value);
-  inline void add_names(const char* value);
-  inline void add_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_names();
-
-  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
-  inline int value_row_size() const;
-  inline void clear_value_row();
-  static const int kValueRowFieldNumber = 6;
-  inline const ::TSCH::CommandDeleteGridRowsArchive_ValueRow& value_row(int index) const;
-  inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* mutable_value_row(int index);
-  inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* add_value_row();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >&
-      value_row() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >*
-      mutable_value_row();
-
-  // optional bool removed_all_rows = 7;
-  inline bool has_removed_all_rows() const;
-  inline void clear_removed_all_rows();
-  static const int kRemovedAllRowsFieldNumber = 7;
-  inline bool removed_all_rows() const;
-  inline void set_removed_all_rows(bool value);
-
-  // repeated string column_names = 8;
-  inline int column_names_size() const;
-  inline void clear_column_names();
-  static const int kColumnNamesFieldNumber = 8;
-  inline const ::std::string& column_names(int index) const;
-  inline ::std::string* mutable_column_names(int index);
-  inline void set_column_names(int index, const ::std::string& value);
-  inline void set_column_names(int index, const char* value);
-  inline void set_column_names(int index, const char* value, size_t size);
-  inline ::std::string* add_column_names();
-  inline void add_column_names(const ::std::string& value);
-  inline void add_column_names(const char* value);
-  inline void add_column_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& column_names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_column_names();
+  // optional string identifier = 1;
+  inline bool has_identifier() const;
+  inline void clear_identifier();
+  static const int kIdentifierFieldNumber = 1;
+  inline const ::std::string& identifier() const;
+  inline void set_identifier(const ::std::string& value);
+  inline void set_identifier(const char* value);
+  inline void set_identifier(const char* value, size_t size);
+  inline ::std::string* mutable_identifier();
+  inline ::std::string* release_identifier();
+  inline void set_allocated_identifier(::std::string* identifier);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridRowsArchive)
+  // optional uint32 number_of_theme_series_styles = 2;
+  inline bool has_number_of_theme_series_styles() const;
+  inline void clear_number_of_theme_series_styles();
+  static const int kNumberOfThemeSeriesStylesFieldNumber = 2;
+  inline ::google::protobuf::uint32 number_of_theme_series_styles() const;
+  inline void set_number_of_theme_series_styles(::google::protobuf::uint32 value);
+
+  // repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+  inline int property_maps_size() const;
+  inline void clear_property_maps();
+  static const int kPropertyMapsFieldNumber = 3;
+  inline const ::TSCH::ChartSeriesStyleArchive& property_maps(int index) const;
+  inline ::TSCH::ChartSeriesStyleArchive* mutable_property_maps(int index);
+  inline ::TSCH::ChartSeriesStyleArchive* add_property_maps();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::ChartSeriesStyleArchive >&
+      property_maps() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartSeriesStyleArchive >*
+      mutable_property_maps();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_location();
-  inline void clear_has_location();
-  inline void set_has_length();
-  inline void clear_has_length();
-  inline void set_has_removed_all_rows();
-  inline void clear_has_removed_all_rows();
+  inline void set_has_identifier();
+  inline void clear_has_identifier();
+  inline void set_has_number_of_theme_series_styles();
+  inline void clear_has_number_of_theme_series_styles();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 location_;
-  ::google::protobuf::uint32 length_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> names_;
-  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow > value_row_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> column_names_;
-  bool removed_all_rows_;
+  ::std::string* identifier_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::ChartSeriesStyleArchive > property_maps_;
+  ::google::protobuf::uint32 number_of_theme_series_styles_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandDeleteGridRowsArchive* default_instance_;
+  static CommandApplyFillSetArchive_CapturedFillSetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandDeleteGridColumnsArchive_ValueRow : public ::google::protobuf::Message {
+class CommandApplyFillSetArchive : public ::google::protobuf::Message {
  public:
-  CommandDeleteGridColumnsArchive_ValueRow();
-  virtual ~CommandDeleteGridColumnsArchive_ValueRow();
+  CommandApplyFillSetArchive();
+  virtual ~CommandApplyFillSetArchive();
 
-  CommandDeleteGridColumnsArchive_ValueRow(const CommandDeleteGridColumnsArchive_ValueRow& from);
+  CommandApplyFillSetArchive(const CommandApplyFillSetArchive& from);
 
-  inline CommandDeleteGridColumnsArchive_ValueRow& operator=(const CommandDeleteGridColumnsArchive_ValueRow& from) {
+  inline CommandApplyFillSetArchive& operator=(const CommandApplyFillSetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1662,17 +1489,17 @@ class CommandDeleteGridColumnsArchive_ValueRow : public ::google::protobuf::Mess
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandDeleteGridColumnsArchive_ValueRow& default_instance();
+  static const CommandApplyFillSetArchive& default_instance();
 
-  void Swap(CommandDeleteGridColumnsArchive_ValueRow* other);
+  void Swap(CommandApplyFillSetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandDeleteGridColumnsArchive_ValueRow* New() const;
+  CommandApplyFillSetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandDeleteGridColumnsArchive_ValueRow& from);
-  void MergeFrom(const CommandDeleteGridColumnsArchive_ValueRow& from);
+  void CopyFrom(const CommandApplyFillSetArchive& from);
+  void MergeFrom(const CommandApplyFillSetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1693,47 +1520,129 @@ class CommandDeleteGridColumnsArchive_ValueRow : public ::google::protobuf::Mess
 
   // nested types ----------------------------------------------------
 
+  typedef CommandApplyFillSetArchive_CapturedFillSetArchive CapturedFillSetArchive;
+
   // accessors -------------------------------------------------------
 
-  // repeated double value = 5;
-  inline int value_size() const;
-  inline void clear_value();
-  static const int kValueFieldNumber = 5;
-  inline double value(int index) const;
-  inline void set_value(int index, double value);
-  inline void add_value(double value);
-  inline const ::google::protobuf::RepeatedField< double >&
-      value() const;
-  inline ::google::protobuf::RepeatedField< double >*
-      mutable_value();
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridColumnsArchive.ValueRow)
+  // optional .TSP.Reference rollback_cmd = 2;
+  inline bool has_rollback_cmd() const;
+  inline void clear_rollback_cmd();
+  static const int kRollbackCmdFieldNumber = 2;
+  inline const ::TSP::Reference& rollback_cmd() const;
+  inline ::TSP::Reference* mutable_rollback_cmd();
+  inline ::TSP::Reference* release_rollback_cmd();
+  inline void set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd);
+
+  // optional string fwd_fill_set_lookup_string = 3;
+  inline bool has_fwd_fill_set_lookup_string() const;
+  inline void clear_fwd_fill_set_lookup_string();
+  static const int kFwdFillSetLookupStringFieldNumber = 3;
+  inline const ::std::string& fwd_fill_set_lookup_string() const;
+  inline void set_fwd_fill_set_lookup_string(const ::std::string& value);
+  inline void set_fwd_fill_set_lookup_string(const char* value);
+  inline void set_fwd_fill_set_lookup_string(const char* value, size_t size);
+  inline ::std::string* mutable_fwd_fill_set_lookup_string();
+  inline ::std::string* release_fwd_fill_set_lookup_string();
+  inline void set_allocated_fwd_fill_set_lookup_string(::std::string* fwd_fill_set_lookup_string);
+
+  // optional string rev_fill_set_lookup_string = 4;
+  inline bool has_rev_fill_set_lookup_string() const;
+  inline void clear_rev_fill_set_lookup_string();
+  static const int kRevFillSetLookupStringFieldNumber = 4;
+  inline const ::std::string& rev_fill_set_lookup_string() const;
+  inline void set_rev_fill_set_lookup_string(const ::std::string& value);
+  inline void set_rev_fill_set_lookup_string(const char* value);
+  inline void set_rev_fill_set_lookup_string(const char* value, size_t size);
+  inline ::std::string* mutable_rev_fill_set_lookup_string();
+  inline ::std::string* release_rev_fill_set_lookup_string();
+  inline void set_allocated_rev_fill_set_lookup_string(::std::string* rev_fill_set_lookup_string);
+
+  // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+  inline bool has_fwd_captured_fill_set() const;
+  inline void clear_fwd_captured_fill_set();
+  static const int kFwdCapturedFillSetFieldNumber = 5;
+  inline const ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive& fwd_captured_fill_set() const;
+  inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* mutable_fwd_captured_fill_set();
+  inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* release_fwd_captured_fill_set();
+  inline void set_allocated_fwd_captured_fill_set(::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* fwd_captured_fill_set);
+
+  // optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+  inline bool has_rev_captured_fill_set() const;
+  inline void clear_rev_captured_fill_set();
+  static const int kRevCapturedFillSetFieldNumber = 6;
+  inline const ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive& rev_captured_fill_set() const;
+  inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* mutable_rev_captured_fill_set();
+  inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* release_rev_captured_fill_set();
+  inline void set_allocated_rev_captured_fill_set(::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* rev_captured_fill_set);
+
+  // optional string rev_last_applied_fill_set_lookup_string = 7;
+  inline bool has_rev_last_applied_fill_set_lookup_string() const;
+  inline void clear_rev_last_applied_fill_set_lookup_string();
+  static const int kRevLastAppliedFillSetLookupStringFieldNumber = 7;
+  inline const ::std::string& rev_last_applied_fill_set_lookup_string() const;
+  inline void set_rev_last_applied_fill_set_lookup_string(const ::std::string& value);
+  inline void set_rev_last_applied_fill_set_lookup_string(const char* value);
+  inline void set_rev_last_applied_fill_set_lookup_string(const char* value, size_t size);
+  inline ::std::string* mutable_rev_last_applied_fill_set_lookup_string();
+  inline ::std::string* release_rev_last_applied_fill_set_lookup_string();
+  inline void set_allocated_rev_last_applied_fill_set_lookup_string(::std::string* rev_last_applied_fill_set_lookup_string);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandApplyFillSetArchive)
  private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_rollback_cmd();
+  inline void clear_has_rollback_cmd();
+  inline void set_has_fwd_fill_set_lookup_string();
+  inline void clear_has_fwd_fill_set_lookup_string();
+  inline void set_has_rev_fill_set_lookup_string();
+  inline void clear_has_rev_fill_set_lookup_string();
+  inline void set_has_fwd_captured_fill_set();
+  inline void clear_has_fwd_captured_fill_set();
+  inline void set_has_rev_captured_fill_set();
+  inline void clear_has_rev_captured_fill_set();
+  inline void set_has_rev_last_applied_fill_set_lookup_string();
+  inline void clear_has_rev_last_applied_fill_set_lookup_string();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedField< double > value_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Reference* rollback_cmd_;
+  ::std::string* fwd_fill_set_lookup_string_;
+  ::std::string* rev_fill_set_lookup_string_;
+  ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* fwd_captured_fill_set_;
+  ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* rev_captured_fill_set_;
+  ::std::string* rev_last_applied_fill_set_lookup_string_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandDeleteGridColumnsArchive_ValueRow* default_instance_;
+  static CommandApplyFillSetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandDeleteGridColumnsArchive : public ::google::protobuf::Message {
+class CommandSetSeriesNameArchive : public ::google::protobuf::Message {
  public:
-  CommandDeleteGridColumnsArchive();
-  virtual ~CommandDeleteGridColumnsArchive();
+  CommandSetSeriesNameArchive();
+  virtual ~CommandSetSeriesNameArchive();
 
-  CommandDeleteGridColumnsArchive(const CommandDeleteGridColumnsArchive& from);
+  CommandSetSeriesNameArchive(const CommandSetSeriesNameArchive& from);
 
-  inline CommandDeleteGridColumnsArchive& operator=(const CommandDeleteGridColumnsArchive& from) {
+  inline CommandSetSeriesNameArchive& operator=(const CommandSetSeriesNameArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1747,17 +1656,17 @@ class CommandDeleteGridColumnsArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandDeleteGridColumnsArchive& default_instance();
+  static const CommandSetSeriesNameArchive& default_instance();
 
-  void Swap(CommandDeleteGridColumnsArchive* other);
+  void Swap(CommandSetSeriesNameArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandDeleteGridColumnsArchive* New() const;
+  CommandSetSeriesNameArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandDeleteGridColumnsArchive& from);
-  void MergeFrom(const CommandDeleteGridColumnsArchive& from);
+  void CopyFrom(const CommandSetSeriesNameArchive& from);
+  void MergeFrom(const CommandSetSeriesNameArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1778,8 +1687,6 @@ class CommandDeleteGridColumnsArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef CommandDeleteGridColumnsArchive_ValueRow ValueRow;
-
   // accessors -------------------------------------------------------
 
   // required .TSCH.ChartCommandArchive super = 1;
@@ -1791,112 +1698,75 @@ class CommandDeleteGridColumnsArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 location = 2;
-  inline bool has_location() const;
-  inline void clear_location();
-  static const int kLocationFieldNumber = 2;
-  inline ::google::protobuf::uint32 location() const;
-  inline void set_location(::google::protobuf::uint32 value);
-
-  // required uint32 length = 3;
-  inline bool has_length() const;
-  inline void clear_length();
-  static const int kLengthFieldNumber = 3;
-  inline ::google::protobuf::uint32 length() const;
-  inline void set_length(::google::protobuf::uint32 value);
-
-  // repeated string names = 4;
-  inline int names_size() const;
-  inline void clear_names();
-  static const int kNamesFieldNumber = 4;
-  inline const ::std::string& names(int index) const;
-  inline ::std::string* mutable_names(int index);
-  inline void set_names(int index, const ::std::string& value);
-  inline void set_names(int index, const char* value);
-  inline void set_names(int index, const char* value, size_t size);
-  inline ::std::string* add_names();
-  inline void add_names(const ::std::string& value);
-  inline void add_names(const char* value);
-  inline void add_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_names();
-
-  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
-  inline int value_row_size() const;
-  inline void clear_value_row();
-  static const int kValueRowFieldNumber = 6;
-  inline const ::TSCH::CommandDeleteGridColumnsArchive_ValueRow& value_row(int index) const;
-  inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* mutable_value_row(int index);
-  inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* add_value_row();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >&
-      value_row() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >*
-      mutable_value_row();
+  // required uint32 seriesIndex = 2;
+  inline bool has_seriesindex() const;
+  inline void clear_seriesindex();
+  static const int kSeriesIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 seriesindex() const;
+  inline void set_seriesindex(::google::protobuf::uint32 value);
 
-  // optional bool removed_all_columns = 7;
-  inline bool has_removed_all_columns() const;
-  inline void clear_removed_all_columns();
-  static const int kRemovedAllColumnsFieldNumber = 7;
-  inline bool removed_all_columns() const;
-  inline void set_removed_all_columns(bool value);
+  // required string oldName = 3;
+  inline bool has_oldname() const;
+  inline void clear_oldname();
+  static const int kOldNameFieldNumber = 3;
+  inline const ::std::string& oldname() const;
+  inline void set_oldname(const ::std::string& value);
+  inline void set_oldname(const char* value);
+  inline void set_oldname(const char* value, size_t size);
+  inline ::std::string* mutable_oldname();
+  inline ::std::string* release_oldname();
+  inline void set_allocated_oldname(::std::string* oldname);
 
-  // repeated string row_names = 8;
-  inline int row_names_size() const;
-  inline void clear_row_names();
-  static const int kRowNamesFieldNumber = 8;
-  inline const ::std::string& row_names(int index) const;
-  inline ::std::string* mutable_row_names(int index);
-  inline void set_row_names(int index, const ::std::string& value);
-  inline void set_row_names(int index, const char* value);
-  inline void set_row_names(int index, const char* value, size_t size);
-  inline ::std::string* add_row_names();
-  inline void add_row_names(const ::std::string& value);
-  inline void add_row_names(const char* value);
-  inline void add_row_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& row_names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_row_names();
+  // required string newName = 4;
+  inline bool has_newname() const;
+  inline void clear_newname();
+  static const int kNewNameFieldNumber = 4;
+  inline const ::std::string& newname() const;
+  inline void set_newname(const ::std::string& value);
+  inline void set_newname(const char* value);
+  inline void set_newname(const char* value, size_t size);
+  inline ::std::string* mutable_newname();
+  inline ::std::string* release_newname();
+  inline void set_allocated_newname(::std::string* newname);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridColumnsArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetSeriesNameArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_location();
-  inline void clear_has_location();
-  inline void set_has_length();
-  inline void clear_has_length();
-  inline void set_has_removed_all_columns();
-  inline void clear_has_removed_all_columns();
+  inline void set_has_seriesindex();
+  inline void clear_has_seriesindex();
+  inline void set_has_oldname();
+  inline void clear_has_oldname();
+  inline void set_has_newname();
+  inline void clear_has_newname();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 location_;
-  ::google::protobuf::uint32 length_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> names_;
-  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow > value_row_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> row_names_;
-  bool removed_all_columns_;
+  ::std::string* oldname_;
+  ::std::string* newname_;
+  ::google::protobuf::uint32 seriesindex_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandDeleteGridColumnsArchive* default_instance_;
+  static CommandSetSeriesNameArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetPreviewLocArchive : public ::google::protobuf::Message {
+class CommandSetCategoryNameArchive : public ::google::protobuf::Message {
  public:
-  CommandSetPreviewLocArchive();
-  virtual ~CommandSetPreviewLocArchive();
+  CommandSetCategoryNameArchive();
+  virtual ~CommandSetCategoryNameArchive();
 
-  CommandSetPreviewLocArchive(const CommandSetPreviewLocArchive& from);
+  CommandSetCategoryNameArchive(const CommandSetCategoryNameArchive& from);
 
-  inline CommandSetPreviewLocArchive& operator=(const CommandSetPreviewLocArchive& from) {
+  inline CommandSetCategoryNameArchive& operator=(const CommandSetCategoryNameArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -1910,17 +1780,17 @@ class CommandSetPreviewLocArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetPreviewLocArchive& default_instance();
+  static const CommandSetCategoryNameArchive& default_instance();
 
-  void Swap(CommandSetPreviewLocArchive* other);
+  void Swap(CommandSetCategoryNameArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetPreviewLocArchive* New() const;
+  CommandSetCategoryNameArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetPreviewLocArchive& from);
-  void MergeFrom(const CommandSetPreviewLocArchive& from);
+  void CopyFrom(const CommandSetCategoryNameArchive& from);
+  void MergeFrom(const CommandSetCategoryNameArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -1952,59 +1822,85 @@ class CommandSetPreviewLocArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required .TSP.Point old_loc = 2;
-  inline bool has_old_loc() const;
-  inline void clear_old_loc();
-  static const int kOldLocFieldNumber = 2;
-  inline const ::TSP::Point& old_loc() const;
-  inline ::TSP::Point* mutable_old_loc();
-  inline ::TSP::Point* release_old_loc();
-  inline void set_allocated_old_loc(::TSP::Point* old_loc);
+  // required uint32 categoryIndex = 2;
+  inline bool has_categoryindex() const;
+  inline void clear_categoryindex();
+  static const int kCategoryIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 categoryindex() const;
+  inline void set_categoryindex(::google::protobuf::uint32 value);
 
-  // required .TSP.Point new_loc = 3;
-  inline bool has_new_loc() const;
-  inline void clear_new_loc();
-  static const int kNewLocFieldNumber = 3;
-  inline const ::TSP::Point& new_loc() const;
-  inline ::TSP::Point* mutable_new_loc();
-  inline ::TSP::Point* release_new_loc();
-  inline void set_allocated_new_loc(::TSP::Point* new_loc);
+  // required string oldName = 3;
+  inline bool has_oldname() const;
+  inline void clear_oldname();
+  static const int kOldNameFieldNumber = 3;
+  inline const ::std::string& oldname() const;
+  inline void set_oldname(const ::std::string& value);
+  inline void set_oldname(const char* value);
+  inline void set_oldname(const char* value, size_t size);
+  inline ::std::string* mutable_oldname();
+  inline ::std::string* release_oldname();
+  inline void set_allocated_oldname(::std::string* oldname);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetPreviewLocArchive)
+  // required string newName = 4;
+  inline bool has_newname() const;
+  inline void clear_newname();
+  static const int kNewNameFieldNumber = 4;
+  inline const ::std::string& newname() const;
+  inline void set_newname(const ::std::string& value);
+  inline void set_newname(const char* value);
+  inline void set_newname(const char* value, size_t size);
+  inline ::std::string* mutable_newname();
+  inline ::std::string* release_newname();
+  inline void set_allocated_newname(::std::string* newname);
+
+  // optional bool isMultiDataIndex = 5;
+  inline bool has_ismultidataindex() const;
+  inline void clear_ismultidataindex();
+  static const int kIsMultiDataIndexFieldNumber = 5;
+  inline bool ismultidataindex() const;
+  inline void set_ismultidataindex(bool value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetCategoryNameArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_old_loc();
-  inline void clear_has_old_loc();
-  inline void set_has_new_loc();
-  inline void clear_has_new_loc();
+  inline void set_has_categoryindex();
+  inline void clear_has_categoryindex();
+  inline void set_has_oldname();
+  inline void clear_has_oldname();
+  inline void set_has_newname();
+  inline void clear_has_newname();
+  inline void set_has_ismultidataindex();
+  inline void clear_has_ismultidataindex();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::TSP::Point* old_loc_;
-  ::TSP::Point* new_loc_;
+  ::std::string* oldname_;
+  ::google::protobuf::uint32 categoryindex_;
+  bool ismultidataindex_;
+  ::std::string* newname_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetPreviewLocArchive* default_instance_;
+  static CommandSetCategoryNameArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetGridValueArchive : public ::google::protobuf::Message {
+class CommandAddGridRowsArchive : public ::google::protobuf::Message {
  public:
-  CommandSetGridValueArchive();
-  virtual ~CommandSetGridValueArchive();
+  CommandAddGridRowsArchive();
+  virtual ~CommandAddGridRowsArchive();
 
-  CommandSetGridValueArchive(const CommandSetGridValueArchive& from);
+  CommandAddGridRowsArchive(const CommandAddGridRowsArchive& from);
 
-  inline CommandSetGridValueArchive& operator=(const CommandSetGridValueArchive& from) {
+  inline CommandAddGridRowsArchive& operator=(const CommandAddGridRowsArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2018,17 +1914,17 @@ class CommandSetGridValueArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetGridValueArchive& default_instance();
+  static const CommandAddGridRowsArchive& default_instance();
 
-  void Swap(CommandSetGridValueArchive* other);
+  void Swap(CommandAddGridRowsArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetGridValueArchive* New() const;
+  CommandAddGridRowsArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetGridValueArchive& from);
-  void MergeFrom(const CommandSetGridValueArchive& from);
+  void CopyFrom(const CommandAddGridRowsArchive& from);
+  void MergeFrom(const CommandAddGridRowsArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2060,54 +1956,68 @@ class CommandSetGridValueArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 rowindex = 2;
-  inline bool has_rowindex() const;
-  inline void clear_rowindex();
-  static const int kRowindexFieldNumber = 2;
-  inline ::google::protobuf::uint32 rowindex() const;
-  inline void set_rowindex(::google::protobuf::uint32 value);
+  // required uint32 location = 2;
+  inline bool has_location() const;
+  inline void clear_location();
+  static const int kLocationFieldNumber = 2;
+  inline ::google::protobuf::uint32 location() const;
+  inline void set_location(::google::protobuf::uint32 value);
 
-  // required uint32 columnindex = 3;
-  inline bool has_columnindex() const;
-  inline void clear_columnindex();
-  static const int kColumnindexFieldNumber = 3;
-  inline ::google::protobuf::uint32 columnindex() const;
-  inline void set_columnindex(::google::protobuf::uint32 value);
+  // optional uint32 length = 3;
+  inline bool has_length() const;
+  inline void clear_length();
+  static const int kLengthFieldNumber = 3;
+  inline ::google::protobuf::uint32 length() const;
+  inline void set_length(::google::protobuf::uint32 value);
 
-  // required double oldvalue = 4;
-  inline bool has_oldvalue() const;
-  inline void clear_oldvalue();
-  static const int kOldvalueFieldNumber = 4;
-  inline double oldvalue() const;
-  inline void set_oldvalue(double value);
+  // repeated string name = 4;
+  inline int name_size() const;
+  inline void clear_name();
+  static const int kNameFieldNumber = 4;
+  inline const ::std::string& name(int index) const;
+  inline ::std::string* mutable_name(int index);
+  inline void set_name(int index, const ::std::string& value);
+  inline void set_name(int index, const char* value);
+  inline void set_name(int index, const char* value, size_t size);
+  inline ::std::string* add_name();
+  inline void add_name(const ::std::string& value);
+  inline void add_name(const char* value);
+  inline void add_name(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& name() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_name();
 
-  // required double newvalue = 5;
-  inline bool has_newvalue() const;
-  inline void clear_newvalue();
-  static const int kNewvalueFieldNumber = 5;
-  inline double newvalue() const;
-  inline void set_newvalue(double value);
+  // repeated string ids = 5;
+  inline int ids_size() const;
+  inline void clear_ids();
+  static const int kIdsFieldNumber = 5;
+  inline const ::std::string& ids(int index) const;
+  inline ::std::string* mutable_ids(int index);
+  inline void set_ids(int index, const ::std::string& value);
+  inline void set_ids(int index, const char* value);
+  inline void set_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_ids();
+  inline void add_ids(const ::std::string& value);
+  inline void add_ids(const char* value);
+  inline void add_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_ids();
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetGridValueArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandAddGridRowsArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_rowindex();
-  inline void clear_has_rowindex();
-  inline void set_has_columnindex();
-  inline void clear_has_columnindex();
-  inline void set_has_oldvalue();
-  inline void clear_has_oldvalue();
-  inline void set_has_newvalue();
-  inline void clear_has_newvalue();
+  inline void set_has_location();
+  inline void clear_has_location();
+  inline void set_has_length();
+  inline void clear_has_length();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 rowindex_;
-  ::google::protobuf::uint32 columnindex_;
-  double oldvalue_;
-  double newvalue_;
+  ::google::protobuf::uint32 location_;
+  ::google::protobuf::uint32 length_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> name_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> ids_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
@@ -2117,18 +2027,18 @@ class CommandSetGridValueArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetGridValueArchive* default_instance_;
+  static CommandAddGridRowsArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetGridDirectionArchive : public ::google::protobuf::Message {
+class CommandAddGridColumnsArchive : public ::google::protobuf::Message {
  public:
-  CommandSetGridDirectionArchive();
-  virtual ~CommandSetGridDirectionArchive();
+  CommandAddGridColumnsArchive();
+  virtual ~CommandAddGridColumnsArchive();
 
-  CommandSetGridDirectionArchive(const CommandSetGridDirectionArchive& from);
+  CommandAddGridColumnsArchive(const CommandAddGridColumnsArchive& from);
 
-  inline CommandSetGridDirectionArchive& operator=(const CommandSetGridDirectionArchive& from) {
+  inline CommandAddGridColumnsArchive& operator=(const CommandAddGridColumnsArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2142,17 +2052,17 @@ class CommandSetGridDirectionArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetGridDirectionArchive& default_instance();
+  static const CommandAddGridColumnsArchive& default_instance();
 
-  void Swap(CommandSetGridDirectionArchive* other);
+  void Swap(CommandAddGridColumnsArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetGridDirectionArchive* New() const;
+  CommandAddGridColumnsArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetGridDirectionArchive& from);
-  void MergeFrom(const CommandSetGridDirectionArchive& from);
+  void CopyFrom(const CommandAddGridColumnsArchive& from);
+  void MergeFrom(const CommandAddGridColumnsArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2184,55 +2094,89 @@ class CommandSetGridDirectionArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 old_direction = 2;
-  inline bool has_old_direction() const;
-  inline void clear_old_direction();
-  static const int kOldDirectionFieldNumber = 2;
-  inline ::google::protobuf::uint32 old_direction() const;
-  inline void set_old_direction(::google::protobuf::uint32 value);
+  // required uint32 location = 2;
+  inline bool has_location() const;
+  inline void clear_location();
+  static const int kLocationFieldNumber = 2;
+  inline ::google::protobuf::uint32 location() const;
+  inline void set_location(::google::protobuf::uint32 value);
 
-  // required uint32 new_direction = 3;
-  inline bool has_new_direction() const;
-  inline void clear_new_direction();
-  static const int kNewDirectionFieldNumber = 3;
-  inline ::google::protobuf::uint32 new_direction() const;
-  inline void set_new_direction(::google::protobuf::uint32 value);
+  // optional uint32 length = 3;
+  inline bool has_length() const;
+  inline void clear_length();
+  static const int kLengthFieldNumber = 3;
+  inline ::google::protobuf::uint32 length() const;
+  inline void set_length(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetGridDirectionArchive)
+  // repeated string name = 4;
+  inline int name_size() const;
+  inline void clear_name();
+  static const int kNameFieldNumber = 4;
+  inline const ::std::string& name(int index) const;
+  inline ::std::string* mutable_name(int index);
+  inline void set_name(int index, const ::std::string& value);
+  inline void set_name(int index, const char* value);
+  inline void set_name(int index, const char* value, size_t size);
+  inline ::std::string* add_name();
+  inline void add_name(const ::std::string& value);
+  inline void add_name(const char* value);
+  inline void add_name(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& name() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_name();
+
+  // repeated string ids = 5;
+  inline int ids_size() const;
+  inline void clear_ids();
+  static const int kIdsFieldNumber = 5;
+  inline const ::std::string& ids(int index) const;
+  inline ::std::string* mutable_ids(int index);
+  inline void set_ids(int index, const ::std::string& value);
+  inline void set_ids(int index, const char* value);
+  inline void set_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_ids();
+  inline void add_ids(const ::std::string& value);
+  inline void add_ids(const char* value);
+  inline void add_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_ids();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandAddGridColumnsArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_old_direction();
-  inline void clear_has_old_direction();
-  inline void set_has_new_direction();
-  inline void clear_has_new_direction();
+  inline void set_has_location();
+  inline void clear_has_location();
+  inline void set_has_length();
+  inline void clear_has_length();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 old_direction_;
-  ::google::protobuf::uint32 new_direction_;
+  ::google::protobuf::uint32 location_;
+  ::google::protobuf::uint32 length_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> name_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> ids_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetGridDirectionArchive* default_instance_;
+  static CommandAddGridColumnsArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetSeriesTypeArchive : public ::google::protobuf::Message {
+class CommandMoveGridRowsArchive : public ::google::protobuf::Message {
  public:
-  CommandSetSeriesTypeArchive();
-  virtual ~CommandSetSeriesTypeArchive();
+  CommandMoveGridRowsArchive();
+  virtual ~CommandMoveGridRowsArchive();
 
-  CommandSetSeriesTypeArchive(const CommandSetSeriesTypeArchive& from);
+  CommandMoveGridRowsArchive(const CommandMoveGridRowsArchive& from);
 
-  inline CommandSetSeriesTypeArchive& operator=(const CommandSetSeriesTypeArchive& from) {
+  inline CommandMoveGridRowsArchive& operator=(const CommandMoveGridRowsArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2246,17 +2190,17 @@ class CommandSetSeriesTypeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetSeriesTypeArchive& default_instance();
+  static const CommandMoveGridRowsArchive& default_instance();
 
-  void Swap(CommandSetSeriesTypeArchive* other);
+  void Swap(CommandMoveGridRowsArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetSeriesTypeArchive* New() const;
+  CommandMoveGridRowsArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetSeriesTypeArchive& from);
-  void MergeFrom(const CommandSetSeriesTypeArchive& from);
+  void CopyFrom(const CommandMoveGridRowsArchive& from);
+  void MergeFrom(const CommandMoveGridRowsArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2288,44 +2232,44 @@ class CommandSetSeriesTypeArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 seriesindex = 2;
-  inline bool has_seriesindex() const;
-  inline void clear_seriesindex();
-  static const int kSeriesindexFieldNumber = 2;
-  inline ::google::protobuf::uint32 seriesindex() const;
-  inline void set_seriesindex(::google::protobuf::uint32 value);
+  // required uint32 location = 2;
+  inline bool has_location() const;
+  inline void clear_location();
+  static const int kLocationFieldNumber = 2;
+  inline ::google::protobuf::uint32 location() const;
+  inline void set_location(::google::protobuf::uint32 value);
 
-  // required uint32 oldtype = 3;
-  inline bool has_oldtype() const;
-  inline void clear_oldtype();
-  static const int kOldtypeFieldNumber = 3;
-  inline ::google::protobuf::uint32 oldtype() const;
-  inline void set_oldtype(::google::protobuf::uint32 value);
+  // required uint32 length = 3;
+  inline bool has_length() const;
+  inline void clear_length();
+  static const int kLengthFieldNumber = 3;
+  inline ::google::protobuf::uint32 length() const;
+  inline void set_length(::google::protobuf::uint32 value);
 
-  // required uint32 newtype = 4;
-  inline bool has_newtype() const;
-  inline void clear_newtype();
-  static const int kNewtypeFieldNumber = 4;
-  inline ::google::protobuf::uint32 newtype() const;
-  inline void set_newtype(::google::protobuf::uint32 value);
+  // required int32 afterrow = 4;
+  inline bool has_afterrow() const;
+  inline void clear_afterrow();
+  static const int kAfterrowFieldNumber = 4;
+  inline ::google::protobuf::int32 afterrow() const;
+  inline void set_afterrow(::google::protobuf::int32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetSeriesTypeArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMoveGridRowsArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_seriesindex();
-  inline void clear_has_seriesindex();
-  inline void set_has_oldtype();
-  inline void clear_has_oldtype();
-  inline void set_has_newtype();
-  inline void clear_has_newtype();
+  inline void set_has_location();
+  inline void clear_has_location();
+  inline void set_has_length();
+  inline void clear_has_length();
+  inline void set_has_afterrow();
+  inline void clear_has_afterrow();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 seriesindex_;
-  ::google::protobuf::uint32 oldtype_;
-  ::google::protobuf::uint32 newtype_;
+  ::google::protobuf::uint32 location_;
+  ::google::protobuf::uint32 length_;
+  ::google::protobuf::int32 afterrow_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
@@ -2335,18 +2279,18 @@ class CommandSetSeriesTypeArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetSeriesTypeArchive* default_instance_;
+  static CommandMoveGridRowsArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetScatterFormatArchive : public ::google::protobuf::Message {
+class CommandMoveGridColumnsArchive : public ::google::protobuf::Message {
  public:
-  CommandSetScatterFormatArchive();
-  virtual ~CommandSetScatterFormatArchive();
+  CommandMoveGridColumnsArchive();
+  virtual ~CommandMoveGridColumnsArchive();
 
-  CommandSetScatterFormatArchive(const CommandSetScatterFormatArchive& from);
+  CommandMoveGridColumnsArchive(const CommandMoveGridColumnsArchive& from);
 
-  inline CommandSetScatterFormatArchive& operator=(const CommandSetScatterFormatArchive& from) {
+  inline CommandMoveGridColumnsArchive& operator=(const CommandMoveGridColumnsArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2360,17 +2304,17 @@ class CommandSetScatterFormatArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetScatterFormatArchive& default_instance();
+  static const CommandMoveGridColumnsArchive& default_instance();
 
-  void Swap(CommandSetScatterFormatArchive* other);
+  void Swap(CommandMoveGridColumnsArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetScatterFormatArchive* New() const;
+  CommandMoveGridColumnsArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetScatterFormatArchive& from);
-  void MergeFrom(const CommandSetScatterFormatArchive& from);
+  void CopyFrom(const CommandMoveGridColumnsArchive& from);
+  void MergeFrom(const CommandMoveGridColumnsArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2402,55 +2346,65 @@ class CommandSetScatterFormatArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 oldformat = 3;
-  inline bool has_oldformat() const;
-  inline void clear_oldformat();
-  static const int kOldformatFieldNumber = 3;
-  inline ::google::protobuf::uint32 oldformat() const;
-  inline void set_oldformat(::google::protobuf::uint32 value);
+  // required uint32 location = 2;
+  inline bool has_location() const;
+  inline void clear_location();
+  static const int kLocationFieldNumber = 2;
+  inline ::google::protobuf::uint32 location() const;
+  inline void set_location(::google::protobuf::uint32 value);
 
-  // required uint32 newformat = 4;
-  inline bool has_newformat() const;
-  inline void clear_newformat();
-  static const int kNewformatFieldNumber = 4;
-  inline ::google::protobuf::uint32 newformat() const;
-  inline void set_newformat(::google::protobuf::uint32 value);
+  // required uint32 length = 3;
+  inline bool has_length() const;
+  inline void clear_length();
+  static const int kLengthFieldNumber = 3;
+  inline ::google::protobuf::uint32 length() const;
+  inline void set_length(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetScatterFormatArchive)
+  // required int32 aftercolumn = 4;
+  inline bool has_aftercolumn() const;
+  inline void clear_aftercolumn();
+  static const int kAftercolumnFieldNumber = 4;
+  inline ::google::protobuf::int32 aftercolumn() const;
+  inline void set_aftercolumn(::google::protobuf::int32 value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandMoveGridColumnsArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_oldformat();
-  inline void clear_has_oldformat();
-  inline void set_has_newformat();
-  inline void clear_has_newformat();
+  inline void set_has_location();
+  inline void clear_has_location();
+  inline void set_has_length();
+  inline void clear_has_length();
+  inline void set_has_aftercolumn();
+  inline void clear_has_aftercolumn();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 oldformat_;
-  ::google::protobuf::uint32 newformat_;
+  ::google::protobuf::uint32 location_;
+  ::google::protobuf::uint32 length_;
+  ::google::protobuf::int32 aftercolumn_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetScatterFormatArchive* default_instance_;
+  static CommandMoveGridColumnsArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetMultiDataSetIndexArchive : public ::google::protobuf::Message {
+class CommandDeleteGridRowsArchive_ValueRow : public ::google::protobuf::Message {
  public:
-  CommandSetMultiDataSetIndexArchive();
-  virtual ~CommandSetMultiDataSetIndexArchive();
+  CommandDeleteGridRowsArchive_ValueRow();
+  virtual ~CommandDeleteGridRowsArchive_ValueRow();
 
-  CommandSetMultiDataSetIndexArchive(const CommandSetMultiDataSetIndexArchive& from);
+  CommandDeleteGridRowsArchive_ValueRow(const CommandDeleteGridRowsArchive_ValueRow& from);
 
-  inline CommandSetMultiDataSetIndexArchive& operator=(const CommandSetMultiDataSetIndexArchive& from) {
+  inline CommandDeleteGridRowsArchive_ValueRow& operator=(const CommandDeleteGridRowsArchive_ValueRow& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2464,17 +2418,17 @@ class CommandSetMultiDataSetIndexArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetMultiDataSetIndexArchive& default_instance();
+  static const CommandDeleteGridRowsArchive_ValueRow& default_instance();
 
-  void Swap(CommandSetMultiDataSetIndexArchive* other);
+  void Swap(CommandDeleteGridRowsArchive_ValueRow* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetMultiDataSetIndexArchive* New() const;
+  CommandDeleteGridRowsArchive_ValueRow* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetMultiDataSetIndexArchive& from);
-  void MergeFrom(const CommandSetMultiDataSetIndexArchive& from);
+  void CopyFrom(const CommandDeleteGridRowsArchive_ValueRow& from);
+  void MergeFrom(const CommandDeleteGridRowsArchive_ValueRow& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2497,64 +2451,45 @@ class CommandSetMultiDataSetIndexArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // required uint32 oldindex = 2;
-  inline bool has_oldindex() const;
-  inline void clear_oldindex();
-  static const int kOldindexFieldNumber = 2;
-  inline ::google::protobuf::uint32 oldindex() const;
-  inline void set_oldindex(::google::protobuf::uint32 value);
-
-  // required uint32 newindex = 3;
-  inline bool has_newindex() const;
-  inline void clear_newindex();
-  static const int kNewindexFieldNumber = 3;
-  inline ::google::protobuf::uint32 newindex() const;
-  inline void set_newindex(::google::protobuf::uint32 value);
+  // repeated double value = 5;
+  inline int value_size() const;
+  inline void clear_value();
+  static const int kValueFieldNumber = 5;
+  inline double value(int index) const;
+  inline void set_value(int index, double value);
+  inline void add_value(double value);
+  inline const ::google::protobuf::RepeatedField< double >&
+      value() const;
+  inline ::google::protobuf::RepeatedField< double >*
+      mutable_value();
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetMultiDataSetIndexArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridRowsArchive.ValueRow)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_oldindex();
-  inline void clear_has_oldindex();
-  inline void set_has_newindex();
-  inline void clear_has_newindex();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 oldindex_;
-  ::google::protobuf::uint32 newindex_;
+  ::google::protobuf::RepeatedField< double > value_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetMultiDataSetIndexArchive* default_instance_;
+  static CommandDeleteGridRowsArchive_ValueRow* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetLegendFrameArchive : public ::google::protobuf::Message {
+class CommandDeleteGridRowsArchive : public ::google::protobuf::Message {
  public:
-  CommandSetLegendFrameArchive();
-  virtual ~CommandSetLegendFrameArchive();
+  CommandDeleteGridRowsArchive();
+  virtual ~CommandDeleteGridRowsArchive();
 
-  CommandSetLegendFrameArchive(const CommandSetLegendFrameArchive& from);
+  CommandDeleteGridRowsArchive(const CommandDeleteGridRowsArchive& from);
 
-  inline CommandSetLegendFrameArchive& operator=(const CommandSetLegendFrameArchive& from) {
+  inline CommandDeleteGridRowsArchive& operator=(const CommandDeleteGridRowsArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2568,17 +2503,17 @@ class CommandSetLegendFrameArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetLegendFrameArchive& default_instance();
+  static const CommandDeleteGridRowsArchive& default_instance();
 
-  void Swap(CommandSetLegendFrameArchive* other);
+  void Swap(CommandDeleteGridRowsArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetLegendFrameArchive* New() const;
+  CommandDeleteGridRowsArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetLegendFrameArchive& from);
-  void MergeFrom(const CommandSetLegendFrameArchive& from);
+  void CopyFrom(const CommandDeleteGridRowsArchive& from);
+  void MergeFrom(const CommandDeleteGridRowsArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2599,6 +2534,8 @@ class CommandSetLegendFrameArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef CommandDeleteGridRowsArchive_ValueRow ValueRow;
+
   // accessors -------------------------------------------------------
 
   // required .TSCH.ChartCommandArchive super = 1;
@@ -2610,59 +2547,156 @@ class CommandSetLegendFrameArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required .TSCH.RectArchive old_legend_frame = 2;
-  inline bool has_old_legend_frame() const;
-  inline void clear_old_legend_frame();
-  static const int kOldLegendFrameFieldNumber = 2;
-  inline const ::TSCH::RectArchive& old_legend_frame() const;
-  inline ::TSCH::RectArchive* mutable_old_legend_frame();
-  inline ::TSCH::RectArchive* release_old_legend_frame();
-  inline void set_allocated_old_legend_frame(::TSCH::RectArchive* old_legend_frame);
+  // required uint32 location = 2;
+  inline bool has_location() const;
+  inline void clear_location();
+  static const int kLocationFieldNumber = 2;
+  inline ::google::protobuf::uint32 location() const;
+  inline void set_location(::google::protobuf::uint32 value);
 
-  // required .TSCH.RectArchive new_legend_frame = 3;
-  inline bool has_new_legend_frame() const;
-  inline void clear_new_legend_frame();
-  static const int kNewLegendFrameFieldNumber = 3;
-  inline const ::TSCH::RectArchive& new_legend_frame() const;
-  inline ::TSCH::RectArchive* mutable_new_legend_frame();
-  inline ::TSCH::RectArchive* release_new_legend_frame();
-  inline void set_allocated_new_legend_frame(::TSCH::RectArchive* new_legend_frame);
+  // required uint32 length = 3;
+  inline bool has_length() const;
+  inline void clear_length();
+  static const int kLengthFieldNumber = 3;
+  inline ::google::protobuf::uint32 length() const;
+  inline void set_length(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetLegendFrameArchive)
+  // repeated string names = 4;
+  inline int names_size() const;
+  inline void clear_names();
+  static const int kNamesFieldNumber = 4;
+  inline const ::std::string& names(int index) const;
+  inline ::std::string* mutable_names(int index);
+  inline void set_names(int index, const ::std::string& value);
+  inline void set_names(int index, const char* value);
+  inline void set_names(int index, const char* value, size_t size);
+  inline ::std::string* add_names();
+  inline void add_names(const ::std::string& value);
+  inline void add_names(const char* value);
+  inline void add_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_names();
+
+  // repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
+  inline int value_row_size() const;
+  inline void clear_value_row();
+  static const int kValueRowFieldNumber = 6;
+  inline const ::TSCH::CommandDeleteGridRowsArchive_ValueRow& value_row(int index) const;
+  inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* mutable_value_row(int index);
+  inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* add_value_row();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >&
+      value_row() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >*
+      mutable_value_row();
+
+  // optional bool removed_all_rows = 7;
+  inline bool has_removed_all_rows() const;
+  inline void clear_removed_all_rows();
+  static const int kRemovedAllRowsFieldNumber = 7;
+  inline bool removed_all_rows() const;
+  inline void set_removed_all_rows(bool value);
+
+  // repeated string column_names = 8;
+  inline int column_names_size() const;
+  inline void clear_column_names();
+  static const int kColumnNamesFieldNumber = 8;
+  inline const ::std::string& column_names(int index) const;
+  inline ::std::string* mutable_column_names(int index);
+  inline void set_column_names(int index, const ::std::string& value);
+  inline void set_column_names(int index, const char* value);
+  inline void set_column_names(int index, const char* value, size_t size);
+  inline ::std::string* add_column_names();
+  inline void add_column_names(const ::std::string& value);
+  inline void add_column_names(const char* value);
+  inline void add_column_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& column_names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_column_names();
+
+  // repeated string row_ids = 9;
+  inline int row_ids_size() const;
+  inline void clear_row_ids();
+  static const int kRowIdsFieldNumber = 9;
+  inline const ::std::string& row_ids(int index) const;
+  inline ::std::string* mutable_row_ids(int index);
+  inline void set_row_ids(int index, const ::std::string& value);
+  inline void set_row_ids(int index, const char* value);
+  inline void set_row_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_row_ids();
+  inline void add_row_ids(const ::std::string& value);
+  inline void add_row_ids(const char* value);
+  inline void add_row_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& row_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_row_ids();
+
+  // repeated string column_ids = 10;
+  inline int column_ids_size() const;
+  inline void clear_column_ids();
+  static const int kColumnIdsFieldNumber = 10;
+  inline const ::std::string& column_ids(int index) const;
+  inline ::std::string* mutable_column_ids(int index);
+  inline void set_column_ids(int index, const ::std::string& value);
+  inline void set_column_ids(int index, const char* value);
+  inline void set_column_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_column_ids();
+  inline void add_column_ids(const ::std::string& value);
+  inline void add_column_ids(const char* value);
+  inline void add_column_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& column_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_column_ids();
+
+  // required bool add_dummy_data_on_delete_all = 11;
+  inline bool has_add_dummy_data_on_delete_all() const;
+  inline void clear_add_dummy_data_on_delete_all();
+  static const int kAddDummyDataOnDeleteAllFieldNumber = 11;
+  inline bool add_dummy_data_on_delete_all() const;
+  inline void set_add_dummy_data_on_delete_all(bool value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridRowsArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_old_legend_frame();
-  inline void clear_has_old_legend_frame();
-  inline void set_has_new_legend_frame();
-  inline void clear_has_new_legend_frame();
+  inline void set_has_location();
+  inline void clear_has_location();
+  inline void set_has_length();
+  inline void clear_has_length();
+  inline void set_has_removed_all_rows();
+  inline void clear_has_removed_all_rows();
+  inline void set_has_add_dummy_data_on_delete_all();
+  inline void clear_has_add_dummy_data_on_delete_all();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::TSCH::RectArchive* old_legend_frame_;
-  ::TSCH::RectArchive* new_legend_frame_;
+  ::google::protobuf::uint32 location_;
+  ::google::protobuf::uint32 length_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> names_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow > value_row_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> column_names_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> row_ids_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> column_ids_;
+  bool removed_all_rows_;
+  bool add_dummy_data_on_delete_all_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(10 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetLegendFrameArchive* default_instance_;
+  static CommandDeleteGridRowsArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetPieWedgeExplosion : public ::google::protobuf::Message {
+class CommandDeleteGridColumnsArchive_ValueRow : public ::google::protobuf::Message {
  public:
-  CommandSetPieWedgeExplosion();
-  virtual ~CommandSetPieWedgeExplosion();
+  CommandDeleteGridColumnsArchive_ValueRow();
+  virtual ~CommandDeleteGridColumnsArchive_ValueRow();
 
-  CommandSetPieWedgeExplosion(const CommandSetPieWedgeExplosion& from);
+  CommandDeleteGridColumnsArchive_ValueRow(const CommandDeleteGridColumnsArchive_ValueRow& from);
 
-  inline CommandSetPieWedgeExplosion& operator=(const CommandSetPieWedgeExplosion& from) {
+  inline CommandDeleteGridColumnsArchive_ValueRow& operator=(const CommandDeleteGridColumnsArchive_ValueRow& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2676,17 +2710,17 @@ class CommandSetPieWedgeExplosion : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetPieWedgeExplosion& default_instance();
+  static const CommandDeleteGridColumnsArchive_ValueRow& default_instance();
 
-  void Swap(CommandSetPieWedgeExplosion* other);
+  void Swap(CommandDeleteGridColumnsArchive_ValueRow* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetPieWedgeExplosion* New() const;
+  CommandDeleteGridColumnsArchive_ValueRow* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetPieWedgeExplosion& from);
-  void MergeFrom(const CommandSetPieWedgeExplosion& from);
+  void CopyFrom(const CommandDeleteGridColumnsArchive_ValueRow& from);
+  void MergeFrom(const CommandDeleteGridColumnsArchive_ValueRow& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2709,80 +2743,45 @@ class CommandSetPieWedgeExplosion : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSCH.ChartCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSCH::ChartCommandArchive& super() const;
-  inline ::TSCH::ChartCommandArchive* mutable_super();
-  inline ::TSCH::ChartCommandArchive* release_super();
-  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
-
-  // optional .TSP.Reference info_geometry_command = 2;
-  inline bool has_info_geometry_command() const;
-  inline void clear_info_geometry_command();
-  static const int kInfoGeometryCommandFieldNumber = 2;
-  inline const ::TSP::Reference& info_geometry_command() const;
-  inline ::TSP::Reference* mutable_info_geometry_command();
-  inline ::TSP::Reference* release_info_geometry_command();
-  inline void set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command);
-
-  // optional .TSP.Reference style_mutation_command = 3;
-  inline bool has_style_mutation_command() const;
-  inline void clear_style_mutation_command();
-  static const int kStyleMutationCommandFieldNumber = 3;
-  inline const ::TSP::Reference& style_mutation_command() const;
-  inline ::TSP::Reference* mutable_style_mutation_command();
-  inline ::TSP::Reference* release_style_mutation_command();
-  inline void set_allocated_style_mutation_command(::TSP::Reference* style_mutation_command);
-
-  // optional .TSP.Reference anchor_attachment_command = 4;
-  inline bool has_anchor_attachment_command() const;
-  inline void clear_anchor_attachment_command();
-  static const int kAnchorAttachmentCommandFieldNumber = 4;
-  inline const ::TSP::Reference& anchor_attachment_command() const;
-  inline ::TSP::Reference* mutable_anchor_attachment_command();
-  inline ::TSP::Reference* release_anchor_attachment_command();
-  inline void set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command);
+  // repeated double value = 5;
+  inline int value_size() const;
+  inline void clear_value();
+  static const int kValueFieldNumber = 5;
+  inline double value(int index) const;
+  inline void set_value(int index, double value);
+  inline void add_value(double value);
+  inline const ::google::protobuf::RepeatedField< double >&
+      value() const;
+  inline ::google::protobuf::RepeatedField< double >*
+      mutable_value();
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandSetPieWedgeExplosion)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridColumnsArchive.ValueRow)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_info_geometry_command();
-  inline void clear_has_info_geometry_command();
-  inline void set_has_style_mutation_command();
-  inline void clear_has_style_mutation_command();
-  inline void set_has_anchor_attachment_command();
-  inline void clear_has_anchor_attachment_command();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCH::ChartCommandArchive* super_;
-  ::TSP::Reference* info_geometry_command_;
-  ::TSP::Reference* style_mutation_command_;
-  ::TSP::Reference* anchor_attachment_command_;
+  ::google::protobuf::RepeatedField< double > value_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetPieWedgeExplosion* default_instance_;
+  static CommandDeleteGridColumnsArchive_ValueRow* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class SynchronousCommandArchive : public ::google::protobuf::Message {
+class CommandDeleteGridColumnsArchive : public ::google::protobuf::Message {
  public:
-  SynchronousCommandArchive();
-  virtual ~SynchronousCommandArchive();
+  CommandDeleteGridColumnsArchive();
+  virtual ~CommandDeleteGridColumnsArchive();
 
-  SynchronousCommandArchive(const SynchronousCommandArchive& from);
+  CommandDeleteGridColumnsArchive(const CommandDeleteGridColumnsArchive& from);
 
-  inline SynchronousCommandArchive& operator=(const SynchronousCommandArchive& from) {
+  inline CommandDeleteGridColumnsArchive& operator=(const CommandDeleteGridColumnsArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2796,17 +2795,17 @@ class SynchronousCommandArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const SynchronousCommandArchive& default_instance();
+  static const CommandDeleteGridColumnsArchive& default_instance();
 
-  void Swap(SynchronousCommandArchive* other);
+  void Swap(CommandDeleteGridColumnsArchive* other);
 
   // implements Message ----------------------------------------------
 
-  SynchronousCommandArchive* New() const;
+  CommandDeleteGridColumnsArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const SynchronousCommandArchive& from);
-  void MergeFrom(const SynchronousCommandArchive& from);
+  void CopyFrom(const CommandDeleteGridColumnsArchive& from);
+  void MergeFrom(const CommandDeleteGridColumnsArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2827,58 +2826,169 @@ class SynchronousCommandArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef CommandDeleteGridColumnsArchive_ValueRow ValueRow;
+
   // accessors -------------------------------------------------------
 
-  // required .TSK.CommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSK::CommandArchive& super() const;
-  inline ::TSK::CommandArchive* mutable_super();
-  inline ::TSK::CommandArchive* release_super();
-  inline void set_allocated_super(::TSK::CommandArchive* super);
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required .TSP.Reference command = 2;
-  inline bool has_command() const;
-  inline void clear_command();
-  static const int kCommandFieldNumber = 2;
-  inline const ::TSP::Reference& command() const;
-  inline ::TSP::Reference* mutable_command();
-  inline ::TSP::Reference* release_command();
-  inline void set_allocated_command(::TSP::Reference* command);
+  // required uint32 location = 2;
+  inline bool has_location() const;
+  inline void clear_location();
+  static const int kLocationFieldNumber = 2;
+  inline ::google::protobuf::uint32 location() const;
+  inline void set_location(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.SynchronousCommandArchive)
- private:
+  // required uint32 length = 3;
+  inline bool has_length() const;
+  inline void clear_length();
+  static const int kLengthFieldNumber = 3;
+  inline ::google::protobuf::uint32 length() const;
+  inline void set_length(::google::protobuf::uint32 value);
+
+  // repeated string names = 4;
+  inline int names_size() const;
+  inline void clear_names();
+  static const int kNamesFieldNumber = 4;
+  inline const ::std::string& names(int index) const;
+  inline ::std::string* mutable_names(int index);
+  inline void set_names(int index, const ::std::string& value);
+  inline void set_names(int index, const char* value);
+  inline void set_names(int index, const char* value, size_t size);
+  inline ::std::string* add_names();
+  inline void add_names(const ::std::string& value);
+  inline void add_names(const char* value);
+  inline void add_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_names();
+
+  // repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
+  inline int value_row_size() const;
+  inline void clear_value_row();
+  static const int kValueRowFieldNumber = 6;
+  inline const ::TSCH::CommandDeleteGridColumnsArchive_ValueRow& value_row(int index) const;
+  inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* mutable_value_row(int index);
+  inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* add_value_row();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >&
+      value_row() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >*
+      mutable_value_row();
+
+  // optional bool removed_all_columns = 7;
+  inline bool has_removed_all_columns() const;
+  inline void clear_removed_all_columns();
+  static const int kRemovedAllColumnsFieldNumber = 7;
+  inline bool removed_all_columns() const;
+  inline void set_removed_all_columns(bool value);
+
+  // repeated string row_names = 8;
+  inline int row_names_size() const;
+  inline void clear_row_names();
+  static const int kRowNamesFieldNumber = 8;
+  inline const ::std::string& row_names(int index) const;
+  inline ::std::string* mutable_row_names(int index);
+  inline void set_row_names(int index, const ::std::string& value);
+  inline void set_row_names(int index, const char* value);
+  inline void set_row_names(int index, const char* value, size_t size);
+  inline ::std::string* add_row_names();
+  inline void add_row_names(const ::std::string& value);
+  inline void add_row_names(const char* value);
+  inline void add_row_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& row_names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_row_names();
+
+  // repeated string row_ids = 9;
+  inline int row_ids_size() const;
+  inline void clear_row_ids();
+  static const int kRowIdsFieldNumber = 9;
+  inline const ::std::string& row_ids(int index) const;
+  inline ::std::string* mutable_row_ids(int index);
+  inline void set_row_ids(int index, const ::std::string& value);
+  inline void set_row_ids(int index, const char* value);
+  inline void set_row_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_row_ids();
+  inline void add_row_ids(const ::std::string& value);
+  inline void add_row_ids(const char* value);
+  inline void add_row_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& row_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_row_ids();
+
+  // repeated string column_ids = 10;
+  inline int column_ids_size() const;
+  inline void clear_column_ids();
+  static const int kColumnIdsFieldNumber = 10;
+  inline const ::std::string& column_ids(int index) const;
+  inline ::std::string* mutable_column_ids(int index);
+  inline void set_column_ids(int index, const ::std::string& value);
+  inline void set_column_ids(int index, const char* value);
+  inline void set_column_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_column_ids();
+  inline void add_column_ids(const ::std::string& value);
+  inline void add_column_ids(const char* value);
+  inline void add_column_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& column_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_column_ids();
+
+  // required bool add_dummy_data_on_delete_all = 11;
+  inline bool has_add_dummy_data_on_delete_all() const;
+  inline void clear_add_dummy_data_on_delete_all();
+  static const int kAddDummyDataOnDeleteAllFieldNumber = 11;
+  inline bool add_dummy_data_on_delete_all() const;
+  inline void set_add_dummy_data_on_delete_all(bool value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandDeleteGridColumnsArchive)
+ private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_command();
-  inline void clear_has_command();
+  inline void set_has_location();
+  inline void clear_has_location();
+  inline void set_has_length();
+  inline void clear_has_length();
+  inline void set_has_removed_all_columns();
+  inline void clear_has_removed_all_columns();
+  inline void set_has_add_dummy_data_on_delete_all();
+  inline void clear_has_add_dummy_data_on_delete_all();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSK::CommandArchive* super_;
-  ::TSP::Reference* command_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::google::protobuf::uint32 location_;
+  ::google::protobuf::uint32 length_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> names_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow > value_row_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> row_names_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> row_ids_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> column_ids_;
+  bool removed_all_columns_;
+  bool add_dummy_data_on_delete_all_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(10 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static SynchronousCommandArchive* default_instance_;
+  static CommandDeleteGridColumnsArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandReplaceAllArchive : public ::google::protobuf::Message {
+class CommandSetPreviewLocArchive : public ::google::protobuf::Message {
  public:
-  CommandReplaceAllArchive();
-  virtual ~CommandReplaceAllArchive();
+  CommandSetPreviewLocArchive();
+  virtual ~CommandSetPreviewLocArchive();
 
-  CommandReplaceAllArchive(const CommandReplaceAllArchive& from);
+  CommandSetPreviewLocArchive(const CommandSetPreviewLocArchive& from);
 
-  inline CommandReplaceAllArchive& operator=(const CommandReplaceAllArchive& from) {
+  inline CommandSetPreviewLocArchive& operator=(const CommandSetPreviewLocArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -2892,17 +3002,17 @@ class CommandReplaceAllArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandReplaceAllArchive& default_instance();
+  static const CommandSetPreviewLocArchive& default_instance();
 
-  void Swap(CommandReplaceAllArchive* other);
+  void Swap(CommandSetPreviewLocArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandReplaceAllArchive* New() const;
+  CommandSetPreviewLocArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandReplaceAllArchive& from);
-  void MergeFrom(const CommandReplaceAllArchive& from);
+  void CopyFrom(const CommandSetPreviewLocArchive& from);
+  void MergeFrom(const CommandSetPreviewLocArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -2925,48 +3035,47 @@ class CommandReplaceAllArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSK.ReplaceAllChildCommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSK::ReplaceAllChildCommandArchive& super() const;
-  inline ::TSK::ReplaceAllChildCommandArchive* mutable_super();
-  inline ::TSK::ReplaceAllChildCommandArchive* release_super();
-  inline void set_allocated_super(::TSK::ReplaceAllChildCommandArchive* super);
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required .TSP.Reference info = 2;
-  inline bool has_info() const;
-  inline void clear_info();
-  static const int kInfoFieldNumber = 2;
-  inline const ::TSP::Reference& info() const;
-  inline ::TSP::Reference* mutable_info();
-  inline ::TSP::Reference* release_info();
-  inline void set_allocated_info(::TSP::Reference* info);
+  // required .TSP.Point old_loc = 2;
+  inline bool has_old_loc() const;
+  inline void clear_old_loc();
+  static const int kOldLocFieldNumber = 2;
+  inline const ::TSP::Point& old_loc() const;
+  inline ::TSP::Point* mutable_old_loc();
+  inline ::TSP::Point* release_old_loc();
+  inline void set_allocated_old_loc(::TSP::Point* old_loc);
 
-  // repeated .TSP.Reference commands = 3;
-  inline int commands_size() const;
-  inline void clear_commands();
-  static const int kCommandsFieldNumber = 3;
-  inline const ::TSP::Reference& commands(int index) const;
-  inline ::TSP::Reference* mutable_commands(int index);
-  inline ::TSP::Reference* add_commands();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
-      commands() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
-      mutable_commands();
+  // required .TSP.Point new_loc = 3;
+  inline bool has_new_loc() const;
+  inline void clear_new_loc();
+  static const int kNewLocFieldNumber = 3;
+  inline const ::TSP::Point& new_loc() const;
+  inline ::TSP::Point* mutable_new_loc();
+  inline ::TSP::Point* release_new_loc();
+  inline void set_allocated_new_loc(::TSP::Point* new_loc);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceAllArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetPreviewLocArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_info();
-  inline void clear_has_info();
+  inline void set_has_old_loc();
+  inline void clear_has_old_loc();
+  inline void set_has_new_loc();
+  inline void clear_has_new_loc();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSK::ReplaceAllChildCommandArchive* super_;
-  ::TSP::Reference* info_;
-  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > commands_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Point* old_loc_;
+  ::TSP::Point* new_loc_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -2976,18 +3085,18 @@ class CommandReplaceAllArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandReplaceAllArchive* default_instance_;
+  static CommandSetPreviewLocArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandChartApplyTheme : public ::google::protobuf::Message {
+class CommandSetGridValueArchive : public ::google::protobuf::Message {
  public:
-  CommandChartApplyTheme();
-  virtual ~CommandChartApplyTheme();
+  CommandSetGridValueArchive();
+  virtual ~CommandSetGridValueArchive();
 
-  CommandChartApplyTheme(const CommandChartApplyTheme& from);
+  CommandSetGridValueArchive(const CommandSetGridValueArchive& from);
 
-  inline CommandChartApplyTheme& operator=(const CommandChartApplyTheme& from) {
+  inline CommandSetGridValueArchive& operator=(const CommandSetGridValueArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3001,17 +3110,17 @@ class CommandChartApplyTheme : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandChartApplyTheme& default_instance();
+  static const CommandSetGridValueArchive& default_instance();
 
-  void Swap(CommandChartApplyTheme* other);
+  void Swap(CommandSetGridValueArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandChartApplyTheme* New() const;
+  CommandSetGridValueArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandChartApplyTheme& from);
-  void MergeFrom(const CommandChartApplyTheme& from);
+  void CopyFrom(const CommandSetGridValueArchive& from);
+  void MergeFrom(const CommandSetGridValueArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3034,80 +3143,84 @@ class CommandChartApplyTheme : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSS::ApplyThemeChildCommandArchive& super() const;
-  inline ::TSS::ApplyThemeChildCommandArchive* mutable_super();
-  inline ::TSS::ApplyThemeChildCommandArchive* release_super();
-  inline void set_allocated_super(::TSS::ApplyThemeChildCommandArchive* super);
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required .TSP.Reference info = 2;
-  inline bool has_info() const;
-  inline void clear_info();
-  static const int kInfoFieldNumber = 2;
-  inline const ::TSP::Reference& info() const;
-  inline ::TSP::Reference* mutable_info();
-  inline ::TSP::Reference* release_info();
-  inline void set_allocated_info(::TSP::Reference* info);
+  // required uint32 rowindex = 2;
+  inline bool has_rowindex() const;
+  inline void clear_rowindex();
+  static const int kRowindexFieldNumber = 2;
+  inline ::google::protobuf::uint32 rowindex() const;
+  inline void set_rowindex(::google::protobuf::uint32 value);
 
-  // optional .TSP.Reference swap_command = 3;
-  inline bool has_swap_command() const;
-  inline void clear_swap_command();
-  static const int kSwapCommandFieldNumber = 3;
-  inline const ::TSP::Reference& swap_command() const;
-  inline ::TSP::Reference* mutable_swap_command();
-  inline ::TSP::Reference* release_swap_command();
-  inline void set_allocated_swap_command(::TSP::Reference* swap_command);
+  // required uint32 columnindex = 3;
+  inline bool has_columnindex() const;
+  inline void clear_columnindex();
+  static const int kColumnindexFieldNumber = 3;
+  inline ::google::protobuf::uint32 columnindex() const;
+  inline void set_columnindex(::google::protobuf::uint32 value);
 
-  // optional .TSP.Reference preset = 4;
-  inline bool has_preset() const;
-  inline void clear_preset();
-  static const int kPresetFieldNumber = 4;
-  inline const ::TSP::Reference& preset() const;
-  inline ::TSP::Reference* mutable_preset();
-  inline ::TSP::Reference* release_preset();
-  inline void set_allocated_preset(::TSP::Reference* preset);
+  // required double oldvalue = 4;
+  inline bool has_oldvalue() const;
+  inline void clear_oldvalue();
+  static const int kOldvalueFieldNumber = 4;
+  inline double oldvalue() const;
+  inline void set_oldvalue(double value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandChartApplyTheme)
+  // required double newvalue = 5;
+  inline bool has_newvalue() const;
+  inline void clear_newvalue();
+  static const int kNewvalueFieldNumber = 5;
+  inline double newvalue() const;
+  inline void set_newvalue(double value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetGridValueArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_info();
-  inline void clear_has_info();
-  inline void set_has_swap_command();
-  inline void clear_has_swap_command();
-  inline void set_has_preset();
-  inline void clear_has_preset();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::TSS::ApplyThemeChildCommandArchive* super_;
-  ::TSP::Reference* info_;
-  ::TSP::Reference* swap_command_;
-  ::TSP::Reference* preset_;
+  inline void set_has_rowindex();
+  inline void clear_has_rowindex();
+  inline void set_has_columnindex();
+  inline void clear_has_columnindex();
+  inline void set_has_oldvalue();
+  inline void clear_has_oldvalue();
+  inline void set_has_newvalue();
+  inline void clear_has_newvalue();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::google::protobuf::uint32 rowindex_;
+  ::google::protobuf::uint32 columnindex_;
+  double oldvalue_;
+  double newvalue_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandChartApplyTheme* default_instance_;
+  static CommandSetGridValueArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandChartApplyPreset : public ::google::protobuf::Message {
+class CommandSetGridDirectionArchive : public ::google::protobuf::Message {
  public:
-  CommandChartApplyPreset();
-  virtual ~CommandChartApplyPreset();
+  CommandSetGridDirectionArchive();
+  virtual ~CommandSetGridDirectionArchive();
 
-  CommandChartApplyPreset(const CommandChartApplyPreset& from);
+  CommandSetGridDirectionArchive(const CommandSetGridDirectionArchive& from);
 
-  inline CommandChartApplyPreset& operator=(const CommandChartApplyPreset& from) {
+  inline CommandSetGridDirectionArchive& operator=(const CommandSetGridDirectionArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3121,17 +3234,17 @@ class CommandChartApplyPreset : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandChartApplyPreset& default_instance();
+  static const CommandSetGridDirectionArchive& default_instance();
 
-  void Swap(CommandChartApplyPreset* other);
+  void Swap(CommandSetGridDirectionArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandChartApplyPreset* New() const;
+  CommandSetGridDirectionArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandChartApplyPreset& from);
-  void MergeFrom(const CommandChartApplyPreset& from);
+  void CopyFrom(const CommandSetGridDirectionArchive& from);
+  void MergeFrom(const CommandSetGridDirectionArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3163,69 +3276,55 @@ class CommandChartApplyPreset : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // optional .TSP.Reference swap_command = 2;
-  inline bool has_swap_command() const;
-  inline void clear_swap_command();
-  static const int kSwapCommandFieldNumber = 2;
-  inline const ::TSP::Reference& swap_command() const;
-  inline ::TSP::Reference* mutable_swap_command();
-  inline ::TSP::Reference* release_swap_command();
-  inline void set_allocated_swap_command(::TSP::Reference* swap_command);
-
-  // optional .TSP.Reference preset = 3;
-  inline bool has_preset() const;
-  inline void clear_preset();
-  static const int kPresetFieldNumber = 3;
-  inline const ::TSP::Reference& preset() const;
-  inline ::TSP::Reference* mutable_preset();
-  inline ::TSP::Reference* release_preset();
-  inline void set_allocated_preset(::TSP::Reference* preset);
+  // required uint32 old_direction = 2;
+  inline bool has_old_direction() const;
+  inline void clear_old_direction();
+  static const int kOldDirectionFieldNumber = 2;
+  inline ::google::protobuf::uint32 old_direction() const;
+  inline void set_old_direction(::google::protobuf::uint32 value);
 
-  // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
-  inline bool has_behavior() const;
-  inline void clear_behavior();
-  static const int kBehaviorFieldNumber = 4;
-  inline ::TSCH::ApplyPresetBehavior behavior() const;
-  inline void set_behavior(::TSCH::ApplyPresetBehavior value);
+  // required uint32 new_direction = 3;
+  inline bool has_new_direction() const;
+  inline void clear_new_direction();
+  static const int kNewDirectionFieldNumber = 3;
+  inline ::google::protobuf::uint32 new_direction() const;
+  inline void set_new_direction(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandChartApplyPreset)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetGridDirectionArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_swap_command();
-  inline void clear_has_swap_command();
-  inline void set_has_preset();
-  inline void clear_has_preset();
-  inline void set_has_behavior();
-  inline void clear_has_behavior();
+  inline void set_has_old_direction();
+  inline void clear_has_old_direction();
+  inline void set_has_new_direction();
+  inline void clear_has_new_direction();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::TSP::Reference* swap_command_;
-  ::TSP::Reference* preset_;
-  int behavior_;
+  ::google::protobuf::uint32 old_direction_;
+  ::google::protobuf::uint32 new_direction_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandChartApplyPreset* default_instance_;
+  static CommandSetGridDirectionArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandCleanupGeometryArchive : public ::google::protobuf::Message {
+class CommandSetSeriesTypeArchive : public ::google::protobuf::Message {
  public:
-  CommandCleanupGeometryArchive();
-  virtual ~CommandCleanupGeometryArchive();
+  CommandSetSeriesTypeArchive();
+  virtual ~CommandSetSeriesTypeArchive();
 
-  CommandCleanupGeometryArchive(const CommandCleanupGeometryArchive& from);
+  CommandSetSeriesTypeArchive(const CommandSetSeriesTypeArchive& from);
 
-  inline CommandCleanupGeometryArchive& operator=(const CommandCleanupGeometryArchive& from) {
+  inline CommandSetSeriesTypeArchive& operator=(const CommandSetSeriesTypeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3239,17 +3338,17 @@ class CommandCleanupGeometryArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandCleanupGeometryArchive& default_instance();
+  static const CommandSetSeriesTypeArchive& default_instance();
 
-  void Swap(CommandCleanupGeometryArchive* other);
+  void Swap(CommandSetSeriesTypeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandCleanupGeometryArchive* New() const;
+  CommandSetSeriesTypeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandCleanupGeometryArchive& from);
-  void MergeFrom(const CommandCleanupGeometryArchive& from);
+  void CopyFrom(const CommandSetSeriesTypeArchive& from);
+  void MergeFrom(const CommandSetSeriesTypeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3281,50 +3380,44 @@ class CommandCleanupGeometryArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // optional .TSP.Reference info_geometry_command = 2;
-  inline bool has_info_geometry_command() const;
-  inline void clear_info_geometry_command();
-  static const int kInfoGeometryCommandFieldNumber = 2;
-  inline const ::TSP::Reference& info_geometry_command() const;
-  inline ::TSP::Reference* mutable_info_geometry_command();
-  inline ::TSP::Reference* release_info_geometry_command();
-  inline void set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command);
+  // required uint32 seriesindex = 2;
+  inline bool has_seriesindex() const;
+  inline void clear_seriesindex();
+  static const int kSeriesindexFieldNumber = 2;
+  inline ::google::protobuf::uint32 seriesindex() const;
+  inline void set_seriesindex(::google::protobuf::uint32 value);
 
-  // optional .TSP.Reference anchor_attachment_command = 3;
-  inline bool has_anchor_attachment_command() const;
-  inline void clear_anchor_attachment_command();
-  static const int kAnchorAttachmentCommandFieldNumber = 3;
-  inline const ::TSP::Reference& anchor_attachment_command() const;
-  inline ::TSP::Reference* mutable_anchor_attachment_command();
-  inline ::TSP::Reference* release_anchor_attachment_command();
-  inline void set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command);
+  // required uint32 oldtype = 3;
+  inline bool has_oldtype() const;
+  inline void clear_oldtype();
+  static const int kOldtypeFieldNumber = 3;
+  inline ::google::protobuf::uint32 oldtype() const;
+  inline void set_oldtype(::google::protobuf::uint32 value);
 
-  // optional .TSCH.RectArchive original_legend_rect = 4;
-  inline bool has_original_legend_rect() const;
-  inline void clear_original_legend_rect();
-  static const int kOriginalLegendRectFieldNumber = 4;
-  inline const ::TSCH::RectArchive& original_legend_rect() const;
-  inline ::TSCH::RectArchive* mutable_original_legend_rect();
-  inline ::TSCH::RectArchive* release_original_legend_rect();
-  inline void set_allocated_original_legend_rect(::TSCH::RectArchive* original_legend_rect);
+  // required uint32 newtype = 4;
+  inline bool has_newtype() const;
+  inline void clear_newtype();
+  static const int kNewtypeFieldNumber = 4;
+  inline ::google::protobuf::uint32 newtype() const;
+  inline void set_newtype(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandCleanupGeometryArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetSeriesTypeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_info_geometry_command();
-  inline void clear_has_info_geometry_command();
-  inline void set_has_anchor_attachment_command();
-  inline void clear_has_anchor_attachment_command();
-  inline void set_has_original_legend_rect();
-  inline void clear_has_original_legend_rect();
+  inline void set_has_seriesindex();
+  inline void clear_has_seriesindex();
+  inline void set_has_oldtype();
+  inline void clear_has_oldtype();
+  inline void set_has_newtype();
+  inline void clear_has_newtype();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::TSP::Reference* info_geometry_command_;
-  ::TSP::Reference* anchor_attachment_command_;
-  ::TSCH::RectArchive* original_legend_rect_;
+  ::google::protobuf::uint32 seriesindex_;
+  ::google::protobuf::uint32 oldtype_;
+  ::google::protobuf::uint32 newtype_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
@@ -3334,18 +3427,18 @@ class CommandCleanupGeometryArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandCleanupGeometryArchive* default_instance_;
+  static CommandSetSeriesTypeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ChartCommandArchive : public ::google::protobuf::Message {
+class CommandSetScatterFormatArchive : public ::google::protobuf::Message {
  public:
-  ChartCommandArchive();
-  virtual ~ChartCommandArchive();
+  CommandSetScatterFormatArchive();
+  virtual ~CommandSetScatterFormatArchive();
 
-  ChartCommandArchive(const ChartCommandArchive& from);
+  CommandSetScatterFormatArchive(const CommandSetScatterFormatArchive& from);
 
-  inline ChartCommandArchive& operator=(const ChartCommandArchive& from) {
+  inline CommandSetScatterFormatArchive& operator=(const CommandSetScatterFormatArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3359,17 +3452,17 @@ class ChartCommandArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ChartCommandArchive& default_instance();
+  static const CommandSetScatterFormatArchive& default_instance();
 
-  void Swap(ChartCommandArchive* other);
+  void Swap(CommandSetScatterFormatArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ChartCommandArchive* New() const;
+  CommandSetScatterFormatArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ChartCommandArchive& from);
-  void MergeFrom(const ChartCommandArchive& from);
+  void CopyFrom(const CommandSetScatterFormatArchive& from);
+  void MergeFrom(const CommandSetScatterFormatArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3392,45 +3485,43 @@ class ChartCommandArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSK.CommandArchive super = 1;
+  // required .TSCH.ChartCommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSK::CommandArchive& super() const;
-  inline ::TSK::CommandArchive* mutable_super();
-  inline ::TSK::CommandArchive* release_super();
-  inline void set_allocated_super(::TSK::CommandArchive* super);
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required .TSP.Reference info = 2;
-  inline bool has_info() const;
-  inline void clear_info();
-  static const int kInfoFieldNumber = 2;
-  inline const ::TSP::Reference& info() const;
-  inline ::TSP::Reference* mutable_info();
-  inline ::TSP::Reference* release_info();
-  inline void set_allocated_info(::TSP::Reference* info);
+  // required uint32 oldformat = 3;
+  inline bool has_oldformat() const;
+  inline void clear_oldformat();
+  static const int kOldformatFieldNumber = 3;
+  inline ::google::protobuf::uint32 oldformat() const;
+  inline void set_oldformat(::google::protobuf::uint32 value);
 
-  // optional bool original_dirty_state = 3;
-  inline bool has_original_dirty_state() const;
-  inline void clear_original_dirty_state();
-  static const int kOriginalDirtyStateFieldNumber = 3;
-  inline bool original_dirty_state() const;
-  inline void set_original_dirty_state(bool value);
+  // required uint32 newformat = 4;
+  inline bool has_newformat() const;
+  inline void clear_newformat();
+  static const int kNewformatFieldNumber = 4;
+  inline ::google::protobuf::uint32 newformat() const;
+  inline void set_newformat(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TSCH.ChartCommandArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetScatterFormatArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_info();
-  inline void clear_has_info();
-  inline void set_has_original_dirty_state();
-  inline void clear_has_original_dirty_state();
+  inline void set_has_oldformat();
+  inline void clear_has_oldformat();
+  inline void set_has_newformat();
+  inline void clear_has_newformat();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSK::CommandArchive* super_;
-  ::TSP::Reference* info_;
-  bool original_dirty_state_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::google::protobuf::uint32 oldformat_;
+  ::google::protobuf::uint32 newformat_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -3440,18 +3531,18 @@ class ChartCommandArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ChartCommandArchive* default_instance_;
+  static CommandSetScatterFormatArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandReplaceGridValuesArchive_ValueRow : public ::google::protobuf::Message {
+class CommandSetMultiDataSetIndexArchive : public ::google::protobuf::Message {
  public:
-  CommandReplaceGridValuesArchive_ValueRow();
-  virtual ~CommandReplaceGridValuesArchive_ValueRow();
+  CommandSetMultiDataSetIndexArchive();
+  virtual ~CommandSetMultiDataSetIndexArchive();
 
-  CommandReplaceGridValuesArchive_ValueRow(const CommandReplaceGridValuesArchive_ValueRow& from);
+  CommandSetMultiDataSetIndexArchive(const CommandSetMultiDataSetIndexArchive& from);
 
-  inline CommandReplaceGridValuesArchive_ValueRow& operator=(const CommandReplaceGridValuesArchive_ValueRow& from) {
+  inline CommandSetMultiDataSetIndexArchive& operator=(const CommandSetMultiDataSetIndexArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3465,17 +3556,17 @@ class CommandReplaceGridValuesArchive_ValueRow : public ::google::protobuf::Mess
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandReplaceGridValuesArchive_ValueRow& default_instance();
+  static const CommandSetMultiDataSetIndexArchive& default_instance();
 
-  void Swap(CommandReplaceGridValuesArchive_ValueRow* other);
+  void Swap(CommandSetMultiDataSetIndexArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandReplaceGridValuesArchive_ValueRow* New() const;
+  CommandSetMultiDataSetIndexArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandReplaceGridValuesArchive_ValueRow& from);
-  void MergeFrom(const CommandReplaceGridValuesArchive_ValueRow& from);
+  void CopyFrom(const CommandSetMultiDataSetIndexArchive& from);
+  void MergeFrom(const CommandSetMultiDataSetIndexArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3498,45 +3589,64 @@ class CommandReplaceGridValuesArchive_ValueRow : public ::google::protobuf::Mess
 
   // accessors -------------------------------------------------------
 
-  // repeated double value = 1;
-  inline int value_size() const;
-  inline void clear_value();
-  static const int kValueFieldNumber = 1;
-  inline double value(int index) const;
-  inline void set_value(int index, double value);
-  inline void add_value(double value);
-  inline const ::google::protobuf::RepeatedField< double >&
-      value() const;
-  inline ::google::protobuf::RepeatedField< double >*
-      mutable_value();
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceGridValuesArchive.ValueRow)
+  // required uint32 oldindex = 2;
+  inline bool has_oldindex() const;
+  inline void clear_oldindex();
+  static const int kOldindexFieldNumber = 2;
+  inline ::google::protobuf::uint32 oldindex() const;
+  inline void set_oldindex(::google::protobuf::uint32 value);
+
+  // required uint32 newindex = 3;
+  inline bool has_newindex() const;
+  inline void clear_newindex();
+  static const int kNewindexFieldNumber = 3;
+  inline ::google::protobuf::uint32 newindex() const;
+  inline void set_newindex(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetMultiDataSetIndexArchive)
  private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_oldindex();
+  inline void clear_has_oldindex();
+  inline void set_has_newindex();
+  inline void clear_has_newindex();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedField< double > value_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::google::protobuf::uint32 oldindex_;
+  ::google::protobuf::uint32 newindex_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandReplaceGridValuesArchive_ValueRow* default_instance_;
+  static CommandSetMultiDataSetIndexArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandReplaceGridValuesArchive : public ::google::protobuf::Message {
+class CommandSetLegendFrameArchive : public ::google::protobuf::Message {
  public:
-  CommandReplaceGridValuesArchive();
-  virtual ~CommandReplaceGridValuesArchive();
+  CommandSetLegendFrameArchive();
+  virtual ~CommandSetLegendFrameArchive();
 
-  CommandReplaceGridValuesArchive(const CommandReplaceGridValuesArchive& from);
+  CommandSetLegendFrameArchive(const CommandSetLegendFrameArchive& from);
 
-  inline CommandReplaceGridValuesArchive& operator=(const CommandReplaceGridValuesArchive& from) {
+  inline CommandSetLegendFrameArchive& operator=(const CommandSetLegendFrameArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3550,17 +3660,17 @@ class CommandReplaceGridValuesArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandReplaceGridValuesArchive& default_instance();
+  static const CommandSetLegendFrameArchive& default_instance();
 
-  void Swap(CommandReplaceGridValuesArchive* other);
+  void Swap(CommandSetLegendFrameArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandReplaceGridValuesArchive* New() const;
+  CommandSetLegendFrameArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandReplaceGridValuesArchive& from);
-  void MergeFrom(const CommandReplaceGridValuesArchive& from);
+  void CopyFrom(const CommandSetLegendFrameArchive& from);
+  void MergeFrom(const CommandSetLegendFrameArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3581,8 +3691,6 @@ class CommandReplaceGridValuesArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef CommandReplaceGridValuesArchive_ValueRow ValueRow;
-
   // accessors -------------------------------------------------------
 
   // required .TSCH.ChartCommandArchive super = 1;
@@ -3594,169 +3702,59 @@ class CommandReplaceGridValuesArchive : public ::google::protobuf::Message {
   inline ::TSCH::ChartCommandArchive* release_super();
   inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required uint32 rowindex = 2;
-  inline bool has_rowindex() const;
-  inline void clear_rowindex();
-  static const int kRowindexFieldNumber = 2;
-  inline ::google::protobuf::uint32 rowindex() const;
-  inline void set_rowindex(::google::protobuf::uint32 value);
-
-  // required uint32 columnindex = 3;
-  inline bool has_columnindex() const;
-  inline void clear_columnindex();
-  static const int kColumnindexFieldNumber = 3;
-  inline ::google::protobuf::uint32 columnindex() const;
-  inline void set_columnindex(::google::protobuf::uint32 value);
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
-  inline int old_data_rows_size() const;
-  inline void clear_old_data_rows();
-  static const int kOldDataRowsFieldNumber = 4;
-  inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& old_data_rows(int index) const;
-  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* mutable_old_data_rows(int index);
-  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* add_old_data_rows();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
-      old_data_rows() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
-      mutable_old_data_rows();
-
-  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
-  inline int new_data_rows_size() const;
-  inline void clear_new_data_rows();
-  static const int kNewDataRowsFieldNumber = 5;
-  inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& new_data_rows(int index) const;
-  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* mutable_new_data_rows(int index);
-  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* add_new_data_rows();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
-      new_data_rows() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
-      mutable_new_data_rows();
-
-  // repeated string old_row_names = 6;
-  inline int old_row_names_size() const;
-  inline void clear_old_row_names();
-  static const int kOldRowNamesFieldNumber = 6;
-  inline const ::std::string& old_row_names(int index) const;
-  inline ::std::string* mutable_old_row_names(int index);
-  inline void set_old_row_names(int index, const ::std::string& value);
-  inline void set_old_row_names(int index, const char* value);
-  inline void set_old_row_names(int index, const char* value, size_t size);
-  inline ::std::string* add_old_row_names();
-  inline void add_old_row_names(const ::std::string& value);
-  inline void add_old_row_names(const char* value);
-  inline void add_old_row_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& old_row_names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_old_row_names();
-
-  // repeated string new_row_names = 7;
-  inline int new_row_names_size() const;
-  inline void clear_new_row_names();
-  static const int kNewRowNamesFieldNumber = 7;
-  inline const ::std::string& new_row_names(int index) const;
-  inline ::std::string* mutable_new_row_names(int index);
-  inline void set_new_row_names(int index, const ::std::string& value);
-  inline void set_new_row_names(int index, const char* value);
-  inline void set_new_row_names(int index, const char* value, size_t size);
-  inline ::std::string* add_new_row_names();
-  inline void add_new_row_names(const ::std::string& value);
-  inline void add_new_row_names(const char* value);
-  inline void add_new_row_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& new_row_names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_new_row_names();
-
-  // repeated string old_col_names = 8;
-  inline int old_col_names_size() const;
-  inline void clear_old_col_names();
-  static const int kOldColNamesFieldNumber = 8;
-  inline const ::std::string& old_col_names(int index) const;
-  inline ::std::string* mutable_old_col_names(int index);
-  inline void set_old_col_names(int index, const ::std::string& value);
-  inline void set_old_col_names(int index, const char* value);
-  inline void set_old_col_names(int index, const char* value, size_t size);
-  inline ::std::string* add_old_col_names();
-  inline void add_old_col_names(const ::std::string& value);
-  inline void add_old_col_names(const char* value);
-  inline void add_old_col_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& old_col_names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_old_col_names();
-
-  // repeated string new_col_names = 9;
-  inline int new_col_names_size() const;
-  inline void clear_new_col_names();
-  static const int kNewColNamesFieldNumber = 9;
-  inline const ::std::string& new_col_names(int index) const;
-  inline ::std::string* mutable_new_col_names(int index);
-  inline void set_new_col_names(int index, const ::std::string& value);
-  inline void set_new_col_names(int index, const char* value);
-  inline void set_new_col_names(int index, const char* value, size_t size);
-  inline ::std::string* add_new_col_names();
-  inline void add_new_col_names(const ::std::string& value);
-  inline void add_new_col_names(const char* value);
-  inline void add_new_col_names(const char* value, size_t size);
-  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& new_col_names() const;
-  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_new_col_names();
-
-  // optional uint32 rows_to_add = 10;
-  inline bool has_rows_to_add() const;
-  inline void clear_rows_to_add();
-  static const int kRowsToAddFieldNumber = 10;
-  inline ::google::protobuf::uint32 rows_to_add() const;
-  inline void set_rows_to_add(::google::protobuf::uint32 value);
+  // required .TSCH.RectArchive old_legend_frame = 2;
+  inline bool has_old_legend_frame() const;
+  inline void clear_old_legend_frame();
+  static const int kOldLegendFrameFieldNumber = 2;
+  inline const ::TSCH::RectArchive& old_legend_frame() const;
+  inline ::TSCH::RectArchive* mutable_old_legend_frame();
+  inline ::TSCH::RectArchive* release_old_legend_frame();
+  inline void set_allocated_old_legend_frame(::TSCH::RectArchive* old_legend_frame);
 
-  // optional uint32 cols_to_add = 11;
-  inline bool has_cols_to_add() const;
-  inline void clear_cols_to_add();
-  static const int kColsToAddFieldNumber = 11;
-  inline ::google::protobuf::uint32 cols_to_add() const;
-  inline void set_cols_to_add(::google::protobuf::uint32 value);
+  // required .TSCH.RectArchive new_legend_frame = 3;
+  inline bool has_new_legend_frame() const;
+  inline void clear_new_legend_frame();
+  static const int kNewLegendFrameFieldNumber = 3;
+  inline const ::TSCH::RectArchive& new_legend_frame() const;
+  inline ::TSCH::RectArchive* mutable_new_legend_frame();
+  inline ::TSCH::RectArchive* release_new_legend_frame();
+  inline void set_allocated_new_legend_frame(::TSCH::RectArchive* new_legend_frame);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceGridValuesArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetLegendFrameArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_rowindex();
-  inline void clear_has_rowindex();
-  inline void set_has_columnindex();
-  inline void clear_has_columnindex();
-  inline void set_has_rows_to_add();
-  inline void clear_has_rows_to_add();
-  inline void set_has_cols_to_add();
-  inline void clear_has_cols_to_add();
+  inline void set_has_old_legend_frame();
+  inline void clear_has_old_legend_frame();
+  inline void set_has_new_legend_frame();
+  inline void clear_has_new_legend_frame();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSCH::ChartCommandArchive* super_;
-  ::google::protobuf::uint32 rowindex_;
-  ::google::protobuf::uint32 columnindex_;
-  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow > old_data_rows_;
-  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow > new_data_rows_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> old_row_names_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> new_row_names_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> old_col_names_;
-  ::google::protobuf::RepeatedPtrField< ::std::string> new_col_names_;
-  ::google::protobuf::uint32 rows_to_add_;
-  ::google::protobuf::uint32 cols_to_add_;
+  ::TSCH::RectArchive* old_legend_frame_;
+  ::TSCH::RectArchive* new_legend_frame_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandReplaceGridValuesArchive* default_instance_;
+  static CommandSetLegendFrameArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandReplaceThemePresetArchive_StyleAndIdentifierPair : public ::google::protobuf::Message {
+class CommandSetPieWedgeExplosion : public ::google::protobuf::Message {
  public:
-  CommandReplaceThemePresetArchive_StyleAndIdentifierPair();
-  virtual ~CommandReplaceThemePresetArchive_StyleAndIdentifierPair();
+  CommandSetPieWedgeExplosion();
+  virtual ~CommandSetPieWedgeExplosion();
 
-  CommandReplaceThemePresetArchive_StyleAndIdentifierPair(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from);
+  CommandSetPieWedgeExplosion(const CommandSetPieWedgeExplosion& from);
 
-  inline CommandReplaceThemePresetArchive_StyleAndIdentifierPair& operator=(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from) {
+  inline CommandSetPieWedgeExplosion& operator=(const CommandSetPieWedgeExplosion& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3770,17 +3768,17 @@ class CommandReplaceThemePresetArchive_StyleAndIdentifierPair : public ::google:
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& default_instance();
+  static const CommandSetPieWedgeExplosion& default_instance();
 
-  void Swap(CommandReplaceThemePresetArchive_StyleAndIdentifierPair* other);
+  void Swap(CommandSetPieWedgeExplosion* other);
 
   // implements Message ----------------------------------------------
 
-  CommandReplaceThemePresetArchive_StyleAndIdentifierPair* New() const;
+  CommandSetPieWedgeExplosion* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from);
-  void MergeFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from);
+  void CopyFrom(const CommandSetPieWedgeExplosion& from);
+  void MergeFrom(const CommandSetPieWedgeExplosion& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3803,59 +3801,80 @@ class CommandReplaceThemePresetArchive_StyleAndIdentifierPair : public ::google:
 
   // accessors -------------------------------------------------------
 
-  // required .TSP.Reference style = 1;
-  inline bool has_style() const;
-  inline void clear_style();
-  static const int kStyleFieldNumber = 1;
-  inline const ::TSP::Reference& style() const;
-  inline ::TSP::Reference* mutable_style();
-  inline ::TSP::Reference* release_style();
-  inline void set_allocated_style(::TSP::Reference* style);
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
 
-  // required string identifier = 2;
-  inline bool has_identifier() const;
-  inline void clear_identifier();
-  static const int kIdentifierFieldNumber = 2;
-  inline const ::std::string& identifier() const;
-  inline void set_identifier(const ::std::string& value);
-  inline void set_identifier(const char* value);
-  inline void set_identifier(const char* value, size_t size);
-  inline ::std::string* mutable_identifier();
-  inline ::std::string* release_identifier();
-  inline void set_allocated_identifier(::std::string* identifier);
+  // optional .TSP.Reference info_geometry_command = 2;
+  inline bool has_info_geometry_command() const;
+  inline void clear_info_geometry_command();
+  static const int kInfoGeometryCommandFieldNumber = 2;
+  inline const ::TSP::Reference& info_geometry_command() const;
+  inline ::TSP::Reference* mutable_info_geometry_command();
+  inline ::TSP::Reference* release_info_geometry_command();
+  inline void set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair)
+  // optional .TSP.Reference style_mutation_command = 3;
+  inline bool has_style_mutation_command() const;
+  inline void clear_style_mutation_command();
+  static const int kStyleMutationCommandFieldNumber = 3;
+  inline const ::TSP::Reference& style_mutation_command() const;
+  inline ::TSP::Reference* mutable_style_mutation_command();
+  inline ::TSP::Reference* release_style_mutation_command();
+  inline void set_allocated_style_mutation_command(::TSP::Reference* style_mutation_command);
+
+  // optional .TSP.Reference anchor_attachment_command = 4;
+  inline bool has_anchor_attachment_command() const;
+  inline void clear_anchor_attachment_command();
+  static const int kAnchorAttachmentCommandFieldNumber = 4;
+  inline const ::TSP::Reference& anchor_attachment_command() const;
+  inline ::TSP::Reference* mutable_anchor_attachment_command();
+  inline ::TSP::Reference* release_anchor_attachment_command();
+  inline void set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetPieWedgeExplosion)
  private:
-  inline void set_has_style();
-  inline void clear_has_style();
-  inline void set_has_identifier();
-  inline void clear_has_identifier();
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_info_geometry_command();
+  inline void clear_has_info_geometry_command();
+  inline void set_has_style_mutation_command();
+  inline void clear_has_style_mutation_command();
+  inline void set_has_anchor_attachment_command();
+  inline void clear_has_anchor_attachment_command();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSP::Reference* style_;
-  ::std::string* identifier_;
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Reference* info_geometry_command_;
+  ::TSP::Reference* style_mutation_command_;
+  ::TSP::Reference* anchor_attachment_command_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandReplaceThemePresetArchive_StyleAndIdentifierPair* default_instance_;
+  static CommandSetPieWedgeExplosion* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandReplaceThemePresetArchive : public ::google::protobuf::Message {
+class SynchronousCommandArchive : public ::google::protobuf::Message {
  public:
-  CommandReplaceThemePresetArchive();
-  virtual ~CommandReplaceThemePresetArchive();
+  SynchronousCommandArchive();
+  virtual ~SynchronousCommandArchive();
 
-  CommandReplaceThemePresetArchive(const CommandReplaceThemePresetArchive& from);
+  SynchronousCommandArchive(const SynchronousCommandArchive& from);
 
-  inline CommandReplaceThemePresetArchive& operator=(const CommandReplaceThemePresetArchive& from) {
+  inline SynchronousCommandArchive& operator=(const SynchronousCommandArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3869,17 +3888,17 @@ class CommandReplaceThemePresetArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandReplaceThemePresetArchive& default_instance();
+  static const SynchronousCommandArchive& default_instance();
 
-  void Swap(CommandReplaceThemePresetArchive* other);
+  void Swap(SynchronousCommandArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandReplaceThemePresetArchive* New() const;
+  SynchronousCommandArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandReplaceThemePresetArchive& from);
-  void MergeFrom(const CommandReplaceThemePresetArchive& from);
+  void CopyFrom(const SynchronousCommandArchive& from);
+  void MergeFrom(const SynchronousCommandArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3900,8 +3919,6 @@ class CommandReplaceThemePresetArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef CommandReplaceThemePresetArchive_StyleAndIdentifierPair StyleAndIdentifierPair;
-
   // accessors -------------------------------------------------------
 
   // required .TSK.CommandArchive super = 1;
@@ -3913,94 +3930,47 @@ class CommandReplaceThemePresetArchive : public ::google::protobuf::Message {
   inline ::TSK::CommandArchive* release_super();
   inline void set_allocated_super(::TSK::CommandArchive* super);
 
-  // required .TSP.Reference theme = 2;
-  inline bool has_theme() const;
-  inline void clear_theme();
-  static const int kThemeFieldNumber = 2;
-  inline const ::TSP::Reference& theme() const;
-  inline ::TSP::Reference* mutable_theme();
-  inline ::TSP::Reference* release_theme();
-  inline void set_allocated_theme(::TSP::Reference* theme);
-
-  // optional .TSP.Reference old_preset = 3;
-  inline bool has_old_preset() const;
-  inline void clear_old_preset();
-  static const int kOldPresetFieldNumber = 3;
-  inline const ::TSP::Reference& old_preset() const;
-  inline ::TSP::Reference* mutable_old_preset();
-  inline ::TSP::Reference* release_old_preset();
-  inline void set_allocated_old_preset(::TSP::Reference* old_preset);
-
-  // optional .TSP.Reference new_preset = 4;
-  inline bool has_new_preset() const;
-  inline void clear_new_preset();
-  static const int kNewPresetFieldNumber = 4;
-  inline const ::TSP::Reference& new_preset() const;
-  inline ::TSP::Reference* mutable_new_preset();
-  inline ::TSP::Reference* release_new_preset();
-  inline void set_allocated_new_preset(::TSP::Reference* new_preset);
-
-  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
-  inline int identifiers_size() const;
-  inline void clear_identifiers();
-  static const int kIdentifiersFieldNumber = 5;
-  inline const ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair& identifiers(int index) const;
-  inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* mutable_identifiers(int index);
-  inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* add_identifiers();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >&
-      identifiers() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >*
-      mutable_identifiers();
-
-  // optional uint64 old_preset_index = 6;
-  inline bool has_old_preset_index() const;
-  inline void clear_old_preset_index();
-  static const int kOldPresetIndexFieldNumber = 6;
-  inline ::google::protobuf::uint64 old_preset_index() const;
-  inline void set_old_preset_index(::google::protobuf::uint64 value);
+  // required .TSP.Reference command = 2;
+  inline bool has_command() const;
+  inline void clear_command();
+  static const int kCommandFieldNumber = 2;
+  inline const ::TSP::Reference& command() const;
+  inline ::TSP::Reference* mutable_command();
+  inline ::TSP::Reference* release_command();
+  inline void set_allocated_command(::TSP::Reference* command);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceThemePresetArchive)
+  // @@protoc_insertion_point(class_scope:TSCH.SynchronousCommandArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_theme();
-  inline void clear_has_theme();
-  inline void set_has_old_preset();
-  inline void clear_has_old_preset();
-  inline void set_has_new_preset();
-  inline void clear_has_new_preset();
-  inline void set_has_old_preset_index();
-  inline void clear_has_old_preset_index();
+  inline void set_has_command();
+  inline void clear_has_command();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSK::CommandArchive* super_;
-  ::TSP::Reference* theme_;
-  ::TSP::Reference* old_preset_;
-  ::TSP::Reference* new_preset_;
-  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair > identifiers_;
-  ::google::protobuf::uint64 old_preset_index_;
+  ::TSP::Reference* command_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandReplaceThemePresetArchive* default_instance_;
+  static SynchronousCommandArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandInvalidateWPCaches : public ::google::protobuf::Message {
+class CommandReplaceAllArchive : public ::google::protobuf::Message {
  public:
-  CommandInvalidateWPCaches();
-  virtual ~CommandInvalidateWPCaches();
+  CommandReplaceAllArchive();
+  virtual ~CommandReplaceAllArchive();
 
-  CommandInvalidateWPCaches(const CommandInvalidateWPCaches& from);
+  CommandReplaceAllArchive(const CommandReplaceAllArchive& from);
 
-  inline CommandInvalidateWPCaches& operator=(const CommandInvalidateWPCaches& from) {
+  inline CommandReplaceAllArchive& operator=(const CommandReplaceAllArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4014,17 +3984,17 @@ class CommandInvalidateWPCaches : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandInvalidateWPCaches& default_instance();
+  static const CommandReplaceAllArchive& default_instance();
 
-  void Swap(CommandInvalidateWPCaches* other);
+  void Swap(CommandReplaceAllArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandInvalidateWPCaches* New() const;
+  CommandReplaceAllArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandInvalidateWPCaches& from);
-  void MergeFrom(const CommandInvalidateWPCaches& from);
+  void CopyFrom(const CommandReplaceAllArchive& from);
+  void MergeFrom(const CommandReplaceAllArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4047,70 +4017,4070 @@ class CommandInvalidateWPCaches : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSK.CommandArchive super = 1;
+  // required .TSK.ReplaceAllChildCommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSK::CommandArchive& super() const;
-  inline ::TSK::CommandArchive* mutable_super();
-  inline ::TSK::CommandArchive* release_super();
-  inline void set_allocated_super(::TSK::CommandArchive* super);
+  inline const ::TSK::ReplaceAllChildCommandArchive& super() const;
+  inline ::TSK::ReplaceAllChildCommandArchive* mutable_super();
+  inline ::TSK::ReplaceAllChildCommandArchive* release_super();
+  inline void set_allocated_super(::TSK::ReplaceAllChildCommandArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TSCH.CommandInvalidateWPCaches)
+  // required .TSP.Reference info = 2;
+  inline bool has_info() const;
+  inline void clear_info();
+  static const int kInfoFieldNumber = 2;
+  inline const ::TSP::Reference& info() const;
+  inline ::TSP::Reference* mutable_info();
+  inline ::TSP::Reference* release_info();
+  inline void set_allocated_info(::TSP::Reference* info);
+
+  // repeated .TSP.Reference commands = 3;
+  inline int commands_size() const;
+  inline void clear_commands();
+  static const int kCommandsFieldNumber = 3;
+  inline const ::TSP::Reference& commands(int index) const;
+  inline ::TSP::Reference* mutable_commands(int index);
+  inline ::TSP::Reference* add_commands();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      commands() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_commands();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceAllArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
+  inline void set_has_info();
+  inline void clear_has_info();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSK::CommandArchive* super_;
+  ::TSK::ReplaceAllChildCommandArchive* super_;
+  ::TSP::Reference* info_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > commands_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandInvalidateWPCaches* default_instance_;
+  static CommandReplaceAllArchive* default_instance_;
 };
-// ===================================================================
+// -------------------------------------------------------------------
 
+class CommandChartApplyTheme : public ::google::protobuf::Message {
+ public:
+  CommandChartApplyTheme();
+  virtual ~CommandChartApplyTheme();
 
-// ===================================================================
+  CommandChartApplyTheme(const CommandChartApplyTheme& from);
+
+  inline CommandChartApplyTheme& operator=(const CommandChartApplyTheme& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandChartApplyTheme& default_instance();
+
+  void Swap(CommandChartApplyTheme* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandChartApplyTheme* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandChartApplyTheme& from);
+  void MergeFrom(const CommandChartApplyTheme& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSS::ApplyThemeChildCommandArchive& super() const;
+  inline ::TSS::ApplyThemeChildCommandArchive* mutable_super();
+  inline ::TSS::ApplyThemeChildCommandArchive* release_super();
+  inline void set_allocated_super(::TSS::ApplyThemeChildCommandArchive* super);
+
+  // required .TSP.Reference info = 2;
+  inline bool has_info() const;
+  inline void clear_info();
+  static const int kInfoFieldNumber = 2;
+  inline const ::TSP::Reference& info() const;
+  inline ::TSP::Reference* mutable_info();
+  inline ::TSP::Reference* release_info();
+  inline void set_allocated_info(::TSP::Reference* info);
+
+  // optional .TSP.Reference swap_command = 3;
+  inline bool has_swap_command() const;
+  inline void clear_swap_command();
+  static const int kSwapCommandFieldNumber = 3;
+  inline const ::TSP::Reference& swap_command() const;
+  inline ::TSP::Reference* mutable_swap_command();
+  inline ::TSP::Reference* release_swap_command();
+  inline void set_allocated_swap_command(::TSP::Reference* swap_command);
+
+  // optional .TSP.Reference preset = 4;
+  inline bool has_preset() const;
+  inline void clear_preset();
+  static const int kPresetFieldNumber = 4;
+  inline const ::TSP::Reference& preset() const;
+  inline ::TSP::Reference* mutable_preset();
+  inline ::TSP::Reference* release_preset();
+  inline void set_allocated_preset(::TSP::Reference* preset);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandChartApplyTheme)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_info();
+  inline void clear_has_info();
+  inline void set_has_swap_command();
+  inline void clear_has_swap_command();
+  inline void set_has_preset();
+  inline void clear_has_preset();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSS::ApplyThemeChildCommandArchive* super_;
+  ::TSP::Reference* info_;
+  ::TSP::Reference* swap_command_;
+  ::TSP::Reference* preset_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandChartApplyTheme* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandChartApplyPreset : public ::google::protobuf::Message {
+ public:
+  CommandChartApplyPreset();
+  virtual ~CommandChartApplyPreset();
+
+  CommandChartApplyPreset(const CommandChartApplyPreset& from);
+
+  inline CommandChartApplyPreset& operator=(const CommandChartApplyPreset& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandChartApplyPreset& default_instance();
+
+  void Swap(CommandChartApplyPreset* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandChartApplyPreset* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandChartApplyPreset& from);
+  void MergeFrom(const CommandChartApplyPreset& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
+
+  // optional .TSP.Reference swap_command = 2;
+  inline bool has_swap_command() const;
+  inline void clear_swap_command();
+  static const int kSwapCommandFieldNumber = 2;
+  inline const ::TSP::Reference& swap_command() const;
+  inline ::TSP::Reference* mutable_swap_command();
+  inline ::TSP::Reference* release_swap_command();
+  inline void set_allocated_swap_command(::TSP::Reference* swap_command);
+
+  // optional .TSP.Reference preset = 3;
+  inline bool has_preset() const;
+  inline void clear_preset();
+  static const int kPresetFieldNumber = 3;
+  inline const ::TSP::Reference& preset() const;
+  inline ::TSP::Reference* mutable_preset();
+  inline ::TSP::Reference* release_preset();
+  inline void set_allocated_preset(::TSP::Reference* preset);
+
+  // optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+  inline bool has_behavior() const;
+  inline void clear_behavior();
+  static const int kBehaviorFieldNumber = 4;
+  inline ::TSCH::ApplyPresetBehavior behavior() const;
+  inline void set_behavior(::TSCH::ApplyPresetBehavior value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandChartApplyPreset)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_swap_command();
+  inline void clear_has_swap_command();
+  inline void set_has_preset();
+  inline void clear_has_preset();
+  inline void set_has_behavior();
+  inline void clear_has_behavior();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Reference* swap_command_;
+  ::TSP::Reference* preset_;
+  int behavior_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandChartApplyPreset* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandCleanupGeometryArchive : public ::google::protobuf::Message {
+ public:
+  CommandCleanupGeometryArchive();
+  virtual ~CommandCleanupGeometryArchive();
+
+  CommandCleanupGeometryArchive(const CommandCleanupGeometryArchive& from);
+
+  inline CommandCleanupGeometryArchive& operator=(const CommandCleanupGeometryArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandCleanupGeometryArchive& default_instance();
+
+  void Swap(CommandCleanupGeometryArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandCleanupGeometryArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandCleanupGeometryArchive& from);
+  void MergeFrom(const CommandCleanupGeometryArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
+
+  // optional .TSP.Reference info_geometry_command = 2;
+  inline bool has_info_geometry_command() const;
+  inline void clear_info_geometry_command();
+  static const int kInfoGeometryCommandFieldNumber = 2;
+  inline const ::TSP::Reference& info_geometry_command() const;
+  inline ::TSP::Reference* mutable_info_geometry_command();
+  inline ::TSP::Reference* release_info_geometry_command();
+  inline void set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command);
+
+  // optional .TSP.Reference anchor_attachment_command = 3;
+  inline bool has_anchor_attachment_command() const;
+  inline void clear_anchor_attachment_command();
+  static const int kAnchorAttachmentCommandFieldNumber = 3;
+  inline const ::TSP::Reference& anchor_attachment_command() const;
+  inline ::TSP::Reference* mutable_anchor_attachment_command();
+  inline ::TSP::Reference* release_anchor_attachment_command();
+  inline void set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command);
+
+  // optional .TSCH.RectArchive original_legend_rect = 4;
+  inline bool has_original_legend_rect() const;
+  inline void clear_original_legend_rect();
+  static const int kOriginalLegendRectFieldNumber = 4;
+  inline const ::TSCH::RectArchive& original_legend_rect() const;
+  inline ::TSCH::RectArchive* mutable_original_legend_rect();
+  inline ::TSCH::RectArchive* release_original_legend_rect();
+  inline void set_allocated_original_legend_rect(::TSCH::RectArchive* original_legend_rect);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandCleanupGeometryArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_info_geometry_command();
+  inline void clear_has_info_geometry_command();
+  inline void set_has_anchor_attachment_command();
+  inline void clear_has_anchor_attachment_command();
+  inline void set_has_original_legend_rect();
+  inline void clear_has_original_legend_rect();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Reference* info_geometry_command_;
+  ::TSP::Reference* anchor_attachment_command_;
+  ::TSCH::RectArchive* original_legend_rect_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandCleanupGeometryArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ChartCommandArchive : public ::google::protobuf::Message {
+ public:
+  ChartCommandArchive();
+  virtual ~ChartCommandArchive();
+
+  ChartCommandArchive(const ChartCommandArchive& from);
+
+  inline ChartCommandArchive& operator=(const ChartCommandArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ChartCommandArchive& default_instance();
+
+  void Swap(ChartCommandArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ChartCommandArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ChartCommandArchive& from);
+  void MergeFrom(const ChartCommandArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // required .TSP.Reference info = 2;
+  inline bool has_info() const;
+  inline void clear_info();
+  static const int kInfoFieldNumber = 2;
+  inline const ::TSP::Reference& info() const;
+  inline ::TSP::Reference* mutable_info();
+  inline ::TSP::Reference* release_info();
+  inline void set_allocated_info(::TSP::Reference* info);
+
+  // optional bool original_dirty_state = 3;
+  inline bool has_original_dirty_state() const;
+  inline void clear_original_dirty_state();
+  static const int kOriginalDirtyStateFieldNumber = 3;
+  inline bool original_dirty_state() const;
+  inline void set_original_dirty_state(bool value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.ChartCommandArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_info();
+  inline void clear_has_info();
+  inline void set_has_original_dirty_state();
+  inline void clear_has_original_dirty_state();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* info_;
+  bool original_dirty_state_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ChartCommandArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandReplaceGridValuesArchive_ValueRow : public ::google::protobuf::Message {
+ public:
+  CommandReplaceGridValuesArchive_ValueRow();
+  virtual ~CommandReplaceGridValuesArchive_ValueRow();
+
+  CommandReplaceGridValuesArchive_ValueRow(const CommandReplaceGridValuesArchive_ValueRow& from);
+
+  inline CommandReplaceGridValuesArchive_ValueRow& operator=(const CommandReplaceGridValuesArchive_ValueRow& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceGridValuesArchive_ValueRow& default_instance();
+
+  void Swap(CommandReplaceGridValuesArchive_ValueRow* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceGridValuesArchive_ValueRow* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceGridValuesArchive_ValueRow& from);
+  void MergeFrom(const CommandReplaceGridValuesArchive_ValueRow& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // repeated double value = 1;
+  inline int value_size() const;
+  inline void clear_value();
+  static const int kValueFieldNumber = 1;
+  inline double value(int index) const;
+  inline void set_value(int index, double value);
+  inline void add_value(double value);
+  inline const ::google::protobuf::RepeatedField< double >&
+      value() const;
+  inline ::google::protobuf::RepeatedField< double >*
+      mutable_value();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceGridValuesArchive.ValueRow)
+ private:
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedField< double > value_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceGridValuesArchive_ValueRow* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandReplaceGridValuesArchive : public ::google::protobuf::Message {
+ public:
+  CommandReplaceGridValuesArchive();
+  virtual ~CommandReplaceGridValuesArchive();
+
+  CommandReplaceGridValuesArchive(const CommandReplaceGridValuesArchive& from);
+
+  inline CommandReplaceGridValuesArchive& operator=(const CommandReplaceGridValuesArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceGridValuesArchive& default_instance();
+
+  void Swap(CommandReplaceGridValuesArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceGridValuesArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceGridValuesArchive& from);
+  void MergeFrom(const CommandReplaceGridValuesArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef CommandReplaceGridValuesArchive_ValueRow ValueRow;
+
+  // accessors -------------------------------------------------------
+
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
+
+  // required uint32 rowindex = 2;
+  inline bool has_rowindex() const;
+  inline void clear_rowindex();
+  static const int kRowindexFieldNumber = 2;
+  inline ::google::protobuf::uint32 rowindex() const;
+  inline void set_rowindex(::google::protobuf::uint32 value);
+
+  // required uint32 columnindex = 3;
+  inline bool has_columnindex() const;
+  inline void clear_columnindex();
+  static const int kColumnindexFieldNumber = 3;
+  inline ::google::protobuf::uint32 columnindex() const;
+  inline void set_columnindex(::google::protobuf::uint32 value);
+
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
+  inline int old_data_rows_size() const;
+  inline void clear_old_data_rows();
+  static const int kOldDataRowsFieldNumber = 4;
+  inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& old_data_rows(int index) const;
+  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* mutable_old_data_rows(int index);
+  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* add_old_data_rows();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
+      old_data_rows() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
+      mutable_old_data_rows();
+
+  // repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
+  inline int new_data_rows_size() const;
+  inline void clear_new_data_rows();
+  static const int kNewDataRowsFieldNumber = 5;
+  inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& new_data_rows(int index) const;
+  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* mutable_new_data_rows(int index);
+  inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* add_new_data_rows();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
+      new_data_rows() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
+      mutable_new_data_rows();
+
+  // repeated string old_row_names = 6;
+  inline int old_row_names_size() const;
+  inline void clear_old_row_names();
+  static const int kOldRowNamesFieldNumber = 6;
+  inline const ::std::string& old_row_names(int index) const;
+  inline ::std::string* mutable_old_row_names(int index);
+  inline void set_old_row_names(int index, const ::std::string& value);
+  inline void set_old_row_names(int index, const char* value);
+  inline void set_old_row_names(int index, const char* value, size_t size);
+  inline ::std::string* add_old_row_names();
+  inline void add_old_row_names(const ::std::string& value);
+  inline void add_old_row_names(const char* value);
+  inline void add_old_row_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& old_row_names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_old_row_names();
+
+  // repeated string new_row_names = 7;
+  inline int new_row_names_size() const;
+  inline void clear_new_row_names();
+  static const int kNewRowNamesFieldNumber = 7;
+  inline const ::std::string& new_row_names(int index) const;
+  inline ::std::string* mutable_new_row_names(int index);
+  inline void set_new_row_names(int index, const ::std::string& value);
+  inline void set_new_row_names(int index, const char* value);
+  inline void set_new_row_names(int index, const char* value, size_t size);
+  inline ::std::string* add_new_row_names();
+  inline void add_new_row_names(const ::std::string& value);
+  inline void add_new_row_names(const char* value);
+  inline void add_new_row_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& new_row_names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_new_row_names();
+
+  // repeated string old_col_names = 8;
+  inline int old_col_names_size() const;
+  inline void clear_old_col_names();
+  static const int kOldColNamesFieldNumber = 8;
+  inline const ::std::string& old_col_names(int index) const;
+  inline ::std::string* mutable_old_col_names(int index);
+  inline void set_old_col_names(int index, const ::std::string& value);
+  inline void set_old_col_names(int index, const char* value);
+  inline void set_old_col_names(int index, const char* value, size_t size);
+  inline ::std::string* add_old_col_names();
+  inline void add_old_col_names(const ::std::string& value);
+  inline void add_old_col_names(const char* value);
+  inline void add_old_col_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& old_col_names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_old_col_names();
+
+  // repeated string new_col_names = 9;
+  inline int new_col_names_size() const;
+  inline void clear_new_col_names();
+  static const int kNewColNamesFieldNumber = 9;
+  inline const ::std::string& new_col_names(int index) const;
+  inline ::std::string* mutable_new_col_names(int index);
+  inline void set_new_col_names(int index, const ::std::string& value);
+  inline void set_new_col_names(int index, const char* value);
+  inline void set_new_col_names(int index, const char* value, size_t size);
+  inline ::std::string* add_new_col_names();
+  inline void add_new_col_names(const ::std::string& value);
+  inline void add_new_col_names(const char* value);
+  inline void add_new_col_names(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& new_col_names() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_new_col_names();
+
+  // optional uint32 rows_to_add = 10;
+  inline bool has_rows_to_add() const;
+  inline void clear_rows_to_add();
+  static const int kRowsToAddFieldNumber = 10;
+  inline ::google::protobuf::uint32 rows_to_add() const;
+  inline void set_rows_to_add(::google::protobuf::uint32 value);
+
+  // optional uint32 cols_to_add = 11;
+  inline bool has_cols_to_add() const;
+  inline void clear_cols_to_add();
+  static const int kColsToAddFieldNumber = 11;
+  inline ::google::protobuf::uint32 cols_to_add() const;
+  inline void set_cols_to_add(::google::protobuf::uint32 value);
+
+  // repeated string row_ids = 12;
+  inline int row_ids_size() const;
+  inline void clear_row_ids();
+  static const int kRowIdsFieldNumber = 12;
+  inline const ::std::string& row_ids(int index) const;
+  inline ::std::string* mutable_row_ids(int index);
+  inline void set_row_ids(int index, const ::std::string& value);
+  inline void set_row_ids(int index, const char* value);
+  inline void set_row_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_row_ids();
+  inline void add_row_ids(const ::std::string& value);
+  inline void add_row_ids(const char* value);
+  inline void add_row_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& row_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_row_ids();
+
+  // repeated string column_ids = 13;
+  inline int column_ids_size() const;
+  inline void clear_column_ids();
+  static const int kColumnIdsFieldNumber = 13;
+  inline const ::std::string& column_ids(int index) const;
+  inline ::std::string* mutable_column_ids(int index);
+  inline void set_column_ids(int index, const ::std::string& value);
+  inline void set_column_ids(int index, const char* value);
+  inline void set_column_ids(int index, const char* value, size_t size);
+  inline ::std::string* add_column_ids();
+  inline void add_column_ids(const ::std::string& value);
+  inline void add_column_ids(const char* value);
+  inline void add_column_ids(const char* value, size_t size);
+  inline const ::google::protobuf::RepeatedPtrField< ::std::string>& column_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::std::string>* mutable_column_ids();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceGridValuesArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_rowindex();
+  inline void clear_has_rowindex();
+  inline void set_has_columnindex();
+  inline void clear_has_columnindex();
+  inline void set_has_rows_to_add();
+  inline void clear_has_rows_to_add();
+  inline void set_has_cols_to_add();
+  inline void clear_has_cols_to_add();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::google::protobuf::uint32 rowindex_;
+  ::google::protobuf::uint32 columnindex_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow > old_data_rows_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow > new_data_rows_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> old_row_names_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> new_row_names_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> old_col_names_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> new_col_names_;
+  ::google::protobuf::uint32 rows_to_add_;
+  ::google::protobuf::uint32 cols_to_add_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> row_ids_;
+  ::google::protobuf::RepeatedPtrField< ::std::string> column_ids_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(13 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceGridValuesArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandReplaceThemePresetArchive_StyleAndIdentifierPair : public ::google::protobuf::Message {
+ public:
+  CommandReplaceThemePresetArchive_StyleAndIdentifierPair();
+  virtual ~CommandReplaceThemePresetArchive_StyleAndIdentifierPair();
+
+  CommandReplaceThemePresetArchive_StyleAndIdentifierPair(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from);
+
+  inline CommandReplaceThemePresetArchive_StyleAndIdentifierPair& operator=(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& default_instance();
+
+  void Swap(CommandReplaceThemePresetArchive_StyleAndIdentifierPair* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceThemePresetArchive_StyleAndIdentifierPair* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from);
+  void MergeFrom(const CommandReplaceThemePresetArchive_StyleAndIdentifierPair& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSP.Reference style = 1;
+  inline bool has_style() const;
+  inline void clear_style();
+  static const int kStyleFieldNumber = 1;
+  inline const ::TSP::Reference& style() const;
+  inline ::TSP::Reference* mutable_style();
+  inline ::TSP::Reference* release_style();
+  inline void set_allocated_style(::TSP::Reference* style);
+
+  // required string identifier = 2;
+  inline bool has_identifier() const;
+  inline void clear_identifier();
+  static const int kIdentifierFieldNumber = 2;
+  inline const ::std::string& identifier() const;
+  inline void set_identifier(const ::std::string& value);
+  inline void set_identifier(const char* value);
+  inline void set_identifier(const char* value, size_t size);
+  inline ::std::string* mutable_identifier();
+  inline ::std::string* release_identifier();
+  inline void set_allocated_identifier(::std::string* identifier);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair)
+ private:
+  inline void set_has_style();
+  inline void clear_has_style();
+  inline void set_has_identifier();
+  inline void clear_has_identifier();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSP::Reference* style_;
+  ::std::string* identifier_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceThemePresetArchive_StyleAndIdentifierPair* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandReplaceThemePresetArchive : public ::google::protobuf::Message {
+ public:
+  CommandReplaceThemePresetArchive();
+  virtual ~CommandReplaceThemePresetArchive();
+
+  CommandReplaceThemePresetArchive(const CommandReplaceThemePresetArchive& from);
+
+  inline CommandReplaceThemePresetArchive& operator=(const CommandReplaceThemePresetArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceThemePresetArchive& default_instance();
+
+  void Swap(CommandReplaceThemePresetArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceThemePresetArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceThemePresetArchive& from);
+  void MergeFrom(const CommandReplaceThemePresetArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef CommandReplaceThemePresetArchive_StyleAndIdentifierPair StyleAndIdentifierPair;
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // required .TSP.Reference theme = 2;
+  inline bool has_theme() const;
+  inline void clear_theme();
+  static const int kThemeFieldNumber = 2;
+  inline const ::TSP::Reference& theme() const;
+  inline ::TSP::Reference* mutable_theme();
+  inline ::TSP::Reference* release_theme();
+  inline void set_allocated_theme(::TSP::Reference* theme);
+
+  // optional .TSP.Reference old_preset = 3;
+  inline bool has_old_preset() const;
+  inline void clear_old_preset();
+  static const int kOldPresetFieldNumber = 3;
+  inline const ::TSP::Reference& old_preset() const;
+  inline ::TSP::Reference* mutable_old_preset();
+  inline ::TSP::Reference* release_old_preset();
+  inline void set_allocated_old_preset(::TSP::Reference* old_preset);
+
+  // optional .TSP.Reference new_preset = 4;
+  inline bool has_new_preset() const;
+  inline void clear_new_preset();
+  static const int kNewPresetFieldNumber = 4;
+  inline const ::TSP::Reference& new_preset() const;
+  inline ::TSP::Reference* mutable_new_preset();
+  inline ::TSP::Reference* release_new_preset();
+  inline void set_allocated_new_preset(::TSP::Reference* new_preset);
+
+  // repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
+  inline int identifiers_size() const;
+  inline void clear_identifiers();
+  static const int kIdentifiersFieldNumber = 5;
+  inline const ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair& identifiers(int index) const;
+  inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* mutable_identifiers(int index);
+  inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* add_identifiers();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >&
+      identifiers() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >*
+      mutable_identifiers();
+
+  // optional uint64 old_preset_index = 6;
+  inline bool has_old_preset_index() const;
+  inline void clear_old_preset_index();
+  static const int kOldPresetIndexFieldNumber = 6;
+  inline ::google::protobuf::uint64 old_preset_index() const;
+  inline void set_old_preset_index(::google::protobuf::uint64 value);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceThemePresetArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_theme();
+  inline void clear_has_theme();
+  inline void set_has_old_preset();
+  inline void clear_has_old_preset();
+  inline void set_has_new_preset();
+  inline void clear_has_new_preset();
+  inline void set_has_old_preset_index();
+  inline void clear_has_old_preset_index();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* theme_;
+  ::TSP::Reference* old_preset_;
+  ::TSP::Reference* new_preset_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair > identifiers_;
+  ::google::protobuf::uint64 old_preset_index_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceThemePresetArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandInvalidateWPCaches : public ::google::protobuf::Message {
+ public:
+  CommandInvalidateWPCaches();
+  virtual ~CommandInvalidateWPCaches();
+
+  CommandInvalidateWPCaches(const CommandInvalidateWPCaches& from);
+
+  inline CommandInvalidateWPCaches& operator=(const CommandInvalidateWPCaches& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandInvalidateWPCaches& default_instance();
+
+  void Swap(CommandInvalidateWPCaches* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandInvalidateWPCaches* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandInvalidateWPCaches& from);
+  void MergeFrom(const CommandInvalidateWPCaches& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandInvalidateWPCaches)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSK::CommandArchive* super_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandInvalidateWPCaches* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandSetGridColumnNameArchive : public ::google::protobuf::Message {
+ public:
+  CommandSetGridColumnNameArchive();
+  virtual ~CommandSetGridColumnNameArchive();
+
+  CommandSetGridColumnNameArchive(const CommandSetGridColumnNameArchive& from);
+
+  inline CommandSetGridColumnNameArchive& operator=(const CommandSetGridColumnNameArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandSetGridColumnNameArchive& default_instance();
+
+  void Swap(CommandSetGridColumnNameArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandSetGridColumnNameArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandSetGridColumnNameArchive& from);
+  void MergeFrom(const CommandSetGridColumnNameArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
+
+  // required uint32 columnindex = 2;
+  inline bool has_columnindex() const;
+  inline void clear_columnindex();
+  static const int kColumnindexFieldNumber = 2;
+  inline ::google::protobuf::uint32 columnindex() const;
+  inline void set_columnindex(::google::protobuf::uint32 value);
+
+  // required string oldvalue = 3;
+  inline bool has_oldvalue() const;
+  inline void clear_oldvalue();
+  static const int kOldvalueFieldNumber = 3;
+  inline const ::std::string& oldvalue() const;
+  inline void set_oldvalue(const ::std::string& value);
+  inline void set_oldvalue(const char* value);
+  inline void set_oldvalue(const char* value, size_t size);
+  inline ::std::string* mutable_oldvalue();
+  inline ::std::string* release_oldvalue();
+  inline void set_allocated_oldvalue(::std::string* oldvalue);
+
+  // required string newvalue = 4;
+  inline bool has_newvalue() const;
+  inline void clear_newvalue();
+  static const int kNewvalueFieldNumber = 4;
+  inline const ::std::string& newvalue() const;
+  inline void set_newvalue(const ::std::string& value);
+  inline void set_newvalue(const char* value);
+  inline void set_newvalue(const char* value, size_t size);
+  inline ::std::string* mutable_newvalue();
+  inline ::std::string* release_newvalue();
+  inline void set_allocated_newvalue(::std::string* newvalue);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetGridColumnNameArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_columnindex();
+  inline void clear_has_columnindex();
+  inline void set_has_oldvalue();
+  inline void clear_has_oldvalue();
+  inline void set_has_newvalue();
+  inline void clear_has_newvalue();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::std::string* oldvalue_;
+  ::std::string* newvalue_;
+  ::google::protobuf::uint32 columnindex_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandSetGridColumnNameArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandSetGridRowNameArchive : public ::google::protobuf::Message {
+ public:
+  CommandSetGridRowNameArchive();
+  virtual ~CommandSetGridRowNameArchive();
+
+  CommandSetGridRowNameArchive(const CommandSetGridRowNameArchive& from);
+
+  inline CommandSetGridRowNameArchive& operator=(const CommandSetGridRowNameArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandSetGridRowNameArchive& default_instance();
+
+  void Swap(CommandSetGridRowNameArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandSetGridRowNameArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandSetGridRowNameArchive& from);
+  void MergeFrom(const CommandSetGridRowNameArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
+
+  // required uint32 rowindex = 2;
+  inline bool has_rowindex() const;
+  inline void clear_rowindex();
+  static const int kRowindexFieldNumber = 2;
+  inline ::google::protobuf::uint32 rowindex() const;
+  inline void set_rowindex(::google::protobuf::uint32 value);
+
+  // required string oldvalue = 3;
+  inline bool has_oldvalue() const;
+  inline void clear_oldvalue();
+  static const int kOldvalueFieldNumber = 3;
+  inline const ::std::string& oldvalue() const;
+  inline void set_oldvalue(const ::std::string& value);
+  inline void set_oldvalue(const char* value);
+  inline void set_oldvalue(const char* value, size_t size);
+  inline ::std::string* mutable_oldvalue();
+  inline ::std::string* release_oldvalue();
+  inline void set_allocated_oldvalue(::std::string* oldvalue);
+
+  // required string newvalue = 4;
+  inline bool has_newvalue() const;
+  inline void clear_newvalue();
+  static const int kNewvalueFieldNumber = 4;
+  inline const ::std::string& newvalue() const;
+  inline void set_newvalue(const ::std::string& value);
+  inline void set_newvalue(const char* value);
+  inline void set_newvalue(const char* value, size_t size);
+  inline ::std::string* mutable_newvalue();
+  inline ::std::string* release_newvalue();
+  inline void set_allocated_newvalue(::std::string* newvalue);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandSetGridRowNameArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_rowindex();
+  inline void clear_has_rowindex();
+  inline void set_has_oldvalue();
+  inline void clear_has_oldvalue();
+  inline void set_has_newvalue();
+  inline void clear_has_newvalue();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::std::string* oldvalue_;
+  ::std::string* newvalue_;
+  ::google::protobuf::uint32 rowindex_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandSetGridRowNameArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandReplaceCustomFormatArchive_FormatObjectMutation : public ::google::protobuf::Message {
+ public:
+  CommandReplaceCustomFormatArchive_FormatObjectMutation();
+  virtual ~CommandReplaceCustomFormatArchive_FormatObjectMutation();
+
+  CommandReplaceCustomFormatArchive_FormatObjectMutation(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from);
+
+  inline CommandReplaceCustomFormatArchive_FormatObjectMutation& operator=(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceCustomFormatArchive_FormatObjectMutation& default_instance();
+
+  void Swap(CommandReplaceCustomFormatArchive_FormatObjectMutation* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceCustomFormatArchive_FormatObjectMutation* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from);
+  void MergeFrom(const CommandReplaceCustomFormatArchive_FormatObjectMutation& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .TSCH.StyleOwnerType style_owner_type = 1;
+  inline bool has_style_owner_type() const;
+  inline void clear_style_owner_type();
+  static const int kStyleOwnerTypeFieldNumber = 1;
+  inline ::TSCH::StyleOwnerType style_owner_type() const;
+  inline void set_style_owner_type(::TSCH::StyleOwnerType value);
+
+  // optional uint32 style_owner_index = 2;
+  inline bool has_style_owner_index() const;
+  inline void clear_style_owner_index();
+  static const int kStyleOwnerIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 style_owner_index() const;
+  inline void set_style_owner_index(::google::protobuf::uint32 value);
+
+  // optional uint32 format_object_property = 3;
+  inline bool has_format_object_property() const;
+  inline void clear_format_object_property();
+  static const int kFormatObjectPropertyFieldNumber = 3;
+  inline ::google::protobuf::uint32 format_object_property() const;
+  inline void set_format_object_property(::google::protobuf::uint32 value);
+
+  // optional .TSK.FormatStructArchive format_object = 4;
+  inline bool has_format_object() const;
+  inline void clear_format_object();
+  static const int kFormatObjectFieldNumber = 4;
+  inline const ::TSK::FormatStructArchive& format_object() const;
+  inline ::TSK::FormatStructArchive* mutable_format_object();
+  inline ::TSK::FormatStructArchive* release_format_object();
+  inline void set_allocated_format_object(::TSK::FormatStructArchive* format_object);
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation)
+ private:
+  inline void set_has_style_owner_type();
+  inline void clear_has_style_owner_type();
+  inline void set_has_style_owner_index();
+  inline void clear_has_style_owner_index();
+  inline void set_has_format_object_property();
+  inline void clear_has_format_object_property();
+  inline void set_has_format_object();
+  inline void clear_has_format_object();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  int style_owner_type_;
+  ::google::protobuf::uint32 style_owner_index_;
+  ::TSK::FormatStructArchive* format_object_;
+  ::google::protobuf::uint32 format_object_property_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceCustomFormatArchive_FormatObjectMutation* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandReplaceCustomFormatArchive : public ::google::protobuf::Message {
+ public:
+  CommandReplaceCustomFormatArchive();
+  virtual ~CommandReplaceCustomFormatArchive();
+
+  CommandReplaceCustomFormatArchive(const CommandReplaceCustomFormatArchive& from);
+
+  inline CommandReplaceCustomFormatArchive& operator=(const CommandReplaceCustomFormatArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceCustomFormatArchive& default_instance();
+
+  void Swap(CommandReplaceCustomFormatArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceCustomFormatArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceCustomFormatArchive& from);
+  void MergeFrom(const CommandReplaceCustomFormatArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef CommandReplaceCustomFormatArchive_FormatObjectMutation FormatObjectMutation;
+
+  // accessors -------------------------------------------------------
+
+  // required .TSCH.ChartCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSCH::ChartCommandArchive& super() const;
+  inline ::TSCH::ChartCommandArchive* mutable_super();
+  inline ::TSCH::ChartCommandArchive* release_super();
+  inline void set_allocated_super(::TSCH::ChartCommandArchive* super);
+
+  // optional .TSP.Reference rollback_cmd = 2;
+  inline bool has_rollback_cmd() const;
+  inline void clear_rollback_cmd();
+  static const int kRollbackCmdFieldNumber = 2;
+  inline const ::TSP::Reference& rollback_cmd() const;
+  inline ::TSP::Reference* mutable_rollback_cmd();
+  inline ::TSP::Reference* release_rollback_cmd();
+  inline void set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd);
+
+  // optional .TSK.FormatStructArchive old_format_object = 3;
+  inline bool has_old_format_object() const;
+  inline void clear_old_format_object();
+  static const int kOldFormatObjectFieldNumber = 3;
+  inline const ::TSK::FormatStructArchive& old_format_object() const;
+  inline ::TSK::FormatStructArchive* mutable_old_format_object();
+  inline ::TSK::FormatStructArchive* release_old_format_object();
+  inline void set_allocated_old_format_object(::TSK::FormatStructArchive* old_format_object);
+
+  // optional .TSK.FormatStructArchive new_format_object = 4;
+  inline bool has_new_format_object() const;
+  inline void clear_new_format_object();
+  static const int kNewFormatObjectFieldNumber = 4;
+  inline const ::TSK::FormatStructArchive& new_format_object() const;
+  inline ::TSK::FormatStructArchive* mutable_new_format_object();
+  inline ::TSK::FormatStructArchive* release_new_format_object();
+  inline void set_allocated_new_format_object(::TSK::FormatStructArchive* new_format_object);
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+  inline int forward_mutations_size() const;
+  inline void clear_forward_mutations();
+  static const int kForwardMutationsFieldNumber = 5;
+  inline const ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation& forward_mutations(int index) const;
+  inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* mutable_forward_mutations(int index);
+  inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* add_forward_mutations();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >&
+      forward_mutations() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >*
+      mutable_forward_mutations();
+
+  // repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+  inline int reverse_mutations_size() const;
+  inline void clear_reverse_mutations();
+  static const int kReverseMutationsFieldNumber = 6;
+  inline const ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation& reverse_mutations(int index) const;
+  inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* mutable_reverse_mutations(int index);
+  inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* add_reverse_mutations();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >&
+      reverse_mutations() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >*
+      mutable_reverse_mutations();
+
+  // @@protoc_insertion_point(class_scope:TSCH.CommandReplaceCustomFormatArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_rollback_cmd();
+  inline void clear_has_rollback_cmd();
+  inline void set_has_old_format_object();
+  inline void clear_has_old_format_object();
+  inline void set_has_new_format_object();
+  inline void clear_has_new_format_object();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCH::ChartCommandArchive* super_;
+  ::TSP::Reference* rollback_cmd_;
+  ::TSK::FormatStructArchive* old_format_object_;
+  ::TSK::FormatStructArchive* new_format_object_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation > forward_mutations_;
+  ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation > reverse_mutations_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSCHCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSCHCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceCustomFormatArchive* default_instance_;
+};
+// ===================================================================
+
+
+// ===================================================================
+
+// CommandSetChartTypeArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetChartTypeArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandSetChartTypeArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandSetChartTypeArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandSetChartTypeArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandSetChartTypeArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetChartTypeArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetChartTypeArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandSetChartTypeArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required .TSCH.ChartType oldChartType = 2;
+inline bool CommandSetChartTypeArchive::has_oldcharttype() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetChartTypeArchive::set_has_oldcharttype() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetChartTypeArchive::clear_has_oldcharttype() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetChartTypeArchive::clear_oldcharttype() {
+  oldcharttype_ = 0;
+  clear_has_oldcharttype();
+}
+inline ::TSCH::ChartType CommandSetChartTypeArchive::oldcharttype() const {
+  return static_cast< ::TSCH::ChartType >(oldcharttype_);
+}
+inline void CommandSetChartTypeArchive::set_oldcharttype(::TSCH::ChartType value) {
+  assert(::TSCH::ChartType_IsValid(value));
+  set_has_oldcharttype();
+  oldcharttype_ = value;
+}
+
+// required .TSCH.ChartType newChartType = 3;
+inline bool CommandSetChartTypeArchive::has_newcharttype() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandSetChartTypeArchive::set_has_newcharttype() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetChartTypeArchive::clear_has_newcharttype() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetChartTypeArchive::clear_newcharttype() {
+  newcharttype_ = 0;
+  clear_has_newcharttype();
+}
+inline ::TSCH::ChartType CommandSetChartTypeArchive::newcharttype() const {
+  return static_cast< ::TSCH::ChartType >(newcharttype_);
+}
+inline void CommandSetChartTypeArchive::set_newcharttype(::TSCH::ChartType value) {
+  assert(::TSCH::ChartType_IsValid(value));
+  set_has_newcharttype();
+  newcharttype_ = value;
+}
+
+// optional .TSP.Reference info_geometry_command = 5;
+inline bool CommandSetChartTypeArchive::has_info_geometry_command() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetChartTypeArchive::set_has_info_geometry_command() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetChartTypeArchive::clear_has_info_geometry_command() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetChartTypeArchive::clear_info_geometry_command() {
+  if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
+  clear_has_info_geometry_command();
+}
+inline const ::TSP::Reference& CommandSetChartTypeArchive::info_geometry_command() const {
+  return info_geometry_command_ != NULL ? *info_geometry_command_ : *default_instance_->info_geometry_command_;
+}
+inline ::TSP::Reference* CommandSetChartTypeArchive::mutable_info_geometry_command() {
+  set_has_info_geometry_command();
+  if (info_geometry_command_ == NULL) info_geometry_command_ = new ::TSP::Reference;
+  return info_geometry_command_;
+}
+inline ::TSP::Reference* CommandSetChartTypeArchive::release_info_geometry_command() {
+  clear_has_info_geometry_command();
+  ::TSP::Reference* temp = info_geometry_command_;
+  info_geometry_command_ = NULL;
+  return temp;
+}
+inline void CommandSetChartTypeArchive::set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command) {
+  delete info_geometry_command_;
+  info_geometry_command_ = info_geometry_command;
+  if (info_geometry_command) {
+    set_has_info_geometry_command();
+  } else {
+    clear_has_info_geometry_command();
+  }
+}
+
+// optional .TSP.Reference anchor_attachment_command = 6;
+inline bool CommandSetChartTypeArchive::has_anchor_attachment_command() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSetChartTypeArchive::set_has_anchor_attachment_command() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSetChartTypeArchive::clear_has_anchor_attachment_command() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSetChartTypeArchive::clear_anchor_attachment_command() {
+  if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
+  clear_has_anchor_attachment_command();
+}
+inline const ::TSP::Reference& CommandSetChartTypeArchive::anchor_attachment_command() const {
+  return anchor_attachment_command_ != NULL ? *anchor_attachment_command_ : *default_instance_->anchor_attachment_command_;
+}
+inline ::TSP::Reference* CommandSetChartTypeArchive::mutable_anchor_attachment_command() {
+  set_has_anchor_attachment_command();
+  if (anchor_attachment_command_ == NULL) anchor_attachment_command_ = new ::TSP::Reference;
+  return anchor_attachment_command_;
+}
+inline ::TSP::Reference* CommandSetChartTypeArchive::release_anchor_attachment_command() {
+  clear_has_anchor_attachment_command();
+  ::TSP::Reference* temp = anchor_attachment_command_;
+  anchor_attachment_command_ = NULL;
+  return temp;
+}
+inline void CommandSetChartTypeArchive::set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command) {
+  delete anchor_attachment_command_;
+  anchor_attachment_command_ = anchor_attachment_command;
+  if (anchor_attachment_command) {
+    set_has_anchor_attachment_command();
+  } else {
+    clear_has_anchor_attachment_command();
+  }
+}
+
+// optional .TSCH.RectArchive original_legend_rect = 7;
+inline bool CommandSetChartTypeArchive::has_original_legend_rect() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandSetChartTypeArchive::set_has_original_legend_rect() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandSetChartTypeArchive::clear_has_original_legend_rect() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandSetChartTypeArchive::clear_original_legend_rect() {
+  if (original_legend_rect_ != NULL) original_legend_rect_->::TSCH::RectArchive::Clear();
+  clear_has_original_legend_rect();
+}
+inline const ::TSCH::RectArchive& CommandSetChartTypeArchive::original_legend_rect() const {
+  return original_legend_rect_ != NULL ? *original_legend_rect_ : *default_instance_->original_legend_rect_;
+}
+inline ::TSCH::RectArchive* CommandSetChartTypeArchive::mutable_original_legend_rect() {
+  set_has_original_legend_rect();
+  if (original_legend_rect_ == NULL) original_legend_rect_ = new ::TSCH::RectArchive;
+  return original_legend_rect_;
+}
+inline ::TSCH::RectArchive* CommandSetChartTypeArchive::release_original_legend_rect() {
+  clear_has_original_legend_rect();
+  ::TSCH::RectArchive* temp = original_legend_rect_;
+  original_legend_rect_ = NULL;
+  return temp;
+}
+inline void CommandSetChartTypeArchive::set_allocated_original_legend_rect(::TSCH::RectArchive* original_legend_rect) {
+  delete original_legend_rect_;
+  original_legend_rect_ = original_legend_rect;
+  if (original_legend_rect) {
+    set_has_original_legend_rect();
+  } else {
+    clear_has_original_legend_rect();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// StyleSwapUndoTupleArchive
+
+// optional .TSP.Reference chart_info = 1;
+inline bool StyleSwapUndoTupleArchive::has_chart_info() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void StyleSwapUndoTupleArchive::set_has_chart_info() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void StyleSwapUndoTupleArchive::clear_has_chart_info() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void StyleSwapUndoTupleArchive::clear_chart_info() {
+  if (chart_info_ != NULL) chart_info_->::TSP::Reference::Clear();
+  clear_has_chart_info();
+}
+inline const ::TSP::Reference& StyleSwapUndoTupleArchive::chart_info() const {
+  return chart_info_ != NULL ? *chart_info_ : *default_instance_->chart_info_;
+}
+inline ::TSP::Reference* StyleSwapUndoTupleArchive::mutable_chart_info() {
+  set_has_chart_info();
+  if (chart_info_ == NULL) chart_info_ = new ::TSP::Reference;
+  return chart_info_;
+}
+inline ::TSP::Reference* StyleSwapUndoTupleArchive::release_chart_info() {
+  clear_has_chart_info();
+  ::TSP::Reference* temp = chart_info_;
+  chart_info_ = NULL;
+  return temp;
+}
+inline void StyleSwapUndoTupleArchive::set_allocated_chart_info(::TSP::Reference* chart_info) {
+  delete chart_info_;
+  chart_info_ = chart_info;
+  if (chart_info) {
+    set_has_chart_info();
+  } else {
+    clear_has_chart_info();
+  }
+}
+
+// optional .TSCH.StyleSwapType swap_type = 2;
+inline bool StyleSwapUndoTupleArchive::has_swap_type() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void StyleSwapUndoTupleArchive::set_has_swap_type() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void StyleSwapUndoTupleArchive::clear_has_swap_type() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void StyleSwapUndoTupleArchive::clear_swap_type() {
+  swap_type_ = 1;
+  clear_has_swap_type();
+}
+inline ::TSCH::StyleSwapType StyleSwapUndoTupleArchive::swap_type() const {
+  return static_cast< ::TSCH::StyleSwapType >(swap_type_);
+}
+inline void StyleSwapUndoTupleArchive::set_swap_type(::TSCH::StyleSwapType value) {
+  assert(::TSCH::StyleSwapType_IsValid(value));
+  set_has_swap_type();
+  swap_type_ = value;
+}
+
+// optional uint32 index = 3;
+inline bool StyleSwapUndoTupleArchive::has_index() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void StyleSwapUndoTupleArchive::set_has_index() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void StyleSwapUndoTupleArchive::clear_has_index() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void StyleSwapUndoTupleArchive::clear_index() {
+  index_ = 0u;
+  clear_has_index();
+}
+inline ::google::protobuf::uint32 StyleSwapUndoTupleArchive::index() const {
+  return index_;
+}
+inline void StyleSwapUndoTupleArchive::set_index(::google::protobuf::uint32 value) {
+  set_has_index();
+  index_ = value;
+}
+
+// optional .TSP.Reference old_value = 4;
+inline bool StyleSwapUndoTupleArchive::has_old_value() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void StyleSwapUndoTupleArchive::set_has_old_value() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void StyleSwapUndoTupleArchive::clear_has_old_value() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void StyleSwapUndoTupleArchive::clear_old_value() {
+  if (old_value_ != NULL) old_value_->::TSP::Reference::Clear();
+  clear_has_old_value();
+}
+inline const ::TSP::Reference& StyleSwapUndoTupleArchive::old_value() const {
+  return old_value_ != NULL ? *old_value_ : *default_instance_->old_value_;
+}
+inline ::TSP::Reference* StyleSwapUndoTupleArchive::mutable_old_value() {
+  set_has_old_value();
+  if (old_value_ == NULL) old_value_ = new ::TSP::Reference;
+  return old_value_;
+}
+inline ::TSP::Reference* StyleSwapUndoTupleArchive::release_old_value() {
+  clear_has_old_value();
+  ::TSP::Reference* temp = old_value_;
+  old_value_ = NULL;
+  return temp;
+}
+inline void StyleSwapUndoTupleArchive::set_allocated_old_value(::TSP::Reference* old_value) {
+  delete old_value_;
+  old_value_ = old_value;
+  if (old_value) {
+    set_has_old_value();
+  } else {
+    clear_has_old_value();
+  }
+}
+
+// optional .TSP.Reference new_value = 5;
+inline bool StyleSwapUndoTupleArchive::has_new_value() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void StyleSwapUndoTupleArchive::set_has_new_value() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void StyleSwapUndoTupleArchive::clear_has_new_value() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void StyleSwapUndoTupleArchive::clear_new_value() {
+  if (new_value_ != NULL) new_value_->::TSP::Reference::Clear();
+  clear_has_new_value();
+}
+inline const ::TSP::Reference& StyleSwapUndoTupleArchive::new_value() const {
+  return new_value_ != NULL ? *new_value_ : *default_instance_->new_value_;
+}
+inline ::TSP::Reference* StyleSwapUndoTupleArchive::mutable_new_value() {
+  set_has_new_value();
+  if (new_value_ == NULL) new_value_ = new ::TSP::Reference;
+  return new_value_;
+}
+inline ::TSP::Reference* StyleSwapUndoTupleArchive::release_new_value() {
+  clear_has_new_value();
+  ::TSP::Reference* temp = new_value_;
+  new_value_ = NULL;
+  return temp;
+}
+inline void StyleSwapUndoTupleArchive::set_allocated_new_value(::TSP::Reference* new_value) {
+  delete new_value_;
+  new_value_ = new_value;
+  if (new_value) {
+    set_has_new_value();
+  } else {
+    clear_has_new_value();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandStyleSwapArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandStyleSwapArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandStyleSwapArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandStyleSwapArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandStyleSwapArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandStyleSwapArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandStyleSwapArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandStyleSwapArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandStyleSwapArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
+inline int CommandStyleSwapArchive::undo_tuples_size() const {
+  return undo_tuples_.size();
+}
+inline void CommandStyleSwapArchive::clear_undo_tuples() {
+  undo_tuples_.Clear();
+}
+inline const ::TSCH::StyleSwapUndoTupleArchive& CommandStyleSwapArchive::undo_tuples(int index) const {
+  return undo_tuples_.Get(index);
+}
+inline ::TSCH::StyleSwapUndoTupleArchive* CommandStyleSwapArchive::mutable_undo_tuples(int index) {
+  return undo_tuples_.Mutable(index);
+}
+inline ::TSCH::StyleSwapUndoTupleArchive* CommandStyleSwapArchive::add_undo_tuples() {
+  return undo_tuples_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::StyleSwapUndoTupleArchive >&
+CommandStyleSwapArchive::undo_tuples() const {
+  return undo_tuples_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::StyleSwapUndoTupleArchive >*
+CommandStyleSwapArchive::mutable_undo_tuples() {
+  return &undo_tuples_;
+}
+
+// -------------------------------------------------------------------
+
+// CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion
+
+// optional .TSCH.Generated.ChartGenericPropertyMapArchive chart_map = 2;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::has_chart_map() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_has_chart_map() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_has_chart_map() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_chart_map() {
+  if (chart_map_ != NULL) chart_map_->::TSCH::Generated::ChartGenericPropertyMapArchive::Clear();
+  clear_has_chart_map();
+}
+inline const ::TSCH::Generated::ChartGenericPropertyMapArchive& CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::chart_map() const {
+  return chart_map_ != NULL ? *chart_map_ : *default_instance_->chart_map_;
+}
+inline ::TSCH::Generated::ChartGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::mutable_chart_map() {
+  set_has_chart_map();
+  if (chart_map_ == NULL) chart_map_ = new ::TSCH::Generated::ChartGenericPropertyMapArchive;
+  return chart_map_;
+}
+inline ::TSCH::Generated::ChartGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::release_chart_map() {
+  clear_has_chart_map();
+  ::TSCH::Generated::ChartGenericPropertyMapArchive* temp = chart_map_;
+  chart_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_allocated_chart_map(::TSCH::Generated::ChartGenericPropertyMapArchive* chart_map) {
+  delete chart_map_;
+  chart_map_ = chart_map;
+  if (chart_map) {
+    set_has_chart_map();
+  } else {
+    clear_has_chart_map();
+  }
+}
+
+// optional .TSCH.Generated.LegendGenericPropertyMapArchive legend_map = 3;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::has_legend_map() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_has_legend_map() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_has_legend_map() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_legend_map() {
+  if (legend_map_ != NULL) legend_map_->::TSCH::Generated::LegendGenericPropertyMapArchive::Clear();
+  clear_has_legend_map();
+}
+inline const ::TSCH::Generated::LegendGenericPropertyMapArchive& CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::legend_map() const {
+  return legend_map_ != NULL ? *legend_map_ : *default_instance_->legend_map_;
+}
+inline ::TSCH::Generated::LegendGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::mutable_legend_map() {
+  set_has_legend_map();
+  if (legend_map_ == NULL) legend_map_ = new ::TSCH::Generated::LegendGenericPropertyMapArchive;
+  return legend_map_;
+}
+inline ::TSCH::Generated::LegendGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::release_legend_map() {
+  clear_has_legend_map();
+  ::TSCH::Generated::LegendGenericPropertyMapArchive* temp = legend_map_;
+  legend_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_allocated_legend_map(::TSCH::Generated::LegendGenericPropertyMapArchive* legend_map) {
+  delete legend_map_;
+  legend_map_ = legend_map;
+  if (legend_map) {
+    set_has_legend_map();
+  } else {
+    clear_has_legend_map();
+  }
+}
+
+// optional .TSCH.Generated.ChartAxisGenericPropertyMapArchive axis_map = 4;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::has_axis_map() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_has_axis_map() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_has_axis_map() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_axis_map() {
+  if (axis_map_ != NULL) axis_map_->::TSCH::Generated::ChartAxisGenericPropertyMapArchive::Clear();
+  clear_has_axis_map();
+}
+inline const ::TSCH::Generated::ChartAxisGenericPropertyMapArchive& CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::axis_map() const {
+  return axis_map_ != NULL ? *axis_map_ : *default_instance_->axis_map_;
+}
+inline ::TSCH::Generated::ChartAxisGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::mutable_axis_map() {
+  set_has_axis_map();
+  if (axis_map_ == NULL) axis_map_ = new ::TSCH::Generated::ChartAxisGenericPropertyMapArchive;
+  return axis_map_;
+}
+inline ::TSCH::Generated::ChartAxisGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::release_axis_map() {
+  clear_has_axis_map();
+  ::TSCH::Generated::ChartAxisGenericPropertyMapArchive* temp = axis_map_;
+  axis_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_allocated_axis_map(::TSCH::Generated::ChartAxisGenericPropertyMapArchive* axis_map) {
+  delete axis_map_;
+  axis_map_ = axis_map;
+  if (axis_map) {
+    set_has_axis_map();
+  } else {
+    clear_has_axis_map();
+  }
+}
+
+// optional .TSCH.Generated.ChartSeriesGenericPropertyMapArchive series_map = 5;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::has_series_map() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_has_series_map() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_has_series_map() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::clear_series_map() {
+  if (series_map_ != NULL) series_map_->::TSCH::Generated::ChartSeriesGenericPropertyMapArchive::Clear();
+  clear_has_series_map();
+}
+inline const ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive& CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::series_map() const {
+  return series_map_ != NULL ? *series_map_ : *default_instance_->series_map_;
+}
+inline ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::mutable_series_map() {
+  set_has_series_map();
+  if (series_map_ == NULL) series_map_ = new ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive;
+  return series_map_;
+}
+inline ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::release_series_map() {
+  clear_has_series_map();
+  ::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* temp = series_map_;
+  series_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::set_allocated_series_map(::TSCH::Generated::ChartSeriesGenericPropertyMapArchive* series_map) {
+  delete series_map_;
+  series_map_ = series_map;
+  if (series_map) {
+    set_has_series_map();
+  } else {
+    clear_has_series_map();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandMutatePropertiesArchive_GenericPropertyDeltaMap
+
+// optional .TSCH.StyleOwnerType style_owner_type = 1;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap::has_style_owner_type() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_has_style_owner_type() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_has_style_owner_type() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_style_owner_type() {
+  style_owner_type_ = 1;
+  clear_has_style_owner_type();
+}
+inline ::TSCH::StyleOwnerType CommandMutatePropertiesArchive_GenericPropertyDeltaMap::style_owner_type() const {
+  return static_cast< ::TSCH::StyleOwnerType >(style_owner_type_);
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_style_owner_type(::TSCH::StyleOwnerType value) {
+  assert(::TSCH::StyleOwnerType_IsValid(value));
+  set_has_style_owner_type();
+  style_owner_type_ = value;
+}
+
+// optional uint32 style_owner_index = 2;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap::has_style_owner_index() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_has_style_owner_index() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_has_style_owner_index() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_style_owner_index() {
+  style_owner_index_ = 0u;
+  clear_has_style_owner_index();
+}
+inline ::google::protobuf::uint32 CommandMutatePropertiesArchive_GenericPropertyDeltaMap::style_owner_index() const {
+  return style_owner_index_;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_style_owner_index(::google::protobuf::uint32 value) {
+  set_has_style_owner_index();
+  style_owner_index_ = value;
+}
+
+// optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion forward_map = 3;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap::has_forward_map() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_has_forward_map() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_has_forward_map() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_forward_map() {
+  if (forward_map_ != NULL) forward_map_->::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::Clear();
+  clear_has_forward_map();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& CommandMutatePropertiesArchive_GenericPropertyDeltaMap::forward_map() const {
+  return forward_map_ != NULL ? *forward_map_ : *default_instance_->forward_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::mutable_forward_map() {
+  set_has_forward_map();
+  if (forward_map_ == NULL) forward_map_ = new ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion;
+  return forward_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::release_forward_map() {
+  clear_has_forward_map();
+  ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* temp = forward_map_;
+  forward_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_allocated_forward_map(::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* forward_map) {
+  delete forward_map_;
+  forward_map_ = forward_map;
+  if (forward_map) {
+    set_has_forward_map();
+  } else {
+    clear_has_forward_map();
+  }
+}
+
+// optional .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap.GenericMapUnion reverse_map = 4;
+inline bool CommandMutatePropertiesArchive_GenericPropertyDeltaMap::has_reverse_map() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_has_reverse_map() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_has_reverse_map() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::clear_reverse_map() {
+  if (reverse_map_ != NULL) reverse_map_->::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion::Clear();
+  clear_has_reverse_map();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion& CommandMutatePropertiesArchive_GenericPropertyDeltaMap::reverse_map() const {
+  return reverse_map_ != NULL ? *reverse_map_ : *default_instance_->reverse_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::mutable_reverse_map() {
+  set_has_reverse_map();
+  if (reverse_map_ == NULL) reverse_map_ = new ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion;
+  return reverse_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* CommandMutatePropertiesArchive_GenericPropertyDeltaMap::release_reverse_map() {
+  clear_has_reverse_map();
+  ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* temp = reverse_map_;
+  reverse_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_GenericPropertyDeltaMap::set_allocated_reverse_map(::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap_GenericMapUnion* reverse_map) {
+  delete reverse_map_;
+  reverse_map_ = reverse_map;
+  if (reverse_map) {
+    set_has_reverse_map();
+  } else {
+    clear_has_reverse_map();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive
+
+// optional .TSWP.CharacterStylePropertiesArchive char_properties = 1;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::has_char_properties() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::set_has_char_properties() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::clear_has_char_properties() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::clear_char_properties() {
+  if (char_properties_ != NULL) char_properties_->::TSWP::CharacterStylePropertiesArchive::Clear();
+  clear_has_char_properties();
+}
+inline const ::TSWP::CharacterStylePropertiesArchive& CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::char_properties() const {
+  return char_properties_ != NULL ? *char_properties_ : *default_instance_->char_properties_;
+}
+inline ::TSWP::CharacterStylePropertiesArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::mutable_char_properties() {
+  set_has_char_properties();
+  if (char_properties_ == NULL) char_properties_ = new ::TSWP::CharacterStylePropertiesArchive;
+  return char_properties_;
+}
+inline ::TSWP::CharacterStylePropertiesArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::release_char_properties() {
+  clear_has_char_properties();
+  ::TSWP::CharacterStylePropertiesArchive* temp = char_properties_;
+  char_properties_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::set_allocated_char_properties(::TSWP::CharacterStylePropertiesArchive* char_properties) {
+  delete char_properties_;
+  char_properties_ = char_properties;
+  if (char_properties) {
+    set_has_char_properties();
+  } else {
+    clear_has_char_properties();
+  }
+}
+
+// optional .TSWP.ParagraphStylePropertiesArchive para_properties = 2;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::has_para_properties() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::set_has_para_properties() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::clear_has_para_properties() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::clear_para_properties() {
+  if (para_properties_ != NULL) para_properties_->::TSWP::ParagraphStylePropertiesArchive::Clear();
+  clear_has_para_properties();
+}
+inline const ::TSWP::ParagraphStylePropertiesArchive& CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::para_properties() const {
+  return para_properties_ != NULL ? *para_properties_ : *default_instance_->para_properties_;
+}
+inline ::TSWP::ParagraphStylePropertiesArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::mutable_para_properties() {
+  set_has_para_properties();
+  if (para_properties_ == NULL) para_properties_ = new ::TSWP::ParagraphStylePropertiesArchive;
+  return para_properties_;
+}
+inline ::TSWP::ParagraphStylePropertiesArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::release_para_properties() {
+  clear_has_para_properties();
+  ::TSWP::ParagraphStylePropertiesArchive* temp = para_properties_;
+  para_properties_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::set_allocated_para_properties(::TSWP::ParagraphStylePropertiesArchive* para_properties) {
+  delete para_properties_;
+  para_properties_ = para_properties;
+  if (para_properties) {
+    set_has_para_properties();
+  } else {
+    clear_has_para_properties();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandMutatePropertiesArchive_ParagraphStyleDeltaMap
+
+// optional .TSCH.StyleOwnerType style_owner_type = 1;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::has_style_owner_type() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_has_style_owner_type() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_has_style_owner_type() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_style_owner_type() {
+  style_owner_type_ = 1;
+  clear_has_style_owner_type();
+}
+inline ::TSCH::StyleOwnerType CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::style_owner_type() const {
+  return static_cast< ::TSCH::StyleOwnerType >(style_owner_type_);
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_style_owner_type(::TSCH::StyleOwnerType value) {
+  assert(::TSCH::StyleOwnerType_IsValid(value));
+  set_has_style_owner_type();
+  style_owner_type_ = value;
+}
+
+// optional uint32 style_owner_index = 2;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::has_style_owner_index() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_has_style_owner_index() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_has_style_owner_index() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_style_owner_index() {
+  style_owner_index_ = 0u;
+  clear_has_style_owner_index();
+}
+inline ::google::protobuf::uint32 CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::style_owner_index() const {
+  return style_owner_index_;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_style_owner_index(::google::protobuf::uint32 value) {
+  set_has_style_owner_index();
+  style_owner_index_ = value;
+}
+
+// optional uint32 paragraph_style_index_property = 3;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::has_paragraph_style_index_property() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_has_paragraph_style_index_property() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_has_paragraph_style_index_property() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_paragraph_style_index_property() {
+  paragraph_style_index_property_ = 0u;
+  clear_has_paragraph_style_index_property();
+}
+inline ::google::protobuf::uint32 CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::paragraph_style_index_property() const {
+  return paragraph_style_index_property_;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_paragraph_style_index_property(::google::protobuf::uint32 value) {
+  set_has_paragraph_style_index_property();
+  paragraph_style_index_property_ = value;
+}
+
+// optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive forward_map = 4;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::has_forward_map() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_has_forward_map() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_has_forward_map() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_forward_map() {
+  if (forward_map_ != NULL) forward_map_->::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::Clear();
+  clear_has_forward_map();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::forward_map() const {
+  return forward_map_ != NULL ? *forward_map_ : *default_instance_->forward_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::mutable_forward_map() {
+  set_has_forward_map();
+  if (forward_map_ == NULL) forward_map_ = new ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive;
+  return forward_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::release_forward_map() {
+  clear_has_forward_map();
+  ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* temp = forward_map_;
+  forward_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_allocated_forward_map(::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* forward_map) {
+  delete forward_map_;
+  forward_map_ = forward_map;
+  if (forward_map) {
+    set_has_forward_map();
+  } else {
+    clear_has_forward_map();
+  }
+}
+
+// optional .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap.ParagraphStylePropertyMapArchive reverse_map = 5;
+inline bool CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::has_reverse_map() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_has_reverse_map() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_has_reverse_map() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::clear_reverse_map() {
+  if (reverse_map_ != NULL) reverse_map_->::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive::Clear();
+  clear_has_reverse_map();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive& CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::reverse_map() const {
+  return reverse_map_ != NULL ? *reverse_map_ : *default_instance_->reverse_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::mutable_reverse_map() {
+  set_has_reverse_map();
+  if (reverse_map_ == NULL) reverse_map_ = new ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive;
+  return reverse_map_;
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::release_reverse_map() {
+  clear_has_reverse_map();
+  ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* temp = reverse_map_;
+  reverse_map_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive_ParagraphStyleDeltaMap::set_allocated_reverse_map(::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap_ParagraphStylePropertyMapArchive* reverse_map) {
+  delete reverse_map_;
+  reverse_map_ = reverse_map;
+  if (reverse_map) {
+    set_has_reverse_map();
+  } else {
+    clear_has_reverse_map();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandMutatePropertiesArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandMutatePropertiesArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandMutatePropertiesArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandMutatePropertiesArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandMutatePropertiesArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandMutatePropertiesArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandMutatePropertiesArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandMutatePropertiesArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// optional .TSP.Reference rollback_cmd = 2;
+inline bool CommandMutatePropertiesArchive::has_rollback_cmd() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMutatePropertiesArchive::set_has_rollback_cmd() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMutatePropertiesArchive::clear_has_rollback_cmd() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMutatePropertiesArchive::clear_rollback_cmd() {
+  if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+  clear_has_rollback_cmd();
+}
+inline const ::TSP::Reference& CommandMutatePropertiesArchive::rollback_cmd() const {
+  return rollback_cmd_ != NULL ? *rollback_cmd_ : *default_instance_->rollback_cmd_;
+}
+inline ::TSP::Reference* CommandMutatePropertiesArchive::mutable_rollback_cmd() {
+  set_has_rollback_cmd();
+  if (rollback_cmd_ == NULL) rollback_cmd_ = new ::TSP::Reference;
+  return rollback_cmd_;
+}
+inline ::TSP::Reference* CommandMutatePropertiesArchive::release_rollback_cmd() {
+  clear_has_rollback_cmd();
+  ::TSP::Reference* temp = rollback_cmd_;
+  rollback_cmd_ = NULL;
+  return temp;
+}
+inline void CommandMutatePropertiesArchive::set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd) {
+  delete rollback_cmd_;
+  rollback_cmd_ = rollback_cmd;
+  if (rollback_cmd) {
+    set_has_rollback_cmd();
+  } else {
+    clear_has_rollback_cmd();
+  }
+}
+
+// repeated .TSCH.CommandMutatePropertiesArchive.GenericPropertyDeltaMap generic_property_delta_maps = 3;
+inline int CommandMutatePropertiesArchive::generic_property_delta_maps_size() const {
+  return generic_property_delta_maps_.size();
+}
+inline void CommandMutatePropertiesArchive::clear_generic_property_delta_maps() {
+  generic_property_delta_maps_.Clear();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap& CommandMutatePropertiesArchive::generic_property_delta_maps(int index) const {
+  return generic_property_delta_maps_.Get(index);
+}
+inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap* CommandMutatePropertiesArchive::mutable_generic_property_delta_maps(int index) {
+  return generic_property_delta_maps_.Mutable(index);
+}
+inline ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap* CommandMutatePropertiesArchive::add_generic_property_delta_maps() {
+  return generic_property_delta_maps_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap >&
+CommandMutatePropertiesArchive::generic_property_delta_maps() const {
+  return generic_property_delta_maps_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_GenericPropertyDeltaMap >*
+CommandMutatePropertiesArchive::mutable_generic_property_delta_maps() {
+  return &generic_property_delta_maps_;
+}
+
+// repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 4;
+inline int CommandMutatePropertiesArchive::paragraph_style_delta_maps_size() const {
+  return paragraph_style_delta_maps_.size();
+}
+inline void CommandMutatePropertiesArchive::clear_paragraph_style_delta_maps() {
+  paragraph_style_delta_maps_.Clear();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& CommandMutatePropertiesArchive::paragraph_style_delta_maps(int index) const {
+  return paragraph_style_delta_maps_.Get(index);
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* CommandMutatePropertiesArchive::mutable_paragraph_style_delta_maps(int index) {
+  return paragraph_style_delta_maps_.Mutable(index);
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* CommandMutatePropertiesArchive::add_paragraph_style_delta_maps() {
+  return paragraph_style_delta_maps_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >&
+CommandMutatePropertiesArchive::paragraph_style_delta_maps() const {
+  return paragraph_style_delta_maps_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >*
+CommandMutatePropertiesArchive::mutable_paragraph_style_delta_maps() {
+  return &paragraph_style_delta_maps_;
+}
+
+// -------------------------------------------------------------------
+
+// CommandScaleAllTextArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandScaleAllTextArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandScaleAllTextArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandScaleAllTextArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandScaleAllTextArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandScaleAllTextArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandScaleAllTextArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandScaleAllTextArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandScaleAllTextArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// optional .TSP.Reference rollback_cmd = 2;
+inline bool CommandScaleAllTextArchive::has_rollback_cmd() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandScaleAllTextArchive::set_has_rollback_cmd() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandScaleAllTextArchive::clear_has_rollback_cmd() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandScaleAllTextArchive::clear_rollback_cmd() {
+  if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+  clear_has_rollback_cmd();
+}
+inline const ::TSP::Reference& CommandScaleAllTextArchive::rollback_cmd() const {
+  return rollback_cmd_ != NULL ? *rollback_cmd_ : *default_instance_->rollback_cmd_;
+}
+inline ::TSP::Reference* CommandScaleAllTextArchive::mutable_rollback_cmd() {
+  set_has_rollback_cmd();
+  if (rollback_cmd_ == NULL) rollback_cmd_ = new ::TSP::Reference;
+  return rollback_cmd_;
+}
+inline ::TSP::Reference* CommandScaleAllTextArchive::release_rollback_cmd() {
+  clear_has_rollback_cmd();
+  ::TSP::Reference* temp = rollback_cmd_;
+  rollback_cmd_ = NULL;
+  return temp;
+}
+inline void CommandScaleAllTextArchive::set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd) {
+  delete rollback_cmd_;
+  rollback_cmd_ = rollback_cmd;
+  if (rollback_cmd) {
+    set_has_rollback_cmd();
+  } else {
+    clear_has_rollback_cmd();
+  }
+}
+
+// optional double scale_factor = 3;
+inline bool CommandScaleAllTextArchive::has_scale_factor() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandScaleAllTextArchive::set_has_scale_factor() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandScaleAllTextArchive::clear_has_scale_factor() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandScaleAllTextArchive::clear_scale_factor() {
+  scale_factor_ = 0;
+  clear_has_scale_factor();
+}
+inline double CommandScaleAllTextArchive::scale_factor() const {
+  return scale_factor_;
+}
+inline void CommandScaleAllTextArchive::set_scale_factor(double value) {
+  set_has_scale_factor();
+  scale_factor_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandSetFontFamilyArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetFontFamilyArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandSetFontFamilyArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandSetFontFamilyArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandSetFontFamilyArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandSetFontFamilyArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetFontFamilyArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetFontFamilyArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandSetFontFamilyArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// optional .TSP.Reference rollback_cmd = 2;
+inline bool CommandSetFontFamilyArchive::has_rollback_cmd() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetFontFamilyArchive::set_has_rollback_cmd() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetFontFamilyArchive::clear_has_rollback_cmd() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetFontFamilyArchive::clear_rollback_cmd() {
+  if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+  clear_has_rollback_cmd();
+}
+inline const ::TSP::Reference& CommandSetFontFamilyArchive::rollback_cmd() const {
+  return rollback_cmd_ != NULL ? *rollback_cmd_ : *default_instance_->rollback_cmd_;
+}
+inline ::TSP::Reference* CommandSetFontFamilyArchive::mutable_rollback_cmd() {
+  set_has_rollback_cmd();
+  if (rollback_cmd_ == NULL) rollback_cmd_ = new ::TSP::Reference;
+  return rollback_cmd_;
+}
+inline ::TSP::Reference* CommandSetFontFamilyArchive::release_rollback_cmd() {
+  clear_has_rollback_cmd();
+  ::TSP::Reference* temp = rollback_cmd_;
+  rollback_cmd_ = NULL;
+  return temp;
+}
+inline void CommandSetFontFamilyArchive::set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd) {
+  delete rollback_cmd_;
+  rollback_cmd_ = rollback_cmd;
+  if (rollback_cmd) {
+    set_has_rollback_cmd();
+  } else {
+    clear_has_rollback_cmd();
+  }
+}
+
+// optional string new_font_family = 3;
+inline bool CommandSetFontFamilyArchive::has_new_font_family() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandSetFontFamilyArchive::set_has_new_font_family() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetFontFamilyArchive::clear_has_new_font_family() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetFontFamilyArchive::clear_new_font_family() {
+  if (new_font_family_ != &::google::protobuf::internal::kEmptyString) {
+    new_font_family_->clear();
+  }
+  clear_has_new_font_family();
+}
+inline const ::std::string& CommandSetFontFamilyArchive::new_font_family() const {
+  return *new_font_family_;
+}
+inline void CommandSetFontFamilyArchive::set_new_font_family(const ::std::string& value) {
+  set_has_new_font_family();
+  if (new_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    new_font_family_ = new ::std::string;
+  }
+  new_font_family_->assign(value);
+}
+inline void CommandSetFontFamilyArchive::set_new_font_family(const char* value) {
+  set_has_new_font_family();
+  if (new_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    new_font_family_ = new ::std::string;
+  }
+  new_font_family_->assign(value);
+}
+inline void CommandSetFontFamilyArchive::set_new_font_family(const char* value, size_t size) {
+  set_has_new_font_family();
+  if (new_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    new_font_family_ = new ::std::string;
+  }
+  new_font_family_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetFontFamilyArchive::mutable_new_font_family() {
+  set_has_new_font_family();
+  if (new_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    new_font_family_ = new ::std::string;
+  }
+  return new_font_family_;
+}
+inline ::std::string* CommandSetFontFamilyArchive::release_new_font_family() {
+  clear_has_new_font_family();
+  if (new_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = new_font_family_;
+    new_font_family_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetFontFamilyArchive::set_allocated_new_font_family(::std::string* new_font_family) {
+  if (new_font_family_ != &::google::protobuf::internal::kEmptyString) {
+    delete new_font_family_;
+  }
+  if (new_font_family) {
+    set_has_new_font_family();
+    new_font_family_ = new_font_family;
+  } else {
+    clear_has_new_font_family();
+    new_font_family_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional string old_font_family = 4;
+inline bool CommandSetFontFamilyArchive::has_old_font_family() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetFontFamilyArchive::set_has_old_font_family() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetFontFamilyArchive::clear_has_old_font_family() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetFontFamilyArchive::clear_old_font_family() {
+  if (old_font_family_ != &::google::protobuf::internal::kEmptyString) {
+    old_font_family_->clear();
+  }
+  clear_has_old_font_family();
+}
+inline const ::std::string& CommandSetFontFamilyArchive::old_font_family() const {
+  return *old_font_family_;
+}
+inline void CommandSetFontFamilyArchive::set_old_font_family(const ::std::string& value) {
+  set_has_old_font_family();
+  if (old_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    old_font_family_ = new ::std::string;
+  }
+  old_font_family_->assign(value);
+}
+inline void CommandSetFontFamilyArchive::set_old_font_family(const char* value) {
+  set_has_old_font_family();
+  if (old_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    old_font_family_ = new ::std::string;
+  }
+  old_font_family_->assign(value);
+}
+inline void CommandSetFontFamilyArchive::set_old_font_family(const char* value, size_t size) {
+  set_has_old_font_family();
+  if (old_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    old_font_family_ = new ::std::string;
+  }
+  old_font_family_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetFontFamilyArchive::mutable_old_font_family() {
+  set_has_old_font_family();
+  if (old_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    old_font_family_ = new ::std::string;
+  }
+  return old_font_family_;
+}
+inline ::std::string* CommandSetFontFamilyArchive::release_old_font_family() {
+  clear_has_old_font_family();
+  if (old_font_family_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = old_font_family_;
+    old_font_family_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetFontFamilyArchive::set_allocated_old_font_family(::std::string* old_font_family) {
+  if (old_font_family_ != &::google::protobuf::internal::kEmptyString) {
+    delete old_font_family_;
+  }
+  if (old_font_family) {
+    set_has_old_font_family();
+    old_font_family_ = old_font_family;
+  } else {
+    clear_has_old_font_family();
+    old_font_family_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// repeated .TSCH.CommandMutatePropertiesArchive.ParagraphStyleDeltaMap paragraph_style_delta_maps = 5;
+inline int CommandSetFontFamilyArchive::paragraph_style_delta_maps_size() const {
+  return paragraph_style_delta_maps_.size();
+}
+inline void CommandSetFontFamilyArchive::clear_paragraph_style_delta_maps() {
+  paragraph_style_delta_maps_.Clear();
+}
+inline const ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap& CommandSetFontFamilyArchive::paragraph_style_delta_maps(int index) const {
+  return paragraph_style_delta_maps_.Get(index);
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* CommandSetFontFamilyArchive::mutable_paragraph_style_delta_maps(int index) {
+  return paragraph_style_delta_maps_.Mutable(index);
+}
+inline ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap* CommandSetFontFamilyArchive::add_paragraph_style_delta_maps() {
+  return paragraph_style_delta_maps_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >&
+CommandSetFontFamilyArchive::paragraph_style_delta_maps() const {
+  return paragraph_style_delta_maps_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandMutatePropertiesArchive_ParagraphStyleDeltaMap >*
+CommandSetFontFamilyArchive::mutable_paragraph_style_delta_maps() {
+  return &paragraph_style_delta_maps_;
+}
+
+// -------------------------------------------------------------------
+
+// CommandApplyFillSetArchive_CapturedFillSetArchive
+
+// optional string identifier = 1;
+inline bool CommandApplyFillSetArchive_CapturedFillSetArchive::has_identifier() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_has_identifier() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::clear_has_identifier() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::clear_identifier() {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    identifier_->clear();
+  }
+  clear_has_identifier();
+}
+inline const ::std::string& CommandApplyFillSetArchive_CapturedFillSetArchive::identifier() const {
+  return *identifier_;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_identifier(const ::std::string& value) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(value);
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_identifier(const char* value) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(value);
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_identifier(const char* value, size_t size) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandApplyFillSetArchive_CapturedFillSetArchive::mutable_identifier() {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  return identifier_;
+}
+inline ::std::string* CommandApplyFillSetArchive_CapturedFillSetArchive::release_identifier() {
+  clear_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = identifier_;
+    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_allocated_identifier(::std::string* identifier) {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete identifier_;
+  }
+  if (identifier) {
+    set_has_identifier();
+    identifier_ = identifier;
+  } else {
+    clear_has_identifier();
+    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional uint32 number_of_theme_series_styles = 2;
+inline bool CommandApplyFillSetArchive_CapturedFillSetArchive::has_number_of_theme_series_styles() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_has_number_of_theme_series_styles() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::clear_has_number_of_theme_series_styles() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::clear_number_of_theme_series_styles() {
+  number_of_theme_series_styles_ = 0u;
+  clear_has_number_of_theme_series_styles();
+}
+inline ::google::protobuf::uint32 CommandApplyFillSetArchive_CapturedFillSetArchive::number_of_theme_series_styles() const {
+  return number_of_theme_series_styles_;
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::set_number_of_theme_series_styles(::google::protobuf::uint32 value) {
+  set_has_number_of_theme_series_styles();
+  number_of_theme_series_styles_ = value;
+}
+
+// repeated .TSCH.ChartSeriesStyleArchive property_maps = 3;
+inline int CommandApplyFillSetArchive_CapturedFillSetArchive::property_maps_size() const {
+  return property_maps_.size();
+}
+inline void CommandApplyFillSetArchive_CapturedFillSetArchive::clear_property_maps() {
+  property_maps_.Clear();
+}
+inline const ::TSCH::ChartSeriesStyleArchive& CommandApplyFillSetArchive_CapturedFillSetArchive::property_maps(int index) const {
+  return property_maps_.Get(index);
+}
+inline ::TSCH::ChartSeriesStyleArchive* CommandApplyFillSetArchive_CapturedFillSetArchive::mutable_property_maps(int index) {
+  return property_maps_.Mutable(index);
+}
+inline ::TSCH::ChartSeriesStyleArchive* CommandApplyFillSetArchive_CapturedFillSetArchive::add_property_maps() {
+  return property_maps_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::ChartSeriesStyleArchive >&
+CommandApplyFillSetArchive_CapturedFillSetArchive::property_maps() const {
+  return property_maps_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::ChartSeriesStyleArchive >*
+CommandApplyFillSetArchive_CapturedFillSetArchive::mutable_property_maps() {
+  return &property_maps_;
+}
+
+// -------------------------------------------------------------------
+
+// CommandApplyFillSetArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandApplyFillSetArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandApplyFillSetArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandApplyFillSetArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandApplyFillSetArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandApplyFillSetArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandApplyFillSetArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandApplyFillSetArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// optional .TSP.Reference rollback_cmd = 2;
+inline bool CommandApplyFillSetArchive::has_rollback_cmd() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_rollback_cmd() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandApplyFillSetArchive::clear_has_rollback_cmd() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandApplyFillSetArchive::clear_rollback_cmd() {
+  if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+  clear_has_rollback_cmd();
+}
+inline const ::TSP::Reference& CommandApplyFillSetArchive::rollback_cmd() const {
+  return rollback_cmd_ != NULL ? *rollback_cmd_ : *default_instance_->rollback_cmd_;
+}
+inline ::TSP::Reference* CommandApplyFillSetArchive::mutable_rollback_cmd() {
+  set_has_rollback_cmd();
+  if (rollback_cmd_ == NULL) rollback_cmd_ = new ::TSP::Reference;
+  return rollback_cmd_;
+}
+inline ::TSP::Reference* CommandApplyFillSetArchive::release_rollback_cmd() {
+  clear_has_rollback_cmd();
+  ::TSP::Reference* temp = rollback_cmd_;
+  rollback_cmd_ = NULL;
+  return temp;
+}
+inline void CommandApplyFillSetArchive::set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd) {
+  delete rollback_cmd_;
+  rollback_cmd_ = rollback_cmd;
+  if (rollback_cmd) {
+    set_has_rollback_cmd();
+  } else {
+    clear_has_rollback_cmd();
+  }
+}
+
+// optional string fwd_fill_set_lookup_string = 3;
+inline bool CommandApplyFillSetArchive::has_fwd_fill_set_lookup_string() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_fwd_fill_set_lookup_string() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandApplyFillSetArchive::clear_has_fwd_fill_set_lookup_string() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandApplyFillSetArchive::clear_fwd_fill_set_lookup_string() {
+  if (fwd_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    fwd_fill_set_lookup_string_->clear();
+  }
+  clear_has_fwd_fill_set_lookup_string();
+}
+inline const ::std::string& CommandApplyFillSetArchive::fwd_fill_set_lookup_string() const {
+  return *fwd_fill_set_lookup_string_;
+}
+inline void CommandApplyFillSetArchive::set_fwd_fill_set_lookup_string(const ::std::string& value) {
+  set_has_fwd_fill_set_lookup_string();
+  if (fwd_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    fwd_fill_set_lookup_string_ = new ::std::string;
+  }
+  fwd_fill_set_lookup_string_->assign(value);
+}
+inline void CommandApplyFillSetArchive::set_fwd_fill_set_lookup_string(const char* value) {
+  set_has_fwd_fill_set_lookup_string();
+  if (fwd_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    fwd_fill_set_lookup_string_ = new ::std::string;
+  }
+  fwd_fill_set_lookup_string_->assign(value);
+}
+inline void CommandApplyFillSetArchive::set_fwd_fill_set_lookup_string(const char* value, size_t size) {
+  set_has_fwd_fill_set_lookup_string();
+  if (fwd_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    fwd_fill_set_lookup_string_ = new ::std::string;
+  }
+  fwd_fill_set_lookup_string_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandApplyFillSetArchive::mutable_fwd_fill_set_lookup_string() {
+  set_has_fwd_fill_set_lookup_string();
+  if (fwd_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    fwd_fill_set_lookup_string_ = new ::std::string;
+  }
+  return fwd_fill_set_lookup_string_;
+}
+inline ::std::string* CommandApplyFillSetArchive::release_fwd_fill_set_lookup_string() {
+  clear_has_fwd_fill_set_lookup_string();
+  if (fwd_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = fwd_fill_set_lookup_string_;
+    fwd_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandApplyFillSetArchive::set_allocated_fwd_fill_set_lookup_string(::std::string* fwd_fill_set_lookup_string) {
+  if (fwd_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    delete fwd_fill_set_lookup_string_;
+  }
+  if (fwd_fill_set_lookup_string) {
+    set_has_fwd_fill_set_lookup_string();
+    fwd_fill_set_lookup_string_ = fwd_fill_set_lookup_string;
+  } else {
+    clear_has_fwd_fill_set_lookup_string();
+    fwd_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional string rev_fill_set_lookup_string = 4;
+inline bool CommandApplyFillSetArchive::has_rev_fill_set_lookup_string() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_rev_fill_set_lookup_string() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandApplyFillSetArchive::clear_has_rev_fill_set_lookup_string() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandApplyFillSetArchive::clear_rev_fill_set_lookup_string() {
+  if (rev_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    rev_fill_set_lookup_string_->clear();
+  }
+  clear_has_rev_fill_set_lookup_string();
+}
+inline const ::std::string& CommandApplyFillSetArchive::rev_fill_set_lookup_string() const {
+  return *rev_fill_set_lookup_string_;
+}
+inline void CommandApplyFillSetArchive::set_rev_fill_set_lookup_string(const ::std::string& value) {
+  set_has_rev_fill_set_lookup_string();
+  if (rev_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_fill_set_lookup_string_ = new ::std::string;
+  }
+  rev_fill_set_lookup_string_->assign(value);
+}
+inline void CommandApplyFillSetArchive::set_rev_fill_set_lookup_string(const char* value) {
+  set_has_rev_fill_set_lookup_string();
+  if (rev_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_fill_set_lookup_string_ = new ::std::string;
+  }
+  rev_fill_set_lookup_string_->assign(value);
+}
+inline void CommandApplyFillSetArchive::set_rev_fill_set_lookup_string(const char* value, size_t size) {
+  set_has_rev_fill_set_lookup_string();
+  if (rev_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_fill_set_lookup_string_ = new ::std::string;
+  }
+  rev_fill_set_lookup_string_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandApplyFillSetArchive::mutable_rev_fill_set_lookup_string() {
+  set_has_rev_fill_set_lookup_string();
+  if (rev_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_fill_set_lookup_string_ = new ::std::string;
+  }
+  return rev_fill_set_lookup_string_;
+}
+inline ::std::string* CommandApplyFillSetArchive::release_rev_fill_set_lookup_string() {
+  clear_has_rev_fill_set_lookup_string();
+  if (rev_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = rev_fill_set_lookup_string_;
+    rev_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandApplyFillSetArchive::set_allocated_rev_fill_set_lookup_string(::std::string* rev_fill_set_lookup_string) {
+  if (rev_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    delete rev_fill_set_lookup_string_;
+  }
+  if (rev_fill_set_lookup_string) {
+    set_has_rev_fill_set_lookup_string();
+    rev_fill_set_lookup_string_ = rev_fill_set_lookup_string;
+  } else {
+    clear_has_rev_fill_set_lookup_string();
+    rev_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive fwd_captured_fill_set = 5;
+inline bool CommandApplyFillSetArchive::has_fwd_captured_fill_set() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_fwd_captured_fill_set() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandApplyFillSetArchive::clear_has_fwd_captured_fill_set() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandApplyFillSetArchive::clear_fwd_captured_fill_set() {
+  if (fwd_captured_fill_set_ != NULL) fwd_captured_fill_set_->::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::Clear();
+  clear_has_fwd_captured_fill_set();
+}
+inline const ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive& CommandApplyFillSetArchive::fwd_captured_fill_set() const {
+  return fwd_captured_fill_set_ != NULL ? *fwd_captured_fill_set_ : *default_instance_->fwd_captured_fill_set_;
+}
+inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* CommandApplyFillSetArchive::mutable_fwd_captured_fill_set() {
+  set_has_fwd_captured_fill_set();
+  if (fwd_captured_fill_set_ == NULL) fwd_captured_fill_set_ = new ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive;
+  return fwd_captured_fill_set_;
+}
+inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* CommandApplyFillSetArchive::release_fwd_captured_fill_set() {
+  clear_has_fwd_captured_fill_set();
+  ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* temp = fwd_captured_fill_set_;
+  fwd_captured_fill_set_ = NULL;
+  return temp;
+}
+inline void CommandApplyFillSetArchive::set_allocated_fwd_captured_fill_set(::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* fwd_captured_fill_set) {
+  delete fwd_captured_fill_set_;
+  fwd_captured_fill_set_ = fwd_captured_fill_set;
+  if (fwd_captured_fill_set) {
+    set_has_fwd_captured_fill_set();
+  } else {
+    clear_has_fwd_captured_fill_set();
+  }
+}
+
+// optional .TSCH.CommandApplyFillSetArchive.CapturedFillSetArchive rev_captured_fill_set = 6;
+inline bool CommandApplyFillSetArchive::has_rev_captured_fill_set() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_rev_captured_fill_set() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandApplyFillSetArchive::clear_has_rev_captured_fill_set() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandApplyFillSetArchive::clear_rev_captured_fill_set() {
+  if (rev_captured_fill_set_ != NULL) rev_captured_fill_set_->::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive::Clear();
+  clear_has_rev_captured_fill_set();
+}
+inline const ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive& CommandApplyFillSetArchive::rev_captured_fill_set() const {
+  return rev_captured_fill_set_ != NULL ? *rev_captured_fill_set_ : *default_instance_->rev_captured_fill_set_;
+}
+inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* CommandApplyFillSetArchive::mutable_rev_captured_fill_set() {
+  set_has_rev_captured_fill_set();
+  if (rev_captured_fill_set_ == NULL) rev_captured_fill_set_ = new ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive;
+  return rev_captured_fill_set_;
+}
+inline ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* CommandApplyFillSetArchive::release_rev_captured_fill_set() {
+  clear_has_rev_captured_fill_set();
+  ::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* temp = rev_captured_fill_set_;
+  rev_captured_fill_set_ = NULL;
+  return temp;
+}
+inline void CommandApplyFillSetArchive::set_allocated_rev_captured_fill_set(::TSCH::CommandApplyFillSetArchive_CapturedFillSetArchive* rev_captured_fill_set) {
+  delete rev_captured_fill_set_;
+  rev_captured_fill_set_ = rev_captured_fill_set;
+  if (rev_captured_fill_set) {
+    set_has_rev_captured_fill_set();
+  } else {
+    clear_has_rev_captured_fill_set();
+  }
+}
+
+// optional string rev_last_applied_fill_set_lookup_string = 7;
+inline bool CommandApplyFillSetArchive::has_rev_last_applied_fill_set_lookup_string() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void CommandApplyFillSetArchive::set_has_rev_last_applied_fill_set_lookup_string() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void CommandApplyFillSetArchive::clear_has_rev_last_applied_fill_set_lookup_string() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void CommandApplyFillSetArchive::clear_rev_last_applied_fill_set_lookup_string() {
+  if (rev_last_applied_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    rev_last_applied_fill_set_lookup_string_->clear();
+  }
+  clear_has_rev_last_applied_fill_set_lookup_string();
+}
+inline const ::std::string& CommandApplyFillSetArchive::rev_last_applied_fill_set_lookup_string() const {
+  return *rev_last_applied_fill_set_lookup_string_;
+}
+inline void CommandApplyFillSetArchive::set_rev_last_applied_fill_set_lookup_string(const ::std::string& value) {
+  set_has_rev_last_applied_fill_set_lookup_string();
+  if (rev_last_applied_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_last_applied_fill_set_lookup_string_ = new ::std::string;
+  }
+  rev_last_applied_fill_set_lookup_string_->assign(value);
+}
+inline void CommandApplyFillSetArchive::set_rev_last_applied_fill_set_lookup_string(const char* value) {
+  set_has_rev_last_applied_fill_set_lookup_string();
+  if (rev_last_applied_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_last_applied_fill_set_lookup_string_ = new ::std::string;
+  }
+  rev_last_applied_fill_set_lookup_string_->assign(value);
+}
+inline void CommandApplyFillSetArchive::set_rev_last_applied_fill_set_lookup_string(const char* value, size_t size) {
+  set_has_rev_last_applied_fill_set_lookup_string();
+  if (rev_last_applied_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_last_applied_fill_set_lookup_string_ = new ::std::string;
+  }
+  rev_last_applied_fill_set_lookup_string_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandApplyFillSetArchive::mutable_rev_last_applied_fill_set_lookup_string() {
+  set_has_rev_last_applied_fill_set_lookup_string();
+  if (rev_last_applied_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    rev_last_applied_fill_set_lookup_string_ = new ::std::string;
+  }
+  return rev_last_applied_fill_set_lookup_string_;
+}
+inline ::std::string* CommandApplyFillSetArchive::release_rev_last_applied_fill_set_lookup_string() {
+  clear_has_rev_last_applied_fill_set_lookup_string();
+  if (rev_last_applied_fill_set_lookup_string_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = rev_last_applied_fill_set_lookup_string_;
+    rev_last_applied_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandApplyFillSetArchive::set_allocated_rev_last_applied_fill_set_lookup_string(::std::string* rev_last_applied_fill_set_lookup_string) {
+  if (rev_last_applied_fill_set_lookup_string_ != &::google::protobuf::internal::kEmptyString) {
+    delete rev_last_applied_fill_set_lookup_string_;
+  }
+  if (rev_last_applied_fill_set_lookup_string) {
+    set_has_rev_last_applied_fill_set_lookup_string();
+    rev_last_applied_fill_set_lookup_string_ = rev_last_applied_fill_set_lookup_string;
+  } else {
+    clear_has_rev_last_applied_fill_set_lookup_string();
+    rev_last_applied_fill_set_lookup_string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandSetSeriesNameArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetSeriesNameArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandSetSeriesNameArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandSetSeriesNameArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandSetSeriesNameArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandSetSeriesNameArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetSeriesNameArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetSeriesNameArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandSetSeriesNameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required uint32 seriesIndex = 2;
+inline bool CommandSetSeriesNameArchive::has_seriesindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetSeriesNameArchive::set_has_seriesindex() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetSeriesNameArchive::clear_has_seriesindex() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetSeriesNameArchive::clear_seriesindex() {
+  seriesindex_ = 0u;
+  clear_has_seriesindex();
+}
+inline ::google::protobuf::uint32 CommandSetSeriesNameArchive::seriesindex() const {
+  return seriesindex_;
+}
+inline void CommandSetSeriesNameArchive::set_seriesindex(::google::protobuf::uint32 value) {
+  set_has_seriesindex();
+  seriesindex_ = value;
+}
+
+// required string oldName = 3;
+inline bool CommandSetSeriesNameArchive::has_oldname() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandSetSeriesNameArchive::set_has_oldname() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetSeriesNameArchive::clear_has_oldname() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetSeriesNameArchive::clear_oldname() {
+  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+    oldname_->clear();
+  }
+  clear_has_oldname();
+}
+inline const ::std::string& CommandSetSeriesNameArchive::oldname() const {
+  return *oldname_;
+}
+inline void CommandSetSeriesNameArchive::set_oldname(const ::std::string& value) {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  oldname_->assign(value);
+}
+inline void CommandSetSeriesNameArchive::set_oldname(const char* value) {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  oldname_->assign(value);
+}
+inline void CommandSetSeriesNameArchive::set_oldname(const char* value, size_t size) {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  oldname_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetSeriesNameArchive::mutable_oldname() {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  return oldname_;
+}
+inline ::std::string* CommandSetSeriesNameArchive::release_oldname() {
+  clear_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = oldname_;
+    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetSeriesNameArchive::set_allocated_oldname(::std::string* oldname) {
+  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldname_;
+  }
+  if (oldname) {
+    set_has_oldname();
+    oldname_ = oldname;
+  } else {
+    clear_has_oldname();
+    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required string newName = 4;
+inline bool CommandSetSeriesNameArchive::has_newname() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetSeriesNameArchive::set_has_newname() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetSeriesNameArchive::clear_has_newname() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetSeriesNameArchive::clear_newname() {
+  if (newname_ != &::google::protobuf::internal::kEmptyString) {
+    newname_->clear();
+  }
+  clear_has_newname();
+}
+inline const ::std::string& CommandSetSeriesNameArchive::newname() const {
+  return *newname_;
+}
+inline void CommandSetSeriesNameArchive::set_newname(const ::std::string& value) {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  newname_->assign(value);
+}
+inline void CommandSetSeriesNameArchive::set_newname(const char* value) {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  newname_->assign(value);
+}
+inline void CommandSetSeriesNameArchive::set_newname(const char* value, size_t size) {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  newname_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetSeriesNameArchive::mutable_newname() {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  return newname_;
+}
+inline ::std::string* CommandSetSeriesNameArchive::release_newname() {
+  clear_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = newname_;
+    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetSeriesNameArchive::set_allocated_newname(::std::string* newname) {
+  if (newname_ != &::google::protobuf::internal::kEmptyString) {
+    delete newname_;
+  }
+  if (newname) {
+    set_has_newname();
+    newname_ = newname;
+  } else {
+    clear_has_newname();
+    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandSetCategoryNameArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetCategoryNameArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandSetCategoryNameArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandSetCategoryNameArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandSetCategoryNameArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSCH::ChartCommandArchive& CommandSetCategoryNameArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetCategoryNameArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
+}
+inline ::TSCH::ChartCommandArchive* CommandSetCategoryNameArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandSetCategoryNameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required uint32 categoryIndex = 2;
+inline bool CommandSetCategoryNameArchive::has_categoryindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetCategoryNameArchive::set_has_categoryindex() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetCategoryNameArchive::clear_has_categoryindex() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetCategoryNameArchive::clear_categoryindex() {
+  categoryindex_ = 0u;
+  clear_has_categoryindex();
+}
+inline ::google::protobuf::uint32 CommandSetCategoryNameArchive::categoryindex() const {
+  return categoryindex_;
+}
+inline void CommandSetCategoryNameArchive::set_categoryindex(::google::protobuf::uint32 value) {
+  set_has_categoryindex();
+  categoryindex_ = value;
+}
 
-// CommandSetChartTypeArchive
+// required string oldName = 3;
+inline bool CommandSetCategoryNameArchive::has_oldname() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandSetCategoryNameArchive::set_has_oldname() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetCategoryNameArchive::clear_has_oldname() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetCategoryNameArchive::clear_oldname() {
+  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+    oldname_->clear();
+  }
+  clear_has_oldname();
+}
+inline const ::std::string& CommandSetCategoryNameArchive::oldname() const {
+  return *oldname_;
+}
+inline void CommandSetCategoryNameArchive::set_oldname(const ::std::string& value) {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  oldname_->assign(value);
+}
+inline void CommandSetCategoryNameArchive::set_oldname(const char* value) {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  oldname_->assign(value);
+}
+inline void CommandSetCategoryNameArchive::set_oldname(const char* value, size_t size) {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  oldname_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetCategoryNameArchive::mutable_oldname() {
+  set_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    oldname_ = new ::std::string;
+  }
+  return oldname_;
+}
+inline ::std::string* CommandSetCategoryNameArchive::release_oldname() {
+  clear_has_oldname();
+  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = oldname_;
+    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetCategoryNameArchive::set_allocated_oldname(::std::string* oldname) {
+  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldname_;
+  }
+  if (oldname) {
+    set_has_oldname();
+    oldname_ = oldname;
+  } else {
+    clear_has_oldname();
+    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required string newName = 4;
+inline bool CommandSetCategoryNameArchive::has_newname() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetCategoryNameArchive::set_has_newname() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetCategoryNameArchive::clear_has_newname() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetCategoryNameArchive::clear_newname() {
+  if (newname_ != &::google::protobuf::internal::kEmptyString) {
+    newname_->clear();
+  }
+  clear_has_newname();
+}
+inline const ::std::string& CommandSetCategoryNameArchive::newname() const {
+  return *newname_;
+}
+inline void CommandSetCategoryNameArchive::set_newname(const ::std::string& value) {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  newname_->assign(value);
+}
+inline void CommandSetCategoryNameArchive::set_newname(const char* value) {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  newname_->assign(value);
+}
+inline void CommandSetCategoryNameArchive::set_newname(const char* value, size_t size) {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  newname_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetCategoryNameArchive::mutable_newname() {
+  set_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    newname_ = new ::std::string;
+  }
+  return newname_;
+}
+inline ::std::string* CommandSetCategoryNameArchive::release_newname() {
+  clear_has_newname();
+  if (newname_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = newname_;
+    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetCategoryNameArchive::set_allocated_newname(::std::string* newname) {
+  if (newname_ != &::google::protobuf::internal::kEmptyString) {
+    delete newname_;
+  }
+  if (newname) {
+    set_has_newname();
+    newname_ = newname;
+  } else {
+    clear_has_newname();
+    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional bool isMultiDataIndex = 5;
+inline bool CommandSetCategoryNameArchive::has_ismultidataindex() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSetCategoryNameArchive::set_has_ismultidataindex() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSetCategoryNameArchive::clear_has_ismultidataindex() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSetCategoryNameArchive::clear_ismultidataindex() {
+  ismultidataindex_ = false;
+  clear_has_ismultidataindex();
+}
+inline bool CommandSetCategoryNameArchive::ismultidataindex() const {
+  return ismultidataindex_;
+}
+inline void CommandSetCategoryNameArchive::set_ismultidataindex(bool value) {
+  set_has_ismultidataindex();
+  ismultidataindex_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandAddGridRowsArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetChartTypeArchive::has_super() const {
+inline bool CommandAddGridRowsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetChartTypeArchive::set_has_super() {
+inline void CommandAddGridRowsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetChartTypeArchive::clear_has_super() {
+inline void CommandAddGridRowsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetChartTypeArchive::clear_super() {
+inline void CommandAddGridRowsArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetChartTypeArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandAddGridRowsArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetChartTypeArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandAddGridRowsArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetChartTypeArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandAddGridRowsArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetChartTypeArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandAddGridRowsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -4120,668 +8090,590 @@ inline void CommandSetChartTypeArchive::set_allocated_super(::TSCH::ChartCommand
   }
 }
 
-// required .TSCH.ChartType oldChartType = 2;
-inline bool CommandSetChartTypeArchive::has_oldcharttype() const {
+// required uint32 location = 2;
+inline bool CommandAddGridRowsArchive::has_location() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetChartTypeArchive::set_has_oldcharttype() {
+inline void CommandAddGridRowsArchive::set_has_location() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetChartTypeArchive::clear_has_oldcharttype() {
+inline void CommandAddGridRowsArchive::clear_has_location() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetChartTypeArchive::clear_oldcharttype() {
-  oldcharttype_ = 0;
-  clear_has_oldcharttype();
+inline void CommandAddGridRowsArchive::clear_location() {
+  location_ = 0u;
+  clear_has_location();
 }
-inline ::TSCH::ChartType CommandSetChartTypeArchive::oldcharttype() const {
-  return static_cast< ::TSCH::ChartType >(oldcharttype_);
+inline ::google::protobuf::uint32 CommandAddGridRowsArchive::location() const {
+  return location_;
 }
-inline void CommandSetChartTypeArchive::set_oldcharttype(::TSCH::ChartType value) {
-  assert(::TSCH::ChartType_IsValid(value));
-  set_has_oldcharttype();
-  oldcharttype_ = value;
+inline void CommandAddGridRowsArchive::set_location(::google::protobuf::uint32 value) {
+  set_has_location();
+  location_ = value;
 }
 
-// required .TSCH.ChartType newChartType = 3;
-inline bool CommandSetChartTypeArchive::has_newcharttype() const {
+// optional uint32 length = 3;
+inline bool CommandAddGridRowsArchive::has_length() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetChartTypeArchive::set_has_newcharttype() {
+inline void CommandAddGridRowsArchive::set_has_length() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetChartTypeArchive::clear_has_newcharttype() {
+inline void CommandAddGridRowsArchive::clear_has_length() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetChartTypeArchive::clear_newcharttype() {
-  newcharttype_ = 0;
-  clear_has_newcharttype();
+inline void CommandAddGridRowsArchive::clear_length() {
+  length_ = 0u;
+  clear_has_length();
 }
-inline ::TSCH::ChartType CommandSetChartTypeArchive::newcharttype() const {
-  return static_cast< ::TSCH::ChartType >(newcharttype_);
+inline ::google::protobuf::uint32 CommandAddGridRowsArchive::length() const {
+  return length_;
 }
-inline void CommandSetChartTypeArchive::set_newcharttype(::TSCH::ChartType value) {
-  assert(::TSCH::ChartType_IsValid(value));
-  set_has_newcharttype();
-  newcharttype_ = value;
+inline void CommandAddGridRowsArchive::set_length(::google::protobuf::uint32 value) {
+  set_has_length();
+  length_ = value;
 }
 
-// optional .TSP.Reference info_geometry_command = 5;
-inline bool CommandSetChartTypeArchive::has_info_geometry_command() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// repeated string name = 4;
+inline int CommandAddGridRowsArchive::name_size() const {
+  return name_.size();
 }
-inline void CommandSetChartTypeArchive::set_has_info_geometry_command() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandAddGridRowsArchive::clear_name() {
+  name_.Clear();
+}
+inline const ::std::string& CommandAddGridRowsArchive::name(int index) const {
+  return name_.Get(index);
+}
+inline ::std::string* CommandAddGridRowsArchive::mutable_name(int index) {
+  return name_.Mutable(index);
 }
-inline void CommandSetChartTypeArchive::clear_has_info_geometry_command() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandAddGridRowsArchive::set_name(int index, const ::std::string& value) {
+  name_.Mutable(index)->assign(value);
 }
-inline void CommandSetChartTypeArchive::clear_info_geometry_command() {
-  if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
-  clear_has_info_geometry_command();
+inline void CommandAddGridRowsArchive::set_name(int index, const char* value) {
+  name_.Mutable(index)->assign(value);
 }
-inline const ::TSP::Reference& CommandSetChartTypeArchive::info_geometry_command() const {
-  return info_geometry_command_ != NULL ? *info_geometry_command_ : *default_instance_->info_geometry_command_;
+inline void CommandAddGridRowsArchive::set_name(int index, const char* value, size_t size) {
+  name_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline ::TSP::Reference* CommandSetChartTypeArchive::mutable_info_geometry_command() {
-  set_has_info_geometry_command();
-  if (info_geometry_command_ == NULL) info_geometry_command_ = new ::TSP::Reference;
-  return info_geometry_command_;
+inline ::std::string* CommandAddGridRowsArchive::add_name() {
+  return name_.Add();
 }
-inline ::TSP::Reference* CommandSetChartTypeArchive::release_info_geometry_command() {
-  clear_has_info_geometry_command();
-  ::TSP::Reference* temp = info_geometry_command_;
-  info_geometry_command_ = NULL;
-  return temp;
+inline void CommandAddGridRowsArchive::add_name(const ::std::string& value) {
+  name_.Add()->assign(value);
 }
-inline void CommandSetChartTypeArchive::set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command) {
-  delete info_geometry_command_;
-  info_geometry_command_ = info_geometry_command;
-  if (info_geometry_command) {
-    set_has_info_geometry_command();
-  } else {
-    clear_has_info_geometry_command();
-  }
+inline void CommandAddGridRowsArchive::add_name(const char* value) {
+  name_.Add()->assign(value);
 }
-
-// optional .TSP.Reference anchor_attachment_command = 6;
-inline bool CommandSetChartTypeArchive::has_anchor_attachment_command() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+inline void CommandAddGridRowsArchive::add_name(const char* value, size_t size) {
+  name_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandSetChartTypeArchive::set_has_anchor_attachment_command() {
-  _has_bits_[0] |= 0x00000010u;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandAddGridRowsArchive::name() const {
+  return name_;
 }
-inline void CommandSetChartTypeArchive::clear_has_anchor_attachment_command() {
-  _has_bits_[0] &= ~0x00000010u;
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandAddGridRowsArchive::mutable_name() {
+  return &name_;
 }
-inline void CommandSetChartTypeArchive::clear_anchor_attachment_command() {
-  if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
-  clear_has_anchor_attachment_command();
+
+// repeated string ids = 5;
+inline int CommandAddGridRowsArchive::ids_size() const {
+  return ids_.size();
 }
-inline const ::TSP::Reference& CommandSetChartTypeArchive::anchor_attachment_command() const {
-  return anchor_attachment_command_ != NULL ? *anchor_attachment_command_ : *default_instance_->anchor_attachment_command_;
+inline void CommandAddGridRowsArchive::clear_ids() {
+  ids_.Clear();
 }
-inline ::TSP::Reference* CommandSetChartTypeArchive::mutable_anchor_attachment_command() {
-  set_has_anchor_attachment_command();
-  if (anchor_attachment_command_ == NULL) anchor_attachment_command_ = new ::TSP::Reference;
-  return anchor_attachment_command_;
+inline const ::std::string& CommandAddGridRowsArchive::ids(int index) const {
+  return ids_.Get(index);
 }
-inline ::TSP::Reference* CommandSetChartTypeArchive::release_anchor_attachment_command() {
-  clear_has_anchor_attachment_command();
-  ::TSP::Reference* temp = anchor_attachment_command_;
-  anchor_attachment_command_ = NULL;
-  return temp;
+inline ::std::string* CommandAddGridRowsArchive::mutable_ids(int index) {
+  return ids_.Mutable(index);
 }
-inline void CommandSetChartTypeArchive::set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command) {
-  delete anchor_attachment_command_;
-  anchor_attachment_command_ = anchor_attachment_command;
-  if (anchor_attachment_command) {
-    set_has_anchor_attachment_command();
-  } else {
-    clear_has_anchor_attachment_command();
-  }
+inline void CommandAddGridRowsArchive::set_ids(int index, const ::std::string& value) {
+  ids_.Mutable(index)->assign(value);
 }
-
-// optional .TSCH.RectArchive original_legend_rect = 7;
-inline bool CommandSetChartTypeArchive::has_original_legend_rect() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+inline void CommandAddGridRowsArchive::set_ids(int index, const char* value) {
+  ids_.Mutable(index)->assign(value);
 }
-inline void CommandSetChartTypeArchive::set_has_original_legend_rect() {
-  _has_bits_[0] |= 0x00000020u;
+inline void CommandAddGridRowsArchive::set_ids(int index, const char* value, size_t size) {
+  ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void CommandSetChartTypeArchive::clear_has_original_legend_rect() {
-  _has_bits_[0] &= ~0x00000020u;
+inline ::std::string* CommandAddGridRowsArchive::add_ids() {
+  return ids_.Add();
 }
-inline void CommandSetChartTypeArchive::clear_original_legend_rect() {
-  if (original_legend_rect_ != NULL) original_legend_rect_->::TSCH::RectArchive::Clear();
-  clear_has_original_legend_rect();
+inline void CommandAddGridRowsArchive::add_ids(const ::std::string& value) {
+  ids_.Add()->assign(value);
 }
-inline const ::TSCH::RectArchive& CommandSetChartTypeArchive::original_legend_rect() const {
-  return original_legend_rect_ != NULL ? *original_legend_rect_ : *default_instance_->original_legend_rect_;
+inline void CommandAddGridRowsArchive::add_ids(const char* value) {
+  ids_.Add()->assign(value);
 }
-inline ::TSCH::RectArchive* CommandSetChartTypeArchive::mutable_original_legend_rect() {
-  set_has_original_legend_rect();
-  if (original_legend_rect_ == NULL) original_legend_rect_ = new ::TSCH::RectArchive;
-  return original_legend_rect_;
+inline void CommandAddGridRowsArchive::add_ids(const char* value, size_t size) {
+  ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::TSCH::RectArchive* CommandSetChartTypeArchive::release_original_legend_rect() {
-  clear_has_original_legend_rect();
-  ::TSCH::RectArchive* temp = original_legend_rect_;
-  original_legend_rect_ = NULL;
-  return temp;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandAddGridRowsArchive::ids() const {
+  return ids_;
 }
-inline void CommandSetChartTypeArchive::set_allocated_original_legend_rect(::TSCH::RectArchive* original_legend_rect) {
-  delete original_legend_rect_;
-  original_legend_rect_ = original_legend_rect;
-  if (original_legend_rect) {
-    set_has_original_legend_rect();
-  } else {
-    clear_has_original_legend_rect();
-  }
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandAddGridRowsArchive::mutable_ids() {
+  return &ids_;
 }
 
 // -------------------------------------------------------------------
 
-// PropertyMutationUndoTupleArchive
+// CommandAddGridColumnsArchive
 
-// optional .TSP.Reference chart_info = 1;
-inline bool PropertyMutationUndoTupleArchive::has_chart_info() const {
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandAddGridColumnsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void PropertyMutationUndoTupleArchive::set_has_chart_info() {
+inline void CommandAddGridColumnsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void PropertyMutationUndoTupleArchive::clear_has_chart_info() {
+inline void CommandAddGridColumnsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void PropertyMutationUndoTupleArchive::clear_chart_info() {
-  if (chart_info_ != NULL) chart_info_->::TSP::Reference::Clear();
-  clear_has_chart_info();
+inline void CommandAddGridColumnsArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
 }
-inline const ::TSP::Reference& PropertyMutationUndoTupleArchive::chart_info() const {
-  return chart_info_ != NULL ? *chart_info_ : *default_instance_->chart_info_;
+inline const ::TSCH::ChartCommandArchive& CommandAddGridColumnsArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::mutable_chart_info() {
-  set_has_chart_info();
-  if (chart_info_ == NULL) chart_info_ = new ::TSP::Reference;
-  return chart_info_;
+inline ::TSCH::ChartCommandArchive* CommandAddGridColumnsArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::release_chart_info() {
-  clear_has_chart_info();
-  ::TSP::Reference* temp = chart_info_;
-  chart_info_ = NULL;
+inline ::TSCH::ChartCommandArchive* CommandAddGridColumnsArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void PropertyMutationUndoTupleArchive::set_allocated_chart_info(::TSP::Reference* chart_info) {
-  delete chart_info_;
-  chart_info_ = chart_info;
-  if (chart_info) {
-    set_has_chart_info();
+inline void CommandAddGridColumnsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_chart_info();
+    clear_has_super();
   }
 }
 
-// optional .TSCH.StyleOwnerType style_owner_type = 2;
-inline bool PropertyMutationUndoTupleArchive::has_style_owner_type() const {
+// required uint32 location = 2;
+inline bool CommandAddGridColumnsArchive::has_location() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void PropertyMutationUndoTupleArchive::set_has_style_owner_type() {
+inline void CommandAddGridColumnsArchive::set_has_location() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void PropertyMutationUndoTupleArchive::clear_has_style_owner_type() {
+inline void CommandAddGridColumnsArchive::clear_has_location() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void PropertyMutationUndoTupleArchive::clear_style_owner_type() {
-  style_owner_type_ = 1;
-  clear_has_style_owner_type();
+inline void CommandAddGridColumnsArchive::clear_location() {
+  location_ = 0u;
+  clear_has_location();
 }
-inline ::TSCH::StyleOwnerType PropertyMutationUndoTupleArchive::style_owner_type() const {
-  return static_cast< ::TSCH::StyleOwnerType >(style_owner_type_);
+inline ::google::protobuf::uint32 CommandAddGridColumnsArchive::location() const {
+  return location_;
 }
-inline void PropertyMutationUndoTupleArchive::set_style_owner_type(::TSCH::StyleOwnerType value) {
-  assert(::TSCH::StyleOwnerType_IsValid(value));
-  set_has_style_owner_type();
-  style_owner_type_ = value;
+inline void CommandAddGridColumnsArchive::set_location(::google::protobuf::uint32 value) {
+  set_has_location();
+  location_ = value;
 }
 
-// optional uint32 index = 3;
-inline bool PropertyMutationUndoTupleArchive::has_index() const {
+// optional uint32 length = 3;
+inline bool CommandAddGridColumnsArchive::has_length() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void PropertyMutationUndoTupleArchive::set_has_index() {
+inline void CommandAddGridColumnsArchive::set_has_length() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void PropertyMutationUndoTupleArchive::clear_has_index() {
+inline void CommandAddGridColumnsArchive::clear_has_length() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void PropertyMutationUndoTupleArchive::clear_index() {
-  index_ = 0u;
-  clear_has_index();
+inline void CommandAddGridColumnsArchive::clear_length() {
+  length_ = 0u;
+  clear_has_length();
 }
-inline ::google::protobuf::uint32 PropertyMutationUndoTupleArchive::index() const {
-  return index_;
+inline ::google::protobuf::uint32 CommandAddGridColumnsArchive::length() const {
+  return length_;
 }
-inline void PropertyMutationUndoTupleArchive::set_index(::google::protobuf::uint32 value) {
-  set_has_index();
-  index_ = value;
+inline void CommandAddGridColumnsArchive::set_length(::google::protobuf::uint32 value) {
+  set_has_length();
+  length_ = value;
 }
 
-// optional .TSP.Reference old_style = 4;
-inline bool PropertyMutationUndoTupleArchive::has_old_style() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void PropertyMutationUndoTupleArchive::set_has_old_style() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void PropertyMutationUndoTupleArchive::clear_has_old_style() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void PropertyMutationUndoTupleArchive::clear_old_style() {
-  if (old_style_ != NULL) old_style_->::TSP::Reference::Clear();
-  clear_has_old_style();
+// repeated string name = 4;
+inline int CommandAddGridColumnsArchive::name_size() const {
+  return name_.size();
 }
-inline const ::TSP::Reference& PropertyMutationUndoTupleArchive::old_style() const {
-  return old_style_ != NULL ? *old_style_ : *default_instance_->old_style_;
+inline void CommandAddGridColumnsArchive::clear_name() {
+  name_.Clear();
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::mutable_old_style() {
-  set_has_old_style();
-  if (old_style_ == NULL) old_style_ = new ::TSP::Reference;
-  return old_style_;
+inline const ::std::string& CommandAddGridColumnsArchive::name(int index) const {
+  return name_.Get(index);
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::release_old_style() {
-  clear_has_old_style();
-  ::TSP::Reference* temp = old_style_;
-  old_style_ = NULL;
-  return temp;
+inline ::std::string* CommandAddGridColumnsArchive::mutable_name(int index) {
+  return name_.Mutable(index);
 }
-inline void PropertyMutationUndoTupleArchive::set_allocated_old_style(::TSP::Reference* old_style) {
-  delete old_style_;
-  old_style_ = old_style;
-  if (old_style) {
-    set_has_old_style();
-  } else {
-    clear_has_old_style();
-  }
+inline void CommandAddGridColumnsArchive::set_name(int index, const ::std::string& value) {
+  name_.Mutable(index)->assign(value);
 }
-
-// optional .TSP.Reference new_style = 5;
-inline bool PropertyMutationUndoTupleArchive::has_new_style() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+inline void CommandAddGridColumnsArchive::set_name(int index, const char* value) {
+  name_.Mutable(index)->assign(value);
 }
-inline void PropertyMutationUndoTupleArchive::set_has_new_style() {
-  _has_bits_[0] |= 0x00000010u;
+inline void CommandAddGridColumnsArchive::set_name(int index, const char* value, size_t size) {
+  name_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void PropertyMutationUndoTupleArchive::clear_has_new_style() {
-  _has_bits_[0] &= ~0x00000010u;
+inline ::std::string* CommandAddGridColumnsArchive::add_name() {
+  return name_.Add();
 }
-inline void PropertyMutationUndoTupleArchive::clear_new_style() {
-  if (new_style_ != NULL) new_style_->::TSP::Reference::Clear();
-  clear_has_new_style();
+inline void CommandAddGridColumnsArchive::add_name(const ::std::string& value) {
+  name_.Add()->assign(value);
 }
-inline const ::TSP::Reference& PropertyMutationUndoTupleArchive::new_style() const {
-  return new_style_ != NULL ? *new_style_ : *default_instance_->new_style_;
+inline void CommandAddGridColumnsArchive::add_name(const char* value) {
+  name_.Add()->assign(value);
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::mutable_new_style() {
-  set_has_new_style();
-  if (new_style_ == NULL) new_style_ = new ::TSP::Reference;
-  return new_style_;
+inline void CommandAddGridColumnsArchive::add_name(const char* value, size_t size) {
+  name_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::release_new_style() {
-  clear_has_new_style();
-  ::TSP::Reference* temp = new_style_;
-  new_style_ = NULL;
-  return temp;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandAddGridColumnsArchive::name() const {
+  return name_;
 }
-inline void PropertyMutationUndoTupleArchive::set_allocated_new_style(::TSP::Reference* new_style) {
-  delete new_style_;
-  new_style_ = new_style;
-  if (new_style) {
-    set_has_new_style();
-  } else {
-    clear_has_new_style();
-  }
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandAddGridColumnsArchive::mutable_name() {
+  return &name_;
 }
 
-// optional .TSP.Reference old_non_style = 6;
-inline bool PropertyMutationUndoTupleArchive::has_old_non_style() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
-}
-inline void PropertyMutationUndoTupleArchive::set_has_old_non_style() {
-  _has_bits_[0] |= 0x00000020u;
-}
-inline void PropertyMutationUndoTupleArchive::clear_has_old_non_style() {
-  _has_bits_[0] &= ~0x00000020u;
-}
-inline void PropertyMutationUndoTupleArchive::clear_old_non_style() {
-  if (old_non_style_ != NULL) old_non_style_->::TSP::Reference::Clear();
-  clear_has_old_non_style();
+// repeated string ids = 5;
+inline int CommandAddGridColumnsArchive::ids_size() const {
+  return ids_.size();
 }
-inline const ::TSP::Reference& PropertyMutationUndoTupleArchive::old_non_style() const {
-  return old_non_style_ != NULL ? *old_non_style_ : *default_instance_->old_non_style_;
+inline void CommandAddGridColumnsArchive::clear_ids() {
+  ids_.Clear();
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::mutable_old_non_style() {
-  set_has_old_non_style();
-  if (old_non_style_ == NULL) old_non_style_ = new ::TSP::Reference;
-  return old_non_style_;
+inline const ::std::string& CommandAddGridColumnsArchive::ids(int index) const {
+  return ids_.Get(index);
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::release_old_non_style() {
-  clear_has_old_non_style();
-  ::TSP::Reference* temp = old_non_style_;
-  old_non_style_ = NULL;
-  return temp;
+inline ::std::string* CommandAddGridColumnsArchive::mutable_ids(int index) {
+  return ids_.Mutable(index);
 }
-inline void PropertyMutationUndoTupleArchive::set_allocated_old_non_style(::TSP::Reference* old_non_style) {
-  delete old_non_style_;
-  old_non_style_ = old_non_style;
-  if (old_non_style) {
-    set_has_old_non_style();
-  } else {
-    clear_has_old_non_style();
-  }
+inline void CommandAddGridColumnsArchive::set_ids(int index, const ::std::string& value) {
+  ids_.Mutable(index)->assign(value);
 }
-
-// optional .TSP.Reference new_non_style = 7;
-inline bool PropertyMutationUndoTupleArchive::has_new_non_style() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
+inline void CommandAddGridColumnsArchive::set_ids(int index, const char* value) {
+  ids_.Mutable(index)->assign(value);
 }
-inline void PropertyMutationUndoTupleArchive::set_has_new_non_style() {
-  _has_bits_[0] |= 0x00000040u;
+inline void CommandAddGridColumnsArchive::set_ids(int index, const char* value, size_t size) {
+  ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void PropertyMutationUndoTupleArchive::clear_has_new_non_style() {
-  _has_bits_[0] &= ~0x00000040u;
+inline ::std::string* CommandAddGridColumnsArchive::add_ids() {
+  return ids_.Add();
 }
-inline void PropertyMutationUndoTupleArchive::clear_new_non_style() {
-  if (new_non_style_ != NULL) new_non_style_->::TSP::Reference::Clear();
-  clear_has_new_non_style();
+inline void CommandAddGridColumnsArchive::add_ids(const ::std::string& value) {
+  ids_.Add()->assign(value);
 }
-inline const ::TSP::Reference& PropertyMutationUndoTupleArchive::new_non_style() const {
-  return new_non_style_ != NULL ? *new_non_style_ : *default_instance_->new_non_style_;
+inline void CommandAddGridColumnsArchive::add_ids(const char* value) {
+  ids_.Add()->assign(value);
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::mutable_new_non_style() {
-  set_has_new_non_style();
-  if (new_non_style_ == NULL) new_non_style_ = new ::TSP::Reference;
-  return new_non_style_;
+inline void CommandAddGridColumnsArchive::add_ids(const char* value, size_t size) {
+  ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::TSP::Reference* PropertyMutationUndoTupleArchive::release_new_non_style() {
-  clear_has_new_non_style();
-  ::TSP::Reference* temp = new_non_style_;
-  new_non_style_ = NULL;
-  return temp;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandAddGridColumnsArchive::ids() const {
+  return ids_;
 }
-inline void PropertyMutationUndoTupleArchive::set_allocated_new_non_style(::TSP::Reference* new_non_style) {
-  delete new_non_style_;
-  new_non_style_ = new_non_style;
-  if (new_non_style) {
-    set_has_new_non_style();
-  } else {
-    clear_has_new_non_style();
-  }
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandAddGridColumnsArchive::mutable_ids() {
+  return &ids_;
 }
 
 // -------------------------------------------------------------------
 
-// StyleSwapUndoTupleArchive
+// CommandMoveGridRowsArchive
 
-// optional .TSP.Reference chart_info = 1;
-inline bool StyleSwapUndoTupleArchive::has_chart_info() const {
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandMoveGridRowsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void StyleSwapUndoTupleArchive::set_has_chart_info() {
+inline void CommandMoveGridRowsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void StyleSwapUndoTupleArchive::clear_has_chart_info() {
+inline void CommandMoveGridRowsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void StyleSwapUndoTupleArchive::clear_chart_info() {
-  if (chart_info_ != NULL) chart_info_->::TSP::Reference::Clear();
-  clear_has_chart_info();
+inline void CommandMoveGridRowsArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
 }
-inline const ::TSP::Reference& StyleSwapUndoTupleArchive::chart_info() const {
-  return chart_info_ != NULL ? *chart_info_ : *default_instance_->chart_info_;
+inline const ::TSCH::ChartCommandArchive& CommandMoveGridRowsArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSP::Reference* StyleSwapUndoTupleArchive::mutable_chart_info() {
-  set_has_chart_info();
-  if (chart_info_ == NULL) chart_info_ = new ::TSP::Reference;
-  return chart_info_;
+inline ::TSCH::ChartCommandArchive* CommandMoveGridRowsArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
 }
-inline ::TSP::Reference* StyleSwapUndoTupleArchive::release_chart_info() {
-  clear_has_chart_info();
-  ::TSP::Reference* temp = chart_info_;
-  chart_info_ = NULL;
+inline ::TSCH::ChartCommandArchive* CommandMoveGridRowsArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void StyleSwapUndoTupleArchive::set_allocated_chart_info(::TSP::Reference* chart_info) {
-  delete chart_info_;
-  chart_info_ = chart_info;
-  if (chart_info) {
-    set_has_chart_info();
+inline void CommandMoveGridRowsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_chart_info();
+    clear_has_super();
   }
 }
 
-// optional .TSCH.StyleSwapType swap_type = 2;
-inline bool StyleSwapUndoTupleArchive::has_swap_type() const {
+// required uint32 location = 2;
+inline bool CommandMoveGridRowsArchive::has_location() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void StyleSwapUndoTupleArchive::set_has_swap_type() {
+inline void CommandMoveGridRowsArchive::set_has_location() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void StyleSwapUndoTupleArchive::clear_has_swap_type() {
+inline void CommandMoveGridRowsArchive::clear_has_location() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void StyleSwapUndoTupleArchive::clear_swap_type() {
-  swap_type_ = 1;
-  clear_has_swap_type();
+inline void CommandMoveGridRowsArchive::clear_location() {
+  location_ = 0u;
+  clear_has_location();
 }
-inline ::TSCH::StyleSwapType StyleSwapUndoTupleArchive::swap_type() const {
-  return static_cast< ::TSCH::StyleSwapType >(swap_type_);
+inline ::google::protobuf::uint32 CommandMoveGridRowsArchive::location() const {
+  return location_;
 }
-inline void StyleSwapUndoTupleArchive::set_swap_type(::TSCH::StyleSwapType value) {
-  assert(::TSCH::StyleSwapType_IsValid(value));
-  set_has_swap_type();
-  swap_type_ = value;
+inline void CommandMoveGridRowsArchive::set_location(::google::protobuf::uint32 value) {
+  set_has_location();
+  location_ = value;
 }
 
-// optional uint32 index = 3;
-inline bool StyleSwapUndoTupleArchive::has_index() const {
+// required uint32 length = 3;
+inline bool CommandMoveGridRowsArchive::has_length() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void StyleSwapUndoTupleArchive::set_has_index() {
+inline void CommandMoveGridRowsArchive::set_has_length() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void StyleSwapUndoTupleArchive::clear_has_index() {
+inline void CommandMoveGridRowsArchive::clear_has_length() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void StyleSwapUndoTupleArchive::clear_index() {
-  index_ = 0u;
-  clear_has_index();
+inline void CommandMoveGridRowsArchive::clear_length() {
+  length_ = 0u;
+  clear_has_length();
 }
-inline ::google::protobuf::uint32 StyleSwapUndoTupleArchive::index() const {
-  return index_;
+inline ::google::protobuf::uint32 CommandMoveGridRowsArchive::length() const {
+  return length_;
 }
-inline void StyleSwapUndoTupleArchive::set_index(::google::protobuf::uint32 value) {
-  set_has_index();
-  index_ = value;
+inline void CommandMoveGridRowsArchive::set_length(::google::protobuf::uint32 value) {
+  set_has_length();
+  length_ = value;
 }
 
-// optional .TSP.Reference old_value = 4;
-inline bool StyleSwapUndoTupleArchive::has_old_value() const {
+// required int32 afterrow = 4;
+inline bool CommandMoveGridRowsArchive::has_afterrow() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void StyleSwapUndoTupleArchive::set_has_old_value() {
+inline void CommandMoveGridRowsArchive::set_has_afterrow() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void StyleSwapUndoTupleArchive::clear_has_old_value() {
+inline void CommandMoveGridRowsArchive::clear_has_afterrow() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void StyleSwapUndoTupleArchive::clear_old_value() {
-  if (old_value_ != NULL) old_value_->::TSP::Reference::Clear();
-  clear_has_old_value();
-}
-inline const ::TSP::Reference& StyleSwapUndoTupleArchive::old_value() const {
-  return old_value_ != NULL ? *old_value_ : *default_instance_->old_value_;
-}
-inline ::TSP::Reference* StyleSwapUndoTupleArchive::mutable_old_value() {
-  set_has_old_value();
-  if (old_value_ == NULL) old_value_ = new ::TSP::Reference;
-  return old_value_;
-}
-inline ::TSP::Reference* StyleSwapUndoTupleArchive::release_old_value() {
-  clear_has_old_value();
-  ::TSP::Reference* temp = old_value_;
-  old_value_ = NULL;
-  return temp;
-}
-inline void StyleSwapUndoTupleArchive::set_allocated_old_value(::TSP::Reference* old_value) {
-  delete old_value_;
-  old_value_ = old_value;
-  if (old_value) {
-    set_has_old_value();
-  } else {
-    clear_has_old_value();
-  }
-}
-
-// optional .TSP.Reference new_value = 5;
-inline bool StyleSwapUndoTupleArchive::has_new_value() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void StyleSwapUndoTupleArchive::set_has_new_value() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void StyleSwapUndoTupleArchive::clear_has_new_value() {
-  _has_bits_[0] &= ~0x00000010u;
-}
-inline void StyleSwapUndoTupleArchive::clear_new_value() {
-  if (new_value_ != NULL) new_value_->::TSP::Reference::Clear();
-  clear_has_new_value();
-}
-inline const ::TSP::Reference& StyleSwapUndoTupleArchive::new_value() const {
-  return new_value_ != NULL ? *new_value_ : *default_instance_->new_value_;
-}
-inline ::TSP::Reference* StyleSwapUndoTupleArchive::mutable_new_value() {
-  set_has_new_value();
-  if (new_value_ == NULL) new_value_ = new ::TSP::Reference;
-  return new_value_;
+inline void CommandMoveGridRowsArchive::clear_afterrow() {
+  afterrow_ = 0;
+  clear_has_afterrow();
 }
-inline ::TSP::Reference* StyleSwapUndoTupleArchive::release_new_value() {
-  clear_has_new_value();
-  ::TSP::Reference* temp = new_value_;
-  new_value_ = NULL;
-  return temp;
+inline ::google::protobuf::int32 CommandMoveGridRowsArchive::afterrow() const {
+  return afterrow_;
 }
-inline void StyleSwapUndoTupleArchive::set_allocated_new_value(::TSP::Reference* new_value) {
-  delete new_value_;
-  new_value_ = new_value;
-  if (new_value) {
-    set_has_new_value();
-  } else {
-    clear_has_new_value();
-  }
+inline void CommandMoveGridRowsArchive::set_afterrow(::google::protobuf::int32 value) {
+  set_has_afterrow();
+  afterrow_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandStyleSwapArchive
+// CommandMoveGridColumnsArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandStyleSwapArchive::has_super() const {
+inline bool CommandMoveGridColumnsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandStyleSwapArchive::set_has_super() {
+inline void CommandMoveGridColumnsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandStyleSwapArchive::clear_has_super() {
+inline void CommandMoveGridColumnsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandStyleSwapArchive::clear_super() {
+inline void CommandMoveGridColumnsArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandStyleSwapArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandMoveGridColumnsArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandStyleSwapArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandMoveGridColumnsArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandStyleSwapArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandMoveGridColumnsArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandStyleSwapArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline void CommandMoveGridColumnsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required uint32 location = 2;
+inline bool CommandMoveGridColumnsArchive::has_location() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandMoveGridColumnsArchive::set_has_location() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandMoveGridColumnsArchive::clear_has_location() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandMoveGridColumnsArchive::clear_location() {
+  location_ = 0u;
+  clear_has_location();
+}
+inline ::google::protobuf::uint32 CommandMoveGridColumnsArchive::location() const {
+  return location_;
+}
+inline void CommandMoveGridColumnsArchive::set_location(::google::protobuf::uint32 value) {
+  set_has_location();
+  location_ = value;
+}
+
+// required uint32 length = 3;
+inline bool CommandMoveGridColumnsArchive::has_length() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandMoveGridColumnsArchive::set_has_length() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandMoveGridColumnsArchive::clear_has_length() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandMoveGridColumnsArchive::clear_length() {
+  length_ = 0u;
+  clear_has_length();
+}
+inline ::google::protobuf::uint32 CommandMoveGridColumnsArchive::length() const {
+  return length_;
+}
+inline void CommandMoveGridColumnsArchive::set_length(::google::protobuf::uint32 value) {
+  set_has_length();
+  length_ = value;
+}
+
+// required int32 aftercolumn = 4;
+inline bool CommandMoveGridColumnsArchive::has_aftercolumn() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandMoveGridColumnsArchive::set_has_aftercolumn() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandMoveGridColumnsArchive::clear_has_aftercolumn() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandMoveGridColumnsArchive::clear_aftercolumn() {
+  aftercolumn_ = 0;
+  clear_has_aftercolumn();
+}
+inline ::google::protobuf::int32 CommandMoveGridColumnsArchive::aftercolumn() const {
+  return aftercolumn_;
+}
+inline void CommandMoveGridColumnsArchive::set_aftercolumn(::google::protobuf::int32 value) {
+  set_has_aftercolumn();
+  aftercolumn_ = value;
 }
 
-// repeated .TSCH.StyleSwapUndoTupleArchive undo_tuples = 2;
-inline int CommandStyleSwapArchive::undo_tuples_size() const {
-  return undo_tuples_.size();
+// -------------------------------------------------------------------
+
+// CommandDeleteGridRowsArchive_ValueRow
+
+// repeated double value = 5;
+inline int CommandDeleteGridRowsArchive_ValueRow::value_size() const {
+  return value_.size();
 }
-inline void CommandStyleSwapArchive::clear_undo_tuples() {
-  undo_tuples_.Clear();
+inline void CommandDeleteGridRowsArchive_ValueRow::clear_value() {
+  value_.Clear();
 }
-inline const ::TSCH::StyleSwapUndoTupleArchive& CommandStyleSwapArchive::undo_tuples(int index) const {
-  return undo_tuples_.Get(index);
+inline double CommandDeleteGridRowsArchive_ValueRow::value(int index) const {
+  return value_.Get(index);
 }
-inline ::TSCH::StyleSwapUndoTupleArchive* CommandStyleSwapArchive::mutable_undo_tuples(int index) {
-  return undo_tuples_.Mutable(index);
+inline void CommandDeleteGridRowsArchive_ValueRow::set_value(int index, double value) {
+  value_.Set(index, value);
 }
-inline ::TSCH::StyleSwapUndoTupleArchive* CommandStyleSwapArchive::add_undo_tuples() {
-  return undo_tuples_.Add();
+inline void CommandDeleteGridRowsArchive_ValueRow::add_value(double value) {
+  value_.Add(value);
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TSCH::StyleSwapUndoTupleArchive >&
-CommandStyleSwapArchive::undo_tuples() const {
-  return undo_tuples_;
+inline const ::google::protobuf::RepeatedField< double >&
+CommandDeleteGridRowsArchive_ValueRow::value() const {
+  return value_;
 }
-inline ::google::protobuf::RepeatedPtrField< ::TSCH::StyleSwapUndoTupleArchive >*
-CommandStyleSwapArchive::mutable_undo_tuples() {
-  return &undo_tuples_;
+inline ::google::protobuf::RepeatedField< double >*
+CommandDeleteGridRowsArchive_ValueRow::mutable_value() {
+  return &value_;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetSeriesNameArchive
+// CommandDeleteGridRowsArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetSeriesNameArchive::has_super() const {
+inline bool CommandDeleteGridRowsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetSeriesNameArchive::set_has_super() {
+inline void CommandDeleteGridRowsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetSeriesNameArchive::clear_has_super() {
+inline void CommandDeleteGridRowsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetSeriesNameArchive::clear_super() {
+inline void CommandDeleteGridRowsArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetSeriesNameArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandDeleteGridRowsArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetSeriesNameArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandDeleteGridRowsArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetSeriesNameArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandDeleteGridRowsArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetSeriesNameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandDeleteGridRowsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -4791,427 +8683,357 @@ inline void CommandSetSeriesNameArchive::set_allocated_super(::TSCH::ChartComman
   }
 }
 
-// required uint32 seriesIndex = 2;
-inline bool CommandSetSeriesNameArchive::has_seriesindex() const {
+// required uint32 location = 2;
+inline bool CommandDeleteGridRowsArchive::has_location() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetSeriesNameArchive::set_has_seriesindex() {
+inline void CommandDeleteGridRowsArchive::set_has_location() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetSeriesNameArchive::clear_has_seriesindex() {
+inline void CommandDeleteGridRowsArchive::clear_has_location() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetSeriesNameArchive::clear_seriesindex() {
-  seriesindex_ = 0u;
-  clear_has_seriesindex();
+inline void CommandDeleteGridRowsArchive::clear_location() {
+  location_ = 0u;
+  clear_has_location();
 }
-inline ::google::protobuf::uint32 CommandSetSeriesNameArchive::seriesindex() const {
-  return seriesindex_;
+inline ::google::protobuf::uint32 CommandDeleteGridRowsArchive::location() const {
+  return location_;
 }
-inline void CommandSetSeriesNameArchive::set_seriesindex(::google::protobuf::uint32 value) {
-  set_has_seriesindex();
-  seriesindex_ = value;
+inline void CommandDeleteGridRowsArchive::set_location(::google::protobuf::uint32 value) {
+  set_has_location();
+  location_ = value;
 }
 
-// required string oldName = 3;
-inline bool CommandSetSeriesNameArchive::has_oldname() const {
+// required uint32 length = 3;
+inline bool CommandDeleteGridRowsArchive::has_length() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetSeriesNameArchive::set_has_oldname() {
+inline void CommandDeleteGridRowsArchive::set_has_length() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetSeriesNameArchive::clear_has_oldname() {
+inline void CommandDeleteGridRowsArchive::clear_has_length() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetSeriesNameArchive::clear_oldname() {
-  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-    oldname_->clear();
-  }
-  clear_has_oldname();
+inline void CommandDeleteGridRowsArchive::clear_length() {
+  length_ = 0u;
+  clear_has_length();
 }
-inline const ::std::string& CommandSetSeriesNameArchive::oldname() const {
-  return *oldname_;
+inline ::google::protobuf::uint32 CommandDeleteGridRowsArchive::length() const {
+  return length_;
 }
-inline void CommandSetSeriesNameArchive::set_oldname(const ::std::string& value) {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  oldname_->assign(value);
+inline void CommandDeleteGridRowsArchive::set_length(::google::protobuf::uint32 value) {
+  set_has_length();
+  length_ = value;
 }
-inline void CommandSetSeriesNameArchive::set_oldname(const char* value) {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  oldname_->assign(value);
+
+// repeated string names = 4;
+inline int CommandDeleteGridRowsArchive::names_size() const {
+  return names_.size();
 }
-inline void CommandSetSeriesNameArchive::set_oldname(const char* value, size_t size) {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  oldname_->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandDeleteGridRowsArchive::clear_names() {
+  names_.Clear();
 }
-inline ::std::string* CommandSetSeriesNameArchive::mutable_oldname() {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  return oldname_;
+inline const ::std::string& CommandDeleteGridRowsArchive::names(int index) const {
+  return names_.Get(index);
 }
-inline ::std::string* CommandSetSeriesNameArchive::release_oldname() {
-  clear_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = oldname_;
-    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline ::std::string* CommandDeleteGridRowsArchive::mutable_names(int index) {
+  return names_.Mutable(index);
 }
-inline void CommandSetSeriesNameArchive::set_allocated_oldname(::std::string* oldname) {
-  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-    delete oldname_;
-  }
-  if (oldname) {
-    set_has_oldname();
-    oldname_ = oldname;
-  } else {
-    clear_has_oldname();
-    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
+inline void CommandDeleteGridRowsArchive::set_names(int index, const ::std::string& value) {
+  names_.Mutable(index)->assign(value);
+}
+inline void CommandDeleteGridRowsArchive::set_names(int index, const char* value) {
+  names_.Mutable(index)->assign(value);
+}
+inline void CommandDeleteGridRowsArchive::set_names(int index, const char* value, size_t size) {
+  names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandDeleteGridRowsArchive::add_names() {
+  return names_.Add();
+}
+inline void CommandDeleteGridRowsArchive::add_names(const ::std::string& value) {
+  names_.Add()->assign(value);
+}
+inline void CommandDeleteGridRowsArchive::add_names(const char* value) {
+  names_.Add()->assign(value);
+}
+inline void CommandDeleteGridRowsArchive::add_names(const char* value, size_t size) {
+  names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+}
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandDeleteGridRowsArchive::names() const {
+  return names_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandDeleteGridRowsArchive::mutable_names() {
+  return &names_;
 }
 
-// required string newName = 4;
-inline bool CommandSetSeriesNameArchive::has_newname() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
+inline int CommandDeleteGridRowsArchive::value_row_size() const {
+  return value_row_.size();
 }
-inline void CommandSetSeriesNameArchive::set_has_newname() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandDeleteGridRowsArchive::clear_value_row() {
+  value_row_.Clear();
 }
-inline void CommandSetSeriesNameArchive::clear_has_newname() {
-  _has_bits_[0] &= ~0x00000008u;
+inline const ::TSCH::CommandDeleteGridRowsArchive_ValueRow& CommandDeleteGridRowsArchive::value_row(int index) const {
+  return value_row_.Get(index);
 }
-inline void CommandSetSeriesNameArchive::clear_newname() {
-  if (newname_ != &::google::protobuf::internal::kEmptyString) {
-    newname_->clear();
-  }
-  clear_has_newname();
+inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive::mutable_value_row(int index) {
+  return value_row_.Mutable(index);
+}
+inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive::add_value_row() {
+  return value_row_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >&
+CommandDeleteGridRowsArchive::value_row() const {
+  return value_row_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >*
+CommandDeleteGridRowsArchive::mutable_value_row() {
+  return &value_row_;
+}
+
+// optional bool removed_all_rows = 7;
+inline bool CommandDeleteGridRowsArchive::has_removed_all_rows() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandDeleteGridRowsArchive::set_has_removed_all_rows() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandDeleteGridRowsArchive::clear_has_removed_all_rows() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandDeleteGridRowsArchive::clear_removed_all_rows() {
+  removed_all_rows_ = false;
+  clear_has_removed_all_rows();
+}
+inline bool CommandDeleteGridRowsArchive::removed_all_rows() const {
+  return removed_all_rows_;
+}
+inline void CommandDeleteGridRowsArchive::set_removed_all_rows(bool value) {
+  set_has_removed_all_rows();
+  removed_all_rows_ = value;
+}
+
+// repeated string column_names = 8;
+inline int CommandDeleteGridRowsArchive::column_names_size() const {
+  return column_names_.size();
 }
-inline const ::std::string& CommandSetSeriesNameArchive::newname() const {
-  return *newname_;
+inline void CommandDeleteGridRowsArchive::clear_column_names() {
+  column_names_.Clear();
 }
-inline void CommandSetSeriesNameArchive::set_newname(const ::std::string& value) {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  newname_->assign(value);
+inline const ::std::string& CommandDeleteGridRowsArchive::column_names(int index) const {
+  return column_names_.Get(index);
 }
-inline void CommandSetSeriesNameArchive::set_newname(const char* value) {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  newname_->assign(value);
+inline ::std::string* CommandDeleteGridRowsArchive::mutable_column_names(int index) {
+  return column_names_.Mutable(index);
 }
-inline void CommandSetSeriesNameArchive::set_newname(const char* value, size_t size) {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  newname_->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandDeleteGridRowsArchive::set_column_names(int index, const ::std::string& value) {
+  column_names_.Mutable(index)->assign(value);
 }
-inline ::std::string* CommandSetSeriesNameArchive::mutable_newname() {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  return newname_;
+inline void CommandDeleteGridRowsArchive::set_column_names(int index, const char* value) {
+  column_names_.Mutable(index)->assign(value);
 }
-inline ::std::string* CommandSetSeriesNameArchive::release_newname() {
-  clear_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = newname_;
-    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline void CommandDeleteGridRowsArchive::set_column_names(int index, const char* value, size_t size) {
+  column_names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void CommandSetSeriesNameArchive::set_allocated_newname(::std::string* newname) {
-  if (newname_ != &::google::protobuf::internal::kEmptyString) {
-    delete newname_;
-  }
-  if (newname) {
-    set_has_newname();
-    newname_ = newname;
-  } else {
-    clear_has_newname();
-    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
+inline ::std::string* CommandDeleteGridRowsArchive::add_column_names() {
+  return column_names_.Add();
 }
-
-// -------------------------------------------------------------------
-
-// CommandSetCategoryNameArchive
-
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetCategoryNameArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+inline void CommandDeleteGridRowsArchive::add_column_names(const ::std::string& value) {
+  column_names_.Add()->assign(value);
 }
-inline void CommandSetCategoryNameArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+inline void CommandDeleteGridRowsArchive::add_column_names(const char* value) {
+  column_names_.Add()->assign(value);
 }
-inline void CommandSetCategoryNameArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void CommandDeleteGridRowsArchive::add_column_names(const char* value, size_t size) {
+  column_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandSetCategoryNameArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-  clear_has_super();
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandDeleteGridRowsArchive::column_names() const {
+  return column_names_;
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetCategoryNameArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandDeleteGridRowsArchive::mutable_column_names() {
+  return &column_names_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetCategoryNameArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
-  return super_;
+
+// repeated string row_ids = 9;
+inline int CommandDeleteGridRowsArchive::row_ids_size() const {
+  return row_ids_.size();
 }
-inline ::TSCH::ChartCommandArchive* CommandSetCategoryNameArchive::release_super() {
-  clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
-  super_ = NULL;
-  return temp;
+inline void CommandDeleteGridRowsArchive::clear_row_ids() {
+  row_ids_.Clear();
 }
-inline void CommandSetCategoryNameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline const ::std::string& CommandDeleteGridRowsArchive::row_ids(int index) const {
+  return row_ids_.Get(index);
 }
-
-// required uint32 categoryIndex = 2;
-inline bool CommandSetCategoryNameArchive::has_categoryindex() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+inline ::std::string* CommandDeleteGridRowsArchive::mutable_row_ids(int index) {
+  return row_ids_.Mutable(index);
 }
-inline void CommandSetCategoryNameArchive::set_has_categoryindex() {
-  _has_bits_[0] |= 0x00000002u;
+inline void CommandDeleteGridRowsArchive::set_row_ids(int index, const ::std::string& value) {
+  row_ids_.Mutable(index)->assign(value);
 }
-inline void CommandSetCategoryNameArchive::clear_has_categoryindex() {
-  _has_bits_[0] &= ~0x00000002u;
+inline void CommandDeleteGridRowsArchive::set_row_ids(int index, const char* value) {
+  row_ids_.Mutable(index)->assign(value);
 }
-inline void CommandSetCategoryNameArchive::clear_categoryindex() {
-  categoryindex_ = 0u;
-  clear_has_categoryindex();
+inline void CommandDeleteGridRowsArchive::set_row_ids(int index, const char* value, size_t size) {
+  row_ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline ::google::protobuf::uint32 CommandSetCategoryNameArchive::categoryindex() const {
-  return categoryindex_;
+inline ::std::string* CommandDeleteGridRowsArchive::add_row_ids() {
+  return row_ids_.Add();
 }
-inline void CommandSetCategoryNameArchive::set_categoryindex(::google::protobuf::uint32 value) {
-  set_has_categoryindex();
-  categoryindex_ = value;
+inline void CommandDeleteGridRowsArchive::add_row_ids(const ::std::string& value) {
+  row_ids_.Add()->assign(value);
 }
-
-// required string oldName = 3;
-inline bool CommandSetCategoryNameArchive::has_oldname() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+inline void CommandDeleteGridRowsArchive::add_row_ids(const char* value) {
+  row_ids_.Add()->assign(value);
 }
-inline void CommandSetCategoryNameArchive::set_has_oldname() {
-  _has_bits_[0] |= 0x00000004u;
+inline void CommandDeleteGridRowsArchive::add_row_ids(const char* value, size_t size) {
+  row_ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandSetCategoryNameArchive::clear_has_oldname() {
-  _has_bits_[0] &= ~0x00000004u;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandDeleteGridRowsArchive::row_ids() const {
+  return row_ids_;
 }
-inline void CommandSetCategoryNameArchive::clear_oldname() {
-  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-    oldname_->clear();
-  }
-  clear_has_oldname();
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandDeleteGridRowsArchive::mutable_row_ids() {
+  return &row_ids_;
 }
-inline const ::std::string& CommandSetCategoryNameArchive::oldname() const {
-  return *oldname_;
+
+// repeated string column_ids = 10;
+inline int CommandDeleteGridRowsArchive::column_ids_size() const {
+  return column_ids_.size();
 }
-inline void CommandSetCategoryNameArchive::set_oldname(const ::std::string& value) {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  oldname_->assign(value);
+inline void CommandDeleteGridRowsArchive::clear_column_ids() {
+  column_ids_.Clear();
 }
-inline void CommandSetCategoryNameArchive::set_oldname(const char* value) {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  oldname_->assign(value);
+inline const ::std::string& CommandDeleteGridRowsArchive::column_ids(int index) const {
+  return column_ids_.Get(index);
 }
-inline void CommandSetCategoryNameArchive::set_oldname(const char* value, size_t size) {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  oldname_->assign(reinterpret_cast<const char*>(value), size);
+inline ::std::string* CommandDeleteGridRowsArchive::mutable_column_ids(int index) {
+  return column_ids_.Mutable(index);
 }
-inline ::std::string* CommandSetCategoryNameArchive::mutable_oldname() {
-  set_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    oldname_ = new ::std::string;
-  }
-  return oldname_;
+inline void CommandDeleteGridRowsArchive::set_column_ids(int index, const ::std::string& value) {
+  column_ids_.Mutable(index)->assign(value);
 }
-inline ::std::string* CommandSetCategoryNameArchive::release_oldname() {
-  clear_has_oldname();
-  if (oldname_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = oldname_;
-    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline void CommandDeleteGridRowsArchive::set_column_ids(int index, const char* value) {
+  column_ids_.Mutable(index)->assign(value);
 }
-inline void CommandSetCategoryNameArchive::set_allocated_oldname(::std::string* oldname) {
-  if (oldname_ != &::google::protobuf::internal::kEmptyString) {
-    delete oldname_;
-  }
-  if (oldname) {
-    set_has_oldname();
-    oldname_ = oldname;
-  } else {
-    clear_has_oldname();
-    oldname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
+inline void CommandDeleteGridRowsArchive::set_column_ids(int index, const char* value, size_t size) {
+  column_ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-
-// required string newName = 4;
-inline bool CommandSetCategoryNameArchive::has_newname() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+inline ::std::string* CommandDeleteGridRowsArchive::add_column_ids() {
+  return column_ids_.Add();
 }
-inline void CommandSetCategoryNameArchive::set_has_newname() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandDeleteGridRowsArchive::add_column_ids(const ::std::string& value) {
+  column_ids_.Add()->assign(value);
 }
-inline void CommandSetCategoryNameArchive::clear_has_newname() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandDeleteGridRowsArchive::add_column_ids(const char* value) {
+  column_ids_.Add()->assign(value);
 }
-inline void CommandSetCategoryNameArchive::clear_newname() {
-  if (newname_ != &::google::protobuf::internal::kEmptyString) {
-    newname_->clear();
-  }
-  clear_has_newname();
+inline void CommandDeleteGridRowsArchive::add_column_ids(const char* value, size_t size) {
+  column_ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline const ::std::string& CommandSetCategoryNameArchive::newname() const {
-  return *newname_;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandDeleteGridRowsArchive::column_ids() const {
+  return column_ids_;
 }
-inline void CommandSetCategoryNameArchive::set_newname(const ::std::string& value) {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  newname_->assign(value);
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandDeleteGridRowsArchive::mutable_column_ids() {
+  return &column_ids_;
 }
-inline void CommandSetCategoryNameArchive::set_newname(const char* value) {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  newname_->assign(value);
+
+// required bool add_dummy_data_on_delete_all = 11;
+inline bool CommandDeleteGridRowsArchive::has_add_dummy_data_on_delete_all() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
-inline void CommandSetCategoryNameArchive::set_newname(const char* value, size_t size) {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  newname_->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandDeleteGridRowsArchive::set_has_add_dummy_data_on_delete_all() {
+  _has_bits_[0] |= 0x00000200u;
 }
-inline ::std::string* CommandSetCategoryNameArchive::mutable_newname() {
-  set_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    newname_ = new ::std::string;
-  }
-  return newname_;
+inline void CommandDeleteGridRowsArchive::clear_has_add_dummy_data_on_delete_all() {
+  _has_bits_[0] &= ~0x00000200u;
 }
-inline ::std::string* CommandSetCategoryNameArchive::release_newname() {
-  clear_has_newname();
-  if (newname_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = newname_;
-    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline void CommandDeleteGridRowsArchive::clear_add_dummy_data_on_delete_all() {
+  add_dummy_data_on_delete_all_ = false;
+  clear_has_add_dummy_data_on_delete_all();
 }
-inline void CommandSetCategoryNameArchive::set_allocated_newname(::std::string* newname) {
-  if (newname_ != &::google::protobuf::internal::kEmptyString) {
-    delete newname_;
-  }
-  if (newname) {
-    set_has_newname();
-    newname_ = newname;
-  } else {
-    clear_has_newname();
-    newname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
+inline bool CommandDeleteGridRowsArchive::add_dummy_data_on_delete_all() const {
+  return add_dummy_data_on_delete_all_;
 }
+inline void CommandDeleteGridRowsArchive::set_add_dummy_data_on_delete_all(bool value) {
+  set_has_add_dummy_data_on_delete_all();
+  add_dummy_data_on_delete_all_ = value;
+}
+
+// -------------------------------------------------------------------
 
-// optional bool isMultiDataIndex = 5;
-inline bool CommandSetCategoryNameArchive::has_ismultidataindex() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+// CommandDeleteGridColumnsArchive_ValueRow
+
+// repeated double value = 5;
+inline int CommandDeleteGridColumnsArchive_ValueRow::value_size() const {
+  return value_.size();
 }
-inline void CommandSetCategoryNameArchive::set_has_ismultidataindex() {
-  _has_bits_[0] |= 0x00000010u;
+inline void CommandDeleteGridColumnsArchive_ValueRow::clear_value() {
+  value_.Clear();
 }
-inline void CommandSetCategoryNameArchive::clear_has_ismultidataindex() {
-  _has_bits_[0] &= ~0x00000010u;
+inline double CommandDeleteGridColumnsArchive_ValueRow::value(int index) const {
+  return value_.Get(index);
 }
-inline void CommandSetCategoryNameArchive::clear_ismultidataindex() {
-  ismultidataindex_ = false;
-  clear_has_ismultidataindex();
+inline void CommandDeleteGridColumnsArchive_ValueRow::set_value(int index, double value) {
+  value_.Set(index, value);
 }
-inline bool CommandSetCategoryNameArchive::ismultidataindex() const {
-  return ismultidataindex_;
+inline void CommandDeleteGridColumnsArchive_ValueRow::add_value(double value) {
+  value_.Add(value);
 }
-inline void CommandSetCategoryNameArchive::set_ismultidataindex(bool value) {
-  set_has_ismultidataindex();
-  ismultidataindex_ = value;
+inline const ::google::protobuf::RepeatedField< double >&
+CommandDeleteGridColumnsArchive_ValueRow::value() const {
+  return value_;
+}
+inline ::google::protobuf::RepeatedField< double >*
+CommandDeleteGridColumnsArchive_ValueRow::mutable_value() {
+  return &value_;
 }
 
 // -------------------------------------------------------------------
 
-// CommandAddGridRowsArchive
+// CommandDeleteGridColumnsArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandAddGridRowsArchive::has_super() const {
+inline bool CommandDeleteGridColumnsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandAddGridRowsArchive::set_has_super() {
+inline void CommandDeleteGridColumnsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandAddGridRowsArchive::clear_has_super() {
+inline void CommandDeleteGridColumnsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandAddGridRowsArchive::clear_super() {
+inline void CommandDeleteGridColumnsArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandAddGridRowsArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandDeleteGridColumnsArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandAddGridRowsArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandDeleteGridColumnsArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandAddGridRowsArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandDeleteGridColumnsArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandAddGridRowsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandDeleteGridColumnsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -5222,256 +9044,327 @@ inline void CommandAddGridRowsArchive::set_allocated_super(::TSCH::ChartCommandA
 }
 
 // required uint32 location = 2;
-inline bool CommandAddGridRowsArchive::has_location() const {
+inline bool CommandDeleteGridColumnsArchive::has_location() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandAddGridRowsArchive::set_has_location() {
+inline void CommandDeleteGridColumnsArchive::set_has_location() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandAddGridRowsArchive::clear_has_location() {
+inline void CommandDeleteGridColumnsArchive::clear_has_location() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandAddGridRowsArchive::clear_location() {
+inline void CommandDeleteGridColumnsArchive::clear_location() {
   location_ = 0u;
   clear_has_location();
 }
-inline ::google::protobuf::uint32 CommandAddGridRowsArchive::location() const {
+inline ::google::protobuf::uint32 CommandDeleteGridColumnsArchive::location() const {
   return location_;
 }
-inline void CommandAddGridRowsArchive::set_location(::google::protobuf::uint32 value) {
+inline void CommandDeleteGridColumnsArchive::set_location(::google::protobuf::uint32 value) {
   set_has_location();
   location_ = value;
 }
 
-// optional uint32 length = 3;
-inline bool CommandAddGridRowsArchive::has_length() const {
+// required uint32 length = 3;
+inline bool CommandDeleteGridColumnsArchive::has_length() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandAddGridRowsArchive::set_has_length() {
+inline void CommandDeleteGridColumnsArchive::set_has_length() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandAddGridRowsArchive::clear_has_length() {
+inline void CommandDeleteGridColumnsArchive::clear_has_length() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandAddGridRowsArchive::clear_length() {
+inline void CommandDeleteGridColumnsArchive::clear_length() {
   length_ = 0u;
   clear_has_length();
 }
-inline ::google::protobuf::uint32 CommandAddGridRowsArchive::length() const {
+inline ::google::protobuf::uint32 CommandDeleteGridColumnsArchive::length() const {
   return length_;
 }
-inline void CommandAddGridRowsArchive::set_length(::google::protobuf::uint32 value) {
+inline void CommandDeleteGridColumnsArchive::set_length(::google::protobuf::uint32 value) {
   set_has_length();
   length_ = value;
 }
 
-// repeated string name = 4;
-inline int CommandAddGridRowsArchive::name_size() const {
-  return name_.size();
+// repeated string names = 4;
+inline int CommandDeleteGridColumnsArchive::names_size() const {
+  return names_.size();
 }
-inline void CommandAddGridRowsArchive::clear_name() {
-  name_.Clear();
+inline void CommandDeleteGridColumnsArchive::clear_names() {
+  names_.Clear();
 }
-inline const ::std::string& CommandAddGridRowsArchive::name(int index) const {
-  return name_.Get(index);
+inline const ::std::string& CommandDeleteGridColumnsArchive::names(int index) const {
+  return names_.Get(index);
 }
-inline ::std::string* CommandAddGridRowsArchive::mutable_name(int index) {
-  return name_.Mutable(index);
+inline ::std::string* CommandDeleteGridColumnsArchive::mutable_names(int index) {
+  return names_.Mutable(index);
 }
-inline void CommandAddGridRowsArchive::set_name(int index, const ::std::string& value) {
-  name_.Mutable(index)->assign(value);
+inline void CommandDeleteGridColumnsArchive::set_names(int index, const ::std::string& value) {
+  names_.Mutable(index)->assign(value);
 }
-inline void CommandAddGridRowsArchive::set_name(int index, const char* value) {
-  name_.Mutable(index)->assign(value);
+inline void CommandDeleteGridColumnsArchive::set_names(int index, const char* value) {
+  names_.Mutable(index)->assign(value);
 }
-inline void CommandAddGridRowsArchive::set_name(int index, const char* value, size_t size) {
-  name_.Mutable(index)->assign(
+inline void CommandDeleteGridColumnsArchive::set_names(int index, const char* value, size_t size) {
+  names_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* CommandAddGridRowsArchive::add_name() {
-  return name_.Add();
+inline ::std::string* CommandDeleteGridColumnsArchive::add_names() {
+  return names_.Add();
 }
-inline void CommandAddGridRowsArchive::add_name(const ::std::string& value) {
-  name_.Add()->assign(value);
+inline void CommandDeleteGridColumnsArchive::add_names(const ::std::string& value) {
+  names_.Add()->assign(value);
 }
-inline void CommandAddGridRowsArchive::add_name(const char* value) {
-  name_.Add()->assign(value);
+inline void CommandDeleteGridColumnsArchive::add_names(const char* value) {
+  names_.Add()->assign(value);
 }
-inline void CommandAddGridRowsArchive::add_name(const char* value, size_t size) {
-  name_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandDeleteGridColumnsArchive::add_names(const char* value, size_t size) {
+  names_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
 inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandAddGridRowsArchive::name() const {
-  return name_;
+CommandDeleteGridColumnsArchive::names() const {
+  return names_;
 }
 inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandAddGridRowsArchive::mutable_name() {
-  return &name_;
+CommandDeleteGridColumnsArchive::mutable_names() {
+  return &names_;
 }
 
-// -------------------------------------------------------------------
+// repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
+inline int CommandDeleteGridColumnsArchive::value_row_size() const {
+  return value_row_.size();
+}
+inline void CommandDeleteGridColumnsArchive::clear_value_row() {
+  value_row_.Clear();
+}
+inline const ::TSCH::CommandDeleteGridColumnsArchive_ValueRow& CommandDeleteGridColumnsArchive::value_row(int index) const {
+  return value_row_.Get(index);
+}
+inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive::mutable_value_row(int index) {
+  return value_row_.Mutable(index);
+}
+inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive::add_value_row() {
+  return value_row_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >&
+CommandDeleteGridColumnsArchive::value_row() const {
+  return value_row_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >*
+CommandDeleteGridColumnsArchive::mutable_value_row() {
+  return &value_row_;
+}
 
-// CommandAddGridColumnsArchive
+// optional bool removed_all_columns = 7;
+inline bool CommandDeleteGridColumnsArchive::has_removed_all_columns() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandDeleteGridColumnsArchive::set_has_removed_all_columns() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandDeleteGridColumnsArchive::clear_has_removed_all_columns() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandDeleteGridColumnsArchive::clear_removed_all_columns() {
+  removed_all_columns_ = false;
+  clear_has_removed_all_columns();
+}
+inline bool CommandDeleteGridColumnsArchive::removed_all_columns() const {
+  return removed_all_columns_;
+}
+inline void CommandDeleteGridColumnsArchive::set_removed_all_columns(bool value) {
+  set_has_removed_all_columns();
+  removed_all_columns_ = value;
+}
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandAddGridColumnsArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// repeated string row_names = 8;
+inline int CommandDeleteGridColumnsArchive::row_names_size() const {
+  return row_names_.size();
 }
-inline void CommandAddGridColumnsArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+inline void CommandDeleteGridColumnsArchive::clear_row_names() {
+  row_names_.Clear();
 }
-inline void CommandAddGridColumnsArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline const ::std::string& CommandDeleteGridColumnsArchive::row_names(int index) const {
+  return row_names_.Get(index);
 }
-inline void CommandAddGridColumnsArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-  clear_has_super();
+inline ::std::string* CommandDeleteGridColumnsArchive::mutable_row_names(int index) {
+  return row_names_.Mutable(index);
 }
-inline const ::TSCH::ChartCommandArchive& CommandAddGridColumnsArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline void CommandDeleteGridColumnsArchive::set_row_names(int index, const ::std::string& value) {
+  row_names_.Mutable(index)->assign(value);
 }
-inline ::TSCH::ChartCommandArchive* CommandAddGridColumnsArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
-  return super_;
+inline void CommandDeleteGridColumnsArchive::set_row_names(int index, const char* value) {
+  row_names_.Mutable(index)->assign(value);
 }
-inline ::TSCH::ChartCommandArchive* CommandAddGridColumnsArchive::release_super() {
-  clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
-  super_ = NULL;
-  return temp;
+inline void CommandDeleteGridColumnsArchive::set_row_names(int index, const char* value, size_t size) {
+  row_names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void CommandAddGridColumnsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline ::std::string* CommandDeleteGridColumnsArchive::add_row_names() {
+  return row_names_.Add();
+}
+inline void CommandDeleteGridColumnsArchive::add_row_names(const ::std::string& value) {
+  row_names_.Add()->assign(value);
+}
+inline void CommandDeleteGridColumnsArchive::add_row_names(const char* value) {
+  row_names_.Add()->assign(value);
+}
+inline void CommandDeleteGridColumnsArchive::add_row_names(const char* value, size_t size) {
+  row_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+}
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandDeleteGridColumnsArchive::row_names() const {
+  return row_names_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandDeleteGridColumnsArchive::mutable_row_names() {
+  return &row_names_;
 }
 
-// required uint32 location = 2;
-inline bool CommandAddGridColumnsArchive::has_location() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+// repeated string row_ids = 9;
+inline int CommandDeleteGridColumnsArchive::row_ids_size() const {
+  return row_ids_.size();
 }
-inline void CommandAddGridColumnsArchive::set_has_location() {
-  _has_bits_[0] |= 0x00000002u;
+inline void CommandDeleteGridColumnsArchive::clear_row_ids() {
+  row_ids_.Clear();
 }
-inline void CommandAddGridColumnsArchive::clear_has_location() {
-  _has_bits_[0] &= ~0x00000002u;
+inline const ::std::string& CommandDeleteGridColumnsArchive::row_ids(int index) const {
+  return row_ids_.Get(index);
 }
-inline void CommandAddGridColumnsArchive::clear_location() {
-  location_ = 0u;
-  clear_has_location();
+inline ::std::string* CommandDeleteGridColumnsArchive::mutable_row_ids(int index) {
+  return row_ids_.Mutable(index);
+}
+inline void CommandDeleteGridColumnsArchive::set_row_ids(int index, const ::std::string& value) {
+  row_ids_.Mutable(index)->assign(value);
 }
-inline ::google::protobuf::uint32 CommandAddGridColumnsArchive::location() const {
-  return location_;
+inline void CommandDeleteGridColumnsArchive::set_row_ids(int index, const char* value) {
+  row_ids_.Mutable(index)->assign(value);
 }
-inline void CommandAddGridColumnsArchive::set_location(::google::protobuf::uint32 value) {
-  set_has_location();
-  location_ = value;
+inline void CommandDeleteGridColumnsArchive::set_row_ids(int index, const char* value, size_t size) {
+  row_ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-
-// optional uint32 length = 3;
-inline bool CommandAddGridColumnsArchive::has_length() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+inline ::std::string* CommandDeleteGridColumnsArchive::add_row_ids() {
+  return row_ids_.Add();
 }
-inline void CommandAddGridColumnsArchive::set_has_length() {
-  _has_bits_[0] |= 0x00000004u;
+inline void CommandDeleteGridColumnsArchive::add_row_ids(const ::std::string& value) {
+  row_ids_.Add()->assign(value);
 }
-inline void CommandAddGridColumnsArchive::clear_has_length() {
-  _has_bits_[0] &= ~0x00000004u;
+inline void CommandDeleteGridColumnsArchive::add_row_ids(const char* value) {
+  row_ids_.Add()->assign(value);
 }
-inline void CommandAddGridColumnsArchive::clear_length() {
-  length_ = 0u;
-  clear_has_length();
+inline void CommandDeleteGridColumnsArchive::add_row_ids(const char* value, size_t size) {
+  row_ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::google::protobuf::uint32 CommandAddGridColumnsArchive::length() const {
-  return length_;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandDeleteGridColumnsArchive::row_ids() const {
+  return row_ids_;
 }
-inline void CommandAddGridColumnsArchive::set_length(::google::protobuf::uint32 value) {
-  set_has_length();
-  length_ = value;
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandDeleteGridColumnsArchive::mutable_row_ids() {
+  return &row_ids_;
 }
 
-// repeated string name = 4;
-inline int CommandAddGridColumnsArchive::name_size() const {
-  return name_.size();
+// repeated string column_ids = 10;
+inline int CommandDeleteGridColumnsArchive::column_ids_size() const {
+  return column_ids_.size();
 }
-inline void CommandAddGridColumnsArchive::clear_name() {
-  name_.Clear();
+inline void CommandDeleteGridColumnsArchive::clear_column_ids() {
+  column_ids_.Clear();
 }
-inline const ::std::string& CommandAddGridColumnsArchive::name(int index) const {
-  return name_.Get(index);
+inline const ::std::string& CommandDeleteGridColumnsArchive::column_ids(int index) const {
+  return column_ids_.Get(index);
 }
-inline ::std::string* CommandAddGridColumnsArchive::mutable_name(int index) {
-  return name_.Mutable(index);
+inline ::std::string* CommandDeleteGridColumnsArchive::mutable_column_ids(int index) {
+  return column_ids_.Mutable(index);
 }
-inline void CommandAddGridColumnsArchive::set_name(int index, const ::std::string& value) {
-  name_.Mutable(index)->assign(value);
+inline void CommandDeleteGridColumnsArchive::set_column_ids(int index, const ::std::string& value) {
+  column_ids_.Mutable(index)->assign(value);
 }
-inline void CommandAddGridColumnsArchive::set_name(int index, const char* value) {
-  name_.Mutable(index)->assign(value);
+inline void CommandDeleteGridColumnsArchive::set_column_ids(int index, const char* value) {
+  column_ids_.Mutable(index)->assign(value);
 }
-inline void CommandAddGridColumnsArchive::set_name(int index, const char* value, size_t size) {
-  name_.Mutable(index)->assign(
+inline void CommandDeleteGridColumnsArchive::set_column_ids(int index, const char* value, size_t size) {
+  column_ids_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* CommandAddGridColumnsArchive::add_name() {
-  return name_.Add();
+inline ::std::string* CommandDeleteGridColumnsArchive::add_column_ids() {
+  return column_ids_.Add();
 }
-inline void CommandAddGridColumnsArchive::add_name(const ::std::string& value) {
-  name_.Add()->assign(value);
+inline void CommandDeleteGridColumnsArchive::add_column_ids(const ::std::string& value) {
+  column_ids_.Add()->assign(value);
 }
-inline void CommandAddGridColumnsArchive::add_name(const char* value) {
-  name_.Add()->assign(value);
+inline void CommandDeleteGridColumnsArchive::add_column_ids(const char* value) {
+  column_ids_.Add()->assign(value);
 }
-inline void CommandAddGridColumnsArchive::add_name(const char* value, size_t size) {
-  name_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandDeleteGridColumnsArchive::add_column_ids(const char* value, size_t size) {
+  column_ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
 inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandAddGridColumnsArchive::name() const {
-  return name_;
+CommandDeleteGridColumnsArchive::column_ids() const {
+  return column_ids_;
 }
 inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandAddGridColumnsArchive::mutable_name() {
-  return &name_;
+CommandDeleteGridColumnsArchive::mutable_column_ids() {
+  return &column_ids_;
+}
+
+// required bool add_dummy_data_on_delete_all = 11;
+inline bool CommandDeleteGridColumnsArchive::has_add_dummy_data_on_delete_all() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void CommandDeleteGridColumnsArchive::set_has_add_dummy_data_on_delete_all() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void CommandDeleteGridColumnsArchive::clear_has_add_dummy_data_on_delete_all() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void CommandDeleteGridColumnsArchive::clear_add_dummy_data_on_delete_all() {
+  add_dummy_data_on_delete_all_ = false;
+  clear_has_add_dummy_data_on_delete_all();
+}
+inline bool CommandDeleteGridColumnsArchive::add_dummy_data_on_delete_all() const {
+  return add_dummy_data_on_delete_all_;
+}
+inline void CommandDeleteGridColumnsArchive::set_add_dummy_data_on_delete_all(bool value) {
+  set_has_add_dummy_data_on_delete_all();
+  add_dummy_data_on_delete_all_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandMoveGridRowsArchive
+// CommandSetPreviewLocArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandMoveGridRowsArchive::has_super() const {
+inline bool CommandSetPreviewLocArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandMoveGridRowsArchive::set_has_super() {
+inline void CommandSetPreviewLocArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandMoveGridRowsArchive::clear_has_super() {
+inline void CommandSetPreviewLocArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandMoveGridRowsArchive::clear_super() {
+inline void CommandSetPreviewLocArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandMoveGridRowsArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandSetPreviewLocArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandMoveGridRowsArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetPreviewLocArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandMoveGridRowsArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetPreviewLocArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandMoveGridRowsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandSetPreviewLocArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -5481,105 +9374,115 @@ inline void CommandMoveGridRowsArchive::set_allocated_super(::TSCH::ChartCommand
   }
 }
 
-// required uint32 location = 2;
-inline bool CommandMoveGridRowsArchive::has_location() const {
+// required .TSP.Point old_loc = 2;
+inline bool CommandSetPreviewLocArchive::has_old_loc() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandMoveGridRowsArchive::set_has_location() {
+inline void CommandSetPreviewLocArchive::set_has_old_loc() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandMoveGridRowsArchive::clear_has_location() {
+inline void CommandSetPreviewLocArchive::clear_has_old_loc() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandMoveGridRowsArchive::clear_location() {
-  location_ = 0u;
-  clear_has_location();
+inline void CommandSetPreviewLocArchive::clear_old_loc() {
+  if (old_loc_ != NULL) old_loc_->::TSP::Point::Clear();
+  clear_has_old_loc();
 }
-inline ::google::protobuf::uint32 CommandMoveGridRowsArchive::location() const {
-  return location_;
+inline const ::TSP::Point& CommandSetPreviewLocArchive::old_loc() const {
+  return old_loc_ != NULL ? *old_loc_ : *default_instance_->old_loc_;
 }
-inline void CommandMoveGridRowsArchive::set_location(::google::protobuf::uint32 value) {
-  set_has_location();
-  location_ = value;
+inline ::TSP::Point* CommandSetPreviewLocArchive::mutable_old_loc() {
+  set_has_old_loc();
+  if (old_loc_ == NULL) old_loc_ = new ::TSP::Point;
+  return old_loc_;
+}
+inline ::TSP::Point* CommandSetPreviewLocArchive::release_old_loc() {
+  clear_has_old_loc();
+  ::TSP::Point* temp = old_loc_;
+  old_loc_ = NULL;
+  return temp;
+}
+inline void CommandSetPreviewLocArchive::set_allocated_old_loc(::TSP::Point* old_loc) {
+  delete old_loc_;
+  old_loc_ = old_loc;
+  if (old_loc) {
+    set_has_old_loc();
+  } else {
+    clear_has_old_loc();
+  }
 }
 
-// required uint32 length = 3;
-inline bool CommandMoveGridRowsArchive::has_length() const {
+// required .TSP.Point new_loc = 3;
+inline bool CommandSetPreviewLocArchive::has_new_loc() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandMoveGridRowsArchive::set_has_length() {
+inline void CommandSetPreviewLocArchive::set_has_new_loc() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandMoveGridRowsArchive::clear_has_length() {
+inline void CommandSetPreviewLocArchive::clear_has_new_loc() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandMoveGridRowsArchive::clear_length() {
-  length_ = 0u;
-  clear_has_length();
-}
-inline ::google::protobuf::uint32 CommandMoveGridRowsArchive::length() const {
-  return length_;
-}
-inline void CommandMoveGridRowsArchive::set_length(::google::protobuf::uint32 value) {
-  set_has_length();
-  length_ = value;
-}
-
-// required int32 afterrow = 4;
-inline bool CommandMoveGridRowsArchive::has_afterrow() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void CommandMoveGridRowsArchive::set_has_afterrow() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandSetPreviewLocArchive::clear_new_loc() {
+  if (new_loc_ != NULL) new_loc_->::TSP::Point::Clear();
+  clear_has_new_loc();
 }
-inline void CommandMoveGridRowsArchive::clear_has_afterrow() {
-  _has_bits_[0] &= ~0x00000008u;
+inline const ::TSP::Point& CommandSetPreviewLocArchive::new_loc() const {
+  return new_loc_ != NULL ? *new_loc_ : *default_instance_->new_loc_;
 }
-inline void CommandMoveGridRowsArchive::clear_afterrow() {
-  afterrow_ = 0;
-  clear_has_afterrow();
+inline ::TSP::Point* CommandSetPreviewLocArchive::mutable_new_loc() {
+  set_has_new_loc();
+  if (new_loc_ == NULL) new_loc_ = new ::TSP::Point;
+  return new_loc_;
 }
-inline ::google::protobuf::int32 CommandMoveGridRowsArchive::afterrow() const {
-  return afterrow_;
+inline ::TSP::Point* CommandSetPreviewLocArchive::release_new_loc() {
+  clear_has_new_loc();
+  ::TSP::Point* temp = new_loc_;
+  new_loc_ = NULL;
+  return temp;
 }
-inline void CommandMoveGridRowsArchive::set_afterrow(::google::protobuf::int32 value) {
-  set_has_afterrow();
-  afterrow_ = value;
+inline void CommandSetPreviewLocArchive::set_allocated_new_loc(::TSP::Point* new_loc) {
+  delete new_loc_;
+  new_loc_ = new_loc;
+  if (new_loc) {
+    set_has_new_loc();
+  } else {
+    clear_has_new_loc();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandMoveGridColumnsArchive
+// CommandSetGridValueArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandMoveGridColumnsArchive::has_super() const {
+inline bool CommandSetGridValueArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandMoveGridColumnsArchive::set_has_super() {
+inline void CommandSetGridValueArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandMoveGridColumnsArchive::clear_has_super() {
+inline void CommandSetGridValueArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandMoveGridColumnsArchive::clear_super() {
+inline void CommandSetGridValueArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandMoveGridColumnsArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandSetGridValueArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandMoveGridColumnsArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetGridValueArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandMoveGridColumnsArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetGridValueArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandMoveGridColumnsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandSetGridValueArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -5589,134 +9492,127 @@ inline void CommandMoveGridColumnsArchive::set_allocated_super(::TSCH::ChartComm
   }
 }
 
-// required uint32 location = 2;
-inline bool CommandMoveGridColumnsArchive::has_location() const {
+// required uint32 rowindex = 2;
+inline bool CommandSetGridValueArchive::has_rowindex() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandMoveGridColumnsArchive::set_has_location() {
+inline void CommandSetGridValueArchive::set_has_rowindex() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandMoveGridColumnsArchive::clear_has_location() {
+inline void CommandSetGridValueArchive::clear_has_rowindex() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandMoveGridColumnsArchive::clear_location() {
-  location_ = 0u;
-  clear_has_location();
+inline void CommandSetGridValueArchive::clear_rowindex() {
+  rowindex_ = 0u;
+  clear_has_rowindex();
 }
-inline ::google::protobuf::uint32 CommandMoveGridColumnsArchive::location() const {
-  return location_;
+inline ::google::protobuf::uint32 CommandSetGridValueArchive::rowindex() const {
+  return rowindex_;
 }
-inline void CommandMoveGridColumnsArchive::set_location(::google::protobuf::uint32 value) {
-  set_has_location();
-  location_ = value;
+inline void CommandSetGridValueArchive::set_rowindex(::google::protobuf::uint32 value) {
+  set_has_rowindex();
+  rowindex_ = value;
 }
 
-// required uint32 length = 3;
-inline bool CommandMoveGridColumnsArchive::has_length() const {
+// required uint32 columnindex = 3;
+inline bool CommandSetGridValueArchive::has_columnindex() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandMoveGridColumnsArchive::set_has_length() {
+inline void CommandSetGridValueArchive::set_has_columnindex() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandMoveGridColumnsArchive::clear_has_length() {
+inline void CommandSetGridValueArchive::clear_has_columnindex() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandMoveGridColumnsArchive::clear_length() {
-  length_ = 0u;
-  clear_has_length();
+inline void CommandSetGridValueArchive::clear_columnindex() {
+  columnindex_ = 0u;
+  clear_has_columnindex();
 }
-inline ::google::protobuf::uint32 CommandMoveGridColumnsArchive::length() const {
-  return length_;
+inline ::google::protobuf::uint32 CommandSetGridValueArchive::columnindex() const {
+  return columnindex_;
 }
-inline void CommandMoveGridColumnsArchive::set_length(::google::protobuf::uint32 value) {
-  set_has_length();
-  length_ = value;
+inline void CommandSetGridValueArchive::set_columnindex(::google::protobuf::uint32 value) {
+  set_has_columnindex();
+  columnindex_ = value;
 }
 
-// required int32 aftercolumn = 4;
-inline bool CommandMoveGridColumnsArchive::has_aftercolumn() const {
+// required double oldvalue = 4;
+inline bool CommandSetGridValueArchive::has_oldvalue() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandMoveGridColumnsArchive::set_has_aftercolumn() {
+inline void CommandSetGridValueArchive::set_has_oldvalue() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandMoveGridColumnsArchive::clear_has_aftercolumn() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void CommandMoveGridColumnsArchive::clear_aftercolumn() {
-  aftercolumn_ = 0;
-  clear_has_aftercolumn();
+inline void CommandSetGridValueArchive::clear_has_oldvalue() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline ::google::protobuf::int32 CommandMoveGridColumnsArchive::aftercolumn() const {
-  return aftercolumn_;
+inline void CommandSetGridValueArchive::clear_oldvalue() {
+  oldvalue_ = 0;
+  clear_has_oldvalue();
 }
-inline void CommandMoveGridColumnsArchive::set_aftercolumn(::google::protobuf::int32 value) {
-  set_has_aftercolumn();
-  aftercolumn_ = value;
+inline double CommandSetGridValueArchive::oldvalue() const {
+  return oldvalue_;
 }
-
-// -------------------------------------------------------------------
-
-// CommandDeleteGridRowsArchive_ValueRow
-
-// repeated double value = 5;
-inline int CommandDeleteGridRowsArchive_ValueRow::value_size() const {
-  return value_.size();
+inline void CommandSetGridValueArchive::set_oldvalue(double value) {
+  set_has_oldvalue();
+  oldvalue_ = value;
 }
-inline void CommandDeleteGridRowsArchive_ValueRow::clear_value() {
-  value_.Clear();
+
+// required double newvalue = 5;
+inline bool CommandSetGridValueArchive::has_newvalue() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
-inline double CommandDeleteGridRowsArchive_ValueRow::value(int index) const {
-  return value_.Get(index);
+inline void CommandSetGridValueArchive::set_has_newvalue() {
+  _has_bits_[0] |= 0x00000010u;
 }
-inline void CommandDeleteGridRowsArchive_ValueRow::set_value(int index, double value) {
-  value_.Set(index, value);
+inline void CommandSetGridValueArchive::clear_has_newvalue() {
+  _has_bits_[0] &= ~0x00000010u;
 }
-inline void CommandDeleteGridRowsArchive_ValueRow::add_value(double value) {
-  value_.Add(value);
+inline void CommandSetGridValueArchive::clear_newvalue() {
+  newvalue_ = 0;
+  clear_has_newvalue();
 }
-inline const ::google::protobuf::RepeatedField< double >&
-CommandDeleteGridRowsArchive_ValueRow::value() const {
-  return value_;
+inline double CommandSetGridValueArchive::newvalue() const {
+  return newvalue_;
 }
-inline ::google::protobuf::RepeatedField< double >*
-CommandDeleteGridRowsArchive_ValueRow::mutable_value() {
-  return &value_;
+inline void CommandSetGridValueArchive::set_newvalue(double value) {
+  set_has_newvalue();
+  newvalue_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandDeleteGridRowsArchive
+// CommandSetGridDirectionArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandDeleteGridRowsArchive::has_super() const {
+inline bool CommandSetGridDirectionArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandDeleteGridRowsArchive::set_has_super() {
+inline void CommandSetGridDirectionArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandDeleteGridRowsArchive::clear_has_super() {
+inline void CommandSetGridDirectionArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandDeleteGridRowsArchive::clear_super() {
+inline void CommandSetGridDirectionArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandDeleteGridRowsArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandSetGridDirectionArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandDeleteGridRowsArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetGridDirectionArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandDeleteGridRowsArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetGridDirectionArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandDeleteGridRowsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandSetGridDirectionArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -5726,247 +9622,191 @@ inline void CommandDeleteGridRowsArchive::set_allocated_super(::TSCH::ChartComma
   }
 }
 
-// required uint32 location = 2;
-inline bool CommandDeleteGridRowsArchive::has_location() const {
+// required uint32 old_direction = 2;
+inline bool CommandSetGridDirectionArchive::has_old_direction() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandDeleteGridRowsArchive::set_has_location() {
+inline void CommandSetGridDirectionArchive::set_has_old_direction() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandDeleteGridRowsArchive::clear_has_location() {
+inline void CommandSetGridDirectionArchive::clear_has_old_direction() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandDeleteGridRowsArchive::clear_location() {
-  location_ = 0u;
-  clear_has_location();
+inline void CommandSetGridDirectionArchive::clear_old_direction() {
+  old_direction_ = 0u;
+  clear_has_old_direction();
 }
-inline ::google::protobuf::uint32 CommandDeleteGridRowsArchive::location() const {
-  return location_;
+inline ::google::protobuf::uint32 CommandSetGridDirectionArchive::old_direction() const {
+  return old_direction_;
 }
-inline void CommandDeleteGridRowsArchive::set_location(::google::protobuf::uint32 value) {
-  set_has_location();
-  location_ = value;
+inline void CommandSetGridDirectionArchive::set_old_direction(::google::protobuf::uint32 value) {
+  set_has_old_direction();
+  old_direction_ = value;
 }
 
-// required uint32 length = 3;
-inline bool CommandDeleteGridRowsArchive::has_length() const {
+// required uint32 new_direction = 3;
+inline bool CommandSetGridDirectionArchive::has_new_direction() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandDeleteGridRowsArchive::set_has_length() {
+inline void CommandSetGridDirectionArchive::set_has_new_direction() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandDeleteGridRowsArchive::clear_has_length() {
+inline void CommandSetGridDirectionArchive::clear_has_new_direction() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandDeleteGridRowsArchive::clear_length() {
-  length_ = 0u;
-  clear_has_length();
+inline void CommandSetGridDirectionArchive::clear_new_direction() {
+  new_direction_ = 0u;
+  clear_has_new_direction();
 }
-inline ::google::protobuf::uint32 CommandDeleteGridRowsArchive::length() const {
-  return length_;
+inline ::google::protobuf::uint32 CommandSetGridDirectionArchive::new_direction() const {
+  return new_direction_;
 }
-inline void CommandDeleteGridRowsArchive::set_length(::google::protobuf::uint32 value) {
-  set_has_length();
-  length_ = value;
+inline void CommandSetGridDirectionArchive::set_new_direction(::google::protobuf::uint32 value) {
+  set_has_new_direction();
+  new_direction_ = value;
 }
 
-// repeated string names = 4;
-inline int CommandDeleteGridRowsArchive::names_size() const {
-  return names_.size();
-}
-inline void CommandDeleteGridRowsArchive::clear_names() {
-  names_.Clear();
-}
-inline const ::std::string& CommandDeleteGridRowsArchive::names(int index) const {
-  return names_.Get(index);
-}
-inline ::std::string* CommandDeleteGridRowsArchive::mutable_names(int index) {
-  return names_.Mutable(index);
-}
-inline void CommandDeleteGridRowsArchive::set_names(int index, const ::std::string& value) {
-  names_.Mutable(index)->assign(value);
-}
-inline void CommandDeleteGridRowsArchive::set_names(int index, const char* value) {
-  names_.Mutable(index)->assign(value);
-}
-inline void CommandDeleteGridRowsArchive::set_names(int index, const char* value, size_t size) {
-  names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* CommandDeleteGridRowsArchive::add_names() {
-  return names_.Add();
-}
-inline void CommandDeleteGridRowsArchive::add_names(const ::std::string& value) {
-  names_.Add()->assign(value);
-}
-inline void CommandDeleteGridRowsArchive::add_names(const char* value) {
-  names_.Add()->assign(value);
-}
-inline void CommandDeleteGridRowsArchive::add_names(const char* value, size_t size) {
-  names_.Add()->assign(reinterpret_cast<const char*>(value), size);
-}
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandDeleteGridRowsArchive::names() const {
-  return names_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandDeleteGridRowsArchive::mutable_names() {
-  return &names_;
-}
+// -------------------------------------------------------------------
 
-// repeated .TSCH.CommandDeleteGridRowsArchive.ValueRow value_row = 6;
-inline int CommandDeleteGridRowsArchive::value_row_size() const {
-  return value_row_.size();
-}
-inline void CommandDeleteGridRowsArchive::clear_value_row() {
-  value_row_.Clear();
-}
-inline const ::TSCH::CommandDeleteGridRowsArchive_ValueRow& CommandDeleteGridRowsArchive::value_row(int index) const {
-  return value_row_.Get(index);
-}
-inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive::mutable_value_row(int index) {
-  return value_row_.Mutable(index);
-}
-inline ::TSCH::CommandDeleteGridRowsArchive_ValueRow* CommandDeleteGridRowsArchive::add_value_row() {
-  return value_row_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >&
-CommandDeleteGridRowsArchive::value_row() const {
-  return value_row_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridRowsArchive_ValueRow >*
-CommandDeleteGridRowsArchive::mutable_value_row() {
-  return &value_row_;
-}
+// CommandSetSeriesTypeArchive
 
-// optional bool removed_all_rows = 7;
-inline bool CommandDeleteGridRowsArchive::has_removed_all_rows() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetSeriesTypeArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandDeleteGridRowsArchive::set_has_removed_all_rows() {
-  _has_bits_[0] |= 0x00000020u;
+inline void CommandSetSeriesTypeArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandDeleteGridRowsArchive::clear_has_removed_all_rows() {
-  _has_bits_[0] &= ~0x00000020u;
+inline void CommandSetSeriesTypeArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandDeleteGridRowsArchive::clear_removed_all_rows() {
-  removed_all_rows_ = false;
-  clear_has_removed_all_rows();
+inline void CommandSetSeriesTypeArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
 }
-inline bool CommandDeleteGridRowsArchive::removed_all_rows() const {
-  return removed_all_rows_;
+inline const ::TSCH::ChartCommandArchive& CommandSetSeriesTypeArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline void CommandDeleteGridRowsArchive::set_removed_all_rows(bool value) {
-  set_has_removed_all_rows();
-  removed_all_rows_ = value;
+inline ::TSCH::ChartCommandArchive* CommandSetSeriesTypeArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
 }
-
-// repeated string column_names = 8;
-inline int CommandDeleteGridRowsArchive::column_names_size() const {
-  return column_names_.size();
+inline ::TSCH::ChartCommandArchive* CommandSetSeriesTypeArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
 }
-inline void CommandDeleteGridRowsArchive::clear_column_names() {
-  column_names_.Clear();
+inline void CommandSetSeriesTypeArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
 }
-inline const ::std::string& CommandDeleteGridRowsArchive::column_names(int index) const {
-  return column_names_.Get(index);
+
+// required uint32 seriesindex = 2;
+inline bool CommandSetSeriesTypeArchive::has_seriesindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline ::std::string* CommandDeleteGridRowsArchive::mutable_column_names(int index) {
-  return column_names_.Mutable(index);
+inline void CommandSetSeriesTypeArchive::set_has_seriesindex() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandDeleteGridRowsArchive::set_column_names(int index, const ::std::string& value) {
-  column_names_.Mutable(index)->assign(value);
+inline void CommandSetSeriesTypeArchive::clear_has_seriesindex() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandDeleteGridRowsArchive::set_column_names(int index, const char* value) {
-  column_names_.Mutable(index)->assign(value);
+inline void CommandSetSeriesTypeArchive::clear_seriesindex() {
+  seriesindex_ = 0u;
+  clear_has_seriesindex();
 }
-inline void CommandDeleteGridRowsArchive::set_column_names(int index, const char* value, size_t size) {
-  column_names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline ::google::protobuf::uint32 CommandSetSeriesTypeArchive::seriesindex() const {
+  return seriesindex_;
 }
-inline ::std::string* CommandDeleteGridRowsArchive::add_column_names() {
-  return column_names_.Add();
+inline void CommandSetSeriesTypeArchive::set_seriesindex(::google::protobuf::uint32 value) {
+  set_has_seriesindex();
+  seriesindex_ = value;
 }
-inline void CommandDeleteGridRowsArchive::add_column_names(const ::std::string& value) {
-  column_names_.Add()->assign(value);
+
+// required uint32 oldtype = 3;
+inline bool CommandSetSeriesTypeArchive::has_oldtype() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandDeleteGridRowsArchive::add_column_names(const char* value) {
-  column_names_.Add()->assign(value);
+inline void CommandSetSeriesTypeArchive::set_has_oldtype() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandDeleteGridRowsArchive::add_column_names(const char* value, size_t size) {
-  column_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandSetSeriesTypeArchive::clear_has_oldtype() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandDeleteGridRowsArchive::column_names() const {
-  return column_names_;
+inline void CommandSetSeriesTypeArchive::clear_oldtype() {
+  oldtype_ = 0u;
+  clear_has_oldtype();
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandDeleteGridRowsArchive::mutable_column_names() {
-  return &column_names_;
+inline ::google::protobuf::uint32 CommandSetSeriesTypeArchive::oldtype() const {
+  return oldtype_;
 }
-
-// -------------------------------------------------------------------
-
-// CommandDeleteGridColumnsArchive_ValueRow
-
-// repeated double value = 5;
-inline int CommandDeleteGridColumnsArchive_ValueRow::value_size() const {
-  return value_.size();
+inline void CommandSetSeriesTypeArchive::set_oldtype(::google::protobuf::uint32 value) {
+  set_has_oldtype();
+  oldtype_ = value;
 }
-inline void CommandDeleteGridColumnsArchive_ValueRow::clear_value() {
-  value_.Clear();
+
+// required uint32 newtype = 4;
+inline bool CommandSetSeriesTypeArchive::has_newtype() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline double CommandDeleteGridColumnsArchive_ValueRow::value(int index) const {
-  return value_.Get(index);
+inline void CommandSetSeriesTypeArchive::set_has_newtype() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandDeleteGridColumnsArchive_ValueRow::set_value(int index, double value) {
-  value_.Set(index, value);
+inline void CommandSetSeriesTypeArchive::clear_has_newtype() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandDeleteGridColumnsArchive_ValueRow::add_value(double value) {
-  value_.Add(value);
+inline void CommandSetSeriesTypeArchive::clear_newtype() {
+  newtype_ = 0u;
+  clear_has_newtype();
 }
-inline const ::google::protobuf::RepeatedField< double >&
-CommandDeleteGridColumnsArchive_ValueRow::value() const {
-  return value_;
+inline ::google::protobuf::uint32 CommandSetSeriesTypeArchive::newtype() const {
+  return newtype_;
 }
-inline ::google::protobuf::RepeatedField< double >*
-CommandDeleteGridColumnsArchive_ValueRow::mutable_value() {
-  return &value_;
+inline void CommandSetSeriesTypeArchive::set_newtype(::google::protobuf::uint32 value) {
+  set_has_newtype();
+  newtype_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandDeleteGridColumnsArchive
+// CommandSetScatterFormatArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandDeleteGridColumnsArchive::has_super() const {
+inline bool CommandSetScatterFormatArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::set_has_super() {
+inline void CommandSetScatterFormatArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandDeleteGridColumnsArchive::clear_has_super() {
+inline void CommandSetScatterFormatArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandDeleteGridColumnsArchive::clear_super() {
+inline void CommandSetScatterFormatArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandDeleteGridColumnsArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandSetScatterFormatArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandDeleteGridColumnsArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetScatterFormatArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandDeleteGridColumnsArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetScatterFormatArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandDeleteGridColumnsArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandSetScatterFormatArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -5976,218 +9816,287 @@ inline void CommandDeleteGridColumnsArchive::set_allocated_super(::TSCH::ChartCo
   }
 }
 
-// required uint32 location = 2;
-inline bool CommandDeleteGridColumnsArchive::has_location() const {
+// required uint32 oldformat = 3;
+inline bool CommandSetScatterFormatArchive::has_oldformat() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::set_has_location() {
+inline void CommandSetScatterFormatArchive::set_has_oldformat() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandDeleteGridColumnsArchive::clear_has_location() {
+inline void CommandSetScatterFormatArchive::clear_has_oldformat() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandDeleteGridColumnsArchive::clear_location() {
-  location_ = 0u;
-  clear_has_location();
+inline void CommandSetScatterFormatArchive::clear_oldformat() {
+  oldformat_ = 0u;
+  clear_has_oldformat();
 }
-inline ::google::protobuf::uint32 CommandDeleteGridColumnsArchive::location() const {
-  return location_;
+inline ::google::protobuf::uint32 CommandSetScatterFormatArchive::oldformat() const {
+  return oldformat_;
 }
-inline void CommandDeleteGridColumnsArchive::set_location(::google::protobuf::uint32 value) {
-  set_has_location();
-  location_ = value;
+inline void CommandSetScatterFormatArchive::set_oldformat(::google::protobuf::uint32 value) {
+  set_has_oldformat();
+  oldformat_ = value;
 }
 
-// required uint32 length = 3;
-inline bool CommandDeleteGridColumnsArchive::has_length() const {
+// required uint32 newformat = 4;
+inline bool CommandSetScatterFormatArchive::has_newformat() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::set_has_length() {
+inline void CommandSetScatterFormatArchive::set_has_newformat() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandDeleteGridColumnsArchive::clear_has_length() {
+inline void CommandSetScatterFormatArchive::clear_has_newformat() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandDeleteGridColumnsArchive::clear_length() {
-  length_ = 0u;
-  clear_has_length();
+inline void CommandSetScatterFormatArchive::clear_newformat() {
+  newformat_ = 0u;
+  clear_has_newformat();
 }
-inline ::google::protobuf::uint32 CommandDeleteGridColumnsArchive::length() const {
-  return length_;
+inline ::google::protobuf::uint32 CommandSetScatterFormatArchive::newformat() const {
+  return newformat_;
 }
-inline void CommandDeleteGridColumnsArchive::set_length(::google::protobuf::uint32 value) {
-  set_has_length();
-  length_ = value;
+inline void CommandSetScatterFormatArchive::set_newformat(::google::protobuf::uint32 value) {
+  set_has_newformat();
+  newformat_ = value;
 }
 
-// repeated string names = 4;
-inline int CommandDeleteGridColumnsArchive::names_size() const {
-  return names_.size();
+// -------------------------------------------------------------------
+
+// CommandSetMultiDataSetIndexArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetMultiDataSetIndexArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::clear_names() {
-  names_.Clear();
+inline void CommandSetMultiDataSetIndexArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline const ::std::string& CommandDeleteGridColumnsArchive::names(int index) const {
-  return names_.Get(index);
+inline void CommandSetMultiDataSetIndexArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline ::std::string* CommandDeleteGridColumnsArchive::mutable_names(int index) {
-  return names_.Mutable(index);
+inline void CommandSetMultiDataSetIndexArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
 }
-inline void CommandDeleteGridColumnsArchive::set_names(int index, const ::std::string& value) {
-  names_.Mutable(index)->assign(value);
+inline const ::TSCH::ChartCommandArchive& CommandSetMultiDataSetIndexArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline void CommandDeleteGridColumnsArchive::set_names(int index, const char* value) {
-  names_.Mutable(index)->assign(value);
+inline ::TSCH::ChartCommandArchive* CommandSetMultiDataSetIndexArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
 }
-inline void CommandDeleteGridColumnsArchive::set_names(int index, const char* value, size_t size) {
-  names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline ::TSCH::ChartCommandArchive* CommandSetMultiDataSetIndexArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
 }
-inline ::std::string* CommandDeleteGridColumnsArchive::add_names() {
-  return names_.Add();
+inline void CommandSetMultiDataSetIndexArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
 }
-inline void CommandDeleteGridColumnsArchive::add_names(const ::std::string& value) {
-  names_.Add()->assign(value);
+
+// required uint32 oldindex = 2;
+inline bool CommandSetMultiDataSetIndexArchive::has_oldindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::add_names(const char* value) {
-  names_.Add()->assign(value);
+inline void CommandSetMultiDataSetIndexArchive::set_has_oldindex() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandDeleteGridColumnsArchive::add_names(const char* value, size_t size) {
-  names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandSetMultiDataSetIndexArchive::clear_has_oldindex() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandDeleteGridColumnsArchive::names() const {
-  return names_;
+inline void CommandSetMultiDataSetIndexArchive::clear_oldindex() {
+  oldindex_ = 0u;
+  clear_has_oldindex();
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandDeleteGridColumnsArchive::mutable_names() {
-  return &names_;
+inline ::google::protobuf::uint32 CommandSetMultiDataSetIndexArchive::oldindex() const {
+  return oldindex_;
+}
+inline void CommandSetMultiDataSetIndexArchive::set_oldindex(::google::protobuf::uint32 value) {
+  set_has_oldindex();
+  oldindex_ = value;
 }
 
-// repeated .TSCH.CommandDeleteGridColumnsArchive.ValueRow value_row = 6;
-inline int CommandDeleteGridColumnsArchive::value_row_size() const {
-  return value_row_.size();
+// required uint32 newindex = 3;
+inline bool CommandSetMultiDataSetIndexArchive::has_newindex() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::clear_value_row() {
-  value_row_.Clear();
+inline void CommandSetMultiDataSetIndexArchive::set_has_newindex() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline const ::TSCH::CommandDeleteGridColumnsArchive_ValueRow& CommandDeleteGridColumnsArchive::value_row(int index) const {
-  return value_row_.Get(index);
+inline void CommandSetMultiDataSetIndexArchive::clear_has_newindex() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetMultiDataSetIndexArchive::clear_newindex() {
+  newindex_ = 0u;
+  clear_has_newindex();
+}
+inline ::google::protobuf::uint32 CommandSetMultiDataSetIndexArchive::newindex() const {
+  return newindex_;
+}
+inline void CommandSetMultiDataSetIndexArchive::set_newindex(::google::protobuf::uint32 value) {
+  set_has_newindex();
+  newindex_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandSetLegendFrameArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetLegendFrameArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive::mutable_value_row(int index) {
-  return value_row_.Mutable(index);
+inline void CommandSetLegendFrameArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline ::TSCH::CommandDeleteGridColumnsArchive_ValueRow* CommandDeleteGridColumnsArchive::add_value_row() {
-  return value_row_.Add();
+inline void CommandSetLegendFrameArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >&
-CommandDeleteGridColumnsArchive::value_row() const {
-  return value_row_;
+inline void CommandSetLegendFrameArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
 }
-inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandDeleteGridColumnsArchive_ValueRow >*
-CommandDeleteGridColumnsArchive::mutable_value_row() {
-  return &value_row_;
+inline const ::TSCH::ChartCommandArchive& CommandSetLegendFrameArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-
-// optional bool removed_all_columns = 7;
-inline bool CommandDeleteGridColumnsArchive::has_removed_all_columns() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+inline ::TSCH::ChartCommandArchive* CommandSetLegendFrameArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
 }
-inline void CommandDeleteGridColumnsArchive::set_has_removed_all_columns() {
-  _has_bits_[0] |= 0x00000020u;
+inline ::TSCH::ChartCommandArchive* CommandSetLegendFrameArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
 }
-inline void CommandDeleteGridColumnsArchive::clear_has_removed_all_columns() {
-  _has_bits_[0] &= ~0x00000020u;
+inline void CommandSetLegendFrameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
 }
-inline void CommandDeleteGridColumnsArchive::clear_removed_all_columns() {
-  removed_all_columns_ = false;
-  clear_has_removed_all_columns();
+
+// required .TSCH.RectArchive old_legend_frame = 2;
+inline bool CommandSetLegendFrameArchive::has_old_legend_frame() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline bool CommandDeleteGridColumnsArchive::removed_all_columns() const {
-  return removed_all_columns_;
+inline void CommandSetLegendFrameArchive::set_has_old_legend_frame() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandDeleteGridColumnsArchive::set_removed_all_columns(bool value) {
-  set_has_removed_all_columns();
-  removed_all_columns_ = value;
+inline void CommandSetLegendFrameArchive::clear_has_old_legend_frame() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-
-// repeated string row_names = 8;
-inline int CommandDeleteGridColumnsArchive::row_names_size() const {
-  return row_names_.size();
+inline void CommandSetLegendFrameArchive::clear_old_legend_frame() {
+  if (old_legend_frame_ != NULL) old_legend_frame_->::TSCH::RectArchive::Clear();
+  clear_has_old_legend_frame();
 }
-inline void CommandDeleteGridColumnsArchive::clear_row_names() {
-  row_names_.Clear();
+inline const ::TSCH::RectArchive& CommandSetLegendFrameArchive::old_legend_frame() const {
+  return old_legend_frame_ != NULL ? *old_legend_frame_ : *default_instance_->old_legend_frame_;
 }
-inline const ::std::string& CommandDeleteGridColumnsArchive::row_names(int index) const {
-  return row_names_.Get(index);
+inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::mutable_old_legend_frame() {
+  set_has_old_legend_frame();
+  if (old_legend_frame_ == NULL) old_legend_frame_ = new ::TSCH::RectArchive;
+  return old_legend_frame_;
 }
-inline ::std::string* CommandDeleteGridColumnsArchive::mutable_row_names(int index) {
-  return row_names_.Mutable(index);
+inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::release_old_legend_frame() {
+  clear_has_old_legend_frame();
+  ::TSCH::RectArchive* temp = old_legend_frame_;
+  old_legend_frame_ = NULL;
+  return temp;
 }
-inline void CommandDeleteGridColumnsArchive::set_row_names(int index, const ::std::string& value) {
-  row_names_.Mutable(index)->assign(value);
+inline void CommandSetLegendFrameArchive::set_allocated_old_legend_frame(::TSCH::RectArchive* old_legend_frame) {
+  delete old_legend_frame_;
+  old_legend_frame_ = old_legend_frame;
+  if (old_legend_frame) {
+    set_has_old_legend_frame();
+  } else {
+    clear_has_old_legend_frame();
+  }
 }
-inline void CommandDeleteGridColumnsArchive::set_row_names(int index, const char* value) {
-  row_names_.Mutable(index)->assign(value);
+
+// required .TSCH.RectArchive new_legend_frame = 3;
+inline bool CommandSetLegendFrameArchive::has_new_legend_frame() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandDeleteGridColumnsArchive::set_row_names(int index, const char* value, size_t size) {
-  row_names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline void CommandSetLegendFrameArchive::set_has_new_legend_frame() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline ::std::string* CommandDeleteGridColumnsArchive::add_row_names() {
-  return row_names_.Add();
+inline void CommandSetLegendFrameArchive::clear_has_new_legend_frame() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandDeleteGridColumnsArchive::add_row_names(const ::std::string& value) {
-  row_names_.Add()->assign(value);
+inline void CommandSetLegendFrameArchive::clear_new_legend_frame() {
+  if (new_legend_frame_ != NULL) new_legend_frame_->::TSCH::RectArchive::Clear();
+  clear_has_new_legend_frame();
 }
-inline void CommandDeleteGridColumnsArchive::add_row_names(const char* value) {
-  row_names_.Add()->assign(value);
+inline const ::TSCH::RectArchive& CommandSetLegendFrameArchive::new_legend_frame() const {
+  return new_legend_frame_ != NULL ? *new_legend_frame_ : *default_instance_->new_legend_frame_;
 }
-inline void CommandDeleteGridColumnsArchive::add_row_names(const char* value, size_t size) {
-  row_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::mutable_new_legend_frame() {
+  set_has_new_legend_frame();
+  if (new_legend_frame_ == NULL) new_legend_frame_ = new ::TSCH::RectArchive;
+  return new_legend_frame_;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandDeleteGridColumnsArchive::row_names() const {
-  return row_names_;
+inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::release_new_legend_frame() {
+  clear_has_new_legend_frame();
+  ::TSCH::RectArchive* temp = new_legend_frame_;
+  new_legend_frame_ = NULL;
+  return temp;
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandDeleteGridColumnsArchive::mutable_row_names() {
-  return &row_names_;
+inline void CommandSetLegendFrameArchive::set_allocated_new_legend_frame(::TSCH::RectArchive* new_legend_frame) {
+  delete new_legend_frame_;
+  new_legend_frame_ = new_legend_frame;
+  if (new_legend_frame) {
+    set_has_new_legend_frame();
+  } else {
+    clear_has_new_legend_frame();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetPreviewLocArchive
+// CommandSetPieWedgeExplosion
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetPreviewLocArchive::has_super() const {
+inline bool CommandSetPieWedgeExplosion::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetPreviewLocArchive::set_has_super() {
+inline void CommandSetPieWedgeExplosion::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetPreviewLocArchive::clear_has_super() {
+inline void CommandSetPieWedgeExplosion::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetPreviewLocArchive::clear_super() {
+inline void CommandSetPieWedgeExplosion::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetPreviewLocArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandSetPieWedgeExplosion::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetPreviewLocArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetPieWedgeExplosion::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetPreviewLocArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetPieWedgeExplosion::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetPreviewLocArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandSetPieWedgeExplosion::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6197,115 +10106,153 @@ inline void CommandSetPreviewLocArchive::set_allocated_super(::TSCH::ChartComman
   }
 }
 
-// required .TSP.Point old_loc = 2;
-inline bool CommandSetPreviewLocArchive::has_old_loc() const {
+// optional .TSP.Reference info_geometry_command = 2;
+inline bool CommandSetPieWedgeExplosion::has_info_geometry_command() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetPreviewLocArchive::set_has_old_loc() {
+inline void CommandSetPieWedgeExplosion::set_has_info_geometry_command() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetPreviewLocArchive::clear_has_old_loc() {
+inline void CommandSetPieWedgeExplosion::clear_has_info_geometry_command() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetPreviewLocArchive::clear_old_loc() {
-  if (old_loc_ != NULL) old_loc_->::TSP::Point::Clear();
-  clear_has_old_loc();
+inline void CommandSetPieWedgeExplosion::clear_info_geometry_command() {
+  if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
+  clear_has_info_geometry_command();
 }
-inline const ::TSP::Point& CommandSetPreviewLocArchive::old_loc() const {
-  return old_loc_ != NULL ? *old_loc_ : *default_instance_->old_loc_;
+inline const ::TSP::Reference& CommandSetPieWedgeExplosion::info_geometry_command() const {
+  return info_geometry_command_ != NULL ? *info_geometry_command_ : *default_instance_->info_geometry_command_;
 }
-inline ::TSP::Point* CommandSetPreviewLocArchive::mutable_old_loc() {
-  set_has_old_loc();
-  if (old_loc_ == NULL) old_loc_ = new ::TSP::Point;
-  return old_loc_;
+inline ::TSP::Reference* CommandSetPieWedgeExplosion::mutable_info_geometry_command() {
+  set_has_info_geometry_command();
+  if (info_geometry_command_ == NULL) info_geometry_command_ = new ::TSP::Reference;
+  return info_geometry_command_;
 }
-inline ::TSP::Point* CommandSetPreviewLocArchive::release_old_loc() {
-  clear_has_old_loc();
-  ::TSP::Point* temp = old_loc_;
-  old_loc_ = NULL;
+inline ::TSP::Reference* CommandSetPieWedgeExplosion::release_info_geometry_command() {
+  clear_has_info_geometry_command();
+  ::TSP::Reference* temp = info_geometry_command_;
+  info_geometry_command_ = NULL;
   return temp;
 }
-inline void CommandSetPreviewLocArchive::set_allocated_old_loc(::TSP::Point* old_loc) {
-  delete old_loc_;
-  old_loc_ = old_loc;
-  if (old_loc) {
-    set_has_old_loc();
+inline void CommandSetPieWedgeExplosion::set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command) {
+  delete info_geometry_command_;
+  info_geometry_command_ = info_geometry_command;
+  if (info_geometry_command) {
+    set_has_info_geometry_command();
   } else {
-    clear_has_old_loc();
+    clear_has_info_geometry_command();
   }
 }
 
-// required .TSP.Point new_loc = 3;
-inline bool CommandSetPreviewLocArchive::has_new_loc() const {
+// optional .TSP.Reference style_mutation_command = 3;
+inline bool CommandSetPieWedgeExplosion::has_style_mutation_command() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetPreviewLocArchive::set_has_new_loc() {
+inline void CommandSetPieWedgeExplosion::set_has_style_mutation_command() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetPreviewLocArchive::clear_has_new_loc() {
+inline void CommandSetPieWedgeExplosion::clear_has_style_mutation_command() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetPreviewLocArchive::clear_new_loc() {
-  if (new_loc_ != NULL) new_loc_->::TSP::Point::Clear();
-  clear_has_new_loc();
+inline void CommandSetPieWedgeExplosion::clear_style_mutation_command() {
+  if (style_mutation_command_ != NULL) style_mutation_command_->::TSP::Reference::Clear();
+  clear_has_style_mutation_command();
+}
+inline const ::TSP::Reference& CommandSetPieWedgeExplosion::style_mutation_command() const {
+  return style_mutation_command_ != NULL ? *style_mutation_command_ : *default_instance_->style_mutation_command_;
+}
+inline ::TSP::Reference* CommandSetPieWedgeExplosion::mutable_style_mutation_command() {
+  set_has_style_mutation_command();
+  if (style_mutation_command_ == NULL) style_mutation_command_ = new ::TSP::Reference;
+  return style_mutation_command_;
+}
+inline ::TSP::Reference* CommandSetPieWedgeExplosion::release_style_mutation_command() {
+  clear_has_style_mutation_command();
+  ::TSP::Reference* temp = style_mutation_command_;
+  style_mutation_command_ = NULL;
+  return temp;
+}
+inline void CommandSetPieWedgeExplosion::set_allocated_style_mutation_command(::TSP::Reference* style_mutation_command) {
+  delete style_mutation_command_;
+  style_mutation_command_ = style_mutation_command;
+  if (style_mutation_command) {
+    set_has_style_mutation_command();
+  } else {
+    clear_has_style_mutation_command();
+  }
+}
+
+// optional .TSP.Reference anchor_attachment_command = 4;
+inline bool CommandSetPieWedgeExplosion::has_anchor_attachment_command() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetPieWedgeExplosion::set_has_anchor_attachment_command() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetPieWedgeExplosion::clear_has_anchor_attachment_command() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetPieWedgeExplosion::clear_anchor_attachment_command() {
+  if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
+  clear_has_anchor_attachment_command();
 }
-inline const ::TSP::Point& CommandSetPreviewLocArchive::new_loc() const {
-  return new_loc_ != NULL ? *new_loc_ : *default_instance_->new_loc_;
+inline const ::TSP::Reference& CommandSetPieWedgeExplosion::anchor_attachment_command() const {
+  return anchor_attachment_command_ != NULL ? *anchor_attachment_command_ : *default_instance_->anchor_attachment_command_;
 }
-inline ::TSP::Point* CommandSetPreviewLocArchive::mutable_new_loc() {
-  set_has_new_loc();
-  if (new_loc_ == NULL) new_loc_ = new ::TSP::Point;
-  return new_loc_;
+inline ::TSP::Reference* CommandSetPieWedgeExplosion::mutable_anchor_attachment_command() {
+  set_has_anchor_attachment_command();
+  if (anchor_attachment_command_ == NULL) anchor_attachment_command_ = new ::TSP::Reference;
+  return anchor_attachment_command_;
 }
-inline ::TSP::Point* CommandSetPreviewLocArchive::release_new_loc() {
-  clear_has_new_loc();
-  ::TSP::Point* temp = new_loc_;
-  new_loc_ = NULL;
+inline ::TSP::Reference* CommandSetPieWedgeExplosion::release_anchor_attachment_command() {
+  clear_has_anchor_attachment_command();
+  ::TSP::Reference* temp = anchor_attachment_command_;
+  anchor_attachment_command_ = NULL;
   return temp;
 }
-inline void CommandSetPreviewLocArchive::set_allocated_new_loc(::TSP::Point* new_loc) {
-  delete new_loc_;
-  new_loc_ = new_loc;
-  if (new_loc) {
-    set_has_new_loc();
+inline void CommandSetPieWedgeExplosion::set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command) {
+  delete anchor_attachment_command_;
+  anchor_attachment_command_ = anchor_attachment_command;
+  if (anchor_attachment_command) {
+    set_has_anchor_attachment_command();
   } else {
-    clear_has_new_loc();
+    clear_has_anchor_attachment_command();
   }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetGridValueArchive
+// SynchronousCommandArchive
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetGridValueArchive::has_super() const {
+// required .TSK.CommandArchive super = 1;
+inline bool SynchronousCommandArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetGridValueArchive::set_has_super() {
+inline void SynchronousCommandArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetGridValueArchive::clear_has_super() {
+inline void SynchronousCommandArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetGridValueArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+inline void SynchronousCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetGridValueArchive::super() const {
+inline const ::TSK::CommandArchive& SynchronousCommandArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetGridValueArchive::mutable_super() {
+inline ::TSK::CommandArchive* SynchronousCommandArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetGridValueArchive::release_super() {
+inline ::TSK::CommandArchive* SynchronousCommandArchive::release_super() {
   clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
+  ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetGridValueArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void SynchronousCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6315,127 +10262,77 @@ inline void CommandSetGridValueArchive::set_allocated_super(::TSCH::ChartCommand
   }
 }
 
-// required uint32 rowindex = 2;
-inline bool CommandSetGridValueArchive::has_rowindex() const {
+// required .TSP.Reference command = 2;
+inline bool SynchronousCommandArchive::has_command() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetGridValueArchive::set_has_rowindex() {
+inline void SynchronousCommandArchive::set_has_command() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetGridValueArchive::clear_has_rowindex() {
+inline void SynchronousCommandArchive::clear_has_command() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetGridValueArchive::clear_rowindex() {
-  rowindex_ = 0u;
-  clear_has_rowindex();
-}
-inline ::google::protobuf::uint32 CommandSetGridValueArchive::rowindex() const {
-  return rowindex_;
-}
-inline void CommandSetGridValueArchive::set_rowindex(::google::protobuf::uint32 value) {
-  set_has_rowindex();
-  rowindex_ = value;
-}
-
-// required uint32 columnindex = 3;
-inline bool CommandSetGridValueArchive::has_columnindex() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void CommandSetGridValueArchive::set_has_columnindex() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void CommandSetGridValueArchive::clear_has_columnindex() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void CommandSetGridValueArchive::clear_columnindex() {
-  columnindex_ = 0u;
-  clear_has_columnindex();
-}
-inline ::google::protobuf::uint32 CommandSetGridValueArchive::columnindex() const {
-  return columnindex_;
-}
-inline void CommandSetGridValueArchive::set_columnindex(::google::protobuf::uint32 value) {
-  set_has_columnindex();
-  columnindex_ = value;
-}
-
-// required double oldvalue = 4;
-inline bool CommandSetGridValueArchive::has_oldvalue() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void CommandSetGridValueArchive::set_has_oldvalue() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void CommandSetGridValueArchive::clear_has_oldvalue() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void CommandSetGridValueArchive::clear_oldvalue() {
-  oldvalue_ = 0;
-  clear_has_oldvalue();
-}
-inline double CommandSetGridValueArchive::oldvalue() const {
-  return oldvalue_;
-}
-inline void CommandSetGridValueArchive::set_oldvalue(double value) {
-  set_has_oldvalue();
-  oldvalue_ = value;
-}
-
-// required double newvalue = 5;
-inline bool CommandSetGridValueArchive::has_newvalue() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void CommandSetGridValueArchive::set_has_newvalue() {
-  _has_bits_[0] |= 0x00000010u;
+inline void SynchronousCommandArchive::clear_command() {
+  if (command_ != NULL) command_->::TSP::Reference::Clear();
+  clear_has_command();
 }
-inline void CommandSetGridValueArchive::clear_has_newvalue() {
-  _has_bits_[0] &= ~0x00000010u;
+inline const ::TSP::Reference& SynchronousCommandArchive::command() const {
+  return command_ != NULL ? *command_ : *default_instance_->command_;
 }
-inline void CommandSetGridValueArchive::clear_newvalue() {
-  newvalue_ = 0;
-  clear_has_newvalue();
+inline ::TSP::Reference* SynchronousCommandArchive::mutable_command() {
+  set_has_command();
+  if (command_ == NULL) command_ = new ::TSP::Reference;
+  return command_;
 }
-inline double CommandSetGridValueArchive::newvalue() const {
-  return newvalue_;
+inline ::TSP::Reference* SynchronousCommandArchive::release_command() {
+  clear_has_command();
+  ::TSP::Reference* temp = command_;
+  command_ = NULL;
+  return temp;
 }
-inline void CommandSetGridValueArchive::set_newvalue(double value) {
-  set_has_newvalue();
-  newvalue_ = value;
+inline void SynchronousCommandArchive::set_allocated_command(::TSP::Reference* command) {
+  delete command_;
+  command_ = command;
+  if (command) {
+    set_has_command();
+  } else {
+    clear_has_command();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetGridDirectionArchive
+// CommandReplaceAllArchive
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetGridDirectionArchive::has_super() const {
+// required .TSK.ReplaceAllChildCommandArchive super = 1;
+inline bool CommandReplaceAllArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetGridDirectionArchive::set_has_super() {
+inline void CommandReplaceAllArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetGridDirectionArchive::clear_has_super() {
+inline void CommandReplaceAllArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetGridDirectionArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+inline void CommandReplaceAllArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::ReplaceAllChildCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetGridDirectionArchive::super() const {
+inline const ::TSK::ReplaceAllChildCommandArchive& CommandReplaceAllArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetGridDirectionArchive::mutable_super() {
+inline ::TSK::ReplaceAllChildCommandArchive* CommandReplaceAllArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  if (super_ == NULL) super_ = new ::TSK::ReplaceAllChildCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetGridDirectionArchive::release_super() {
+inline ::TSK::ReplaceAllChildCommandArchive* CommandReplaceAllArchive::release_super() {
   clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
+  ::TSK::ReplaceAllChildCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetGridDirectionArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandReplaceAllArchive::set_allocated_super(::TSK::ReplaceAllChildCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6445,83 +10342,102 @@ inline void CommandSetGridDirectionArchive::set_allocated_super(::TSCH::ChartCom
   }
 }
 
-// required uint32 old_direction = 2;
-inline bool CommandSetGridDirectionArchive::has_old_direction() const {
+// required .TSP.Reference info = 2;
+inline bool CommandReplaceAllArchive::has_info() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetGridDirectionArchive::set_has_old_direction() {
+inline void CommandReplaceAllArchive::set_has_info() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetGridDirectionArchive::clear_has_old_direction() {
+inline void CommandReplaceAllArchive::clear_has_info() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetGridDirectionArchive::clear_old_direction() {
-  old_direction_ = 0u;
-  clear_has_old_direction();
+inline void CommandReplaceAllArchive::clear_info() {
+  if (info_ != NULL) info_->::TSP::Reference::Clear();
+  clear_has_info();
 }
-inline ::google::protobuf::uint32 CommandSetGridDirectionArchive::old_direction() const {
-  return old_direction_;
+inline const ::TSP::Reference& CommandReplaceAllArchive::info() const {
+  return info_ != NULL ? *info_ : *default_instance_->info_;
 }
-inline void CommandSetGridDirectionArchive::set_old_direction(::google::protobuf::uint32 value) {
-  set_has_old_direction();
-  old_direction_ = value;
+inline ::TSP::Reference* CommandReplaceAllArchive::mutable_info() {
+  set_has_info();
+  if (info_ == NULL) info_ = new ::TSP::Reference;
+  return info_;
+}
+inline ::TSP::Reference* CommandReplaceAllArchive::release_info() {
+  clear_has_info();
+  ::TSP::Reference* temp = info_;
+  info_ = NULL;
+  return temp;
+}
+inline void CommandReplaceAllArchive::set_allocated_info(::TSP::Reference* info) {
+  delete info_;
+  info_ = info;
+  if (info) {
+    set_has_info();
+  } else {
+    clear_has_info();
+  }
 }
 
-// required uint32 new_direction = 3;
-inline bool CommandSetGridDirectionArchive::has_new_direction() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+// repeated .TSP.Reference commands = 3;
+inline int CommandReplaceAllArchive::commands_size() const {
+  return commands_.size();
 }
-inline void CommandSetGridDirectionArchive::set_has_new_direction() {
-  _has_bits_[0] |= 0x00000004u;
+inline void CommandReplaceAllArchive::clear_commands() {
+  commands_.Clear();
 }
-inline void CommandSetGridDirectionArchive::clear_has_new_direction() {
-  _has_bits_[0] &= ~0x00000004u;
+inline const ::TSP::Reference& CommandReplaceAllArchive::commands(int index) const {
+  return commands_.Get(index);
 }
-inline void CommandSetGridDirectionArchive::clear_new_direction() {
-  new_direction_ = 0u;
-  clear_has_new_direction();
+inline ::TSP::Reference* CommandReplaceAllArchive::mutable_commands(int index) {
+  return commands_.Mutable(index);
 }
-inline ::google::protobuf::uint32 CommandSetGridDirectionArchive::new_direction() const {
-  return new_direction_;
+inline ::TSP::Reference* CommandReplaceAllArchive::add_commands() {
+  return commands_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+CommandReplaceAllArchive::commands() const {
+  return commands_;
 }
-inline void CommandSetGridDirectionArchive::set_new_direction(::google::protobuf::uint32 value) {
-  set_has_new_direction();
-  new_direction_ = value;
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+CommandReplaceAllArchive::mutable_commands() {
+  return &commands_;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetSeriesTypeArchive
+// CommandChartApplyTheme
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetSeriesTypeArchive::has_super() const {
+// required .TSS.ApplyThemeChildCommandArchive super = 1;
+inline bool CommandChartApplyTheme::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetSeriesTypeArchive::set_has_super() {
+inline void CommandChartApplyTheme::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetSeriesTypeArchive::clear_has_super() {
+inline void CommandChartApplyTheme::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetSeriesTypeArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+inline void CommandChartApplyTheme::clear_super() {
+  if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetSeriesTypeArchive::super() const {
+inline const ::TSS::ApplyThemeChildCommandArchive& CommandChartApplyTheme::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetSeriesTypeArchive::mutable_super() {
+inline ::TSS::ApplyThemeChildCommandArchive* CommandChartApplyTheme::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  if (super_ == NULL) super_ = new ::TSS::ApplyThemeChildCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetSeriesTypeArchive::release_super() {
+inline ::TSS::ApplyThemeChildCommandArchive* CommandChartApplyTheme::release_super() {
   clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
+  ::TSS::ApplyThemeChildCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetSeriesTypeArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandChartApplyTheme::set_allocated_super(::TSS::ApplyThemeChildCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6531,105 +10447,153 @@ inline void CommandSetSeriesTypeArchive::set_allocated_super(::TSCH::ChartComman
   }
 }
 
-// required uint32 seriesindex = 2;
-inline bool CommandSetSeriesTypeArchive::has_seriesindex() const {
+// required .TSP.Reference info = 2;
+inline bool CommandChartApplyTheme::has_info() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetSeriesTypeArchive::set_has_seriesindex() {
+inline void CommandChartApplyTheme::set_has_info() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetSeriesTypeArchive::clear_has_seriesindex() {
+inline void CommandChartApplyTheme::clear_has_info() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetSeriesTypeArchive::clear_seriesindex() {
-  seriesindex_ = 0u;
-  clear_has_seriesindex();
+inline void CommandChartApplyTheme::clear_info() {
+  if (info_ != NULL) info_->::TSP::Reference::Clear();
+  clear_has_info();
 }
-inline ::google::protobuf::uint32 CommandSetSeriesTypeArchive::seriesindex() const {
-  return seriesindex_;
+inline const ::TSP::Reference& CommandChartApplyTheme::info() const {
+  return info_ != NULL ? *info_ : *default_instance_->info_;
 }
-inline void CommandSetSeriesTypeArchive::set_seriesindex(::google::protobuf::uint32 value) {
-  set_has_seriesindex();
-  seriesindex_ = value;
+inline ::TSP::Reference* CommandChartApplyTheme::mutable_info() {
+  set_has_info();
+  if (info_ == NULL) info_ = new ::TSP::Reference;
+  return info_;
+}
+inline ::TSP::Reference* CommandChartApplyTheme::release_info() {
+  clear_has_info();
+  ::TSP::Reference* temp = info_;
+  info_ = NULL;
+  return temp;
+}
+inline void CommandChartApplyTheme::set_allocated_info(::TSP::Reference* info) {
+  delete info_;
+  info_ = info;
+  if (info) {
+    set_has_info();
+  } else {
+    clear_has_info();
+  }
 }
 
-// required uint32 oldtype = 3;
-inline bool CommandSetSeriesTypeArchive::has_oldtype() const {
+// optional .TSP.Reference swap_command = 3;
+inline bool CommandChartApplyTheme::has_swap_command() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetSeriesTypeArchive::set_has_oldtype() {
+inline void CommandChartApplyTheme::set_has_swap_command() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetSeriesTypeArchive::clear_has_oldtype() {
+inline void CommandChartApplyTheme::clear_has_swap_command() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetSeriesTypeArchive::clear_oldtype() {
-  oldtype_ = 0u;
-  clear_has_oldtype();
+inline void CommandChartApplyTheme::clear_swap_command() {
+  if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
+  clear_has_swap_command();
 }
-inline ::google::protobuf::uint32 CommandSetSeriesTypeArchive::oldtype() const {
-  return oldtype_;
+inline const ::TSP::Reference& CommandChartApplyTheme::swap_command() const {
+  return swap_command_ != NULL ? *swap_command_ : *default_instance_->swap_command_;
 }
-inline void CommandSetSeriesTypeArchive::set_oldtype(::google::protobuf::uint32 value) {
-  set_has_oldtype();
-  oldtype_ = value;
+inline ::TSP::Reference* CommandChartApplyTheme::mutable_swap_command() {
+  set_has_swap_command();
+  if (swap_command_ == NULL) swap_command_ = new ::TSP::Reference;
+  return swap_command_;
+}
+inline ::TSP::Reference* CommandChartApplyTheme::release_swap_command() {
+  clear_has_swap_command();
+  ::TSP::Reference* temp = swap_command_;
+  swap_command_ = NULL;
+  return temp;
+}
+inline void CommandChartApplyTheme::set_allocated_swap_command(::TSP::Reference* swap_command) {
+  delete swap_command_;
+  swap_command_ = swap_command;
+  if (swap_command) {
+    set_has_swap_command();
+  } else {
+    clear_has_swap_command();
+  }
 }
 
-// required uint32 newtype = 4;
-inline bool CommandSetSeriesTypeArchive::has_newtype() const {
+// optional .TSP.Reference preset = 4;
+inline bool CommandChartApplyTheme::has_preset() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandSetSeriesTypeArchive::set_has_newtype() {
+inline void CommandChartApplyTheme::set_has_preset() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandSetSeriesTypeArchive::clear_has_newtype() {
+inline void CommandChartApplyTheme::clear_has_preset() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandSetSeriesTypeArchive::clear_newtype() {
-  newtype_ = 0u;
-  clear_has_newtype();
+inline void CommandChartApplyTheme::clear_preset() {
+  if (preset_ != NULL) preset_->::TSP::Reference::Clear();
+  clear_has_preset();
 }
-inline ::google::protobuf::uint32 CommandSetSeriesTypeArchive::newtype() const {
-  return newtype_;
+inline const ::TSP::Reference& CommandChartApplyTheme::preset() const {
+  return preset_ != NULL ? *preset_ : *default_instance_->preset_;
 }
-inline void CommandSetSeriesTypeArchive::set_newtype(::google::protobuf::uint32 value) {
-  set_has_newtype();
-  newtype_ = value;
+inline ::TSP::Reference* CommandChartApplyTheme::mutable_preset() {
+  set_has_preset();
+  if (preset_ == NULL) preset_ = new ::TSP::Reference;
+  return preset_;
+}
+inline ::TSP::Reference* CommandChartApplyTheme::release_preset() {
+  clear_has_preset();
+  ::TSP::Reference* temp = preset_;
+  preset_ = NULL;
+  return temp;
+}
+inline void CommandChartApplyTheme::set_allocated_preset(::TSP::Reference* preset) {
+  delete preset_;
+  preset_ = preset;
+  if (preset) {
+    set_has_preset();
+  } else {
+    clear_has_preset();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetScatterFormatArchive
+// CommandChartApplyPreset
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetScatterFormatArchive::has_super() const {
+inline bool CommandChartApplyPreset::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetScatterFormatArchive::set_has_super() {
+inline void CommandChartApplyPreset::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetScatterFormatArchive::clear_has_super() {
+inline void CommandChartApplyPreset::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetScatterFormatArchive::clear_super() {
+inline void CommandChartApplyPreset::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetScatterFormatArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandChartApplyPreset::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetScatterFormatArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandChartApplyPreset::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetScatterFormatArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandChartApplyPreset::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetScatterFormatArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandChartApplyPreset::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6639,83 +10603,138 @@ inline void CommandSetScatterFormatArchive::set_allocated_super(::TSCH::ChartCom
   }
 }
 
-// required uint32 oldformat = 3;
-inline bool CommandSetScatterFormatArchive::has_oldformat() const {
+// optional .TSP.Reference swap_command = 2;
+inline bool CommandChartApplyPreset::has_swap_command() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetScatterFormatArchive::set_has_oldformat() {
+inline void CommandChartApplyPreset::set_has_swap_command() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetScatterFormatArchive::clear_has_oldformat() {
+inline void CommandChartApplyPreset::clear_has_swap_command() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetScatterFormatArchive::clear_oldformat() {
-  oldformat_ = 0u;
-  clear_has_oldformat();
+inline void CommandChartApplyPreset::clear_swap_command() {
+  if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
+  clear_has_swap_command();
 }
-inline ::google::protobuf::uint32 CommandSetScatterFormatArchive::oldformat() const {
-  return oldformat_;
+inline const ::TSP::Reference& CommandChartApplyPreset::swap_command() const {
+  return swap_command_ != NULL ? *swap_command_ : *default_instance_->swap_command_;
 }
-inline void CommandSetScatterFormatArchive::set_oldformat(::google::protobuf::uint32 value) {
-  set_has_oldformat();
-  oldformat_ = value;
+inline ::TSP::Reference* CommandChartApplyPreset::mutable_swap_command() {
+  set_has_swap_command();
+  if (swap_command_ == NULL) swap_command_ = new ::TSP::Reference;
+  return swap_command_;
+}
+inline ::TSP::Reference* CommandChartApplyPreset::release_swap_command() {
+  clear_has_swap_command();
+  ::TSP::Reference* temp = swap_command_;
+  swap_command_ = NULL;
+  return temp;
+}
+inline void CommandChartApplyPreset::set_allocated_swap_command(::TSP::Reference* swap_command) {
+  delete swap_command_;
+  swap_command_ = swap_command;
+  if (swap_command) {
+    set_has_swap_command();
+  } else {
+    clear_has_swap_command();
+  }
 }
 
-// required uint32 newformat = 4;
-inline bool CommandSetScatterFormatArchive::has_newformat() const {
+// optional .TSP.Reference preset = 3;
+inline bool CommandChartApplyPreset::has_preset() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetScatterFormatArchive::set_has_newformat() {
+inline void CommandChartApplyPreset::set_has_preset() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetScatterFormatArchive::clear_has_newformat() {
+inline void CommandChartApplyPreset::clear_has_preset() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetScatterFormatArchive::clear_newformat() {
-  newformat_ = 0u;
-  clear_has_newformat();
+inline void CommandChartApplyPreset::clear_preset() {
+  if (preset_ != NULL) preset_->::TSP::Reference::Clear();
+  clear_has_preset();
+}
+inline const ::TSP::Reference& CommandChartApplyPreset::preset() const {
+  return preset_ != NULL ? *preset_ : *default_instance_->preset_;
+}
+inline ::TSP::Reference* CommandChartApplyPreset::mutable_preset() {
+  set_has_preset();
+  if (preset_ == NULL) preset_ = new ::TSP::Reference;
+  return preset_;
+}
+inline ::TSP::Reference* CommandChartApplyPreset::release_preset() {
+  clear_has_preset();
+  ::TSP::Reference* temp = preset_;
+  preset_ = NULL;
+  return temp;
+}
+inline void CommandChartApplyPreset::set_allocated_preset(::TSP::Reference* preset) {
+  delete preset_;
+  preset_ = preset;
+  if (preset) {
+    set_has_preset();
+  } else {
+    clear_has_preset();
+  }
+}
+
+// optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
+inline bool CommandChartApplyPreset::has_behavior() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandChartApplyPreset::set_has_behavior() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandChartApplyPreset::clear_has_behavior() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandChartApplyPreset::clear_behavior() {
+  behavior_ = 1;
+  clear_has_behavior();
 }
-inline ::google::protobuf::uint32 CommandSetScatterFormatArchive::newformat() const {
-  return newformat_;
+inline ::TSCH::ApplyPresetBehavior CommandChartApplyPreset::behavior() const {
+  return static_cast< ::TSCH::ApplyPresetBehavior >(behavior_);
 }
-inline void CommandSetScatterFormatArchive::set_newformat(::google::protobuf::uint32 value) {
-  set_has_newformat();
-  newformat_ = value;
+inline void CommandChartApplyPreset::set_behavior(::TSCH::ApplyPresetBehavior value) {
+  assert(::TSCH::ApplyPresetBehavior_IsValid(value));
+  set_has_behavior();
+  behavior_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetMultiDataSetIndexArchive
+// CommandCleanupGeometryArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetMultiDataSetIndexArchive::has_super() const {
+inline bool CommandCleanupGeometryArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetMultiDataSetIndexArchive::set_has_super() {
+inline void CommandCleanupGeometryArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetMultiDataSetIndexArchive::clear_has_super() {
+inline void CommandCleanupGeometryArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetMultiDataSetIndexArchive::clear_super() {
+inline void CommandCleanupGeometryArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetMultiDataSetIndexArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandCleanupGeometryArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetMultiDataSetIndexArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandCleanupGeometryArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetMultiDataSetIndexArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandCleanupGeometryArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetMultiDataSetIndexArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandCleanupGeometryArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6725,83 +10744,153 @@ inline void CommandSetMultiDataSetIndexArchive::set_allocated_super(::TSCH::Char
   }
 }
 
-// required uint32 oldindex = 2;
-inline bool CommandSetMultiDataSetIndexArchive::has_oldindex() const {
+// optional .TSP.Reference info_geometry_command = 2;
+inline bool CommandCleanupGeometryArchive::has_info_geometry_command() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetMultiDataSetIndexArchive::set_has_oldindex() {
+inline void CommandCleanupGeometryArchive::set_has_info_geometry_command() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetMultiDataSetIndexArchive::clear_has_oldindex() {
+inline void CommandCleanupGeometryArchive::clear_has_info_geometry_command() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetMultiDataSetIndexArchive::clear_oldindex() {
-  oldindex_ = 0u;
-  clear_has_oldindex();
+inline void CommandCleanupGeometryArchive::clear_info_geometry_command() {
+  if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
+  clear_has_info_geometry_command();
 }
-inline ::google::protobuf::uint32 CommandSetMultiDataSetIndexArchive::oldindex() const {
-  return oldindex_;
+inline const ::TSP::Reference& CommandCleanupGeometryArchive::info_geometry_command() const {
+  return info_geometry_command_ != NULL ? *info_geometry_command_ : *default_instance_->info_geometry_command_;
 }
-inline void CommandSetMultiDataSetIndexArchive::set_oldindex(::google::protobuf::uint32 value) {
-  set_has_oldindex();
-  oldindex_ = value;
+inline ::TSP::Reference* CommandCleanupGeometryArchive::mutable_info_geometry_command() {
+  set_has_info_geometry_command();
+  if (info_geometry_command_ == NULL) info_geometry_command_ = new ::TSP::Reference;
+  return info_geometry_command_;
+}
+inline ::TSP::Reference* CommandCleanupGeometryArchive::release_info_geometry_command() {
+  clear_has_info_geometry_command();
+  ::TSP::Reference* temp = info_geometry_command_;
+  info_geometry_command_ = NULL;
+  return temp;
+}
+inline void CommandCleanupGeometryArchive::set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command) {
+  delete info_geometry_command_;
+  info_geometry_command_ = info_geometry_command;
+  if (info_geometry_command) {
+    set_has_info_geometry_command();
+  } else {
+    clear_has_info_geometry_command();
+  }
 }
 
-// required uint32 newindex = 3;
-inline bool CommandSetMultiDataSetIndexArchive::has_newindex() const {
+// optional .TSP.Reference anchor_attachment_command = 3;
+inline bool CommandCleanupGeometryArchive::has_anchor_attachment_command() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetMultiDataSetIndexArchive::set_has_newindex() {
+inline void CommandCleanupGeometryArchive::set_has_anchor_attachment_command() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetMultiDataSetIndexArchive::clear_has_newindex() {
+inline void CommandCleanupGeometryArchive::clear_has_anchor_attachment_command() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetMultiDataSetIndexArchive::clear_newindex() {
-  newindex_ = 0u;
-  clear_has_newindex();
+inline void CommandCleanupGeometryArchive::clear_anchor_attachment_command() {
+  if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
+  clear_has_anchor_attachment_command();
 }
-inline ::google::protobuf::uint32 CommandSetMultiDataSetIndexArchive::newindex() const {
-  return newindex_;
+inline const ::TSP::Reference& CommandCleanupGeometryArchive::anchor_attachment_command() const {
+  return anchor_attachment_command_ != NULL ? *anchor_attachment_command_ : *default_instance_->anchor_attachment_command_;
 }
-inline void CommandSetMultiDataSetIndexArchive::set_newindex(::google::protobuf::uint32 value) {
-  set_has_newindex();
-  newindex_ = value;
+inline ::TSP::Reference* CommandCleanupGeometryArchive::mutable_anchor_attachment_command() {
+  set_has_anchor_attachment_command();
+  if (anchor_attachment_command_ == NULL) anchor_attachment_command_ = new ::TSP::Reference;
+  return anchor_attachment_command_;
+}
+inline ::TSP::Reference* CommandCleanupGeometryArchive::release_anchor_attachment_command() {
+  clear_has_anchor_attachment_command();
+  ::TSP::Reference* temp = anchor_attachment_command_;
+  anchor_attachment_command_ = NULL;
+  return temp;
+}
+inline void CommandCleanupGeometryArchive::set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command) {
+  delete anchor_attachment_command_;
+  anchor_attachment_command_ = anchor_attachment_command;
+  if (anchor_attachment_command) {
+    set_has_anchor_attachment_command();
+  } else {
+    clear_has_anchor_attachment_command();
+  }
+}
+
+// optional .TSCH.RectArchive original_legend_rect = 4;
+inline bool CommandCleanupGeometryArchive::has_original_legend_rect() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandCleanupGeometryArchive::set_has_original_legend_rect() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandCleanupGeometryArchive::clear_has_original_legend_rect() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandCleanupGeometryArchive::clear_original_legend_rect() {
+  if (original_legend_rect_ != NULL) original_legend_rect_->::TSCH::RectArchive::Clear();
+  clear_has_original_legend_rect();
+}
+inline const ::TSCH::RectArchive& CommandCleanupGeometryArchive::original_legend_rect() const {
+  return original_legend_rect_ != NULL ? *original_legend_rect_ : *default_instance_->original_legend_rect_;
+}
+inline ::TSCH::RectArchive* CommandCleanupGeometryArchive::mutable_original_legend_rect() {
+  set_has_original_legend_rect();
+  if (original_legend_rect_ == NULL) original_legend_rect_ = new ::TSCH::RectArchive;
+  return original_legend_rect_;
+}
+inline ::TSCH::RectArchive* CommandCleanupGeometryArchive::release_original_legend_rect() {
+  clear_has_original_legend_rect();
+  ::TSCH::RectArchive* temp = original_legend_rect_;
+  original_legend_rect_ = NULL;
+  return temp;
+}
+inline void CommandCleanupGeometryArchive::set_allocated_original_legend_rect(::TSCH::RectArchive* original_legend_rect) {
+  delete original_legend_rect_;
+  original_legend_rect_ = original_legend_rect;
+  if (original_legend_rect) {
+    set_has_original_legend_rect();
+  } else {
+    clear_has_original_legend_rect();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetLegendFrameArchive
+// ChartCommandArchive
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetLegendFrameArchive::has_super() const {
+// required .TSK.CommandArchive super = 1;
+inline bool ChartCommandArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetLegendFrameArchive::set_has_super() {
+inline void ChartCommandArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetLegendFrameArchive::clear_has_super() {
+inline void ChartCommandArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetLegendFrameArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+inline void ChartCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetLegendFrameArchive::super() const {
+inline const ::TSK::CommandArchive& ChartCommandArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetLegendFrameArchive::mutable_super() {
+inline ::TSK::CommandArchive* ChartCommandArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetLegendFrameArchive::release_super() {
+inline ::TSK::CommandArchive* ChartCommandArchive::release_super() {
   clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
+  ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetLegendFrameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void ChartCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6811,115 +10900,128 @@ inline void CommandSetLegendFrameArchive::set_allocated_super(::TSCH::ChartComma
   }
 }
 
-// required .TSCH.RectArchive old_legend_frame = 2;
-inline bool CommandSetLegendFrameArchive::has_old_legend_frame() const {
+// required .TSP.Reference info = 2;
+inline bool ChartCommandArchive::has_info() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetLegendFrameArchive::set_has_old_legend_frame() {
+inline void ChartCommandArchive::set_has_info() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetLegendFrameArchive::clear_has_old_legend_frame() {
+inline void ChartCommandArchive::clear_has_info() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetLegendFrameArchive::clear_old_legend_frame() {
-  if (old_legend_frame_ != NULL) old_legend_frame_->::TSCH::RectArchive::Clear();
-  clear_has_old_legend_frame();
+inline void ChartCommandArchive::clear_info() {
+  if (info_ != NULL) info_->::TSP::Reference::Clear();
+  clear_has_info();
 }
-inline const ::TSCH::RectArchive& CommandSetLegendFrameArchive::old_legend_frame() const {
-  return old_legend_frame_ != NULL ? *old_legend_frame_ : *default_instance_->old_legend_frame_;
+inline const ::TSP::Reference& ChartCommandArchive::info() const {
+  return info_ != NULL ? *info_ : *default_instance_->info_;
 }
-inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::mutable_old_legend_frame() {
-  set_has_old_legend_frame();
-  if (old_legend_frame_ == NULL) old_legend_frame_ = new ::TSCH::RectArchive;
-  return old_legend_frame_;
+inline ::TSP::Reference* ChartCommandArchive::mutable_info() {
+  set_has_info();
+  if (info_ == NULL) info_ = new ::TSP::Reference;
+  return info_;
 }
-inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::release_old_legend_frame() {
-  clear_has_old_legend_frame();
-  ::TSCH::RectArchive* temp = old_legend_frame_;
-  old_legend_frame_ = NULL;
+inline ::TSP::Reference* ChartCommandArchive::release_info() {
+  clear_has_info();
+  ::TSP::Reference* temp = info_;
+  info_ = NULL;
   return temp;
 }
-inline void CommandSetLegendFrameArchive::set_allocated_old_legend_frame(::TSCH::RectArchive* old_legend_frame) {
-  delete old_legend_frame_;
-  old_legend_frame_ = old_legend_frame;
-  if (old_legend_frame) {
-    set_has_old_legend_frame();
+inline void ChartCommandArchive::set_allocated_info(::TSP::Reference* info) {
+  delete info_;
+  info_ = info;
+  if (info) {
+    set_has_info();
   } else {
-    clear_has_old_legend_frame();
+    clear_has_info();
   }
 }
 
-// required .TSCH.RectArchive new_legend_frame = 3;
-inline bool CommandSetLegendFrameArchive::has_new_legend_frame() const {
+// optional bool original_dirty_state = 3;
+inline bool ChartCommandArchive::has_original_dirty_state() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetLegendFrameArchive::set_has_new_legend_frame() {
+inline void ChartCommandArchive::set_has_original_dirty_state() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetLegendFrameArchive::clear_has_new_legend_frame() {
+inline void ChartCommandArchive::clear_has_original_dirty_state() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetLegendFrameArchive::clear_new_legend_frame() {
-  if (new_legend_frame_ != NULL) new_legend_frame_->::TSCH::RectArchive::Clear();
-  clear_has_new_legend_frame();
+inline void ChartCommandArchive::clear_original_dirty_state() {
+  original_dirty_state_ = false;
+  clear_has_original_dirty_state();
+}
+inline bool ChartCommandArchive::original_dirty_state() const {
+  return original_dirty_state_;
+}
+inline void ChartCommandArchive::set_original_dirty_state(bool value) {
+  set_has_original_dirty_state();
+  original_dirty_state_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandReplaceGridValuesArchive_ValueRow
+
+// repeated double value = 1;
+inline int CommandReplaceGridValuesArchive_ValueRow::value_size() const {
+  return value_.size();
+}
+inline void CommandReplaceGridValuesArchive_ValueRow::clear_value() {
+  value_.Clear();
+}
+inline double CommandReplaceGridValuesArchive_ValueRow::value(int index) const {
+  return value_.Get(index);
 }
-inline const ::TSCH::RectArchive& CommandSetLegendFrameArchive::new_legend_frame() const {
-  return new_legend_frame_ != NULL ? *new_legend_frame_ : *default_instance_->new_legend_frame_;
+inline void CommandReplaceGridValuesArchive_ValueRow::set_value(int index, double value) {
+  value_.Set(index, value);
 }
-inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::mutable_new_legend_frame() {
-  set_has_new_legend_frame();
-  if (new_legend_frame_ == NULL) new_legend_frame_ = new ::TSCH::RectArchive;
-  return new_legend_frame_;
+inline void CommandReplaceGridValuesArchive_ValueRow::add_value(double value) {
+  value_.Add(value);
 }
-inline ::TSCH::RectArchive* CommandSetLegendFrameArchive::release_new_legend_frame() {
-  clear_has_new_legend_frame();
-  ::TSCH::RectArchive* temp = new_legend_frame_;
-  new_legend_frame_ = NULL;
-  return temp;
+inline const ::google::protobuf::RepeatedField< double >&
+CommandReplaceGridValuesArchive_ValueRow::value() const {
+  return value_;
 }
-inline void CommandSetLegendFrameArchive::set_allocated_new_legend_frame(::TSCH::RectArchive* new_legend_frame) {
-  delete new_legend_frame_;
-  new_legend_frame_ = new_legend_frame;
-  if (new_legend_frame) {
-    set_has_new_legend_frame();
-  } else {
-    clear_has_new_legend_frame();
-  }
+inline ::google::protobuf::RepeatedField< double >*
+CommandReplaceGridValuesArchive_ValueRow::mutable_value() {
+  return &value_;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetPieWedgeExplosion
+// CommandReplaceGridValuesArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandSetPieWedgeExplosion::has_super() const {
+inline bool CommandReplaceGridValuesArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetPieWedgeExplosion::set_has_super() {
+inline void CommandReplaceGridValuesArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetPieWedgeExplosion::clear_has_super() {
+inline void CommandReplaceGridValuesArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetPieWedgeExplosion::clear_super() {
+inline void CommandReplaceGridValuesArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandSetPieWedgeExplosion::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandReplaceGridValuesArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetPieWedgeExplosion::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandReplaceGridValuesArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandSetPieWedgeExplosion::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandReplaceGridValuesArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetPieWedgeExplosion::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandReplaceGridValuesArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -6929,635 +11031,553 @@ inline void CommandSetPieWedgeExplosion::set_allocated_super(::TSCH::ChartComman
   }
 }
 
-// optional .TSP.Reference info_geometry_command = 2;
-inline bool CommandSetPieWedgeExplosion::has_info_geometry_command() const {
+// required uint32 rowindex = 2;
+inline bool CommandReplaceGridValuesArchive::has_rowindex() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetPieWedgeExplosion::set_has_info_geometry_command() {
+inline void CommandReplaceGridValuesArchive::set_has_rowindex() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetPieWedgeExplosion::clear_has_info_geometry_command() {
+inline void CommandReplaceGridValuesArchive::clear_has_rowindex() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetPieWedgeExplosion::clear_info_geometry_command() {
-  if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
-  clear_has_info_geometry_command();
-}
-inline const ::TSP::Reference& CommandSetPieWedgeExplosion::info_geometry_command() const {
-  return info_geometry_command_ != NULL ? *info_geometry_command_ : *default_instance_->info_geometry_command_;
-}
-inline ::TSP::Reference* CommandSetPieWedgeExplosion::mutable_info_geometry_command() {
-  set_has_info_geometry_command();
-  if (info_geometry_command_ == NULL) info_geometry_command_ = new ::TSP::Reference;
-  return info_geometry_command_;
+inline void CommandReplaceGridValuesArchive::clear_rowindex() {
+  rowindex_ = 0u;
+  clear_has_rowindex();
 }
-inline ::TSP::Reference* CommandSetPieWedgeExplosion::release_info_geometry_command() {
-  clear_has_info_geometry_command();
-  ::TSP::Reference* temp = info_geometry_command_;
-  info_geometry_command_ = NULL;
-  return temp;
+inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::rowindex() const {
+  return rowindex_;
 }
-inline void CommandSetPieWedgeExplosion::set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command) {
-  delete info_geometry_command_;
-  info_geometry_command_ = info_geometry_command;
-  if (info_geometry_command) {
-    set_has_info_geometry_command();
-  } else {
-    clear_has_info_geometry_command();
-  }
+inline void CommandReplaceGridValuesArchive::set_rowindex(::google::protobuf::uint32 value) {
+  set_has_rowindex();
+  rowindex_ = value;
 }
 
-// optional .TSP.Reference style_mutation_command = 3;
-inline bool CommandSetPieWedgeExplosion::has_style_mutation_command() const {
+// required uint32 columnindex = 3;
+inline bool CommandReplaceGridValuesArchive::has_columnindex() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetPieWedgeExplosion::set_has_style_mutation_command() {
+inline void CommandReplaceGridValuesArchive::set_has_columnindex() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetPieWedgeExplosion::clear_has_style_mutation_command() {
+inline void CommandReplaceGridValuesArchive::clear_has_columnindex() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetPieWedgeExplosion::clear_style_mutation_command() {
-  if (style_mutation_command_ != NULL) style_mutation_command_->::TSP::Reference::Clear();
-  clear_has_style_mutation_command();
+inline void CommandReplaceGridValuesArchive::clear_columnindex() {
+  columnindex_ = 0u;
+  clear_has_columnindex();
 }
-inline const ::TSP::Reference& CommandSetPieWedgeExplosion::style_mutation_command() const {
-  return style_mutation_command_ != NULL ? *style_mutation_command_ : *default_instance_->style_mutation_command_;
+inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::columnindex() const {
+  return columnindex_;
 }
-inline ::TSP::Reference* CommandSetPieWedgeExplosion::mutable_style_mutation_command() {
-  set_has_style_mutation_command();
-  if (style_mutation_command_ == NULL) style_mutation_command_ = new ::TSP::Reference;
-  return style_mutation_command_;
+inline void CommandReplaceGridValuesArchive::set_columnindex(::google::protobuf::uint32 value) {
+  set_has_columnindex();
+  columnindex_ = value;
 }
-inline ::TSP::Reference* CommandSetPieWedgeExplosion::release_style_mutation_command() {
-  clear_has_style_mutation_command();
-  ::TSP::Reference* temp = style_mutation_command_;
-  style_mutation_command_ = NULL;
-  return temp;
+
+// repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
+inline int CommandReplaceGridValuesArchive::old_data_rows_size() const {
+  return old_data_rows_.size();
 }
-inline void CommandSetPieWedgeExplosion::set_allocated_style_mutation_command(::TSP::Reference* style_mutation_command) {
-  delete style_mutation_command_;
-  style_mutation_command_ = style_mutation_command;
-  if (style_mutation_command) {
-    set_has_style_mutation_command();
-  } else {
-    clear_has_style_mutation_command();
-  }
+inline void CommandReplaceGridValuesArchive::clear_old_data_rows() {
+  old_data_rows_.Clear();
 }
-
-// optional .TSP.Reference anchor_attachment_command = 4;
-inline bool CommandSetPieWedgeExplosion::has_anchor_attachment_command() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& CommandReplaceGridValuesArchive::old_data_rows(int index) const {
+  return old_data_rows_.Get(index);
 }
-inline void CommandSetPieWedgeExplosion::set_has_anchor_attachment_command() {
-  _has_bits_[0] |= 0x00000008u;
+inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::mutable_old_data_rows(int index) {
+  return old_data_rows_.Mutable(index);
 }
-inline void CommandSetPieWedgeExplosion::clear_has_anchor_attachment_command() {
-  _has_bits_[0] &= ~0x00000008u;
+inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::add_old_data_rows() {
+  return old_data_rows_.Add();
 }
-inline void CommandSetPieWedgeExplosion::clear_anchor_attachment_command() {
-  if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
-  clear_has_anchor_attachment_command();
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
+CommandReplaceGridValuesArchive::old_data_rows() const {
+  return old_data_rows_;
 }
-inline const ::TSP::Reference& CommandSetPieWedgeExplosion::anchor_attachment_command() const {
-  return anchor_attachment_command_ != NULL ? *anchor_attachment_command_ : *default_instance_->anchor_attachment_command_;
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
+CommandReplaceGridValuesArchive::mutable_old_data_rows() {
+  return &old_data_rows_;
 }
-inline ::TSP::Reference* CommandSetPieWedgeExplosion::mutable_anchor_attachment_command() {
-  set_has_anchor_attachment_command();
-  if (anchor_attachment_command_ == NULL) anchor_attachment_command_ = new ::TSP::Reference;
-  return anchor_attachment_command_;
+
+// repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
+inline int CommandReplaceGridValuesArchive::new_data_rows_size() const {
+  return new_data_rows_.size();
 }
-inline ::TSP::Reference* CommandSetPieWedgeExplosion::release_anchor_attachment_command() {
-  clear_has_anchor_attachment_command();
-  ::TSP::Reference* temp = anchor_attachment_command_;
-  anchor_attachment_command_ = NULL;
-  return temp;
+inline void CommandReplaceGridValuesArchive::clear_new_data_rows() {
+  new_data_rows_.Clear();
 }
-inline void CommandSetPieWedgeExplosion::set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command) {
-  delete anchor_attachment_command_;
-  anchor_attachment_command_ = anchor_attachment_command;
-  if (anchor_attachment_command) {
-    set_has_anchor_attachment_command();
-  } else {
-    clear_has_anchor_attachment_command();
-  }
+inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& CommandReplaceGridValuesArchive::new_data_rows(int index) const {
+  return new_data_rows_.Get(index);
+}
+inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::mutable_new_data_rows(int index) {
+  return new_data_rows_.Mutable(index);
+}
+inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::add_new_data_rows() {
+  return new_data_rows_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
+CommandReplaceGridValuesArchive::new_data_rows() const {
+  return new_data_rows_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
+CommandReplaceGridValuesArchive::mutable_new_data_rows() {
+  return &new_data_rows_;
 }
 
-// -------------------------------------------------------------------
-
-// SynchronousCommandArchive
+// repeated string old_row_names = 6;
+inline int CommandReplaceGridValuesArchive::old_row_names_size() const {
+  return old_row_names_.size();
+}
+inline void CommandReplaceGridValuesArchive::clear_old_row_names() {
+  old_row_names_.Clear();
+}
+inline const ::std::string& CommandReplaceGridValuesArchive::old_row_names(int index) const {
+  return old_row_names_.Get(index);
+}
+inline ::std::string* CommandReplaceGridValuesArchive::mutable_old_row_names(int index) {
+  return old_row_names_.Mutable(index);
+}
+inline void CommandReplaceGridValuesArchive::set_old_row_names(int index, const ::std::string& value) {
+  old_row_names_.Mutable(index)->assign(value);
+}
+inline void CommandReplaceGridValuesArchive::set_old_row_names(int index, const char* value) {
+  old_row_names_.Mutable(index)->assign(value);
+}
+inline void CommandReplaceGridValuesArchive::set_old_row_names(int index, const char* value, size_t size) {
+  old_row_names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandReplaceGridValuesArchive::add_old_row_names() {
+  return old_row_names_.Add();
+}
+inline void CommandReplaceGridValuesArchive::add_old_row_names(const ::std::string& value) {
+  old_row_names_.Add()->assign(value);
+}
+inline void CommandReplaceGridValuesArchive::add_old_row_names(const char* value) {
+  old_row_names_.Add()->assign(value);
+}
+inline void CommandReplaceGridValuesArchive::add_old_row_names(const char* value, size_t size) {
+  old_row_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+}
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandReplaceGridValuesArchive::old_row_names() const {
+  return old_row_names_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandReplaceGridValuesArchive::mutable_old_row_names() {
+  return &old_row_names_;
+}
 
-// required .TSK.CommandArchive super = 1;
-inline bool SynchronousCommandArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// repeated string new_row_names = 7;
+inline int CommandReplaceGridValuesArchive::new_row_names_size() const {
+  return new_row_names_.size();
+}
+inline void CommandReplaceGridValuesArchive::clear_new_row_names() {
+  new_row_names_.Clear();
+}
+inline const ::std::string& CommandReplaceGridValuesArchive::new_row_names(int index) const {
+  return new_row_names_.Get(index);
 }
-inline void SynchronousCommandArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+inline ::std::string* CommandReplaceGridValuesArchive::mutable_new_row_names(int index) {
+  return new_row_names_.Mutable(index);
 }
-inline void SynchronousCommandArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void CommandReplaceGridValuesArchive::set_new_row_names(int index, const ::std::string& value) {
+  new_row_names_.Mutable(index)->assign(value);
 }
-inline void SynchronousCommandArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
-  clear_has_super();
+inline void CommandReplaceGridValuesArchive::set_new_row_names(int index, const char* value) {
+  new_row_names_.Mutable(index)->assign(value);
 }
-inline const ::TSK::CommandArchive& SynchronousCommandArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline void CommandReplaceGridValuesArchive::set_new_row_names(int index, const char* value, size_t size) {
+  new_row_names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline ::TSK::CommandArchive* SynchronousCommandArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
-  return super_;
+inline ::std::string* CommandReplaceGridValuesArchive::add_new_row_names() {
+  return new_row_names_.Add();
 }
-inline ::TSK::CommandArchive* SynchronousCommandArchive::release_super() {
-  clear_has_super();
-  ::TSK::CommandArchive* temp = super_;
-  super_ = NULL;
-  return temp;
+inline void CommandReplaceGridValuesArchive::add_new_row_names(const ::std::string& value) {
+  new_row_names_.Add()->assign(value);
 }
-inline void SynchronousCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline void CommandReplaceGridValuesArchive::add_new_row_names(const char* value) {
+  new_row_names_.Add()->assign(value);
 }
-
-// required .TSP.Reference command = 2;
-inline bool SynchronousCommandArchive::has_command() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+inline void CommandReplaceGridValuesArchive::add_new_row_names(const char* value, size_t size) {
+  new_row_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void SynchronousCommandArchive::set_has_command() {
-  _has_bits_[0] |= 0x00000002u;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandReplaceGridValuesArchive::new_row_names() const {
+  return new_row_names_;
 }
-inline void SynchronousCommandArchive::clear_has_command() {
-  _has_bits_[0] &= ~0x00000002u;
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandReplaceGridValuesArchive::mutable_new_row_names() {
+  return &new_row_names_;
 }
-inline void SynchronousCommandArchive::clear_command() {
-  if (command_ != NULL) command_->::TSP::Reference::Clear();
-  clear_has_command();
+
+// repeated string old_col_names = 8;
+inline int CommandReplaceGridValuesArchive::old_col_names_size() const {
+  return old_col_names_.size();
 }
-inline const ::TSP::Reference& SynchronousCommandArchive::command() const {
-  return command_ != NULL ? *command_ : *default_instance_->command_;
+inline void CommandReplaceGridValuesArchive::clear_old_col_names() {
+  old_col_names_.Clear();
 }
-inline ::TSP::Reference* SynchronousCommandArchive::mutable_command() {
-  set_has_command();
-  if (command_ == NULL) command_ = new ::TSP::Reference;
-  return command_;
+inline const ::std::string& CommandReplaceGridValuesArchive::old_col_names(int index) const {
+  return old_col_names_.Get(index);
 }
-inline ::TSP::Reference* SynchronousCommandArchive::release_command() {
-  clear_has_command();
-  ::TSP::Reference* temp = command_;
-  command_ = NULL;
-  return temp;
+inline ::std::string* CommandReplaceGridValuesArchive::mutable_old_col_names(int index) {
+  return old_col_names_.Mutable(index);
 }
-inline void SynchronousCommandArchive::set_allocated_command(::TSP::Reference* command) {
-  delete command_;
-  command_ = command;
-  if (command) {
-    set_has_command();
-  } else {
-    clear_has_command();
-  }
+inline void CommandReplaceGridValuesArchive::set_old_col_names(int index, const ::std::string& value) {
+  old_col_names_.Mutable(index)->assign(value);
 }
-
-// -------------------------------------------------------------------
-
-// CommandReplaceAllArchive
-
-// required .TSK.ReplaceAllChildCommandArchive super = 1;
-inline bool CommandReplaceAllArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+inline void CommandReplaceGridValuesArchive::set_old_col_names(int index, const char* value) {
+  old_col_names_.Mutable(index)->assign(value);
 }
-inline void CommandReplaceAllArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+inline void CommandReplaceGridValuesArchive::set_old_col_names(int index, const char* value, size_t size) {
+  old_col_names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void CommandReplaceAllArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline ::std::string* CommandReplaceGridValuesArchive::add_old_col_names() {
+  return old_col_names_.Add();
 }
-inline void CommandReplaceAllArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::ReplaceAllChildCommandArchive::Clear();
-  clear_has_super();
+inline void CommandReplaceGridValuesArchive::add_old_col_names(const ::std::string& value) {
+  old_col_names_.Add()->assign(value);
 }
-inline const ::TSK::ReplaceAllChildCommandArchive& CommandReplaceAllArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline void CommandReplaceGridValuesArchive::add_old_col_names(const char* value) {
+  old_col_names_.Add()->assign(value);
 }
-inline ::TSK::ReplaceAllChildCommandArchive* CommandReplaceAllArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::ReplaceAllChildCommandArchive;
-  return super_;
+inline void CommandReplaceGridValuesArchive::add_old_col_names(const char* value, size_t size) {
+  old_col_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::TSK::ReplaceAllChildCommandArchive* CommandReplaceAllArchive::release_super() {
-  clear_has_super();
-  ::TSK::ReplaceAllChildCommandArchive* temp = super_;
-  super_ = NULL;
-  return temp;
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandReplaceGridValuesArchive::old_col_names() const {
+  return old_col_names_;
 }
-inline void CommandReplaceAllArchive::set_allocated_super(::TSK::ReplaceAllChildCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandReplaceGridValuesArchive::mutable_old_col_names() {
+  return &old_col_names_;
 }
 
-// required .TSP.Reference info = 2;
-inline bool CommandReplaceAllArchive::has_info() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+// repeated string new_col_names = 9;
+inline int CommandReplaceGridValuesArchive::new_col_names_size() const {
+  return new_col_names_.size();
 }
-inline void CommandReplaceAllArchive::set_has_info() {
-  _has_bits_[0] |= 0x00000002u;
+inline void CommandReplaceGridValuesArchive::clear_new_col_names() {
+  new_col_names_.Clear();
 }
-inline void CommandReplaceAllArchive::clear_has_info() {
-  _has_bits_[0] &= ~0x00000002u;
+inline const ::std::string& CommandReplaceGridValuesArchive::new_col_names(int index) const {
+  return new_col_names_.Get(index);
 }
-inline void CommandReplaceAllArchive::clear_info() {
-  if (info_ != NULL) info_->::TSP::Reference::Clear();
-  clear_has_info();
+inline ::std::string* CommandReplaceGridValuesArchive::mutable_new_col_names(int index) {
+  return new_col_names_.Mutable(index);
 }
-inline const ::TSP::Reference& CommandReplaceAllArchive::info() const {
-  return info_ != NULL ? *info_ : *default_instance_->info_;
+inline void CommandReplaceGridValuesArchive::set_new_col_names(int index, const ::std::string& value) {
+  new_col_names_.Mutable(index)->assign(value);
 }
-inline ::TSP::Reference* CommandReplaceAllArchive::mutable_info() {
-  set_has_info();
-  if (info_ == NULL) info_ = new ::TSP::Reference;
-  return info_;
+inline void CommandReplaceGridValuesArchive::set_new_col_names(int index, const char* value) {
+  new_col_names_.Mutable(index)->assign(value);
 }
-inline ::TSP::Reference* CommandReplaceAllArchive::release_info() {
-  clear_has_info();
-  ::TSP::Reference* temp = info_;
-  info_ = NULL;
-  return temp;
+inline void CommandReplaceGridValuesArchive::set_new_col_names(int index, const char* value, size_t size) {
+  new_col_names_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void CommandReplaceAllArchive::set_allocated_info(::TSP::Reference* info) {
-  delete info_;
-  info_ = info;
-  if (info) {
-    set_has_info();
-  } else {
-    clear_has_info();
-  }
+inline ::std::string* CommandReplaceGridValuesArchive::add_new_col_names() {
+  return new_col_names_.Add();
 }
-
-// repeated .TSP.Reference commands = 3;
-inline int CommandReplaceAllArchive::commands_size() const {
-  return commands_.size();
+inline void CommandReplaceGridValuesArchive::add_new_col_names(const ::std::string& value) {
+  new_col_names_.Add()->assign(value);
 }
-inline void CommandReplaceAllArchive::clear_commands() {
-  commands_.Clear();
+inline void CommandReplaceGridValuesArchive::add_new_col_names(const char* value) {
+  new_col_names_.Add()->assign(value);
 }
-inline const ::TSP::Reference& CommandReplaceAllArchive::commands(int index) const {
-  return commands_.Get(index);
+inline void CommandReplaceGridValuesArchive::add_new_col_names(const char* value, size_t size) {
+  new_col_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::TSP::Reference* CommandReplaceAllArchive::mutable_commands(int index) {
-  return commands_.Mutable(index);
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandReplaceGridValuesArchive::new_col_names() const {
+  return new_col_names_;
 }
-inline ::TSP::Reference* CommandReplaceAllArchive::add_commands() {
-  return commands_.Add();
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandReplaceGridValuesArchive::mutable_new_col_names() {
+  return &new_col_names_;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
-CommandReplaceAllArchive::commands() const {
-  return commands_;
+
+// optional uint32 rows_to_add = 10;
+inline bool CommandReplaceGridValuesArchive::has_rows_to_add() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
-inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
-CommandReplaceAllArchive::mutable_commands() {
-  return &commands_;
+inline void CommandReplaceGridValuesArchive::set_has_rows_to_add() {
+  _has_bits_[0] |= 0x00000200u;
 }
-
-// -------------------------------------------------------------------
-
-// CommandChartApplyTheme
-
-// required .TSS.ApplyThemeChildCommandArchive super = 1;
-inline bool CommandChartApplyTheme::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+inline void CommandReplaceGridValuesArchive::clear_has_rows_to_add() {
+  _has_bits_[0] &= ~0x00000200u;
 }
-inline void CommandChartApplyTheme::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+inline void CommandReplaceGridValuesArchive::clear_rows_to_add() {
+  rows_to_add_ = 0u;
+  clear_has_rows_to_add();
 }
-inline void CommandChartApplyTheme::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::rows_to_add() const {
+  return rows_to_add_;
+}
+inline void CommandReplaceGridValuesArchive::set_rows_to_add(::google::protobuf::uint32 value) {
+  set_has_rows_to_add();
+  rows_to_add_ = value;
+}
+
+// optional uint32 cols_to_add = 11;
+inline bool CommandReplaceGridValuesArchive::has_cols_to_add() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
 }
-inline void CommandChartApplyTheme::clear_super() {
-  if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
-  clear_has_super();
+inline void CommandReplaceGridValuesArchive::set_has_cols_to_add() {
+  _has_bits_[0] |= 0x00000400u;
 }
-inline const ::TSS::ApplyThemeChildCommandArchive& CommandChartApplyTheme::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline void CommandReplaceGridValuesArchive::clear_has_cols_to_add() {
+  _has_bits_[0] &= ~0x00000400u;
 }
-inline ::TSS::ApplyThemeChildCommandArchive* CommandChartApplyTheme::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSS::ApplyThemeChildCommandArchive;
-  return super_;
+inline void CommandReplaceGridValuesArchive::clear_cols_to_add() {
+  cols_to_add_ = 0u;
+  clear_has_cols_to_add();
 }
-inline ::TSS::ApplyThemeChildCommandArchive* CommandChartApplyTheme::release_super() {
-  clear_has_super();
-  ::TSS::ApplyThemeChildCommandArchive* temp = super_;
-  super_ = NULL;
-  return temp;
+inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::cols_to_add() const {
+  return cols_to_add_;
 }
-inline void CommandChartApplyTheme::set_allocated_super(::TSS::ApplyThemeChildCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline void CommandReplaceGridValuesArchive::set_cols_to_add(::google::protobuf::uint32 value) {
+  set_has_cols_to_add();
+  cols_to_add_ = value;
 }
 
-// required .TSP.Reference info = 2;
-inline bool CommandChartApplyTheme::has_info() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+// repeated string row_ids = 12;
+inline int CommandReplaceGridValuesArchive::row_ids_size() const {
+  return row_ids_.size();
 }
-inline void CommandChartApplyTheme::set_has_info() {
-  _has_bits_[0] |= 0x00000002u;
+inline void CommandReplaceGridValuesArchive::clear_row_ids() {
+  row_ids_.Clear();
 }
-inline void CommandChartApplyTheme::clear_has_info() {
-  _has_bits_[0] &= ~0x00000002u;
+inline const ::std::string& CommandReplaceGridValuesArchive::row_ids(int index) const {
+  return row_ids_.Get(index);
 }
-inline void CommandChartApplyTheme::clear_info() {
-  if (info_ != NULL) info_->::TSP::Reference::Clear();
-  clear_has_info();
+inline ::std::string* CommandReplaceGridValuesArchive::mutable_row_ids(int index) {
+  return row_ids_.Mutable(index);
 }
-inline const ::TSP::Reference& CommandChartApplyTheme::info() const {
-  return info_ != NULL ? *info_ : *default_instance_->info_;
+inline void CommandReplaceGridValuesArchive::set_row_ids(int index, const ::std::string& value) {
+  row_ids_.Mutable(index)->assign(value);
 }
-inline ::TSP::Reference* CommandChartApplyTheme::mutable_info() {
-  set_has_info();
-  if (info_ == NULL) info_ = new ::TSP::Reference;
-  return info_;
+inline void CommandReplaceGridValuesArchive::set_row_ids(int index, const char* value) {
+  row_ids_.Mutable(index)->assign(value);
 }
-inline ::TSP::Reference* CommandChartApplyTheme::release_info() {
-  clear_has_info();
-  ::TSP::Reference* temp = info_;
-  info_ = NULL;
-  return temp;
+inline void CommandReplaceGridValuesArchive::set_row_ids(int index, const char* value, size_t size) {
+  row_ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline void CommandChartApplyTheme::set_allocated_info(::TSP::Reference* info) {
-  delete info_;
-  info_ = info;
-  if (info) {
-    set_has_info();
-  } else {
-    clear_has_info();
-  }
+inline ::std::string* CommandReplaceGridValuesArchive::add_row_ids() {
+  return row_ids_.Add();
 }
-
-// optional .TSP.Reference swap_command = 3;
-inline bool CommandChartApplyTheme::has_swap_command() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+inline void CommandReplaceGridValuesArchive::add_row_ids(const ::std::string& value) {
+  row_ids_.Add()->assign(value);
 }
-inline void CommandChartApplyTheme::set_has_swap_command() {
-  _has_bits_[0] |= 0x00000004u;
+inline void CommandReplaceGridValuesArchive::add_row_ids(const char* value) {
+  row_ids_.Add()->assign(value);
 }
-inline void CommandChartApplyTheme::clear_has_swap_command() {
-  _has_bits_[0] &= ~0x00000004u;
+inline void CommandReplaceGridValuesArchive::add_row_ids(const char* value, size_t size) {
+  row_ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandChartApplyTheme::clear_swap_command() {
-  if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
-  clear_has_swap_command();
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandReplaceGridValuesArchive::row_ids() const {
+  return row_ids_;
 }
-inline const ::TSP::Reference& CommandChartApplyTheme::swap_command() const {
-  return swap_command_ != NULL ? *swap_command_ : *default_instance_->swap_command_;
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandReplaceGridValuesArchive::mutable_row_ids() {
+  return &row_ids_;
 }
-inline ::TSP::Reference* CommandChartApplyTheme::mutable_swap_command() {
-  set_has_swap_command();
-  if (swap_command_ == NULL) swap_command_ = new ::TSP::Reference;
-  return swap_command_;
+
+// repeated string column_ids = 13;
+inline int CommandReplaceGridValuesArchive::column_ids_size() const {
+  return column_ids_.size();
 }
-inline ::TSP::Reference* CommandChartApplyTheme::release_swap_command() {
-  clear_has_swap_command();
-  ::TSP::Reference* temp = swap_command_;
-  swap_command_ = NULL;
-  return temp;
+inline void CommandReplaceGridValuesArchive::clear_column_ids() {
+  column_ids_.Clear();
 }
-inline void CommandChartApplyTheme::set_allocated_swap_command(::TSP::Reference* swap_command) {
-  delete swap_command_;
-  swap_command_ = swap_command;
-  if (swap_command) {
-    set_has_swap_command();
-  } else {
-    clear_has_swap_command();
-  }
+inline const ::std::string& CommandReplaceGridValuesArchive::column_ids(int index) const {
+  return column_ids_.Get(index);
 }
-
-// optional .TSP.Reference preset = 4;
-inline bool CommandChartApplyTheme::has_preset() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+inline ::std::string* CommandReplaceGridValuesArchive::mutable_column_ids(int index) {
+  return column_ids_.Mutable(index);
 }
-inline void CommandChartApplyTheme::set_has_preset() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandReplaceGridValuesArchive::set_column_ids(int index, const ::std::string& value) {
+  column_ids_.Mutable(index)->assign(value);
 }
-inline void CommandChartApplyTheme::clear_has_preset() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandReplaceGridValuesArchive::set_column_ids(int index, const char* value) {
+  column_ids_.Mutable(index)->assign(value);
 }
-inline void CommandChartApplyTheme::clear_preset() {
-  if (preset_ != NULL) preset_->::TSP::Reference::Clear();
-  clear_has_preset();
+inline void CommandReplaceGridValuesArchive::set_column_ids(int index, const char* value, size_t size) {
+  column_ids_.Mutable(index)->assign(
+    reinterpret_cast<const char*>(value), size);
 }
-inline const ::TSP::Reference& CommandChartApplyTheme::preset() const {
-  return preset_ != NULL ? *preset_ : *default_instance_->preset_;
+inline ::std::string* CommandReplaceGridValuesArchive::add_column_ids() {
+  return column_ids_.Add();
 }
-inline ::TSP::Reference* CommandChartApplyTheme::mutable_preset() {
-  set_has_preset();
-  if (preset_ == NULL) preset_ = new ::TSP::Reference;
-  return preset_;
+inline void CommandReplaceGridValuesArchive::add_column_ids(const ::std::string& value) {
+  column_ids_.Add()->assign(value);
 }
-inline ::TSP::Reference* CommandChartApplyTheme::release_preset() {
-  clear_has_preset();
-  ::TSP::Reference* temp = preset_;
-  preset_ = NULL;
-  return temp;
+inline void CommandReplaceGridValuesArchive::add_column_ids(const char* value) {
+  column_ids_.Add()->assign(value);
 }
-inline void CommandChartApplyTheme::set_allocated_preset(::TSP::Reference* preset) {
-  delete preset_;
-  preset_ = preset;
-  if (preset) {
-    set_has_preset();
-  } else {
-    clear_has_preset();
-  }
+inline void CommandReplaceGridValuesArchive::add_column_ids(const char* value, size_t size) {
+  column_ids_.Add()->assign(reinterpret_cast<const char*>(value), size);
+}
+inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
+CommandReplaceGridValuesArchive::column_ids() const {
+  return column_ids_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::std::string>*
+CommandReplaceGridValuesArchive::mutable_column_ids() {
+  return &column_ids_;
 }
 
 // -------------------------------------------------------------------
 
-// CommandChartApplyPreset
+// CommandReplaceThemePresetArchive_StyleAndIdentifierPair
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandChartApplyPreset::has_super() const {
+// required .TSP.Reference style = 1;
+inline bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::has_style() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandChartApplyPreset::set_has_super() {
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_has_style() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandChartApplyPreset::clear_has_super() {
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_has_style() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandChartApplyPreset::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
-  clear_has_super();
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_style() {
+  if (style_ != NULL) style_->::TSP::Reference::Clear();
+  clear_has_style();
 }
-inline const ::TSCH::ChartCommandArchive& CommandChartApplyPreset::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline const ::TSP::Reference& CommandReplaceThemePresetArchive_StyleAndIdentifierPair::style() const {
+  return style_ != NULL ? *style_ : *default_instance_->style_;
 }
-inline ::TSCH::ChartCommandArchive* CommandChartApplyPreset::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
-  return super_;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::mutable_style() {
+  set_has_style();
+  if (style_ == NULL) style_ = new ::TSP::Reference;
+  return style_;
 }
-inline ::TSCH::ChartCommandArchive* CommandChartApplyPreset::release_super() {
-  clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
-  super_ = NULL;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::release_style() {
+  clear_has_style();
+  ::TSP::Reference* temp = style_;
+  style_ = NULL;
   return temp;
 }
-inline void CommandChartApplyPreset::set_allocated_super(::TSCH::ChartCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_allocated_style(::TSP::Reference* style) {
+  delete style_;
+  style_ = style;
+  if (style) {
+    set_has_style();
   } else {
-    clear_has_super();
+    clear_has_style();
   }
 }
 
-// optional .TSP.Reference swap_command = 2;
-inline bool CommandChartApplyPreset::has_swap_command() const {
+// required string identifier = 2;
+inline bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::has_identifier() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandChartApplyPreset::set_has_swap_command() {
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_has_identifier() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandChartApplyPreset::clear_has_swap_command() {
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_has_identifier() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandChartApplyPreset::clear_swap_command() {
-  if (swap_command_ != NULL) swap_command_->::TSP::Reference::Clear();
-  clear_has_swap_command();
-}
-inline const ::TSP::Reference& CommandChartApplyPreset::swap_command() const {
-  return swap_command_ != NULL ? *swap_command_ : *default_instance_->swap_command_;
-}
-inline ::TSP::Reference* CommandChartApplyPreset::mutable_swap_command() {
-  set_has_swap_command();
-  if (swap_command_ == NULL) swap_command_ = new ::TSP::Reference;
-  return swap_command_;
-}
-inline ::TSP::Reference* CommandChartApplyPreset::release_swap_command() {
-  clear_has_swap_command();
-  ::TSP::Reference* temp = swap_command_;
-  swap_command_ = NULL;
-  return temp;
-}
-inline void CommandChartApplyPreset::set_allocated_swap_command(::TSP::Reference* swap_command) {
-  delete swap_command_;
-  swap_command_ = swap_command;
-  if (swap_command) {
-    set_has_swap_command();
-  } else {
-    clear_has_swap_command();
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_identifier() {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    identifier_->clear();
   }
+  clear_has_identifier();
 }
-
-// optional .TSP.Reference preset = 3;
-inline bool CommandChartApplyPreset::has_preset() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void CommandChartApplyPreset::set_has_preset() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void CommandChartApplyPreset::clear_has_preset() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void CommandChartApplyPreset::clear_preset() {
-  if (preset_ != NULL) preset_->::TSP::Reference::Clear();
-  clear_has_preset();
-}
-inline const ::TSP::Reference& CommandChartApplyPreset::preset() const {
-  return preset_ != NULL ? *preset_ : *default_instance_->preset_;
-}
-inline ::TSP::Reference* CommandChartApplyPreset::mutable_preset() {
-  set_has_preset();
-  if (preset_ == NULL) preset_ = new ::TSP::Reference;
-  return preset_;
-}
-inline ::TSP::Reference* CommandChartApplyPreset::release_preset() {
-  clear_has_preset();
-  ::TSP::Reference* temp = preset_;
-  preset_ = NULL;
-  return temp;
+inline const ::std::string& CommandReplaceThemePresetArchive_StyleAndIdentifierPair::identifier() const {
+  return *identifier_;
 }
-inline void CommandChartApplyPreset::set_allocated_preset(::TSP::Reference* preset) {
-  delete preset_;
-  preset_ = preset;
-  if (preset) {
-    set_has_preset();
-  } else {
-    clear_has_preset();
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_identifier(const ::std::string& value) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
   }
+  identifier_->assign(value);
 }
-
-// optional .TSCH.ApplyPresetBehavior behavior = 4 [default = remove_overrides];
-inline bool CommandChartApplyPreset::has_behavior() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void CommandChartApplyPreset::set_has_behavior() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_identifier(const char* value) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(value);
 }
-inline void CommandChartApplyPreset::clear_has_behavior() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_identifier(const char* value, size_t size) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandChartApplyPreset::clear_behavior() {
-  behavior_ = 1;
-  clear_has_behavior();
+inline ::std::string* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::mutable_identifier() {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  return identifier_;
 }
-inline ::TSCH::ApplyPresetBehavior CommandChartApplyPreset::behavior() const {
-  return static_cast< ::TSCH::ApplyPresetBehavior >(behavior_);
+inline ::std::string* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::release_identifier() {
+  clear_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = identifier_;
+    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
 }
-inline void CommandChartApplyPreset::set_behavior(::TSCH::ApplyPresetBehavior value) {
-  assert(::TSCH::ApplyPresetBehavior_IsValid(value));
-  set_has_behavior();
-  behavior_ = value;
+inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_allocated_identifier(::std::string* identifier) {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete identifier_;
+  }
+  if (identifier) {
+    set_has_identifier();
+    identifier_ = identifier;
+  } else {
+    clear_has_identifier();
+    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandCleanupGeometryArchive
+// CommandReplaceThemePresetArchive
 
-// required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandCleanupGeometryArchive::has_super() const {
+// required .TSK.CommandArchive super = 1;
+inline bool CommandReplaceThemePresetArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandCleanupGeometryArchive::set_has_super() {
+inline void CommandReplaceThemePresetArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandCleanupGeometryArchive::clear_has_super() {
+inline void CommandReplaceThemePresetArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandCleanupGeometryArchive::clear_super() {
-  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+inline void CommandReplaceThemePresetArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandCleanupGeometryArchive::super() const {
+inline const ::TSK::CommandArchive& CommandReplaceThemePresetArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandCleanupGeometryArchive::mutable_super() {
+inline ::TSK::CommandArchive* CommandReplaceThemePresetArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandCleanupGeometryArchive::release_super() {
+inline ::TSK::CommandArchive* CommandReplaceThemePresetArchive::release_super() {
   clear_has_super();
-  ::TSCH::ChartCommandArchive* temp = super_;
+  ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandCleanupGeometryArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandReplaceThemePresetArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -7567,153 +11587,200 @@ inline void CommandCleanupGeometryArchive::set_allocated_super(::TSCH::ChartComm
   }
 }
 
-// optional .TSP.Reference info_geometry_command = 2;
-inline bool CommandCleanupGeometryArchive::has_info_geometry_command() const {
+// required .TSP.Reference theme = 2;
+inline bool CommandReplaceThemePresetArchive::has_theme() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandCleanupGeometryArchive::set_has_info_geometry_command() {
+inline void CommandReplaceThemePresetArchive::set_has_theme() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandCleanupGeometryArchive::clear_has_info_geometry_command() {
+inline void CommandReplaceThemePresetArchive::clear_has_theme() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandCleanupGeometryArchive::clear_info_geometry_command() {
-  if (info_geometry_command_ != NULL) info_geometry_command_->::TSP::Reference::Clear();
-  clear_has_info_geometry_command();
+inline void CommandReplaceThemePresetArchive::clear_theme() {
+  if (theme_ != NULL) theme_->::TSP::Reference::Clear();
+  clear_has_theme();
 }
-inline const ::TSP::Reference& CommandCleanupGeometryArchive::info_geometry_command() const {
-  return info_geometry_command_ != NULL ? *info_geometry_command_ : *default_instance_->info_geometry_command_;
+inline const ::TSP::Reference& CommandReplaceThemePresetArchive::theme() const {
+  return theme_ != NULL ? *theme_ : *default_instance_->theme_;
 }
-inline ::TSP::Reference* CommandCleanupGeometryArchive::mutable_info_geometry_command() {
-  set_has_info_geometry_command();
-  if (info_geometry_command_ == NULL) info_geometry_command_ = new ::TSP::Reference;
-  return info_geometry_command_;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive::mutable_theme() {
+  set_has_theme();
+  if (theme_ == NULL) theme_ = new ::TSP::Reference;
+  return theme_;
 }
-inline ::TSP::Reference* CommandCleanupGeometryArchive::release_info_geometry_command() {
-  clear_has_info_geometry_command();
-  ::TSP::Reference* temp = info_geometry_command_;
-  info_geometry_command_ = NULL;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive::release_theme() {
+  clear_has_theme();
+  ::TSP::Reference* temp = theme_;
+  theme_ = NULL;
   return temp;
 }
-inline void CommandCleanupGeometryArchive::set_allocated_info_geometry_command(::TSP::Reference* info_geometry_command) {
-  delete info_geometry_command_;
-  info_geometry_command_ = info_geometry_command;
-  if (info_geometry_command) {
-    set_has_info_geometry_command();
+inline void CommandReplaceThemePresetArchive::set_allocated_theme(::TSP::Reference* theme) {
+  delete theme_;
+  theme_ = theme;
+  if (theme) {
+    set_has_theme();
   } else {
-    clear_has_info_geometry_command();
+    clear_has_theme();
   }
 }
 
-// optional .TSP.Reference anchor_attachment_command = 3;
-inline bool CommandCleanupGeometryArchive::has_anchor_attachment_command() const {
+// optional .TSP.Reference old_preset = 3;
+inline bool CommandReplaceThemePresetArchive::has_old_preset() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandCleanupGeometryArchive::set_has_anchor_attachment_command() {
+inline void CommandReplaceThemePresetArchive::set_has_old_preset() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandCleanupGeometryArchive::clear_has_anchor_attachment_command() {
+inline void CommandReplaceThemePresetArchive::clear_has_old_preset() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandCleanupGeometryArchive::clear_anchor_attachment_command() {
-  if (anchor_attachment_command_ != NULL) anchor_attachment_command_->::TSP::Reference::Clear();
-  clear_has_anchor_attachment_command();
+inline void CommandReplaceThemePresetArchive::clear_old_preset() {
+  if (old_preset_ != NULL) old_preset_->::TSP::Reference::Clear();
+  clear_has_old_preset();
 }
-inline const ::TSP::Reference& CommandCleanupGeometryArchive::anchor_attachment_command() const {
-  return anchor_attachment_command_ != NULL ? *anchor_attachment_command_ : *default_instance_->anchor_attachment_command_;
+inline const ::TSP::Reference& CommandReplaceThemePresetArchive::old_preset() const {
+  return old_preset_ != NULL ? *old_preset_ : *default_instance_->old_preset_;
 }
-inline ::TSP::Reference* CommandCleanupGeometryArchive::mutable_anchor_attachment_command() {
-  set_has_anchor_attachment_command();
-  if (anchor_attachment_command_ == NULL) anchor_attachment_command_ = new ::TSP::Reference;
-  return anchor_attachment_command_;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive::mutable_old_preset() {
+  set_has_old_preset();
+  if (old_preset_ == NULL) old_preset_ = new ::TSP::Reference;
+  return old_preset_;
 }
-inline ::TSP::Reference* CommandCleanupGeometryArchive::release_anchor_attachment_command() {
-  clear_has_anchor_attachment_command();
-  ::TSP::Reference* temp = anchor_attachment_command_;
-  anchor_attachment_command_ = NULL;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive::release_old_preset() {
+  clear_has_old_preset();
+  ::TSP::Reference* temp = old_preset_;
+  old_preset_ = NULL;
   return temp;
 }
-inline void CommandCleanupGeometryArchive::set_allocated_anchor_attachment_command(::TSP::Reference* anchor_attachment_command) {
-  delete anchor_attachment_command_;
-  anchor_attachment_command_ = anchor_attachment_command;
-  if (anchor_attachment_command) {
-    set_has_anchor_attachment_command();
+inline void CommandReplaceThemePresetArchive::set_allocated_old_preset(::TSP::Reference* old_preset) {
+  delete old_preset_;
+  old_preset_ = old_preset;
+  if (old_preset) {
+    set_has_old_preset();
   } else {
-    clear_has_anchor_attachment_command();
+    clear_has_old_preset();
   }
 }
 
-// optional .TSCH.RectArchive original_legend_rect = 4;
-inline bool CommandCleanupGeometryArchive::has_original_legend_rect() const {
+// optional .TSP.Reference new_preset = 4;
+inline bool CommandReplaceThemePresetArchive::has_new_preset() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandCleanupGeometryArchive::set_has_original_legend_rect() {
+inline void CommandReplaceThemePresetArchive::set_has_new_preset() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandCleanupGeometryArchive::clear_has_original_legend_rect() {
+inline void CommandReplaceThemePresetArchive::clear_has_new_preset() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandCleanupGeometryArchive::clear_original_legend_rect() {
-  if (original_legend_rect_ != NULL) original_legend_rect_->::TSCH::RectArchive::Clear();
-  clear_has_original_legend_rect();
+inline void CommandReplaceThemePresetArchive::clear_new_preset() {
+  if (new_preset_ != NULL) new_preset_->::TSP::Reference::Clear();
+  clear_has_new_preset();
 }
-inline const ::TSCH::RectArchive& CommandCleanupGeometryArchive::original_legend_rect() const {
-  return original_legend_rect_ != NULL ? *original_legend_rect_ : *default_instance_->original_legend_rect_;
+inline const ::TSP::Reference& CommandReplaceThemePresetArchive::new_preset() const {
+  return new_preset_ != NULL ? *new_preset_ : *default_instance_->new_preset_;
 }
-inline ::TSCH::RectArchive* CommandCleanupGeometryArchive::mutable_original_legend_rect() {
-  set_has_original_legend_rect();
-  if (original_legend_rect_ == NULL) original_legend_rect_ = new ::TSCH::RectArchive;
-  return original_legend_rect_;
+inline ::TSP::Reference* CommandReplaceThemePresetArchive::mutable_new_preset() {
+  set_has_new_preset();
+  if (new_preset_ == NULL) new_preset_ = new ::TSP::Reference;
+  return new_preset_;
+}
+inline ::TSP::Reference* CommandReplaceThemePresetArchive::release_new_preset() {
+  clear_has_new_preset();
+  ::TSP::Reference* temp = new_preset_;
+  new_preset_ = NULL;
+  return temp;
+}
+inline void CommandReplaceThemePresetArchive::set_allocated_new_preset(::TSP::Reference* new_preset) {
+  delete new_preset_;
+  new_preset_ = new_preset;
+  if (new_preset) {
+    set_has_new_preset();
+  } else {
+    clear_has_new_preset();
+  }
+}
+
+// repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
+inline int CommandReplaceThemePresetArchive::identifiers_size() const {
+  return identifiers_.size();
+}
+inline void CommandReplaceThemePresetArchive::clear_identifiers() {
+  identifiers_.Clear();
+}
+inline const ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair& CommandReplaceThemePresetArchive::identifiers(int index) const {
+  return identifiers_.Get(index);
+}
+inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive::mutable_identifiers(int index) {
+  return identifiers_.Mutable(index);
+}
+inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive::add_identifiers() {
+  return identifiers_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >&
+CommandReplaceThemePresetArchive::identifiers() const {
+  return identifiers_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >*
+CommandReplaceThemePresetArchive::mutable_identifiers() {
+  return &identifiers_;
+}
+
+// optional uint64 old_preset_index = 6;
+inline bool CommandReplaceThemePresetArchive::has_old_preset_index() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandReplaceThemePresetArchive::set_has_old_preset_index() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandReplaceThemePresetArchive::clear_has_old_preset_index() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandReplaceThemePresetArchive::clear_old_preset_index() {
+  old_preset_index_ = GOOGLE_ULONGLONG(0);
+  clear_has_old_preset_index();
 }
-inline ::TSCH::RectArchive* CommandCleanupGeometryArchive::release_original_legend_rect() {
-  clear_has_original_legend_rect();
-  ::TSCH::RectArchive* temp = original_legend_rect_;
-  original_legend_rect_ = NULL;
-  return temp;
+inline ::google::protobuf::uint64 CommandReplaceThemePresetArchive::old_preset_index() const {
+  return old_preset_index_;
 }
-inline void CommandCleanupGeometryArchive::set_allocated_original_legend_rect(::TSCH::RectArchive* original_legend_rect) {
-  delete original_legend_rect_;
-  original_legend_rect_ = original_legend_rect;
-  if (original_legend_rect) {
-    set_has_original_legend_rect();
-  } else {
-    clear_has_original_legend_rect();
-  }
+inline void CommandReplaceThemePresetArchive::set_old_preset_index(::google::protobuf::uint64 value) {
+  set_has_old_preset_index();
+  old_preset_index_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// ChartCommandArchive
+// CommandInvalidateWPCaches
 
 // required .TSK.CommandArchive super = 1;
-inline bool ChartCommandArchive::has_super() const {
+inline bool CommandInvalidateWPCaches::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void ChartCommandArchive::set_has_super() {
+inline void CommandInvalidateWPCaches::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void ChartCommandArchive::clear_has_super() {
+inline void CommandInvalidateWPCaches::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void ChartCommandArchive::clear_super() {
+inline void CommandInvalidateWPCaches::clear_super() {
   if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSK::CommandArchive& ChartCommandArchive::super() const {
+inline const ::TSK::CommandArchive& CommandInvalidateWPCaches::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSK::CommandArchive* ChartCommandArchive::mutable_super() {
+inline ::TSK::CommandArchive* CommandInvalidateWPCaches::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TSK::CommandArchive* ChartCommandArchive::release_super() {
+inline ::TSK::CommandArchive* CommandInvalidateWPCaches::release_super() {
   clear_has_super();
   ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void ChartCommandArchive::set_allocated_super(::TSK::CommandArchive* super) {
+inline void CommandInvalidateWPCaches::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -7723,128 +11790,39 @@ inline void ChartCommandArchive::set_allocated_super(::TSK::CommandArchive* supe
   }
 }
 
-// required .TSP.Reference info = 2;
-inline bool ChartCommandArchive::has_info() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void ChartCommandArchive::set_has_info() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void ChartCommandArchive::clear_has_info() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void ChartCommandArchive::clear_info() {
-  if (info_ != NULL) info_->::TSP::Reference::Clear();
-  clear_has_info();
-}
-inline const ::TSP::Reference& ChartCommandArchive::info() const {
-  return info_ != NULL ? *info_ : *default_instance_->info_;
-}
-inline ::TSP::Reference* ChartCommandArchive::mutable_info() {
-  set_has_info();
-  if (info_ == NULL) info_ = new ::TSP::Reference;
-  return info_;
-}
-inline ::TSP::Reference* ChartCommandArchive::release_info() {
-  clear_has_info();
-  ::TSP::Reference* temp = info_;
-  info_ = NULL;
-  return temp;
-}
-inline void ChartCommandArchive::set_allocated_info(::TSP::Reference* info) {
-  delete info_;
-  info_ = info;
-  if (info) {
-    set_has_info();
-  } else {
-    clear_has_info();
-  }
-}
-
-// optional bool original_dirty_state = 3;
-inline bool ChartCommandArchive::has_original_dirty_state() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void ChartCommandArchive::set_has_original_dirty_state() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void ChartCommandArchive::clear_has_original_dirty_state() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void ChartCommandArchive::clear_original_dirty_state() {
-  original_dirty_state_ = false;
-  clear_has_original_dirty_state();
-}
-inline bool ChartCommandArchive::original_dirty_state() const {
-  return original_dirty_state_;
-}
-inline void ChartCommandArchive::set_original_dirty_state(bool value) {
-  set_has_original_dirty_state();
-  original_dirty_state_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// CommandReplaceGridValuesArchive_ValueRow
-
-// repeated double value = 1;
-inline int CommandReplaceGridValuesArchive_ValueRow::value_size() const {
-  return value_.size();
-}
-inline void CommandReplaceGridValuesArchive_ValueRow::clear_value() {
-  value_.Clear();
-}
-inline double CommandReplaceGridValuesArchive_ValueRow::value(int index) const {
-  return value_.Get(index);
-}
-inline void CommandReplaceGridValuesArchive_ValueRow::set_value(int index, double value) {
-  value_.Set(index, value);
-}
-inline void CommandReplaceGridValuesArchive_ValueRow::add_value(double value) {
-  value_.Add(value);
-}
-inline const ::google::protobuf::RepeatedField< double >&
-CommandReplaceGridValuesArchive_ValueRow::value() const {
-  return value_;
-}
-inline ::google::protobuf::RepeatedField< double >*
-CommandReplaceGridValuesArchive_ValueRow::mutable_value() {
-  return &value_;
-}
-
 // -------------------------------------------------------------------
 
-// CommandReplaceGridValuesArchive
+// CommandSetGridColumnNameArchive
 
 // required .TSCH.ChartCommandArchive super = 1;
-inline bool CommandReplaceGridValuesArchive::has_super() const {
+inline bool CommandSetGridColumnNameArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandReplaceGridValuesArchive::set_has_super() {
+inline void CommandSetGridColumnNameArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandReplaceGridValuesArchive::clear_has_super() {
+inline void CommandSetGridColumnNameArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandReplaceGridValuesArchive::clear_super() {
+inline void CommandSetGridColumnNameArchive::clear_super() {
   if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSCH::ChartCommandArchive& CommandReplaceGridValuesArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandSetGridColumnNameArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandReplaceGridValuesArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetGridColumnNameArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSCH::ChartCommandArchive* CommandReplaceGridValuesArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandSetGridColumnNameArchive::release_super() {
   clear_has_super();
   ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandReplaceGridValuesArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+inline void CommandSetGridColumnNameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -7854,465 +11832,514 @@ inline void CommandReplaceGridValuesArchive::set_allocated_super(::TSCH::ChartCo
   }
 }
 
-// required uint32 rowindex = 2;
-inline bool CommandReplaceGridValuesArchive::has_rowindex() const {
+// required uint32 columnindex = 2;
+inline bool CommandSetGridColumnNameArchive::has_columnindex() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandReplaceGridValuesArchive::set_has_rowindex() {
+inline void CommandSetGridColumnNameArchive::set_has_columnindex() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandReplaceGridValuesArchive::clear_has_rowindex() {
+inline void CommandSetGridColumnNameArchive::clear_has_columnindex() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandReplaceGridValuesArchive::clear_rowindex() {
-  rowindex_ = 0u;
-  clear_has_rowindex();
-}
-inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::rowindex() const {
-  return rowindex_;
-}
-inline void CommandReplaceGridValuesArchive::set_rowindex(::google::protobuf::uint32 value) {
-  set_has_rowindex();
-  rowindex_ = value;
-}
-
-// required uint32 columnindex = 3;
-inline bool CommandReplaceGridValuesArchive::has_columnindex() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void CommandReplaceGridValuesArchive::set_has_columnindex() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void CommandReplaceGridValuesArchive::clear_has_columnindex() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void CommandReplaceGridValuesArchive::clear_columnindex() {
+inline void CommandSetGridColumnNameArchive::clear_columnindex() {
   columnindex_ = 0u;
   clear_has_columnindex();
 }
-inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::columnindex() const {
+inline ::google::protobuf::uint32 CommandSetGridColumnNameArchive::columnindex() const {
   return columnindex_;
 }
-inline void CommandReplaceGridValuesArchive::set_columnindex(::google::protobuf::uint32 value) {
+inline void CommandSetGridColumnNameArchive::set_columnindex(::google::protobuf::uint32 value) {
   set_has_columnindex();
   columnindex_ = value;
 }
 
-// repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow old_data_rows = 4;
-inline int CommandReplaceGridValuesArchive::old_data_rows_size() const {
-  return old_data_rows_.size();
-}
-inline void CommandReplaceGridValuesArchive::clear_old_data_rows() {
-  old_data_rows_.Clear();
-}
-inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& CommandReplaceGridValuesArchive::old_data_rows(int index) const {
-  return old_data_rows_.Get(index);
-}
-inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::mutable_old_data_rows(int index) {
-  return old_data_rows_.Mutable(index);
-}
-inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::add_old_data_rows() {
-  return old_data_rows_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
-CommandReplaceGridValuesArchive::old_data_rows() const {
-  return old_data_rows_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
-CommandReplaceGridValuesArchive::mutable_old_data_rows() {
-  return &old_data_rows_;
-}
-
-// repeated .TSCH.CommandReplaceGridValuesArchive.ValueRow new_data_rows = 5;
-inline int CommandReplaceGridValuesArchive::new_data_rows_size() const {
-  return new_data_rows_.size();
-}
-inline void CommandReplaceGridValuesArchive::clear_new_data_rows() {
-  new_data_rows_.Clear();
-}
-inline const ::TSCH::CommandReplaceGridValuesArchive_ValueRow& CommandReplaceGridValuesArchive::new_data_rows(int index) const {
-  return new_data_rows_.Get(index);
-}
-inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::mutable_new_data_rows(int index) {
-  return new_data_rows_.Mutable(index);
-}
-inline ::TSCH::CommandReplaceGridValuesArchive_ValueRow* CommandReplaceGridValuesArchive::add_new_data_rows() {
-  return new_data_rows_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >&
-CommandReplaceGridValuesArchive::new_data_rows() const {
-  return new_data_rows_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceGridValuesArchive_ValueRow >*
-CommandReplaceGridValuesArchive::mutable_new_data_rows() {
-  return &new_data_rows_;
-}
-
-// repeated string old_row_names = 6;
-inline int CommandReplaceGridValuesArchive::old_row_names_size() const {
-  return old_row_names_.size();
-}
-inline void CommandReplaceGridValuesArchive::clear_old_row_names() {
-  old_row_names_.Clear();
-}
-inline const ::std::string& CommandReplaceGridValuesArchive::old_row_names(int index) const {
-  return old_row_names_.Get(index);
-}
-inline ::std::string* CommandReplaceGridValuesArchive::mutable_old_row_names(int index) {
-  return old_row_names_.Mutable(index);
-}
-inline void CommandReplaceGridValuesArchive::set_old_row_names(int index, const ::std::string& value) {
-  old_row_names_.Mutable(index)->assign(value);
-}
-inline void CommandReplaceGridValuesArchive::set_old_row_names(int index, const char* value) {
-  old_row_names_.Mutable(index)->assign(value);
+// required string oldvalue = 3;
+inline bool CommandSetGridColumnNameArchive::has_oldvalue() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandReplaceGridValuesArchive::set_old_row_names(int index, const char* value, size_t size) {
-  old_row_names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline void CommandSetGridColumnNameArchive::set_has_oldvalue() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline ::std::string* CommandReplaceGridValuesArchive::add_old_row_names() {
-  return old_row_names_.Add();
+inline void CommandSetGridColumnNameArchive::clear_has_oldvalue() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandReplaceGridValuesArchive::add_old_row_names(const ::std::string& value) {
-  old_row_names_.Add()->assign(value);
+inline void CommandSetGridColumnNameArchive::clear_oldvalue() {
+  if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+    oldvalue_->clear();
+  }
+  clear_has_oldvalue();
 }
-inline void CommandReplaceGridValuesArchive::add_old_row_names(const char* value) {
-  old_row_names_.Add()->assign(value);
+inline const ::std::string& CommandSetGridColumnNameArchive::oldvalue() const {
+  return *oldvalue_;
 }
-inline void CommandReplaceGridValuesArchive::add_old_row_names(const char* value, size_t size) {
-  old_row_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandSetGridColumnNameArchive::set_oldvalue(const ::std::string& value) {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  oldvalue_->assign(value);
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandReplaceGridValuesArchive::old_row_names() const {
-  return old_row_names_;
+inline void CommandSetGridColumnNameArchive::set_oldvalue(const char* value) {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  oldvalue_->assign(value);
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandReplaceGridValuesArchive::mutable_old_row_names() {
-  return &old_row_names_;
+inline void CommandSetGridColumnNameArchive::set_oldvalue(const char* value, size_t size) {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  oldvalue_->assign(reinterpret_cast<const char*>(value), size);
 }
-
-// repeated string new_row_names = 7;
-inline int CommandReplaceGridValuesArchive::new_row_names_size() const {
-  return new_row_names_.size();
+inline ::std::string* CommandSetGridColumnNameArchive::mutable_oldvalue() {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  return oldvalue_;
 }
-inline void CommandReplaceGridValuesArchive::clear_new_row_names() {
-  new_row_names_.Clear();
+inline ::std::string* CommandSetGridColumnNameArchive::release_oldvalue() {
+  clear_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = oldvalue_;
+    oldvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
 }
-inline const ::std::string& CommandReplaceGridValuesArchive::new_row_names(int index) const {
-  return new_row_names_.Get(index);
+inline void CommandSetGridColumnNameArchive::set_allocated_oldvalue(::std::string* oldvalue) {
+  if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldvalue_;
+  }
+  if (oldvalue) {
+    set_has_oldvalue();
+    oldvalue_ = oldvalue;
+  } else {
+    clear_has_oldvalue();
+    oldvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
-inline ::std::string* CommandReplaceGridValuesArchive::mutable_new_row_names(int index) {
-  return new_row_names_.Mutable(index);
+
+// required string newvalue = 4;
+inline bool CommandSetGridColumnNameArchive::has_newvalue() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandReplaceGridValuesArchive::set_new_row_names(int index, const ::std::string& value) {
-  new_row_names_.Mutable(index)->assign(value);
+inline void CommandSetGridColumnNameArchive::set_has_newvalue() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandReplaceGridValuesArchive::set_new_row_names(int index, const char* value) {
-  new_row_names_.Mutable(index)->assign(value);
+inline void CommandSetGridColumnNameArchive::clear_has_newvalue() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandReplaceGridValuesArchive::set_new_row_names(int index, const char* value, size_t size) {
-  new_row_names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline void CommandSetGridColumnNameArchive::clear_newvalue() {
+  if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+    newvalue_->clear();
+  }
+  clear_has_newvalue();
 }
-inline ::std::string* CommandReplaceGridValuesArchive::add_new_row_names() {
-  return new_row_names_.Add();
+inline const ::std::string& CommandSetGridColumnNameArchive::newvalue() const {
+  return *newvalue_;
 }
-inline void CommandReplaceGridValuesArchive::add_new_row_names(const ::std::string& value) {
-  new_row_names_.Add()->assign(value);
+inline void CommandSetGridColumnNameArchive::set_newvalue(const ::std::string& value) {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  newvalue_->assign(value);
 }
-inline void CommandReplaceGridValuesArchive::add_new_row_names(const char* value) {
-  new_row_names_.Add()->assign(value);
+inline void CommandSetGridColumnNameArchive::set_newvalue(const char* value) {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  newvalue_->assign(value);
 }
-inline void CommandReplaceGridValuesArchive::add_new_row_names(const char* value, size_t size) {
-  new_row_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandSetGridColumnNameArchive::set_newvalue(const char* value, size_t size) {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  newvalue_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandReplaceGridValuesArchive::new_row_names() const {
-  return new_row_names_;
+inline ::std::string* CommandSetGridColumnNameArchive::mutable_newvalue() {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  return newvalue_;
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandReplaceGridValuesArchive::mutable_new_row_names() {
-  return &new_row_names_;
+inline ::std::string* CommandSetGridColumnNameArchive::release_newvalue() {
+  clear_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = newvalue_;
+    newvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
 }
-
-// repeated string old_col_names = 8;
-inline int CommandReplaceGridValuesArchive::old_col_names_size() const {
-  return old_col_names_.size();
+inline void CommandSetGridColumnNameArchive::set_allocated_newvalue(::std::string* newvalue) {
+  if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete newvalue_;
+  }
+  if (newvalue) {
+    set_has_newvalue();
+    newvalue_ = newvalue;
+  } else {
+    clear_has_newvalue();
+    newvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
-inline void CommandReplaceGridValuesArchive::clear_old_col_names() {
-  old_col_names_.Clear();
+
+// -------------------------------------------------------------------
+
+// CommandSetGridRowNameArchive
+
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandSetGridRowNameArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline const ::std::string& CommandReplaceGridValuesArchive::old_col_names(int index) const {
-  return old_col_names_.Get(index);
+inline void CommandSetGridRowNameArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline ::std::string* CommandReplaceGridValuesArchive::mutable_old_col_names(int index) {
-  return old_col_names_.Mutable(index);
+inline void CommandSetGridRowNameArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandReplaceGridValuesArchive::set_old_col_names(int index, const ::std::string& value) {
-  old_col_names_.Mutable(index)->assign(value);
+inline void CommandSetGridRowNameArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
+  clear_has_super();
 }
-inline void CommandReplaceGridValuesArchive::set_old_col_names(int index, const char* value) {
-  old_col_names_.Mutable(index)->assign(value);
+inline const ::TSCH::ChartCommandArchive& CommandSetGridRowNameArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline void CommandReplaceGridValuesArchive::set_old_col_names(int index, const char* value, size_t size) {
-  old_col_names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline ::TSCH::ChartCommandArchive* CommandSetGridRowNameArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
+  return super_;
 }
-inline ::std::string* CommandReplaceGridValuesArchive::add_old_col_names() {
-  return old_col_names_.Add();
+inline ::TSCH::ChartCommandArchive* CommandSetGridRowNameArchive::release_super() {
+  clear_has_super();
+  ::TSCH::ChartCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
 }
-inline void CommandReplaceGridValuesArchive::add_old_col_names(const ::std::string& value) {
-  old_col_names_.Add()->assign(value);
+inline void CommandSetGridRowNameArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
 }
-inline void CommandReplaceGridValuesArchive::add_old_col_names(const char* value) {
-  old_col_names_.Add()->assign(value);
+
+// required uint32 rowindex = 2;
+inline bool CommandSetGridRowNameArchive::has_rowindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandReplaceGridValuesArchive::add_old_col_names(const char* value, size_t size) {
-  old_col_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandSetGridRowNameArchive::set_has_rowindex() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandReplaceGridValuesArchive::old_col_names() const {
-  return old_col_names_;
+inline void CommandSetGridRowNameArchive::clear_has_rowindex() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandReplaceGridValuesArchive::mutable_old_col_names() {
-  return &old_col_names_;
+inline void CommandSetGridRowNameArchive::clear_rowindex() {
+  rowindex_ = 0u;
+  clear_has_rowindex();
 }
-
-// repeated string new_col_names = 9;
-inline int CommandReplaceGridValuesArchive::new_col_names_size() const {
-  return new_col_names_.size();
+inline ::google::protobuf::uint32 CommandSetGridRowNameArchive::rowindex() const {
+  return rowindex_;
 }
-inline void CommandReplaceGridValuesArchive::clear_new_col_names() {
-  new_col_names_.Clear();
+inline void CommandSetGridRowNameArchive::set_rowindex(::google::protobuf::uint32 value) {
+  set_has_rowindex();
+  rowindex_ = value;
 }
-inline const ::std::string& CommandReplaceGridValuesArchive::new_col_names(int index) const {
-  return new_col_names_.Get(index);
+
+// required string oldvalue = 3;
+inline bool CommandSetGridRowNameArchive::has_oldvalue() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline ::std::string* CommandReplaceGridValuesArchive::mutable_new_col_names(int index) {
-  return new_col_names_.Mutable(index);
+inline void CommandSetGridRowNameArchive::set_has_oldvalue() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandReplaceGridValuesArchive::set_new_col_names(int index, const ::std::string& value) {
-  new_col_names_.Mutable(index)->assign(value);
+inline void CommandSetGridRowNameArchive::clear_has_oldvalue() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandReplaceGridValuesArchive::set_new_col_names(int index, const char* value) {
-  new_col_names_.Mutable(index)->assign(value);
+inline void CommandSetGridRowNameArchive::clear_oldvalue() {
+  if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+    oldvalue_->clear();
+  }
+  clear_has_oldvalue();
 }
-inline void CommandReplaceGridValuesArchive::set_new_col_names(int index, const char* value, size_t size) {
-  new_col_names_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
+inline const ::std::string& CommandSetGridRowNameArchive::oldvalue() const {
+  return *oldvalue_;
 }
-inline ::std::string* CommandReplaceGridValuesArchive::add_new_col_names() {
-  return new_col_names_.Add();
+inline void CommandSetGridRowNameArchive::set_oldvalue(const ::std::string& value) {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  oldvalue_->assign(value);
 }
-inline void CommandReplaceGridValuesArchive::add_new_col_names(const ::std::string& value) {
-  new_col_names_.Add()->assign(value);
+inline void CommandSetGridRowNameArchive::set_oldvalue(const char* value) {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  oldvalue_->assign(value);
 }
-inline void CommandReplaceGridValuesArchive::add_new_col_names(const char* value) {
-  new_col_names_.Add()->assign(value);
+inline void CommandSetGridRowNameArchive::set_oldvalue(const char* value, size_t size) {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  oldvalue_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandReplaceGridValuesArchive::add_new_col_names(const char* value, size_t size) {
-  new_col_names_.Add()->assign(reinterpret_cast<const char*>(value), size);
+inline ::std::string* CommandSetGridRowNameArchive::mutable_oldvalue() {
+  set_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    oldvalue_ = new ::std::string;
+  }
+  return oldvalue_;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::std::string>&
-CommandReplaceGridValuesArchive::new_col_names() const {
-  return new_col_names_;
+inline ::std::string* CommandSetGridRowNameArchive::release_oldvalue() {
+  clear_has_oldvalue();
+  if (oldvalue_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = oldvalue_;
+    oldvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
 }
-inline ::google::protobuf::RepeatedPtrField< ::std::string>*
-CommandReplaceGridValuesArchive::mutable_new_col_names() {
-  return &new_col_names_;
+inline void CommandSetGridRowNameArchive::set_allocated_oldvalue(::std::string* oldvalue) {
+  if (oldvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete oldvalue_;
+  }
+  if (oldvalue) {
+    set_has_oldvalue();
+    oldvalue_ = oldvalue;
+  } else {
+    clear_has_oldvalue();
+    oldvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
 
-// optional uint32 rows_to_add = 10;
-inline bool CommandReplaceGridValuesArchive::has_rows_to_add() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
-}
-inline void CommandReplaceGridValuesArchive::set_has_rows_to_add() {
-  _has_bits_[0] |= 0x00000200u;
+// required string newvalue = 4;
+inline bool CommandSetGridRowNameArchive::has_newvalue() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandReplaceGridValuesArchive::clear_has_rows_to_add() {
-  _has_bits_[0] &= ~0x00000200u;
+inline void CommandSetGridRowNameArchive::set_has_newvalue() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandReplaceGridValuesArchive::clear_rows_to_add() {
-  rows_to_add_ = 0u;
-  clear_has_rows_to_add();
+inline void CommandSetGridRowNameArchive::clear_has_newvalue() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::rows_to_add() const {
-  return rows_to_add_;
+inline void CommandSetGridRowNameArchive::clear_newvalue() {
+  if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+    newvalue_->clear();
+  }
+  clear_has_newvalue();
 }
-inline void CommandReplaceGridValuesArchive::set_rows_to_add(::google::protobuf::uint32 value) {
-  set_has_rows_to_add();
-  rows_to_add_ = value;
+inline const ::std::string& CommandSetGridRowNameArchive::newvalue() const {
+  return *newvalue_;
 }
-
-// optional uint32 cols_to_add = 11;
-inline bool CommandReplaceGridValuesArchive::has_cols_to_add() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+inline void CommandSetGridRowNameArchive::set_newvalue(const ::std::string& value) {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  newvalue_->assign(value);
 }
-inline void CommandReplaceGridValuesArchive::set_has_cols_to_add() {
-  _has_bits_[0] |= 0x00000400u;
+inline void CommandSetGridRowNameArchive::set_newvalue(const char* value) {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  newvalue_->assign(value);
 }
-inline void CommandReplaceGridValuesArchive::clear_has_cols_to_add() {
-  _has_bits_[0] &= ~0x00000400u;
+inline void CommandSetGridRowNameArchive::set_newvalue(const char* value, size_t size) {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  newvalue_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline void CommandReplaceGridValuesArchive::clear_cols_to_add() {
-  cols_to_add_ = 0u;
-  clear_has_cols_to_add();
+inline ::std::string* CommandSetGridRowNameArchive::mutable_newvalue() {
+  set_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    newvalue_ = new ::std::string;
+  }
+  return newvalue_;
 }
-inline ::google::protobuf::uint32 CommandReplaceGridValuesArchive::cols_to_add() const {
-  return cols_to_add_;
+inline ::std::string* CommandSetGridRowNameArchive::release_newvalue() {
+  clear_has_newvalue();
+  if (newvalue_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = newvalue_;
+    newvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
 }
-inline void CommandReplaceGridValuesArchive::set_cols_to_add(::google::protobuf::uint32 value) {
-  set_has_cols_to_add();
-  cols_to_add_ = value;
+inline void CommandSetGridRowNameArchive::set_allocated_newvalue(::std::string* newvalue) {
+  if (newvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete newvalue_;
+  }
+  if (newvalue) {
+    set_has_newvalue();
+    newvalue_ = newvalue;
+  } else {
+    clear_has_newvalue();
+    newvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandReplaceThemePresetArchive_StyleAndIdentifierPair
+// CommandReplaceCustomFormatArchive_FormatObjectMutation
 
-// required .TSP.Reference style = 1;
-inline bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::has_style() const {
+// optional .TSCH.StyleOwnerType style_owner_type = 1;
+inline bool CommandReplaceCustomFormatArchive_FormatObjectMutation::has_style_owner_type() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_has_style() {
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_has_style_owner_type() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_has_style() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_style() {
-  if (style_ != NULL) style_->::TSP::Reference::Clear();
-  clear_has_style();
-}
-inline const ::TSP::Reference& CommandReplaceThemePresetArchive_StyleAndIdentifierPair::style() const {
-  return style_ != NULL ? *style_ : *default_instance_->style_;
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_has_style_owner_type() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::mutable_style() {
-  set_has_style();
-  if (style_ == NULL) style_ = new ::TSP::Reference;
-  return style_;
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_style_owner_type() {
+  style_owner_type_ = 1;
+  clear_has_style_owner_type();
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::release_style() {
-  clear_has_style();
-  ::TSP::Reference* temp = style_;
-  style_ = NULL;
-  return temp;
+inline ::TSCH::StyleOwnerType CommandReplaceCustomFormatArchive_FormatObjectMutation::style_owner_type() const {
+  return static_cast< ::TSCH::StyleOwnerType >(style_owner_type_);
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_allocated_style(::TSP::Reference* style) {
-  delete style_;
-  style_ = style;
-  if (style) {
-    set_has_style();
-  } else {
-    clear_has_style();
-  }
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_style_owner_type(::TSCH::StyleOwnerType value) {
+  assert(::TSCH::StyleOwnerType_IsValid(value));
+  set_has_style_owner_type();
+  style_owner_type_ = value;
 }
 
-// required string identifier = 2;
-inline bool CommandReplaceThemePresetArchive_StyleAndIdentifierPair::has_identifier() const {
+// optional uint32 style_owner_index = 2;
+inline bool CommandReplaceCustomFormatArchive_FormatObjectMutation::has_style_owner_index() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_has_identifier() {
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_has_style_owner_index() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_has_identifier() {
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_has_style_owner_index() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::clear_identifier() {
-  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
-    identifier_->clear();
-  }
-  clear_has_identifier();
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_style_owner_index() {
+  style_owner_index_ = 0u;
+  clear_has_style_owner_index();
 }
-inline const ::std::string& CommandReplaceThemePresetArchive_StyleAndIdentifierPair::identifier() const {
-  return *identifier_;
+inline ::google::protobuf::uint32 CommandReplaceCustomFormatArchive_FormatObjectMutation::style_owner_index() const {
+  return style_owner_index_;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_identifier(const ::std::string& value) {
-  set_has_identifier();
-  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
-    identifier_ = new ::std::string;
-  }
-  identifier_->assign(value);
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_style_owner_index(::google::protobuf::uint32 value) {
+  set_has_style_owner_index();
+  style_owner_index_ = value;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_identifier(const char* value) {
-  set_has_identifier();
-  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
-    identifier_ = new ::std::string;
-  }
-  identifier_->assign(value);
+
+// optional uint32 format_object_property = 3;
+inline bool CommandReplaceCustomFormatArchive_FormatObjectMutation::has_format_object_property() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_identifier(const char* value, size_t size) {
-  set_has_identifier();
-  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
-    identifier_ = new ::std::string;
-  }
-  identifier_->assign(reinterpret_cast<const char*>(value), size);
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_has_format_object_property() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline ::std::string* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::mutable_identifier() {
-  set_has_identifier();
-  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
-    identifier_ = new ::std::string;
-  }
-  return identifier_;
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_has_format_object_property() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::std::string* CommandReplaceThemePresetArchive_StyleAndIdentifierPair::release_identifier() {
-  clear_has_identifier();
-  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = identifier_;
-    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_format_object_property() {
+  format_object_property_ = 0u;
+  clear_has_format_object_property();
 }
-inline void CommandReplaceThemePresetArchive_StyleAndIdentifierPair::set_allocated_identifier(::std::string* identifier) {
-  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
-    delete identifier_;
-  }
-  if (identifier) {
-    set_has_identifier();
-    identifier_ = identifier;
+inline ::google::protobuf::uint32 CommandReplaceCustomFormatArchive_FormatObjectMutation::format_object_property() const {
+  return format_object_property_;
+}
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_format_object_property(::google::protobuf::uint32 value) {
+  set_has_format_object_property();
+  format_object_property_ = value;
+}
+
+// optional .TSK.FormatStructArchive format_object = 4;
+inline bool CommandReplaceCustomFormatArchive_FormatObjectMutation::has_format_object() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_has_format_object() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_has_format_object() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::clear_format_object() {
+  if (format_object_ != NULL) format_object_->::TSK::FormatStructArchive::Clear();
+  clear_has_format_object();
+}
+inline const ::TSK::FormatStructArchive& CommandReplaceCustomFormatArchive_FormatObjectMutation::format_object() const {
+  return format_object_ != NULL ? *format_object_ : *default_instance_->format_object_;
+}
+inline ::TSK::FormatStructArchive* CommandReplaceCustomFormatArchive_FormatObjectMutation::mutable_format_object() {
+  set_has_format_object();
+  if (format_object_ == NULL) format_object_ = new ::TSK::FormatStructArchive;
+  return format_object_;
+}
+inline ::TSK::FormatStructArchive* CommandReplaceCustomFormatArchive_FormatObjectMutation::release_format_object() {
+  clear_has_format_object();
+  ::TSK::FormatStructArchive* temp = format_object_;
+  format_object_ = NULL;
+  return temp;
+}
+inline void CommandReplaceCustomFormatArchive_FormatObjectMutation::set_allocated_format_object(::TSK::FormatStructArchive* format_object) {
+  delete format_object_;
+  format_object_ = format_object;
+  if (format_object) {
+    set_has_format_object();
   } else {
-    clear_has_identifier();
-    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_format_object();
   }
 }
 
 // -------------------------------------------------------------------
 
-// CommandReplaceThemePresetArchive
+// CommandReplaceCustomFormatArchive
 
-// required .TSK.CommandArchive super = 1;
-inline bool CommandReplaceThemePresetArchive::has_super() const {
+// required .TSCH.ChartCommandArchive super = 1;
+inline bool CommandReplaceCustomFormatArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandReplaceThemePresetArchive::set_has_super() {
+inline void CommandReplaceCustomFormatArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandReplaceThemePresetArchive::clear_has_super() {
+inline void CommandReplaceCustomFormatArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandReplaceThemePresetArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+inline void CommandReplaceCustomFormatArchive::clear_super() {
+  if (super_ != NULL) super_->::TSCH::ChartCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSK::CommandArchive& CommandReplaceThemePresetArchive::super() const {
+inline const ::TSCH::ChartCommandArchive& CommandReplaceCustomFormatArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSK::CommandArchive* CommandReplaceThemePresetArchive::mutable_super() {
+inline ::TSCH::ChartCommandArchive* CommandReplaceCustomFormatArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  if (super_ == NULL) super_ = new ::TSCH::ChartCommandArchive;
   return super_;
 }
-inline ::TSK::CommandArchive* CommandReplaceThemePresetArchive::release_super() {
+inline ::TSCH::ChartCommandArchive* CommandReplaceCustomFormatArchive::release_super() {
   clear_has_super();
-  ::TSK::CommandArchive* temp = super_;
+  ::TSCH::ChartCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandReplaceThemePresetArchive::set_allocated_super(::TSK::CommandArchive* super) {
+inline void CommandReplaceCustomFormatArchive::set_allocated_super(::TSCH::ChartCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -8322,207 +12349,168 @@ inline void CommandReplaceThemePresetArchive::set_allocated_super(::TSK::Command
   }
 }
 
-// required .TSP.Reference theme = 2;
-inline bool CommandReplaceThemePresetArchive::has_theme() const {
+// optional .TSP.Reference rollback_cmd = 2;
+inline bool CommandReplaceCustomFormatArchive::has_rollback_cmd() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandReplaceThemePresetArchive::set_has_theme() {
+inline void CommandReplaceCustomFormatArchive::set_has_rollback_cmd() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandReplaceThemePresetArchive::clear_has_theme() {
+inline void CommandReplaceCustomFormatArchive::clear_has_rollback_cmd() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandReplaceThemePresetArchive::clear_theme() {
-  if (theme_ != NULL) theme_->::TSP::Reference::Clear();
-  clear_has_theme();
+inline void CommandReplaceCustomFormatArchive::clear_rollback_cmd() {
+  if (rollback_cmd_ != NULL) rollback_cmd_->::TSP::Reference::Clear();
+  clear_has_rollback_cmd();
 }
-inline const ::TSP::Reference& CommandReplaceThemePresetArchive::theme() const {
-  return theme_ != NULL ? *theme_ : *default_instance_->theme_;
+inline const ::TSP::Reference& CommandReplaceCustomFormatArchive::rollback_cmd() const {
+  return rollback_cmd_ != NULL ? *rollback_cmd_ : *default_instance_->rollback_cmd_;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive::mutable_theme() {
-  set_has_theme();
-  if (theme_ == NULL) theme_ = new ::TSP::Reference;
-  return theme_;
+inline ::TSP::Reference* CommandReplaceCustomFormatArchive::mutable_rollback_cmd() {
+  set_has_rollback_cmd();
+  if (rollback_cmd_ == NULL) rollback_cmd_ = new ::TSP::Reference;
+  return rollback_cmd_;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive::release_theme() {
-  clear_has_theme();
-  ::TSP::Reference* temp = theme_;
-  theme_ = NULL;
+inline ::TSP::Reference* CommandReplaceCustomFormatArchive::release_rollback_cmd() {
+  clear_has_rollback_cmd();
+  ::TSP::Reference* temp = rollback_cmd_;
+  rollback_cmd_ = NULL;
   return temp;
 }
-inline void CommandReplaceThemePresetArchive::set_allocated_theme(::TSP::Reference* theme) {
-  delete theme_;
-  theme_ = theme;
-  if (theme) {
-    set_has_theme();
+inline void CommandReplaceCustomFormatArchive::set_allocated_rollback_cmd(::TSP::Reference* rollback_cmd) {
+  delete rollback_cmd_;
+  rollback_cmd_ = rollback_cmd;
+  if (rollback_cmd) {
+    set_has_rollback_cmd();
   } else {
-    clear_has_theme();
+    clear_has_rollback_cmd();
   }
 }
 
-// optional .TSP.Reference old_preset = 3;
-inline bool CommandReplaceThemePresetArchive::has_old_preset() const {
+// optional .TSK.FormatStructArchive old_format_object = 3;
+inline bool CommandReplaceCustomFormatArchive::has_old_format_object() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandReplaceThemePresetArchive::set_has_old_preset() {
+inline void CommandReplaceCustomFormatArchive::set_has_old_format_object() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandReplaceThemePresetArchive::clear_has_old_preset() {
+inline void CommandReplaceCustomFormatArchive::clear_has_old_format_object() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandReplaceThemePresetArchive::clear_old_preset() {
-  if (old_preset_ != NULL) old_preset_->::TSP::Reference::Clear();
-  clear_has_old_preset();
+inline void CommandReplaceCustomFormatArchive::clear_old_format_object() {
+  if (old_format_object_ != NULL) old_format_object_->::TSK::FormatStructArchive::Clear();
+  clear_has_old_format_object();
 }
-inline const ::TSP::Reference& CommandReplaceThemePresetArchive::old_preset() const {
-  return old_preset_ != NULL ? *old_preset_ : *default_instance_->old_preset_;
+inline const ::TSK::FormatStructArchive& CommandReplaceCustomFormatArchive::old_format_object() const {
+  return old_format_object_ != NULL ? *old_format_object_ : *default_instance_->old_format_object_;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive::mutable_old_preset() {
-  set_has_old_preset();
-  if (old_preset_ == NULL) old_preset_ = new ::TSP::Reference;
-  return old_preset_;
+inline ::TSK::FormatStructArchive* CommandReplaceCustomFormatArchive::mutable_old_format_object() {
+  set_has_old_format_object();
+  if (old_format_object_ == NULL) old_format_object_ = new ::TSK::FormatStructArchive;
+  return old_format_object_;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive::release_old_preset() {
-  clear_has_old_preset();
-  ::TSP::Reference* temp = old_preset_;
-  old_preset_ = NULL;
+inline ::TSK::FormatStructArchive* CommandReplaceCustomFormatArchive::release_old_format_object() {
+  clear_has_old_format_object();
+  ::TSK::FormatStructArchive* temp = old_format_object_;
+  old_format_object_ = NULL;
   return temp;
 }
-inline void CommandReplaceThemePresetArchive::set_allocated_old_preset(::TSP::Reference* old_preset) {
-  delete old_preset_;
-  old_preset_ = old_preset;
-  if (old_preset) {
-    set_has_old_preset();
+inline void CommandReplaceCustomFormatArchive::set_allocated_old_format_object(::TSK::FormatStructArchive* old_format_object) {
+  delete old_format_object_;
+  old_format_object_ = old_format_object;
+  if (old_format_object) {
+    set_has_old_format_object();
   } else {
-    clear_has_old_preset();
+    clear_has_old_format_object();
   }
 }
 
-// optional .TSP.Reference new_preset = 4;
-inline bool CommandReplaceThemePresetArchive::has_new_preset() const {
+// optional .TSK.FormatStructArchive new_format_object = 4;
+inline bool CommandReplaceCustomFormatArchive::has_new_format_object() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandReplaceThemePresetArchive::set_has_new_preset() {
+inline void CommandReplaceCustomFormatArchive::set_has_new_format_object() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandReplaceThemePresetArchive::clear_has_new_preset() {
+inline void CommandReplaceCustomFormatArchive::clear_has_new_format_object() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandReplaceThemePresetArchive::clear_new_preset() {
-  if (new_preset_ != NULL) new_preset_->::TSP::Reference::Clear();
-  clear_has_new_preset();
+inline void CommandReplaceCustomFormatArchive::clear_new_format_object() {
+  if (new_format_object_ != NULL) new_format_object_->::TSK::FormatStructArchive::Clear();
+  clear_has_new_format_object();
 }
-inline const ::TSP::Reference& CommandReplaceThemePresetArchive::new_preset() const {
-  return new_preset_ != NULL ? *new_preset_ : *default_instance_->new_preset_;
+inline const ::TSK::FormatStructArchive& CommandReplaceCustomFormatArchive::new_format_object() const {
+  return new_format_object_ != NULL ? *new_format_object_ : *default_instance_->new_format_object_;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive::mutable_new_preset() {
-  set_has_new_preset();
-  if (new_preset_ == NULL) new_preset_ = new ::TSP::Reference;
-  return new_preset_;
+inline ::TSK::FormatStructArchive* CommandReplaceCustomFormatArchive::mutable_new_format_object() {
+  set_has_new_format_object();
+  if (new_format_object_ == NULL) new_format_object_ = new ::TSK::FormatStructArchive;
+  return new_format_object_;
 }
-inline ::TSP::Reference* CommandReplaceThemePresetArchive::release_new_preset() {
-  clear_has_new_preset();
-  ::TSP::Reference* temp = new_preset_;
-  new_preset_ = NULL;
+inline ::TSK::FormatStructArchive* CommandReplaceCustomFormatArchive::release_new_format_object() {
+  clear_has_new_format_object();
+  ::TSK::FormatStructArchive* temp = new_format_object_;
+  new_format_object_ = NULL;
   return temp;
 }
-inline void CommandReplaceThemePresetArchive::set_allocated_new_preset(::TSP::Reference* new_preset) {
-  delete new_preset_;
-  new_preset_ = new_preset;
-  if (new_preset) {
-    set_has_new_preset();
+inline void CommandReplaceCustomFormatArchive::set_allocated_new_format_object(::TSK::FormatStructArchive* new_format_object) {
+  delete new_format_object_;
+  new_format_object_ = new_format_object;
+  if (new_format_object) {
+    set_has_new_format_object();
   } else {
-    clear_has_new_preset();
+    clear_has_new_format_object();
   }
 }
 
-// repeated .TSCH.CommandReplaceThemePresetArchive.StyleAndIdentifierPair identifiers = 5;
-inline int CommandReplaceThemePresetArchive::identifiers_size() const {
-  return identifiers_.size();
-}
-inline void CommandReplaceThemePresetArchive::clear_identifiers() {
-  identifiers_.Clear();
-}
-inline const ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair& CommandReplaceThemePresetArchive::identifiers(int index) const {
-  return identifiers_.Get(index);
+// repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation forward_mutations = 5;
+inline int CommandReplaceCustomFormatArchive::forward_mutations_size() const {
+  return forward_mutations_.size();
 }
-inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive::mutable_identifiers(int index) {
-  return identifiers_.Mutable(index);
-}
-inline ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair* CommandReplaceThemePresetArchive::add_identifiers() {
-  return identifiers_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >&
-CommandReplaceThemePresetArchive::identifiers() const {
-  return identifiers_;
-}
-inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceThemePresetArchive_StyleAndIdentifierPair >*
-CommandReplaceThemePresetArchive::mutable_identifiers() {
-  return &identifiers_;
-}
-
-// optional uint64 old_preset_index = 6;
-inline bool CommandReplaceThemePresetArchive::has_old_preset_index() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+inline void CommandReplaceCustomFormatArchive::clear_forward_mutations() {
+  forward_mutations_.Clear();
 }
-inline void CommandReplaceThemePresetArchive::set_has_old_preset_index() {
-  _has_bits_[0] |= 0x00000020u;
+inline const ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation& CommandReplaceCustomFormatArchive::forward_mutations(int index) const {
+  return forward_mutations_.Get(index);
 }
-inline void CommandReplaceThemePresetArchive::clear_has_old_preset_index() {
-  _has_bits_[0] &= ~0x00000020u;
+inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* CommandReplaceCustomFormatArchive::mutable_forward_mutations(int index) {
+  return forward_mutations_.Mutable(index);
 }
-inline void CommandReplaceThemePresetArchive::clear_old_preset_index() {
-  old_preset_index_ = GOOGLE_ULONGLONG(0);
-  clear_has_old_preset_index();
+inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* CommandReplaceCustomFormatArchive::add_forward_mutations() {
+  return forward_mutations_.Add();
 }
-inline ::google::protobuf::uint64 CommandReplaceThemePresetArchive::old_preset_index() const {
-  return old_preset_index_;
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >&
+CommandReplaceCustomFormatArchive::forward_mutations() const {
+  return forward_mutations_;
 }
-inline void CommandReplaceThemePresetArchive::set_old_preset_index(::google::protobuf::uint64 value) {
-  set_has_old_preset_index();
-  old_preset_index_ = value;
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >*
+CommandReplaceCustomFormatArchive::mutable_forward_mutations() {
+  return &forward_mutations_;
 }
 
-// -------------------------------------------------------------------
-
-// CommandInvalidateWPCaches
-
-// required .TSK.CommandArchive super = 1;
-inline bool CommandInvalidateWPCaches::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void CommandInvalidateWPCaches::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+// repeated .TSCH.CommandReplaceCustomFormatArchive.FormatObjectMutation reverse_mutations = 6;
+inline int CommandReplaceCustomFormatArchive::reverse_mutations_size() const {
+  return reverse_mutations_.size();
 }
-inline void CommandInvalidateWPCaches::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void CommandReplaceCustomFormatArchive::clear_reverse_mutations() {
+  reverse_mutations_.Clear();
 }
-inline void CommandInvalidateWPCaches::clear_super() {
-  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
-  clear_has_super();
+inline const ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation& CommandReplaceCustomFormatArchive::reverse_mutations(int index) const {
+  return reverse_mutations_.Get(index);
 }
-inline const ::TSK::CommandArchive& CommandInvalidateWPCaches::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* CommandReplaceCustomFormatArchive::mutable_reverse_mutations(int index) {
+  return reverse_mutations_.Mutable(index);
 }
-inline ::TSK::CommandArchive* CommandInvalidateWPCaches::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
-  return super_;
+inline ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation* CommandReplaceCustomFormatArchive::add_reverse_mutations() {
+  return reverse_mutations_.Add();
 }
-inline ::TSK::CommandArchive* CommandInvalidateWPCaches::release_super() {
-  clear_has_super();
-  ::TSK::CommandArchive* temp = super_;
-  super_ = NULL;
-  return temp;
+inline const ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >&
+CommandReplaceCustomFormatArchive::reverse_mutations() const {
+  return reverse_mutations_;
 }
-inline void CommandInvalidateWPCaches::set_allocated_super(::TSK::CommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
+inline ::google::protobuf::RepeatedPtrField< ::TSCH::CommandReplaceCustomFormatArchive_FormatObjectMutation >*
+CommandReplaceCustomFormatArchive::mutable_reverse_mutations() {
+  return &reverse_mutations_;
 }
 
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.cc
index 63058d7..3febfe6 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.cc
@@ -158,6 +158,7 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* MovieArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   MovieArchive_reflection_ = NULL;
+const ::google::protobuf::EnumDescriptor* MovieArchive_MovieLoopOption_descriptor_ = NULL;
 const ::google::protobuf::Descriptor* ExteriorTextWrapArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ExteriorTextWrapArchive_reflection_ = NULL;
@@ -974,7 +975,7 @@ void protobuf_AssignDesc_TSDArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MaskArchive));
   MovieArchive_descriptor_ = file->message_type(39);
-  static const int MovieArchive_offsets_[22] = {
+  static const int MovieArchive_offsets_[24] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, moviedata_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, importedauxiliarymoviedata_),
@@ -982,13 +983,15 @@ void protobuf_AssignDesc_TSDArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, starttime_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, endtime_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, postertime_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, loopoption_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, loopoptionasinteger_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, loop_option_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, volume_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, autoplay_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, audioonly_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, streaming_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, posterimagedata_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, audioonlyimagedata_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, poster_image_generated_with_alpha_support_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, playablestate_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, flags_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MovieArchive, database_moviedata_),
@@ -1009,6 +1012,7 @@ void protobuf_AssignDesc_TSDArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MovieArchive));
+  MovieArchive_MovieLoopOption_descriptor_ = MovieArchive_descriptor_->enum_type(0);
   ExteriorTextWrapArchive_descriptor_ = file->message_type(40);
   static const int ExteriorTextWrapArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExteriorTextWrapArchive, type_),
@@ -1547,44 +1551,49 @@ void protobuf_AddDesc_TSDArchives_2eproto() {
     "abase_originalData\030\010 \001(\0132\016.TSP.Reference"
     "\"^\n\013MaskArchive\022#\n\005super\030\001 \002(\0132\024.TSD.Dra"
     "wableArchive\022*\n\npathsource\030\002 \001(\0132\026.TSD.P"
-    "athSourceArchive\"\270\005\n\014MovieArchive\022#\n\005sup"
+    "athSourceArchive\"\361\006\n\014MovieArchive\022#\n\005sup"
     "er\030\001 \002(\0132\024.TSD.DrawableArchive\022%\n\tmovieD"
     "ata\030\016 \001(\0132\022.TSP.DataReference\0226\n\032importe"
     "dAuxiliaryMovieData\030\026 \001(\0132\022.TSP.DataRefe"
     "rence\022\026\n\016movieRemoteURL\030\021 \001(\t\022\021\n\tstartTi"
     "me\030\003 \001(\002\022\017\n\007endTime\030\004 \001(\002\022\022\n\nposterTime\030"
-    "\005 \001(\002\022\022\n\nloopOption\030\006 \001(\r\022\016\n\006volume\030\007 \001("
-    "\002\022\024\n\010autoPlay\030\010 \001(\010B\002\030\001\022\021\n\taudioOnly\030\t \001"
-    "(\010\022\021\n\tstreaming\030\022 \001(\010\022+\n\017posterImageData"
-    "\030\017 \001(\0132\022.TSP.DataReference\022.\n\022audioOnlyI"
-    "mageData\030\020 \001(\0132\022.TSP.DataReference\022\025\n\rpl"
-    "ayableState\030\014 \001(\r\022\r\n\005flags\030\r \001(\r\022*\n\022data"
-    "base_movieData\030\002 \001(\0132\016.TSP.Reference\0220\n\030"
-    "database_posterImageData\030\n \001(\0132\016.TSP.Ref"
-    "erence\0223\n\033database_audioOnlyImageData\030\013 "
-    "\001(\0132\016.TSP.Reference\022\035\n\005style\030\023 \001(\0132\016.TSP"
-    ".Reference\022\037\n\014originalSize\030\024 \001(\0132\t.TSP.S"
-    "ize\022\036\n\013naturalSize\030\025 \001(\0132\t.TSP.Size\"\213\001\n\027"
-    "ExteriorTextWrapArchive\022\014\n\004type\030\001 \001(\r\022\021\n"
-    "\tdirection\030\002 \001(\r\022\020\n\010fit_type\030\003 \001(\r\022\016\n\006ma"
-    "rgin\030\004 \001(\002\022\027\n\017alpha_threshold\030\005 \001(\002\022\024\n\014i"
-    "s_html_wrap\030\006 \001(\010\"\263\001\n\014GuideArchive\022)\n\004ty"
-    "pe\030\001 \001(\0162\033.TSD.GuideArchive.GuideType\022\016\n"
-    "\006offset\030\002 \001(\002\022\r\n\005start\030\003 \001(\002\022\013\n\003end\030\004 \001("
-    "\002\022\017\n\007dynamic\030\005 \001(\010\022\020\n\010infinite\030\006 \001(\010\")\n\t"
-    "GuideType\022\016\n\nHorizontal\020\000\022\014\n\010Vertical\020\001\""
-    "\214\001\n\027UserDefinedGuideArchive\0224\n\004type\030\001 \001("
-    "\0162&.TSD.UserDefinedGuideArchive.GuideTyp"
-    "e\022\020\n\010position\030\002 \001(\002\")\n\tGuideType\022\016\n\nHori"
-    "zontal\020\000\022\014\n\010Vertical\020\001\"N\n\023GuideStorageAr"
-    "chive\0227\n\021userDefinedGuides\030\001 \003(\0132\034.TSD.U"
-    "serDefinedGuideArchive\"Z\n\026CanvasSelectio"
-    "nArchive\022\035\n\005infos\030\001 \003(\0132\016.TSP.Reference\022"
-    "!\n\tcontainer\030\002 \001(\0132\016.TSP.Reference\"g\n\025Co"
-    "mmentStorageArchive\022\014\n\004text\030\001 \001(\t\022 \n\rcre"
-    "ation_date\030\002 \001(\0132\t.TSP.Date\022\036\n\006author\030\003 "
-    "\001(\0132\016.TSP.Reference*7\n\010LineJoin\022\r\n\tMiter"
-    "Join\020\000\022\r\n\tRoundJoin\020\001\022\r\n\tBevelJoin\020\002", 9756);
+    "\005 \001(\002\022\037\n\023loopOptionAsInteger\030\006 \001(\rB\002\030\001\022<"
+    "\n\013loop_option\030\030 \001(\0162!.TSD.MovieArchive.M"
+    "ovieLoopOption:\004None\022\016\n\006volume\030\007 \001(\002\022\024\n\010"
+    "autoPlay\030\010 \001(\010B\002\030\001\022\021\n\taudioOnly\030\t \001(\010\022\021\n"
+    "\tstreaming\030\022 \001(\010\022+\n\017posterImageData\030\017 \001("
+    "\0132\022.TSP.DataReference\022.\n\022audioOnlyImageD"
+    "ata\030\020 \001(\0132\022.TSP.DataReference\0221\n)poster_"
+    "image_generated_with_alpha_support\030\027 \001(\010"
+    "\022\025\n\rplayableState\030\014 \001(\r\022\r\n\005flags\030\r \001(\r\022*"
+    "\n\022database_movieData\030\002 \001(\0132\016.TSP.Referen"
+    "ce\0220\n\030database_posterImageData\030\n \001(\0132\016.T"
+    "SP.Reference\0223\n\033database_audioOnlyImageD"
+    "ata\030\013 \001(\0132\016.TSP.Reference\022\035\n\005style\030\023 \001(\013"
+    "2\016.TSP.Reference\022\037\n\014originalSize\030\024 \001(\0132\t"
+    ".TSP.Size\022\036\n\013naturalSize\030\025 \001(\0132\t.TSP.Siz"
+    "e\"9\n\017MovieLoopOption\022\010\n\004None\020\000\022\n\n\006Repeat"
+    "\020\001\022\020\n\014BackAndForth\020\002\"\213\001\n\027ExteriorTextWra"
+    "pArchive\022\014\n\004type\030\001 \001(\r\022\021\n\tdirection\030\002 \001("
+    "\r\022\020\n\010fit_type\030\003 \001(\r\022\016\n\006margin\030\004 \001(\002\022\027\n\017a"
+    "lpha_threshold\030\005 \001(\002\022\024\n\014is_html_wrap\030\006 \001"
+    "(\010\"\263\001\n\014GuideArchive\022)\n\004type\030\001 \001(\0162\033.TSD."
+    "GuideArchive.GuideType\022\016\n\006offset\030\002 \001(\002\022\r"
+    "\n\005start\030\003 \001(\002\022\013\n\003end\030\004 \001(\002\022\017\n\007dynamic\030\005 "
+    "\001(\010\022\020\n\010infinite\030\006 \001(\010\")\n\tGuideType\022\016\n\nHo"
+    "rizontal\020\000\022\014\n\010Vertical\020\001\"\214\001\n\027UserDefined"
+    "GuideArchive\0224\n\004type\030\001 \001(\0162&.TSD.UserDef"
+    "inedGuideArchive.GuideType\022\020\n\010position\030\002"
+    " \001(\002\")\n\tGuideType\022\016\n\nHorizontal\020\000\022\014\n\010Ver"
+    "tical\020\001\"N\n\023GuideStorageArchive\0227\n\021userDe"
+    "finedGuides\030\001 \003(\0132\034.TSD.UserDefinedGuide"
+    "Archive\"Z\n\026CanvasSelectionArchive\022\035\n\005inf"
+    "os\030\001 \003(\0132\016.TSP.Reference\022!\n\tcontainer\030\002 "
+    "\001(\0132\016.TSP.Reference\"g\n\025CommentStorageArc"
+    "hive\022\014\n\004text\030\001 \001(\t\022 \n\rcreation_date\030\002 \001("
+    "\0132\t.TSP.Date\022\036\n\006author\030\003 \001(\0132\016.TSP.Refer"
+    "ence*7\n\010LineJoin\022\r\n\tMiterJoin\020\000\022\r\n\tRound"
+    "Join\020\001\022\r\n\tBevelJoin\020\002", 9941);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSDArchives.proto", &protobuf_RegisterTypes);
   EdgeInsetsArchive::default_instance_ = new EdgeInsetsArchive();
@@ -17367,6 +17376,29 @@ ::google::protobuf::Metadata MaskArchive::GetMetadata() const {
 
 // ===================================================================
 
+const ::google::protobuf::EnumDescriptor* MovieArchive_MovieLoopOption_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return MovieArchive_MovieLoopOption_descriptor_;
+}
+bool MovieArchive_MovieLoopOption_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+    case 2:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#ifndef _MSC_VER
+const MovieArchive_MovieLoopOption MovieArchive::None;
+const MovieArchive_MovieLoopOption MovieArchive::Repeat;
+const MovieArchive_MovieLoopOption MovieArchive::BackAndForth;
+const MovieArchive_MovieLoopOption MovieArchive::MovieLoopOption_MIN;
+const MovieArchive_MovieLoopOption MovieArchive::MovieLoopOption_MAX;
+const int MovieArchive::MovieLoopOption_ARRAYSIZE;
+#endif  // _MSC_VER
 #ifndef _MSC_VER
 const int MovieArchive::kSuperFieldNumber;
 const int MovieArchive::kMovieDataFieldNumber;
@@ -17375,6 +17407,7 @@ const int MovieArchive::kMovieRemoteURLFieldNumber;
 const int MovieArchive::kStartTimeFieldNumber;
 const int MovieArchive::kEndTimeFieldNumber;
 const int MovieArchive::kPosterTimeFieldNumber;
+const int MovieArchive::kLoopOptionAsIntegerFieldNumber;
 const int MovieArchive::kLoopOptionFieldNumber;
 const int MovieArchive::kVolumeFieldNumber;
 const int MovieArchive::kAutoPlayFieldNumber;
@@ -17382,6 +17415,7 @@ const int MovieArchive::kAudioOnlyFieldNumber;
 const int MovieArchive::kStreamingFieldNumber;
 const int MovieArchive::kPosterImageDataFieldNumber;
 const int MovieArchive::kAudioOnlyImageDataFieldNumber;
+const int MovieArchive::kPosterImageGeneratedWithAlphaSupportFieldNumber;
 const int MovieArchive::kPlayableStateFieldNumber;
 const int MovieArchive::kFlagsFieldNumber;
 const int MovieArchive::kDatabaseMovieDataFieldNumber;
@@ -17426,13 +17460,15 @@ void MovieArchive::SharedCtor() {
   starttime_ = 0;
   endtime_ = 0;
   postertime_ = 0;
-  loopoption_ = 0u;
+  loopoptionasinteger_ = 0u;
+  loop_option_ = 0;
   volume_ = 0;
   autoplay_ = false;
   audioonly_ = false;
   streaming_ = false;
   posterimagedata_ = NULL;
   audioonlyimagedata_ = NULL;
+  poster_image_generated_with_alpha_support_ = false;
   playablestate_ = 0u;
   flags_ = 0u;
   database_moviedata_ = NULL;
@@ -17507,9 +17543,10 @@ void MovieArchive::Clear() {
     starttime_ = 0;
     endtime_ = 0;
     postertime_ = 0;
-    loopoption_ = 0u;
+    loopoptionasinteger_ = 0u;
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    loop_option_ = 0;
     volume_ = 0;
     autoplay_ = false;
     audioonly_ = false;
@@ -17520,10 +17557,11 @@ void MovieArchive::Clear() {
     if (has_audioonlyimagedata()) {
       if (audioonlyimagedata_ != NULL) audioonlyimagedata_->::TSP::DataReference::Clear();
     }
-    playablestate_ = 0u;
-    flags_ = 0u;
+    poster_image_generated_with_alpha_support_ = false;
   }
   if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    playablestate_ = 0u;
+    flags_ = 0u;
     if (has_database_moviedata()) {
       if (database_moviedata_ != NULL) database_moviedata_->::TSP::Reference::Clear();
     }
@@ -17624,19 +17662,19 @@ bool MovieArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(48)) goto parse_loopOption;
+        if (input->ExpectTag(48)) goto parse_loopOptionAsInteger;
         break;
       }
 
-      // optional uint32 loopOption = 6;
+      // optional uint32 loopOptionAsInteger = 6 [deprecated = true];
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_loopOption:
+         parse_loopOptionAsInteger:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &loopoption_)));
-          set_has_loopoption();
+                 input, &loopoptionasinteger_)));
+          set_has_loopoptionasinteger();
         } else {
           goto handle_uninterpreted;
         }
@@ -17879,6 +17917,43 @@ bool MovieArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(184)) goto parse_poster_image_generated_with_alpha_support;
+        break;
+      }
+
+      // optional bool poster_image_generated_with_alpha_support = 23;
+      case 23: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_poster_image_generated_with_alpha_support:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &poster_image_generated_with_alpha_support_)));
+          set_has_poster_image_generated_with_alpha_support();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(192)) goto parse_loop_option;
+        break;
+      }
+
+      // optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
+      case 24: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_loop_option:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TSD::MovieArchive_MovieLoopOption_IsValid(value)) {
+            set_loop_option(static_cast< ::TSD::MovieArchive_MovieLoopOption >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(24, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -17928,9 +18003,9 @@ void MovieArchive::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteFloat(5, this->postertime(), output);
   }
 
-  // optional uint32 loopOption = 6;
-  if (has_loopoption()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->loopoption(), output);
+  // optional uint32 loopOptionAsInteger = 6 [deprecated = true];
+  if (has_loopoptionasinteger()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->loopoptionasinteger(), output);
   }
 
   // optional float volume = 7;
@@ -18026,6 +18101,17 @@ void MovieArchive::SerializeWithCachedSizes(
       22, this->importedauxiliarymoviedata(), output);
   }
 
+  // optional bool poster_image_generated_with_alpha_support = 23;
+  if (has_poster_image_generated_with_alpha_support()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(23, this->poster_image_generated_with_alpha_support(), output);
+  }
+
+  // optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
+  if (has_loop_option()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      24, this->loop_option(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -18063,9 +18149,9 @@ ::google::protobuf::uint8* MovieArchive::SerializeWithCachedSizesToArray(
     target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(5, this->postertime(), target);
   }
 
-  // optional uint32 loopOption = 6;
-  if (has_loopoption()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(6, this->loopoption(), target);
+  // optional uint32 loopOptionAsInteger = 6 [deprecated = true];
+  if (has_loopoptionasinteger()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(6, this->loopoptionasinteger(), target);
   }
 
   // optional float volume = 7;
@@ -18171,6 +18257,17 @@ ::google::protobuf::uint8* MovieArchive::SerializeWithCachedSizesToArray(
         22, this->importedauxiliarymoviedata(), target);
   }
 
+  // optional bool poster_image_generated_with_alpha_support = 23;
+  if (has_poster_image_generated_with_alpha_support()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(23, this->poster_image_generated_with_alpha_support(), target);
+  }
+
+  // optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
+  if (has_loop_option()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      24, this->loop_option(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -18225,15 +18322,21 @@ int MovieArchive::ByteSize() const {
       total_size += 1 + 4;
     }
 
-    // optional uint32 loopOption = 6;
-    if (has_loopoption()) {
+    // optional uint32 loopOptionAsInteger = 6 [deprecated = true];
+    if (has_loopoptionasinteger()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->loopoption());
+          this->loopoptionasinteger());
     }
 
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
+    if (has_loop_option()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->loop_option());
+    }
+
     // optional float volume = 7;
     if (has_volume()) {
       total_size += 1 + 4;
@@ -18268,6 +18371,13 @@ int MovieArchive::ByteSize() const {
           this->audioonlyimagedata());
     }
 
+    // optional bool poster_image_generated_with_alpha_support = 23;
+    if (has_poster_image_generated_with_alpha_support()) {
+      total_size += 2 + 1;
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional uint32 playableState = 12;
     if (has_playablestate()) {
       total_size += 1 +
@@ -18282,8 +18392,6 @@ int MovieArchive::ByteSize() const {
           this->flags());
     }
 
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     // optional .TSP.Reference database_movieData = 2;
     if (has_database_moviedata()) {
       total_size += 1 +
@@ -18374,11 +18482,14 @@ void MovieArchive::MergeFrom(const MovieArchive& from) {
     if (from.has_postertime()) {
       set_postertime(from.postertime());
     }
-    if (from.has_loopoption()) {
-      set_loopoption(from.loopoption());
+    if (from.has_loopoptionasinteger()) {
+      set_loopoptionasinteger(from.loopoptionasinteger());
     }
   }
   if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_loop_option()) {
+      set_loop_option(from.loop_option());
+    }
     if (from.has_volume()) {
       set_volume(from.volume());
     }
@@ -18397,14 +18508,17 @@ void MovieArchive::MergeFrom(const MovieArchive& from) {
     if (from.has_audioonlyimagedata()) {
       mutable_audioonlyimagedata()->::TSP::DataReference::MergeFrom(from.audioonlyimagedata());
     }
+    if (from.has_poster_image_generated_with_alpha_support()) {
+      set_poster_image_generated_with_alpha_support(from.poster_image_generated_with_alpha_support());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_playablestate()) {
       set_playablestate(from.playablestate());
     }
     if (from.has_flags()) {
       set_flags(from.flags());
     }
-  }
-  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
     if (from.has_database_moviedata()) {
       mutable_database_moviedata()->::TSP::Reference::MergeFrom(from.database_moviedata());
     }
@@ -18487,13 +18601,15 @@ void MovieArchive::Swap(MovieArchive* other) {
     std::swap(starttime_, other->starttime_);
     std::swap(endtime_, other->endtime_);
     std::swap(postertime_, other->postertime_);
-    std::swap(loopoption_, other->loopoption_);
+    std::swap(loopoptionasinteger_, other->loopoptionasinteger_);
+    std::swap(loop_option_, other->loop_option_);
     std::swap(volume_, other->volume_);
     std::swap(autoplay_, other->autoplay_);
     std::swap(audioonly_, other->audioonly_);
     std::swap(streaming_, other->streaming_);
     std::swap(posterimagedata_, other->posterimagedata_);
     std::swap(audioonlyimagedata_, other->audioonlyimagedata_);
+    std::swap(poster_image_generated_with_alpha_support_, other->poster_image_generated_with_alpha_support_);
     std::swap(playablestate_, other->playablestate_);
     std::swap(flags_, other->flags_);
     std::swap(database_moviedata_, other->database_moviedata_);
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.h
index 5a322ee..4d6c80a 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSDArchives.pb.h
@@ -269,6 +269,26 @@ inline bool ShadowArchive_ShadowType_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<ShadowArchive_ShadowType>(
     ShadowArchive_ShadowType_descriptor(), name, value);
 }
+enum MovieArchive_MovieLoopOption {
+  MovieArchive_MovieLoopOption_None = 0,
+  MovieArchive_MovieLoopOption_Repeat = 1,
+  MovieArchive_MovieLoopOption_BackAndForth = 2
+};
+bool MovieArchive_MovieLoopOption_IsValid(int value);
+const MovieArchive_MovieLoopOption MovieArchive_MovieLoopOption_MovieLoopOption_MIN = MovieArchive_MovieLoopOption_None;
+const MovieArchive_MovieLoopOption MovieArchive_MovieLoopOption_MovieLoopOption_MAX = MovieArchive_MovieLoopOption_BackAndForth;
+const int MovieArchive_MovieLoopOption_MovieLoopOption_ARRAYSIZE = MovieArchive_MovieLoopOption_MovieLoopOption_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* MovieArchive_MovieLoopOption_descriptor();
+inline const ::std::string& MovieArchive_MovieLoopOption_Name(MovieArchive_MovieLoopOption value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    MovieArchive_MovieLoopOption_descriptor(), value);
+}
+inline bool MovieArchive_MovieLoopOption_Parse(
+    const ::std::string& name, MovieArchive_MovieLoopOption* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<MovieArchive_MovieLoopOption>(
+    MovieArchive_MovieLoopOption_descriptor(), name, value);
+}
 enum GuideArchive_GuideType {
   GuideArchive_GuideType_Horizontal = 0,
   GuideArchive_GuideType_Vertical = 1
@@ -5781,6 +5801,31 @@ class MovieArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef MovieArchive_MovieLoopOption MovieLoopOption;
+  static const MovieLoopOption None = MovieArchive_MovieLoopOption_None;
+  static const MovieLoopOption Repeat = MovieArchive_MovieLoopOption_Repeat;
+  static const MovieLoopOption BackAndForth = MovieArchive_MovieLoopOption_BackAndForth;
+  static inline bool MovieLoopOption_IsValid(int value) {
+    return MovieArchive_MovieLoopOption_IsValid(value);
+  }
+  static const MovieLoopOption MovieLoopOption_MIN =
+    MovieArchive_MovieLoopOption_MovieLoopOption_MIN;
+  static const MovieLoopOption MovieLoopOption_MAX =
+    MovieArchive_MovieLoopOption_MovieLoopOption_MAX;
+  static const int MovieLoopOption_ARRAYSIZE =
+    MovieArchive_MovieLoopOption_MovieLoopOption_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  MovieLoopOption_descriptor() {
+    return MovieArchive_MovieLoopOption_descriptor();
+  }
+  static inline const ::std::string& MovieLoopOption_Name(MovieLoopOption value) {
+    return MovieArchive_MovieLoopOption_Name(value);
+  }
+  static inline bool MovieLoopOption_Parse(const ::std::string& name,
+      MovieLoopOption* value) {
+    return MovieArchive_MovieLoopOption_Parse(name, value);
+  }
+
   // accessors -------------------------------------------------------
 
   // required .TSD.DrawableArchive super = 1;
@@ -5843,12 +5888,19 @@ class MovieArchive : public ::google::protobuf::Message {
   inline float postertime() const;
   inline void set_postertime(float value);
 
-  // optional uint32 loopOption = 6;
-  inline bool has_loopoption() const;
-  inline void clear_loopoption();
-  static const int kLoopOptionFieldNumber = 6;
-  inline ::google::protobuf::uint32 loopoption() const;
-  inline void set_loopoption(::google::protobuf::uint32 value);
+  // optional uint32 loopOptionAsInteger = 6 [deprecated = true];
+  inline bool has_loopoptionasinteger() const PROTOBUF_DEPRECATED;
+  inline void clear_loopoptionasinteger() PROTOBUF_DEPRECATED;
+  static const int kLoopOptionAsIntegerFieldNumber = 6;
+  inline ::google::protobuf::uint32 loopoptionasinteger() const PROTOBUF_DEPRECATED;
+  inline void set_loopoptionasinteger(::google::protobuf::uint32 value) PROTOBUF_DEPRECATED;
+
+  // optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
+  inline bool has_loop_option() const;
+  inline void clear_loop_option();
+  static const int kLoopOptionFieldNumber = 24;
+  inline ::TSD::MovieArchive_MovieLoopOption loop_option() const;
+  inline void set_loop_option(::TSD::MovieArchive_MovieLoopOption value);
 
   // optional float volume = 7;
   inline bool has_volume() const;
@@ -5896,6 +5948,13 @@ class MovieArchive : public ::google::protobuf::Message {
   inline ::TSP::DataReference* release_audioonlyimagedata();
   inline void set_allocated_audioonlyimagedata(::TSP::DataReference* audioonlyimagedata);
 
+  // optional bool poster_image_generated_with_alpha_support = 23;
+  inline bool has_poster_image_generated_with_alpha_support() const;
+  inline void clear_poster_image_generated_with_alpha_support();
+  static const int kPosterImageGeneratedWithAlphaSupportFieldNumber = 23;
+  inline bool poster_image_generated_with_alpha_support() const;
+  inline void set_poster_image_generated_with_alpha_support(bool value);
+
   // optional uint32 playableState = 12;
   inline bool has_playablestate() const;
   inline void clear_playablestate();
@@ -5980,8 +6039,10 @@ class MovieArchive : public ::google::protobuf::Message {
   inline void clear_has_endtime();
   inline void set_has_postertime();
   inline void clear_has_postertime();
-  inline void set_has_loopoption();
-  inline void clear_has_loopoption();
+  inline void set_has_loopoptionasinteger();
+  inline void clear_has_loopoptionasinteger();
+  inline void set_has_loop_option();
+  inline void clear_has_loop_option();
   inline void set_has_volume();
   inline void clear_has_volume();
   inline void set_has_autoplay();
@@ -5994,6 +6055,8 @@ class MovieArchive : public ::google::protobuf::Message {
   inline void clear_has_posterimagedata();
   inline void set_has_audioonlyimagedata();
   inline void clear_has_audioonlyimagedata();
+  inline void set_has_poster_image_generated_with_alpha_support();
+  inline void clear_has_poster_image_generated_with_alpha_support();
   inline void set_has_playablestate();
   inline void clear_has_playablestate();
   inline void set_has_flags();
@@ -6020,24 +6083,26 @@ class MovieArchive : public ::google::protobuf::Message {
   float starttime_;
   float endtime_;
   float postertime_;
-  ::google::protobuf::uint32 loopoption_;
+  ::google::protobuf::uint32 loopoptionasinteger_;
+  int loop_option_;
   float volume_;
   bool autoplay_;
   bool audioonly_;
   bool streaming_;
+  bool poster_image_generated_with_alpha_support_;
+  ::google::protobuf::uint32 playablestate_;
   ::TSP::DataReference* posterimagedata_;
   ::TSP::DataReference* audioonlyimagedata_;
-  ::google::protobuf::uint32 playablestate_;
-  ::google::protobuf::uint32 flags_;
   ::TSP::Reference* database_moviedata_;
   ::TSP::Reference* database_posterimagedata_;
   ::TSP::Reference* database_audioonlyimagedata_;
   ::TSP::Reference* style_;
   ::TSP::Size* originalsize_;
   ::TSP::Size* naturalsize_;
+  ::google::protobuf::uint32 flags_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(22 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(24 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSDArchives_2eproto();
   friend void protobuf_AssignDesc_TSDArchives_2eproto();
@@ -13191,37 +13256,60 @@ inline void MovieArchive::set_postertime(float value) {
   postertime_ = value;
 }
 
-// optional uint32 loopOption = 6;
-inline bool MovieArchive::has_loopoption() const {
+// optional uint32 loopOptionAsInteger = 6 [deprecated = true];
+inline bool MovieArchive::has_loopoptionasinteger() const {
   return (_has_bits_[0] & 0x00000080u) != 0;
 }
-inline void MovieArchive::set_has_loopoption() {
+inline void MovieArchive::set_has_loopoptionasinteger() {
   _has_bits_[0] |= 0x00000080u;
 }
-inline void MovieArchive::clear_has_loopoption() {
+inline void MovieArchive::clear_has_loopoptionasinteger() {
   _has_bits_[0] &= ~0x00000080u;
 }
-inline void MovieArchive::clear_loopoption() {
-  loopoption_ = 0u;
-  clear_has_loopoption();
+inline void MovieArchive::clear_loopoptionasinteger() {
+  loopoptionasinteger_ = 0u;
+  clear_has_loopoptionasinteger();
+}
+inline ::google::protobuf::uint32 MovieArchive::loopoptionasinteger() const {
+  return loopoptionasinteger_;
+}
+inline void MovieArchive::set_loopoptionasinteger(::google::protobuf::uint32 value) {
+  set_has_loopoptionasinteger();
+  loopoptionasinteger_ = value;
+}
+
+// optional .TSD.MovieArchive.MovieLoopOption loop_option = 24 [default = None];
+inline bool MovieArchive::has_loop_option() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void MovieArchive::set_has_loop_option() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void MovieArchive::clear_has_loop_option() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void MovieArchive::clear_loop_option() {
+  loop_option_ = 0;
+  clear_has_loop_option();
 }
-inline ::google::protobuf::uint32 MovieArchive::loopoption() const {
-  return loopoption_;
+inline ::TSD::MovieArchive_MovieLoopOption MovieArchive::loop_option() const {
+  return static_cast< ::TSD::MovieArchive_MovieLoopOption >(loop_option_);
 }
-inline void MovieArchive::set_loopoption(::google::protobuf::uint32 value) {
-  set_has_loopoption();
-  loopoption_ = value;
+inline void MovieArchive::set_loop_option(::TSD::MovieArchive_MovieLoopOption value) {
+  assert(::TSD::MovieArchive_MovieLoopOption_IsValid(value));
+  set_has_loop_option();
+  loop_option_ = value;
 }
 
 // optional float volume = 7;
 inline bool MovieArchive::has_volume() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
 inline void MovieArchive::set_has_volume() {
-  _has_bits_[0] |= 0x00000100u;
+  _has_bits_[0] |= 0x00000200u;
 }
 inline void MovieArchive::clear_has_volume() {
-  _has_bits_[0] &= ~0x00000100u;
+  _has_bits_[0] &= ~0x00000200u;
 }
 inline void MovieArchive::clear_volume() {
   volume_ = 0;
@@ -13237,13 +13325,13 @@ inline void MovieArchive::set_volume(float value) {
 
 // optional bool autoPlay = 8 [deprecated = true];
 inline bool MovieArchive::has_autoplay() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
+  return (_has_bits_[0] & 0x00000400u) != 0;
 }
 inline void MovieArchive::set_has_autoplay() {
-  _has_bits_[0] |= 0x00000200u;
+  _has_bits_[0] |= 0x00000400u;
 }
 inline void MovieArchive::clear_has_autoplay() {
-  _has_bits_[0] &= ~0x00000200u;
+  _has_bits_[0] &= ~0x00000400u;
 }
 inline void MovieArchive::clear_autoplay() {
   autoplay_ = false;
@@ -13259,13 +13347,13 @@ inline void MovieArchive::set_autoplay(bool value) {
 
 // optional bool audioOnly = 9;
 inline bool MovieArchive::has_audioonly() const {
-  return (_has_bits_[0] & 0x00000400u) != 0;
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
 inline void MovieArchive::set_has_audioonly() {
-  _has_bits_[0] |= 0x00000400u;
+  _has_bits_[0] |= 0x00000800u;
 }
 inline void MovieArchive::clear_has_audioonly() {
-  _has_bits_[0] &= ~0x00000400u;
+  _has_bits_[0] &= ~0x00000800u;
 }
 inline void MovieArchive::clear_audioonly() {
   audioonly_ = false;
@@ -13281,13 +13369,13 @@ inline void MovieArchive::set_audioonly(bool value) {
 
 // optional bool streaming = 18;
 inline bool MovieArchive::has_streaming() const {
-  return (_has_bits_[0] & 0x00000800u) != 0;
+  return (_has_bits_[0] & 0x00001000u) != 0;
 }
 inline void MovieArchive::set_has_streaming() {
-  _has_bits_[0] |= 0x00000800u;
+  _has_bits_[0] |= 0x00001000u;
 }
 inline void MovieArchive::clear_has_streaming() {
-  _has_bits_[0] &= ~0x00000800u;
+  _has_bits_[0] &= ~0x00001000u;
 }
 inline void MovieArchive::clear_streaming() {
   streaming_ = false;
@@ -13303,13 +13391,13 @@ inline void MovieArchive::set_streaming(bool value) {
 
 // optional .TSP.DataReference posterImageData = 15;
 inline bool MovieArchive::has_posterimagedata() const {
-  return (_has_bits_[0] & 0x00001000u) != 0;
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
 inline void MovieArchive::set_has_posterimagedata() {
-  _has_bits_[0] |= 0x00001000u;
+  _has_bits_[0] |= 0x00002000u;
 }
 inline void MovieArchive::clear_has_posterimagedata() {
-  _has_bits_[0] &= ~0x00001000u;
+  _has_bits_[0] &= ~0x00002000u;
 }
 inline void MovieArchive::clear_posterimagedata() {
   if (posterimagedata_ != NULL) posterimagedata_->::TSP::DataReference::Clear();
@@ -13341,13 +13429,13 @@ inline void MovieArchive::set_allocated_posterimagedata(::TSP::DataReference* po
 
 // optional .TSP.DataReference audioOnlyImageData = 16;
 inline bool MovieArchive::has_audioonlyimagedata() const {
-  return (_has_bits_[0] & 0x00002000u) != 0;
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
 inline void MovieArchive::set_has_audioonlyimagedata() {
-  _has_bits_[0] |= 0x00002000u;
+  _has_bits_[0] |= 0x00004000u;
 }
 inline void MovieArchive::clear_has_audioonlyimagedata() {
-  _has_bits_[0] &= ~0x00002000u;
+  _has_bits_[0] &= ~0x00004000u;
 }
 inline void MovieArchive::clear_audioonlyimagedata() {
   if (audioonlyimagedata_ != NULL) audioonlyimagedata_->::TSP::DataReference::Clear();
@@ -13377,15 +13465,37 @@ inline void MovieArchive::set_allocated_audioonlyimagedata(::TSP::DataReference*
   }
 }
 
+// optional bool poster_image_generated_with_alpha_support = 23;
+inline bool MovieArchive::has_poster_image_generated_with_alpha_support() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void MovieArchive::set_has_poster_image_generated_with_alpha_support() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void MovieArchive::clear_has_poster_image_generated_with_alpha_support() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void MovieArchive::clear_poster_image_generated_with_alpha_support() {
+  poster_image_generated_with_alpha_support_ = false;
+  clear_has_poster_image_generated_with_alpha_support();
+}
+inline bool MovieArchive::poster_image_generated_with_alpha_support() const {
+  return poster_image_generated_with_alpha_support_;
+}
+inline void MovieArchive::set_poster_image_generated_with_alpha_support(bool value) {
+  set_has_poster_image_generated_with_alpha_support();
+  poster_image_generated_with_alpha_support_ = value;
+}
+
 // optional uint32 playableState = 12;
 inline bool MovieArchive::has_playablestate() const {
-  return (_has_bits_[0] & 0x00004000u) != 0;
+  return (_has_bits_[0] & 0x00010000u) != 0;
 }
 inline void MovieArchive::set_has_playablestate() {
-  _has_bits_[0] |= 0x00004000u;
+  _has_bits_[0] |= 0x00010000u;
 }
 inline void MovieArchive::clear_has_playablestate() {
-  _has_bits_[0] &= ~0x00004000u;
+  _has_bits_[0] &= ~0x00010000u;
 }
 inline void MovieArchive::clear_playablestate() {
   playablestate_ = 0u;
@@ -13401,13 +13511,13 @@ inline void MovieArchive::set_playablestate(::google::protobuf::uint32 value) {
 
 // optional uint32 flags = 13;
 inline bool MovieArchive::has_flags() const {
-  return (_has_bits_[0] & 0x00008000u) != 0;
+  return (_has_bits_[0] & 0x00020000u) != 0;
 }
 inline void MovieArchive::set_has_flags() {
-  _has_bits_[0] |= 0x00008000u;
+  _has_bits_[0] |= 0x00020000u;
 }
 inline void MovieArchive::clear_has_flags() {
-  _has_bits_[0] &= ~0x00008000u;
+  _has_bits_[0] &= ~0x00020000u;
 }
 inline void MovieArchive::clear_flags() {
   flags_ = 0u;
@@ -13423,13 +13533,13 @@ inline void MovieArchive::set_flags(::google::protobuf::uint32 value) {
 
 // optional .TSP.Reference database_movieData = 2;
 inline bool MovieArchive::has_database_moviedata() const {
-  return (_has_bits_[0] & 0x00010000u) != 0;
+  return (_has_bits_[0] & 0x00040000u) != 0;
 }
 inline void MovieArchive::set_has_database_moviedata() {
-  _has_bits_[0] |= 0x00010000u;
+  _has_bits_[0] |= 0x00040000u;
 }
 inline void MovieArchive::clear_has_database_moviedata() {
-  _has_bits_[0] &= ~0x00010000u;
+  _has_bits_[0] &= ~0x00040000u;
 }
 inline void MovieArchive::clear_database_moviedata() {
   if (database_moviedata_ != NULL) database_moviedata_->::TSP::Reference::Clear();
@@ -13461,13 +13571,13 @@ inline void MovieArchive::set_allocated_database_moviedata(::TSP::Reference* dat
 
 // optional .TSP.Reference database_posterImageData = 10;
 inline bool MovieArchive::has_database_posterimagedata() const {
-  return (_has_bits_[0] & 0x00020000u) != 0;
+  return (_has_bits_[0] & 0x00080000u) != 0;
 }
 inline void MovieArchive::set_has_database_posterimagedata() {
-  _has_bits_[0] |= 0x00020000u;
+  _has_bits_[0] |= 0x00080000u;
 }
 inline void MovieArchive::clear_has_database_posterimagedata() {
-  _has_bits_[0] &= ~0x00020000u;
+  _has_bits_[0] &= ~0x00080000u;
 }
 inline void MovieArchive::clear_database_posterimagedata() {
   if (database_posterimagedata_ != NULL) database_posterimagedata_->::TSP::Reference::Clear();
@@ -13499,13 +13609,13 @@ inline void MovieArchive::set_allocated_database_posterimagedata(::TSP::Referenc
 
 // optional .TSP.Reference database_audioOnlyImageData = 11;
 inline bool MovieArchive::has_database_audioonlyimagedata() const {
-  return (_has_bits_[0] & 0x00040000u) != 0;
+  return (_has_bits_[0] & 0x00100000u) != 0;
 }
 inline void MovieArchive::set_has_database_audioonlyimagedata() {
-  _has_bits_[0] |= 0x00040000u;
+  _has_bits_[0] |= 0x00100000u;
 }
 inline void MovieArchive::clear_has_database_audioonlyimagedata() {
-  _has_bits_[0] &= ~0x00040000u;
+  _has_bits_[0] &= ~0x00100000u;
 }
 inline void MovieArchive::clear_database_audioonlyimagedata() {
   if (database_audioonlyimagedata_ != NULL) database_audioonlyimagedata_->::TSP::Reference::Clear();
@@ -13537,13 +13647,13 @@ inline void MovieArchive::set_allocated_database_audioonlyimagedata(::TSP::Refer
 
 // optional .TSP.Reference style = 19;
 inline bool MovieArchive::has_style() const {
-  return (_has_bits_[0] & 0x00080000u) != 0;
+  return (_has_bits_[0] & 0x00200000u) != 0;
 }
 inline void MovieArchive::set_has_style() {
-  _has_bits_[0] |= 0x00080000u;
+  _has_bits_[0] |= 0x00200000u;
 }
 inline void MovieArchive::clear_has_style() {
-  _has_bits_[0] &= ~0x00080000u;
+  _has_bits_[0] &= ~0x00200000u;
 }
 inline void MovieArchive::clear_style() {
   if (style_ != NULL) style_->::TSP::Reference::Clear();
@@ -13575,13 +13685,13 @@ inline void MovieArchive::set_allocated_style(::TSP::Reference* style) {
 
 // optional .TSP.Size originalSize = 20;
 inline bool MovieArchive::has_originalsize() const {
-  return (_has_bits_[0] & 0x00100000u) != 0;
+  return (_has_bits_[0] & 0x00400000u) != 0;
 }
 inline void MovieArchive::set_has_originalsize() {
-  _has_bits_[0] |= 0x00100000u;
+  _has_bits_[0] |= 0x00400000u;
 }
 inline void MovieArchive::clear_has_originalsize() {
-  _has_bits_[0] &= ~0x00100000u;
+  _has_bits_[0] &= ~0x00400000u;
 }
 inline void MovieArchive::clear_originalsize() {
   if (originalsize_ != NULL) originalsize_->::TSP::Size::Clear();
@@ -13613,13 +13723,13 @@ inline void MovieArchive::set_allocated_originalsize(::TSP::Size* originalsize)
 
 // optional .TSP.Size naturalSize = 21;
 inline bool MovieArchive::has_naturalsize() const {
-  return (_has_bits_[0] & 0x00200000u) != 0;
+  return (_has_bits_[0] & 0x00800000u) != 0;
 }
 inline void MovieArchive::set_has_naturalsize() {
-  _has_bits_[0] |= 0x00200000u;
+  _has_bits_[0] |= 0x00800000u;
 }
 inline void MovieArchive::clear_has_naturalsize() {
-  _has_bits_[0] &= ~0x00200000u;
+  _has_bits_[0] &= ~0x00800000u;
 }
 inline void MovieArchive::clear_naturalsize() {
   if (naturalsize_ != NULL) naturalsize_->::TSP::Size::Clear();
@@ -14263,6 +14373,10 @@ inline const EnumDescriptor* GetEnumDescriptor< ::TSD::ShadowArchive_ShadowType>
   return ::TSD::ShadowArchive_ShadowType_descriptor();
 }
 template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::TSD::MovieArchive_MovieLoopOption>() {
+  return ::TSD::MovieArchive_MovieLoopOption_descriptor();
+}
+template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::TSD::GuideArchive_GuideType>() {
   return ::TSD::GuideArchive_GuideType_descriptor();
 }
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.cc
index 200c886..710e1b4 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.cc
@@ -687,11 +687,12 @@ void protobuf_AssignDesc_TSDCommandArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DrawableHyperlinkCommandArchive));
   CommandSelectionBehaviorArchive_descriptor_ = file->message_type(27);
-  static const int CommandSelectionBehaviorArchive_offsets_[4] = {
+  static const int CommandSelectionBehaviorArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSelectionBehaviorArchive, model_for_selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSelectionBehaviorArchive, type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSelectionBehaviorArchive, archived_selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSelectionBehaviorArchive, archived_new_selection_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSelectionBehaviorArchive, old_model_for_selection_),
   };
   CommandSelectionBehaviorArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -774,12 +775,13 @@ void protobuf_AssignDesc_TSDCommandArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommentStorageApplyCommandArchive));
   GuideCommandArchive_descriptor_ = file->message_type(32);
-  static const int GuideCommandArchive_offsets_[5] = {
+  static const int GuideCommandArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GuideCommandArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GuideCommandArchive, storage_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GuideCommandArchive, old_guide_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GuideCommandArchive, new_guide_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GuideCommandArchive, mode_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(GuideCommandArchive, old_storage_),
   };
   GuideCommandArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -1181,47 +1183,49 @@ void protobuf_AddDesc_TSDCommandArchives_2eproto() {
     "rawableHyperlinkCommandArchive\022\"\n\005super\030"
     "\001 \002(\0132\023.TSK.CommandArchive\022\034\n\004info\030\002 \001(\013"
     "2\016.TSP.Reference\022\030\n\020oldhyperlink_url\030\003 \001"
-    "(\t\022\030\n\020newhyperlink_url\030\004 \001(\t\"\330\002\n\037Command"
+    "(\t\022\030\n\020newhyperlink_url\030\004 \001(\t\"\211\003\n\037Command"
     "SelectionBehaviorArchive\022+\n\023model_for_se"
     "lection\030\002 \001(\0132\016.TSP.Reference\022O\n\004type\030\003 "
     "\001(\0162A.TSD.CommandSelectionBehaviorArchiv"
     "e.CommandSelectionBehaviorType\022*\n\022archiv"
     "ed_selection\030\004 \001(\0132\016.TSP.Reference\022.\n\026ar"
     "chived_new_selection\030\005 \001(\0132\016.TSP.Referen"
-    "ce\"[\n\034CommandSelectionBehaviorType\022\020\n\014Co"
-    "nstructive\020\001\022\017\n\013Destructive\020\002\022\013\n\007InPlace"
-    "\020\003\022\013\n\007Replace\020\004\"@\n\032ImageReplaceCommandAr"
-    "chive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchiv"
-    "e\"l\n\032DrawableLockCommandArchive\022\"\n\005super"
-    "\030\001 \002(\0132\023.TSK.CommandArchive\022\034\n\004info\030\002 \001("
-    "\0132\016.TSP.Reference\022\014\n\004lock\030\003 \001(\010\"\257\001\n!Draw"
-    "ableInfoCommentCommandArchive\022\"\n\005super\030\001"
-    " \002(\0132\023.TSK.CommandArchive\022\034\n\004info\030\002 \001(\0132"
-    "\016.TSP.Reference\022#\n\013old_comment\030\003 \001(\0132\016.T"
-    "SP.Reference\022#\n\013new_comment\030\004 \001(\0132\016.TSP."
-    "Reference\"\244\001\n!CommentStorageApplyCommand"
-    "Archive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArch"
-    "ive\022\'\n\017comment_storage\030\002 \002(\0132\016.TSP.Refer"
-    "ence\022\026\n\016comment_string\030\003 \002(\t\022\032\n\022old_comm"
-    "ent_string\030\004 \002(\t\"\253\002\n\023GuideCommandArchive"
-    "\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\037\n\007"
-    "storage\030\002 \001(\0132\016.TSP.Reference\022/\n\told_gui"
-    "de\030\003 \001(\0132\034.TSD.UserDefinedGuideArchive\022/"
-    "\n\tnew_guide\030\004 \001(\0132\034.TSD.UserDefinedGuide"
-    "Archive\0227\n\004mode\030\005 \001(\0162).TSD.GuideCommand"
-    "Archive.GuideCommandMode\"4\n\020GuideCommand"
-    "Mode\022\007\n\003Add\020\001\022\013\n\007Replace\020\002\022\n\n\006Delete\020\003\"\210"
-    "\001\n\'DrawableAspectRatioLockedCommandArchi"
-    "ve\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\034"
-    "\n\004info\030\002 \001(\0132\016.TSP.Reference\022\033\n\023aspect_r"
-    "atio_locked\030\003 \001(\010\"\225\001\n.DrawableAccessibil"
-    "ityDescriptionCommandArchive\022\"\n\005super\030\001 "
-    "\002(\0132\023.TSK.CommandArchive\022\034\n\004info\030\002 \001(\0132\016"
-    ".TSP.Reference\022!\n\031accessibility_descript"
-    "ion\030\003 \001(\t\"\206\001\n\030PasteStyleCommandArchive\022\""
-    "\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022!\n\tde"
-    "st_info\030\002 \002(\0132\016.TSP.Reference\022#\n\013shape_s"
-    "tyle\030\003 \001(\0132\016.TSP.Reference", 7826);
+    "ce\022/\n\027old_model_for_selection\030\006 \001(\0132\016.TS"
+    "P.Reference\"[\n\034CommandSelectionBehaviorT"
+    "ype\022\020\n\014Constructive\020\001\022\017\n\013Destructive\020\002\022\013"
+    "\n\007InPlace\020\003\022\013\n\007Replace\020\004\"@\n\032ImageReplace"
+    "CommandArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Comm"
+    "andArchive\"l\n\032DrawableLockCommandArchive"
+    "\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\034\n\004"
+    "info\030\002 \001(\0132\016.TSP.Reference\022\014\n\004lock\030\003 \001(\010"
+    "\"\257\001\n!DrawableInfoCommentCommandArchive\022\""
+    "\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\034\n\004in"
+    "fo\030\002 \001(\0132\016.TSP.Reference\022#\n\013old_comment\030"
+    "\003 \001(\0132\016.TSP.Reference\022#\n\013new_comment\030\004 \001"
+    "(\0132\016.TSP.Reference\"\244\001\n!CommentStorageApp"
+    "lyCommandArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.Co"
+    "mmandArchive\022\'\n\017comment_storage\030\002 \002(\0132\016."
+    "TSP.Reference\022\026\n\016comment_string\030\003 \002(\t\022\032\n"
+    "\022old_comment_string\030\004 \002(\t\"\320\002\n\023GuideComma"
+    "ndArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandAr"
+    "chive\022\037\n\007storage\030\002 \001(\0132\016.TSP.Reference\022/"
+    "\n\told_guide\030\003 \001(\0132\034.TSD.UserDefinedGuide"
+    "Archive\022/\n\tnew_guide\030\004 \001(\0132\034.TSD.UserDef"
+    "inedGuideArchive\0227\n\004mode\030\005 \001(\0162).TSD.Gui"
+    "deCommandArchive.GuideCommandMode\022#\n\013old"
+    "_storage\030\006 \001(\0132\016.TSP.Reference\"4\n\020GuideC"
+    "ommandMode\022\007\n\003Add\020\001\022\013\n\007Replace\020\002\022\n\n\006Dele"
+    "te\020\003\"\210\001\n\'DrawableAspectRatioLockedComman"
+    "dArchive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArc"
+    "hive\022\034\n\004info\030\002 \001(\0132\016.TSP.Reference\022\033\n\023as"
+    "pect_ratio_locked\030\003 \001(\010\"\225\001\n.DrawableAcce"
+    "ssibilityDescriptionCommandArchive\022\"\n\005su"
+    "per\030\001 \002(\0132\023.TSK.CommandArchive\022\034\n\004info\030\002"
+    " \001(\0132\016.TSP.Reference\022!\n\031accessibility_de"
+    "scription\030\003 \001(\t\"\206\001\n\030PasteStyleCommandArc"
+    "hive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive"
+    "\022!\n\tdest_info\030\002 \002(\0132\016.TSP.Reference\022#\n\013s"
+    "hape_style\030\003 \001(\0132\016.TSP.Reference", 7912);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSDCommandArchives.proto", &protobuf_RegisterTypes);
   ConnectionLineConnectCommandArchive::default_instance_ = new ConnectionLineConnectCommandArchive();
@@ -12366,6 +12370,7 @@ const int CommandSelectionBehaviorArchive::kModelForSelectionFieldNumber;
 const int CommandSelectionBehaviorArchive::kTypeFieldNumber;
 const int CommandSelectionBehaviorArchive::kArchivedSelectionFieldNumber;
 const int CommandSelectionBehaviorArchive::kArchivedNewSelectionFieldNumber;
+const int CommandSelectionBehaviorArchive::kOldModelForSelectionFieldNumber;
 #endif  // !_MSC_VER
 
 CommandSelectionBehaviorArchive::CommandSelectionBehaviorArchive()
@@ -12377,6 +12382,7 @@ void CommandSelectionBehaviorArchive::InitAsDefaultInstance() {
   model_for_selection_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   archived_selection_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   archived_new_selection_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_model_for_selection_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
 CommandSelectionBehaviorArchive::CommandSelectionBehaviorArchive(const CommandSelectionBehaviorArchive& from)
@@ -12391,6 +12397,7 @@ void CommandSelectionBehaviorArchive::SharedCtor() {
   type_ = 1;
   archived_selection_ = NULL;
   archived_new_selection_ = NULL;
+  old_model_for_selection_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -12403,6 +12410,7 @@ void CommandSelectionBehaviorArchive::SharedDtor() {
     delete model_for_selection_;
     delete archived_selection_;
     delete archived_new_selection_;
+    delete old_model_for_selection_;
   }
 }
 
@@ -12439,6 +12447,9 @@ void CommandSelectionBehaviorArchive::Clear() {
     if (has_archived_new_selection()) {
       if (archived_new_selection_ != NULL) archived_new_selection_->::TSP::Reference::Clear();
     }
+    if (has_old_model_for_selection()) {
+      if (old_model_for_selection_ != NULL) old_model_for_selection_->::TSP::Reference::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -12508,6 +12519,20 @@ bool CommandSelectionBehaviorArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(50)) goto parse_old_model_for_selection;
+        break;
+      }
+
+      // optional .TSP.Reference old_model_for_selection = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_model_for_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_model_for_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -12554,6 +12579,12 @@ void CommandSelectionBehaviorArchive::SerializeWithCachedSizes(
       5, this->archived_new_selection(), output);
   }
 
+  // optional .TSP.Reference old_model_for_selection = 6;
+  if (has_old_model_for_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->old_model_for_selection(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -12589,6 +12620,13 @@ ::google::protobuf::uint8* CommandSelectionBehaviorArchive::SerializeWithCachedS
         5, this->archived_new_selection(), target);
   }
 
+  // optional .TSP.Reference old_model_for_selection = 6;
+  if (has_old_model_for_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->old_model_for_selection(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -12627,6 +12665,13 @@ int CommandSelectionBehaviorArchive::ByteSize() const {
           this->archived_new_selection());
     }
 
+    // optional .TSP.Reference old_model_for_selection = 6;
+    if (has_old_model_for_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_model_for_selection());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -12666,6 +12711,9 @@ void CommandSelectionBehaviorArchive::MergeFrom(const CommandSelectionBehaviorAr
     if (from.has_archived_new_selection()) {
       mutable_archived_new_selection()->::TSP::Reference::MergeFrom(from.archived_new_selection());
     }
+    if (from.has_old_model_for_selection()) {
+      mutable_old_model_for_selection()->::TSP::Reference::MergeFrom(from.old_model_for_selection());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -12693,6 +12741,9 @@ bool CommandSelectionBehaviorArchive::IsInitialized() const {
   if (has_archived_new_selection()) {
     if (!this->archived_new_selection().IsInitialized()) return false;
   }
+  if (has_old_model_for_selection()) {
+    if (!this->old_model_for_selection().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -12702,6 +12753,7 @@ void CommandSelectionBehaviorArchive::Swap(CommandSelectionBehaviorArchive* othe
     std::swap(type_, other->type_);
     std::swap(archived_selection_, other->archived_selection_);
     std::swap(archived_new_selection_, other->archived_new_selection_);
+    std::swap(old_model_for_selection_, other->old_model_for_selection_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -14008,6 +14060,7 @@ const int GuideCommandArchive::kStorageFieldNumber;
 const int GuideCommandArchive::kOldGuideFieldNumber;
 const int GuideCommandArchive::kNewGuideFieldNumber;
 const int GuideCommandArchive::kModeFieldNumber;
+const int GuideCommandArchive::kOldStorageFieldNumber;
 #endif  // !_MSC_VER
 
 GuideCommandArchive::GuideCommandArchive()
@@ -14020,6 +14073,7 @@ void GuideCommandArchive::InitAsDefaultInstance() {
   storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   old_guide_ = const_cast< ::TSD::UserDefinedGuideArchive*>(&::TSD::UserDefinedGuideArchive::default_instance());
   new_guide_ = const_cast< ::TSD::UserDefinedGuideArchive*>(&::TSD::UserDefinedGuideArchive::default_instance());
+  old_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
 GuideCommandArchive::GuideCommandArchive(const GuideCommandArchive& from)
@@ -14035,6 +14089,7 @@ void GuideCommandArchive::SharedCtor() {
   old_guide_ = NULL;
   new_guide_ = NULL;
   mode_ = 1;
+  old_storage_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -14048,6 +14103,7 @@ void GuideCommandArchive::SharedDtor() {
     delete storage_;
     delete old_guide_;
     delete new_guide_;
+    delete old_storage_;
   }
 }
 
@@ -14087,6 +14143,9 @@ void GuideCommandArchive::Clear() {
       if (new_guide_ != NULL) new_guide_->::TSD::UserDefinedGuideArchive::Clear();
     }
     mode_ = 1;
+    if (has_old_storage()) {
+      if (old_storage_ != NULL) old_storage_->::TSP::Reference::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -14170,6 +14229,20 @@ bool GuideCommandArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(50)) goto parse_old_storage;
+        break;
+      }
+
+      // optional .TSP.Reference old_storage = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_storage:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_storage()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -14222,6 +14295,12 @@ void GuideCommandArchive::SerializeWithCachedSizes(
       5, this->mode(), output);
   }
 
+  // optional .TSP.Reference old_storage = 6;
+  if (has_old_storage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->old_storage(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -14264,6 +14343,13 @@ ::google::protobuf::uint8* GuideCommandArchive::SerializeWithCachedSizesToArray(
       5, this->mode(), target);
   }
 
+  // optional .TSP.Reference old_storage = 6;
+  if (has_old_storage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->old_storage(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -14309,6 +14395,13 @@ int GuideCommandArchive::ByteSize() const {
         ::google::protobuf::internal::WireFormatLite::EnumSize(this->mode());
     }
 
+    // optional .TSP.Reference old_storage = 6;
+    if (has_old_storage()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_storage());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -14351,6 +14444,9 @@ void GuideCommandArchive::MergeFrom(const GuideCommandArchive& from) {
     if (from.has_mode()) {
       set_mode(from.mode());
     }
+    if (from.has_old_storage()) {
+      mutable_old_storage()->::TSP::Reference::MergeFrom(from.old_storage());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -14376,6 +14472,9 @@ bool GuideCommandArchive::IsInitialized() const {
   if (has_storage()) {
     if (!this->storage().IsInitialized()) return false;
   }
+  if (has_old_storage()) {
+    if (!this->old_storage().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -14386,6 +14485,7 @@ void GuideCommandArchive::Swap(GuideCommandArchive* other) {
     std::swap(old_guide_, other->old_guide_);
     std::swap(new_guide_, other->new_guide_);
     std::swap(mode_, other->mode_);
+    std::swap(old_storage_, other->old_storage_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.h
index e678e01..60f77a5 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSDCommandArchives.pb.h
@@ -3955,6 +3955,15 @@ class CommandSelectionBehaviorArchive : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_archived_new_selection();
   inline void set_allocated_archived_new_selection(::TSP::Reference* archived_new_selection);
 
+  // optional .TSP.Reference old_model_for_selection = 6;
+  inline bool has_old_model_for_selection() const;
+  inline void clear_old_model_for_selection();
+  static const int kOldModelForSelectionFieldNumber = 6;
+  inline const ::TSP::Reference& old_model_for_selection() const;
+  inline ::TSP::Reference* mutable_old_model_for_selection();
+  inline ::TSP::Reference* release_old_model_for_selection();
+  inline void set_allocated_old_model_for_selection(::TSP::Reference* old_model_for_selection);
+
   // @@protoc_insertion_point(class_scope:TSD.CommandSelectionBehaviorArchive)
  private:
   inline void set_has_model_for_selection();
@@ -3965,16 +3974,19 @@ class CommandSelectionBehaviorArchive : public ::google::protobuf::Message {
   inline void clear_has_archived_selection();
   inline void set_has_archived_new_selection();
   inline void clear_has_archived_new_selection();
+  inline void set_has_old_model_for_selection();
+  inline void clear_has_old_model_for_selection();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TSP::Reference* model_for_selection_;
   ::TSP::Reference* archived_selection_;
   ::TSP::Reference* archived_new_selection_;
+  ::TSP::Reference* old_model_for_selection_;
   int type_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSDCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSDCommandArchives_2eproto();
@@ -4543,6 +4555,15 @@ class GuideCommandArchive : public ::google::protobuf::Message {
   inline ::TSD::GuideCommandArchive_GuideCommandMode mode() const;
   inline void set_mode(::TSD::GuideCommandArchive_GuideCommandMode value);
 
+  // optional .TSP.Reference old_storage = 6;
+  inline bool has_old_storage() const;
+  inline void clear_old_storage();
+  static const int kOldStorageFieldNumber = 6;
+  inline const ::TSP::Reference& old_storage() const;
+  inline ::TSP::Reference* mutable_old_storage();
+  inline ::TSP::Reference* release_old_storage();
+  inline void set_allocated_old_storage(::TSP::Reference* old_storage);
+
   // @@protoc_insertion_point(class_scope:TSD.GuideCommandArchive)
  private:
   inline void set_has_super();
@@ -4555,6 +4576,8 @@ class GuideCommandArchive : public ::google::protobuf::Message {
   inline void clear_has_new_guide();
   inline void set_has_mode();
   inline void clear_has_mode();
+  inline void set_has_old_storage();
+  inline void clear_has_old_storage();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -4562,10 +4585,11 @@ class GuideCommandArchive : public ::google::protobuf::Message {
   ::TSP::Reference* storage_;
   ::TSD::UserDefinedGuideArchive* old_guide_;
   ::TSD::UserDefinedGuideArchive* new_guide_;
+  ::TSP::Reference* old_storage_;
   int mode_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSDCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSDCommandArchives_2eproto();
@@ -9831,6 +9855,44 @@ inline void CommandSelectionBehaviorArchive::set_allocated_archived_new_selectio
   }
 }
 
+// optional .TSP.Reference old_model_for_selection = 6;
+inline bool CommandSelectionBehaviorArchive::has_old_model_for_selection() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSelectionBehaviorArchive::set_has_old_model_for_selection() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSelectionBehaviorArchive::clear_has_old_model_for_selection() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSelectionBehaviorArchive::clear_old_model_for_selection() {
+  if (old_model_for_selection_ != NULL) old_model_for_selection_->::TSP::Reference::Clear();
+  clear_has_old_model_for_selection();
+}
+inline const ::TSP::Reference& CommandSelectionBehaviorArchive::old_model_for_selection() const {
+  return old_model_for_selection_ != NULL ? *old_model_for_selection_ : *default_instance_->old_model_for_selection_;
+}
+inline ::TSP::Reference* CommandSelectionBehaviorArchive::mutable_old_model_for_selection() {
+  set_has_old_model_for_selection();
+  if (old_model_for_selection_ == NULL) old_model_for_selection_ = new ::TSP::Reference;
+  return old_model_for_selection_;
+}
+inline ::TSP::Reference* CommandSelectionBehaviorArchive::release_old_model_for_selection() {
+  clear_has_old_model_for_selection();
+  ::TSP::Reference* temp = old_model_for_selection_;
+  old_model_for_selection_ = NULL;
+  return temp;
+}
+inline void CommandSelectionBehaviorArchive::set_allocated_old_model_for_selection(::TSP::Reference* old_model_for_selection) {
+  delete old_model_for_selection_;
+  old_model_for_selection_ = old_model_for_selection;
+  if (old_model_for_selection) {
+    set_has_old_model_for_selection();
+  } else {
+    clear_has_old_model_for_selection();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // ImageReplaceCommandArchive
@@ -10530,6 +10592,44 @@ inline void GuideCommandArchive::set_mode(::TSD::GuideCommandArchive_GuideComman
   mode_ = value;
 }
 
+// optional .TSP.Reference old_storage = 6;
+inline bool GuideCommandArchive::has_old_storage() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void GuideCommandArchive::set_has_old_storage() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void GuideCommandArchive::clear_has_old_storage() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void GuideCommandArchive::clear_old_storage() {
+  if (old_storage_ != NULL) old_storage_->::TSP::Reference::Clear();
+  clear_has_old_storage();
+}
+inline const ::TSP::Reference& GuideCommandArchive::old_storage() const {
+  return old_storage_ != NULL ? *old_storage_ : *default_instance_->old_storage_;
+}
+inline ::TSP::Reference* GuideCommandArchive::mutable_old_storage() {
+  set_has_old_storage();
+  if (old_storage_ == NULL) old_storage_ = new ::TSP::Reference;
+  return old_storage_;
+}
+inline ::TSP::Reference* GuideCommandArchive::release_old_storage() {
+  clear_has_old_storage();
+  ::TSP::Reference* temp = old_storage_;
+  old_storage_ = NULL;
+  return temp;
+}
+inline void GuideCommandArchive::set_allocated_old_storage(::TSP::Reference* old_storage) {
+  delete old_storage_;
+  old_storage_ = old_storage;
+  if (old_storage) {
+    set_has_old_storage();
+  } else {
+    clear_has_old_storage();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // DrawableAspectRatioLockedCommandArchive
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.cc
index 2af23e6..e7ad29e 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.cc
@@ -43,9 +43,18 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ComponentDataReference_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ComponentDataReference_reflection_ = NULL;
+const ::google::protobuf::Descriptor* UUIDInternal_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  UUIDInternal_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ObjectUUIDMapEntry_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ObjectUUIDMapEntry_reflection_ = NULL;
 const ::google::protobuf::Descriptor* PackageMetadata_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PackageMetadata_reflection_ = NULL;
+const ::google::protobuf::Descriptor* DocumentRevision_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  DocumentRevision_reflection_ = NULL;
 const ::google::protobuf::Descriptor* PasteboardMetadata_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PasteboardMetadata_reflection_ = NULL;
@@ -146,9 +155,9 @@ void protobuf_AssignDesc_TSPArchiveMessages_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, write_version_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, external_references_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, data_references_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, allows_duplicates_outside_of_document_package_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, dirties_document_package_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, object_uuid_map_entries_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, is_stored_outside_object_archive_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ComponentInfo, save_token_),
   };
   ComponentInfo_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -193,13 +202,48 @@ void protobuf_AssignDesc_TSPArchiveMessages_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ComponentDataReference));
-  PackageMetadata_descriptor_ = file->message_type(7);
-  static const int PackageMetadata_offsets_[5] = {
+  UUIDInternal_descriptor_ = file->message_type(7);
+  static const int UUIDInternal_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDInternal, lower_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDInternal, upper_),
+  };
+  UUIDInternal_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      UUIDInternal_descriptor_,
+      UUIDInternal::default_instance_,
+      UUIDInternal_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDInternal, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDInternal, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(UUIDInternal));
+  ObjectUUIDMapEntry_descriptor_ = file->message_type(8);
+  static const int ObjectUUIDMapEntry_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ObjectUUIDMapEntry, identifier_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ObjectUUIDMapEntry, uuid_),
+  };
+  ObjectUUIDMapEntry_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ObjectUUIDMapEntry_descriptor_,
+      ObjectUUIDMapEntry::default_instance_,
+      ObjectUUIDMapEntry_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ObjectUUIDMapEntry, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ObjectUUIDMapEntry, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ObjectUUIDMapEntry));
+  PackageMetadata_descriptor_ = file->message_type(9);
+  static const int PackageMetadata_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, last_object_identifier_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, revision_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, components_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, datas_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, read_version_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, write_version_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, file_format_version_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PackageMetadata, save_token_),
   };
   PackageMetadata_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -212,7 +256,23 @@ void protobuf_AssignDesc_TSPArchiveMessages_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PackageMetadata));
-  PasteboardMetadata_descriptor_ = file->message_type(8);
+  DocumentRevision_descriptor_ = file->message_type(10);
+  static const int DocumentRevision_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentRevision, sequence_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentRevision, identifier_),
+  };
+  DocumentRevision_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      DocumentRevision_descriptor_,
+      DocumentRevision::default_instance_,
+      DocumentRevision_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentRevision, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DocumentRevision, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(DocumentRevision));
+  PasteboardMetadata_descriptor_ = file->message_type(11);
   static const int PasteboardMetadata_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardMetadata, version_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardMetadata, app_name_),
@@ -230,7 +290,7 @@ void protobuf_AssignDesc_TSPArchiveMessages_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PasteboardMetadata));
-  DataInfo_descriptor_ = file->message_type(9);
+  DataInfo_descriptor_ = file->message_type(12);
   static const int DataInfo_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataInfo, identifier_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataInfo, digest_),
@@ -251,7 +311,7 @@ void protobuf_AssignDesc_TSPArchiveMessages_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DataInfo));
-  ViewStateMetadata_descriptor_ = file->message_type(10);
+  ViewStateMetadata_descriptor_ = file->message_type(13);
   static const int ViewStateMetadata_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ViewStateMetadata, version_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ViewStateMetadata, document_version_uuid_),
@@ -294,8 +354,14 @@ void protobuf_RegisterTypes(const ::std::string&) {
     ComponentExternalReference_descriptor_, &ComponentExternalReference::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ComponentDataReference_descriptor_, &ComponentDataReference::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    UUIDInternal_descriptor_, &UUIDInternal::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ObjectUUIDMapEntry_descriptor_, &ObjectUUIDMapEntry::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PackageMetadata_descriptor_, &PackageMetadata::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    DocumentRevision_descriptor_, &DocumentRevision::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PasteboardMetadata_descriptor_, &PasteboardMetadata::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -321,8 +387,14 @@ void protobuf_ShutdownFile_TSPArchiveMessages_2eproto() {
   delete ComponentExternalReference_reflection_;
   delete ComponentDataReference::default_instance_;
   delete ComponentDataReference_reflection_;
+  delete UUIDInternal::default_instance_;
+  delete UUIDInternal_reflection_;
+  delete ObjectUUIDMapEntry::default_instance_;
+  delete ObjectUUIDMapEntry_reflection_;
   delete PackageMetadata::default_instance_;
   delete PackageMetadata_reflection_;
+  delete DocumentRevision::default_instance_;
+  delete DocumentRevision_reflection_;
   delete PasteboardMetadata::default_instance_;
   delete PasteboardMetadata_reflection_;
   delete DataInfo::default_instance_;
@@ -354,36 +426,43 @@ void protobuf_AddDesc_TSPArchiveMessages_2eproto() {
     "ence\020\002\022\013\n\007Message\020\003\"_\n\004Rule\022\021\n\rIgnoreAnd"
     "Drop\020\000\022\025\n\021IgnoreAndPreserve\020\001\022\022\n\016MustUnd"
     "erstand\020\002\022\031\n\014NotSupported\020\377\377\377\377\377\377\377\377\377\001\"\035\n\t"
-    "FieldPath\022\020\n\004path\030\001 \003(\rB\002\020\001\"\217\003\n\rComponen"
+    "FieldPath\022\020\n\004path\030\001 \003(\rB\002\020\001\"\372\002\n\rComponen"
     "tInfo\022\022\n\nidentifier\030\001 \002(\004\022\031\n\021preferred_l"
     "ocator\030\002 \002(\t\022\017\n\007locator\030\003 \001(\t\022\030\n\014read_ve"
     "rsion\030\004 \003(\rB\002\020\001\022\031\n\rwrite_version\030\005 \003(\rB\002"
     "\020\001\022<\n\023external_references\030\006 \003(\0132\037.TSP.Co"
     "mponentExternalReference\0224\n\017data_referen"
-    "ces\030\007 \003(\0132\033.TSP.ComponentDataReference\022<"
-    "\n-allows_duplicates_outside_of_document_"
-    "package\030\010 \001(\010:\005false\022&\n\030dirties_document"
-    "_package\030\t \001(\010:\004true\022/\n is_stored_outsid"
-    "e_object_archive\030\n \001(\010:\005false\"f\n\032Compone"
-    "ntExternalReference\022\034\n\024component_identif"
-    "ier\030\001 \002(\004\022\031\n\021object_identifier\030\002 \001(\004\022\017\n\007"
-    "is_weak\030\003 \001(\010\"1\n\026ComponentDataReference\022"
-    "\027\n\017data_identifier\030\001 \002(\004\"\254\001\n\017PackageMeta"
-    "data\022\036\n\026last_object_identifier\030\001 \002(\004\022&\n\n"
-    "components\030\003 \003(\0132\022.TSP.ComponentInfo\022\034\n\005"
-    "datas\030\004 \003(\0132\r.TSP.DataInfo\022\030\n\014read_versi"
-    "on\030\005 \003(\rB\002\020\001\022\031\n\rwrite_version\030\006 \003(\rB\002\020\001\""
-    "w\n\022PasteboardMetadata\022\023\n\007version\030\001 \003(\rB\002"
-    "\020\001\022\020\n\010app_name\030\002 \002(\t\022\034\n\005datas\030\003 \003(\0132\r.TS"
-    "P.DataInfo\022\034\n\024source_document_uuid\030\004 \001(\t"
-    "\"\306\001\n\010DataInfo\022\022\n\nidentifier\030\001 \002(\004\022\016\n\006dig"
-    "est\030\002 \002(\014\022\033\n\023preferred_file_name\030\003 \002(\t\022\021"
-    "\n\tfile_name\030\004 \001(\t\022!\n\031document_resource_l"
-    "ocator\030\005 \001(\t\022\034\n\024source_bookmark_data\030\006 \001"
-    "(\014\022%\n\035pasteboard_external_file_path\030c \001("
-    "\t\"n\n\021ViewStateMetadata\022\023\n\007version\030\001 \003(\rB"
-    "\002\020\001\022\035\n\025document_version_uuid\030\002 \002(\t\022%\n\tco"
-    "mponent\030\003 \002(\0132\022.TSP.ComponentInfo", 1833);
+    "ces\030\007 \003(\0132\033.TSP.ComponentDataReference\0228"
+    "\n\027object_uuid_map_entries\030\013 \003(\0132\027.TSP.Ob"
+    "jectUUIDMapEntry\022/\n is_stored_outside_ob"
+    "ject_archive\030\n \001(\010:\005false\022\025\n\nsave_token\030"
+    "\014 \001(\004:\0010\"f\n\032ComponentExternalReference\022\034"
+    "\n\024component_identifier\030\001 \002(\004\022\031\n\021object_i"
+    "dentifier\030\002 \001(\004\022\017\n\007is_weak\030\003 \001(\010\"1\n\026Comp"
+    "onentDataReference\022\027\n\017data_identifier\030\001 "
+    "\002(\004\",\n\014UUIDInternal\022\r\n\005lower\030\001 \002(\004\022\r\n\005up"
+    "per\030\002 \002(\004\"I\n\022ObjectUUIDMapEntry\022\022\n\nident"
+    "ifier\030\001 \002(\004\022\037\n\004uuid\030\002 \002(\0132\021.TSP.UUIDInte"
+    "rnal\"\215\002\n\017PackageMetadata\022\036\n\026last_object_"
+    "identifier\030\001 \002(\004\022\'\n\010revision\030\002 \001(\0132\025.TSP"
+    ".DocumentRevision\022&\n\ncomponents\030\003 \003(\0132\022."
+    "TSP.ComponentInfo\022\034\n\005datas\030\004 \003(\0132\r.TSP.D"
+    "ataInfo\022\030\n\014read_version\030\005 \003(\rB\002\020\001\022\031\n\rwri"
+    "te_version\030\006 \003(\rB\002\020\001\022\037\n\023file_format_vers"
+    "ion\030\007 \003(\rB\002\020\001\022\025\n\nsave_token\030\010 \001(\004:\0010\";\n\020"
+    "DocumentRevision\022\023\n\010sequence\030\001 \001(\004:\0010\022\022\n"
+    "\nidentifier\030\002 \001(\t\"w\n\022PasteboardMetadata\022"
+    "\023\n\007version\030\001 \003(\rB\002\020\001\022\020\n\010app_name\030\002 \002(\t\022\034"
+    "\n\005datas\030\003 \003(\0132\r.TSP.DataInfo\022\034\n\024source_d"
+    "ocument_uuid\030\004 \001(\t\"\306\001\n\010DataInfo\022\022\n\nident"
+    "ifier\030\001 \002(\004\022\016\n\006digest\030\002 \002(\014\022\033\n\023preferred"
+    "_file_name\030\003 \002(\t\022\021\n\tfile_name\030\004 \001(\t\022!\n\031d"
+    "ocument_resource_locator\030\005 \001(\t\022\034\n\024source"
+    "_bookmark_data\030\006 \001(\014\022%\n\035pasteboard_exter"
+    "nal_file_path\030c \001(\t\"n\n\021ViewStateMetadata"
+    "\022\023\n\007version\030\001 \003(\rB\002\020\001\022\035\n\025document_versio"
+    "n_uuid\030\002 \002(\t\022%\n\tcomponent\030\003 \002(\0132\022.TSP.Co"
+    "mponentInfo", 2091);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSPArchiveMessages.proto", &protobuf_RegisterTypes);
   ArchiveInfo::default_instance_ = new ArchiveInfo();
@@ -393,7 +472,10 @@ void protobuf_AddDesc_TSPArchiveMessages_2eproto() {
   ComponentInfo::default_instance_ = new ComponentInfo();
   ComponentExternalReference::default_instance_ = new ComponentExternalReference();
   ComponentDataReference::default_instance_ = new ComponentDataReference();
+  UUIDInternal::default_instance_ = new UUIDInternal();
+  ObjectUUIDMapEntry::default_instance_ = new ObjectUUIDMapEntry();
   PackageMetadata::default_instance_ = new PackageMetadata();
+  DocumentRevision::default_instance_ = new DocumentRevision();
   PasteboardMetadata::default_instance_ = new PasteboardMetadata();
   DataInfo::default_instance_ = new DataInfo();
   ViewStateMetadata::default_instance_ = new ViewStateMetadata();
@@ -404,7 +486,10 @@ void protobuf_AddDesc_TSPArchiveMessages_2eproto() {
   ComponentInfo::default_instance_->InitAsDefaultInstance();
   ComponentExternalReference::default_instance_->InitAsDefaultInstance();
   ComponentDataReference::default_instance_->InitAsDefaultInstance();
+  UUIDInternal::default_instance_->InitAsDefaultInstance();
+  ObjectUUIDMapEntry::default_instance_->InitAsDefaultInstance();
   PackageMetadata::default_instance_->InitAsDefaultInstance();
+  DocumentRevision::default_instance_->InitAsDefaultInstance();
   PasteboardMetadata::default_instance_->InitAsDefaultInstance();
   DataInfo::default_instance_->InitAsDefaultInstance();
   ViewStateMetadata::default_instance_->InitAsDefaultInstance();
@@ -1885,9 +1970,9 @@ const int ComponentInfo::kReadVersionFieldNumber;
 const int ComponentInfo::kWriteVersionFieldNumber;
 const int ComponentInfo::kExternalReferencesFieldNumber;
 const int ComponentInfo::kDataReferencesFieldNumber;
-const int ComponentInfo::kAllowsDuplicatesOutsideOfDocumentPackageFieldNumber;
-const int ComponentInfo::kDirtiesDocumentPackageFieldNumber;
+const int ComponentInfo::kObjectUuidMapEntriesFieldNumber;
 const int ComponentInfo::kIsStoredOutsideObjectArchiveFieldNumber;
+const int ComponentInfo::kSaveTokenFieldNumber;
 #endif  // !_MSC_VER
 
 ComponentInfo::ComponentInfo()
@@ -1909,9 +1994,8 @@ void ComponentInfo::SharedCtor() {
   identifier_ = GOOGLE_ULONGLONG(0);
   preferred_locator_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   locator_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  allows_duplicates_outside_of_document_package_ = false;
-  dirties_document_package_ = true;
   is_stored_outside_object_archive_ = false;
+  save_token_ = GOOGLE_ULONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1964,16 +2048,16 @@ void ComponentInfo::Clear() {
         locator_->clear();
       }
     }
-    allows_duplicates_outside_of_document_package_ = false;
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    dirties_document_package_ = true;
     is_stored_outside_object_archive_ = false;
+    save_token_ = GOOGLE_ULONGLONG(0);
   }
   read_version_.Clear();
   write_version_.Clear();
   external_references_.Clear();
   data_references_.Clear();
+  object_uuid_map_entries_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
@@ -2101,51 +2185,50 @@ bool ComponentInfo::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(58)) goto parse_data_references;
-        if (input->ExpectTag(64)) goto parse_allows_duplicates_outside_of_document_package;
+        if (input->ExpectTag(80)) goto parse_is_stored_outside_object_archive;
         break;
       }
 
-      // optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-      case 8: {
+      // optional bool is_stored_outside_object_archive = 10 [default = false];
+      case 10: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_allows_duplicates_outside_of_document_package:
+         parse_is_stored_outside_object_archive:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &allows_duplicates_outside_of_document_package_)));
-          set_has_allows_duplicates_outside_of_document_package();
+                 input, &is_stored_outside_object_archive_)));
+          set_has_is_stored_outside_object_archive();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(72)) goto parse_dirties_document_package;
+        if (input->ExpectTag(90)) goto parse_object_uuid_map_entries;
         break;
       }
 
-      // optional bool dirties_document_package = 9 [default = true];
-      case 9: {
+      // repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
+      case 11: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_dirties_document_package:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &dirties_document_package_)));
-          set_has_dirties_document_package();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_object_uuid_map_entries:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_object_uuid_map_entries()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(80)) goto parse_is_stored_outside_object_archive;
+        if (input->ExpectTag(90)) goto parse_object_uuid_map_entries;
+        if (input->ExpectTag(96)) goto parse_save_token;
         break;
       }
 
-      // optional bool is_stored_outside_object_archive = 10 [default = false];
-      case 10: {
+      // optional uint64 save_token = 12 [default = 0];
+      case 12: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_is_stored_outside_object_archive:
+         parse_save_token:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &is_stored_outside_object_archive_)));
-          set_has_is_stored_outside_object_archive();
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &save_token_)));
+          set_has_save_token();
         } else {
           goto handle_uninterpreted;
         }
@@ -2226,19 +2309,20 @@ void ComponentInfo::SerializeWithCachedSizes(
       7, this->data_references(i), output);
   }
 
-  // optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-  if (has_allows_duplicates_outside_of_document_package()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->allows_duplicates_outside_of_document_package(), output);
+  // optional bool is_stored_outside_object_archive = 10 [default = false];
+  if (has_is_stored_outside_object_archive()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->is_stored_outside_object_archive(), output);
   }
 
-  // optional bool dirties_document_package = 9 [default = true];
-  if (has_dirties_document_package()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(9, this->dirties_document_package(), output);
+  // repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
+  for (int i = 0; i < this->object_uuid_map_entries_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      11, this->object_uuid_map_entries(i), output);
   }
 
-  // optional bool is_stored_outside_object_archive = 10 [default = false];
-  if (has_is_stored_outside_object_archive()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->is_stored_outside_object_archive(), output);
+  // optional uint64 save_token = 12 [default = 0];
+  if (has_save_token()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(12, this->save_token(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -2316,19 +2400,21 @@ ::google::protobuf::uint8* ComponentInfo::SerializeWithCachedSizesToArray(
         7, this->data_references(i), target);
   }
 
-  // optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-  if (has_allows_duplicates_outside_of_document_package()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->allows_duplicates_outside_of_document_package(), target);
+  // optional bool is_stored_outside_object_archive = 10 [default = false];
+  if (has_is_stored_outside_object_archive()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->is_stored_outside_object_archive(), target);
   }
 
-  // optional bool dirties_document_package = 9 [default = true];
-  if (has_dirties_document_package()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(9, this->dirties_document_package(), target);
+  // repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
+  for (int i = 0; i < this->object_uuid_map_entries_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        11, this->object_uuid_map_entries(i), target);
   }
 
-  // optional bool is_stored_outside_object_archive = 10 [default = false];
-  if (has_is_stored_outside_object_archive()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->is_stored_outside_object_archive(), target);
+  // optional uint64 save_token = 12 [default = 0];
+  if (has_save_token()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(12, this->save_token(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -2363,23 +2449,20 @@ int ComponentInfo::ByteSize() const {
           this->locator());
     }
 
-    // optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-    if (has_allows_duplicates_outside_of_document_package()) {
-      total_size += 1 + 1;
-    }
-
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional bool dirties_document_package = 9 [default = true];
-    if (has_dirties_document_package()) {
-      total_size += 1 + 1;
-    }
-
     // optional bool is_stored_outside_object_archive = 10 [default = false];
     if (has_is_stored_outside_object_archive()) {
       total_size += 1 + 1;
     }
 
+    // optional uint64 save_token = 12 [default = 0];
+    if (has_save_token()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->save_token());
+    }
+
   }
   // repeated uint32 read_version = 4 [packed = true];
   {
@@ -2431,6 +2514,14 @@ int ComponentInfo::ByteSize() const {
         this->data_references(i));
   }
 
+  // repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
+  total_size += 1 * this->object_uuid_map_entries_size();
+  for (int i = 0; i < this->object_uuid_map_entries_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->object_uuid_map_entries(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -2460,6 +2551,7 @@ void ComponentInfo::MergeFrom(const ComponentInfo& from) {
   write_version_.MergeFrom(from.write_version_);
   external_references_.MergeFrom(from.external_references_);
   data_references_.MergeFrom(from.data_references_);
+  object_uuid_map_entries_.MergeFrom(from.object_uuid_map_entries_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_identifier()) {
       set_identifier(from.identifier());
@@ -2470,17 +2562,14 @@ void ComponentInfo::MergeFrom(const ComponentInfo& from) {
     if (from.has_locator()) {
       set_locator(from.locator());
     }
-    if (from.has_allows_duplicates_outside_of_document_package()) {
-      set_allows_duplicates_outside_of_document_package(from.allows_duplicates_outside_of_document_package());
-    }
   }
   if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_dirties_document_package()) {
-      set_dirties_document_package(from.dirties_document_package());
-    }
     if (from.has_is_stored_outside_object_archive()) {
       set_is_stored_outside_object_archive(from.is_stored_outside_object_archive());
     }
+    if (from.has_save_token()) {
+      set_save_token(from.save_token());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -2506,6 +2595,9 @@ bool ComponentInfo::IsInitialized() const {
   for (int i = 0; i < data_references_size(); i++) {
     if (!this->data_references(i).IsInitialized()) return false;
   }
+  for (int i = 0; i < object_uuid_map_entries_size(); i++) {
+    if (!this->object_uuid_map_entries(i).IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -2518,9 +2610,9 @@ void ComponentInfo::Swap(ComponentInfo* other) {
     write_version_.Swap(&other->write_version_);
     external_references_.Swap(&other->external_references_);
     data_references_.Swap(&other->data_references_);
-    std::swap(allows_duplicates_outside_of_document_package_, other->allows_duplicates_outside_of_document_package_);
-    std::swap(dirties_document_package_, other->dirties_document_package_);
+    object_uuid_map_entries_.Swap(&other->object_uuid_map_entries_);
     std::swap(is_stored_outside_object_archive_, other->is_stored_outside_object_archive_);
+    std::swap(save_token_, other->save_token_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -3035,161 +3127,100 @@ ::google::protobuf::Metadata ComponentDataReference::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int PackageMetadata::kLastObjectIdentifierFieldNumber;
-const int PackageMetadata::kComponentsFieldNumber;
-const int PackageMetadata::kDatasFieldNumber;
-const int PackageMetadata::kReadVersionFieldNumber;
-const int PackageMetadata::kWriteVersionFieldNumber;
+const int UUIDInternal::kLowerFieldNumber;
+const int UUIDInternal::kUpperFieldNumber;
 #endif  // !_MSC_VER
 
-PackageMetadata::PackageMetadata()
+UUIDInternal::UUIDInternal()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void PackageMetadata::InitAsDefaultInstance() {
+void UUIDInternal::InitAsDefaultInstance() {
 }
 
-PackageMetadata::PackageMetadata(const PackageMetadata& from)
+UUIDInternal::UUIDInternal(const UUIDInternal& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void PackageMetadata::SharedCtor() {
+void UUIDInternal::SharedCtor() {
   _cached_size_ = 0;
-  last_object_identifier_ = GOOGLE_ULONGLONG(0);
+  lower_ = GOOGLE_ULONGLONG(0);
+  upper_ = GOOGLE_ULONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-PackageMetadata::~PackageMetadata() {
+UUIDInternal::~UUIDInternal() {
   SharedDtor();
 }
 
-void PackageMetadata::SharedDtor() {
+void UUIDInternal::SharedDtor() {
   if (this != default_instance_) {
   }
 }
 
-void PackageMetadata::SetCachedSize(int size) const {
+void UUIDInternal::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* PackageMetadata::descriptor() {
+const ::google::protobuf::Descriptor* UUIDInternal::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return PackageMetadata_descriptor_;
+  return UUIDInternal_descriptor_;
 }
 
-const PackageMetadata& PackageMetadata::default_instance() {
+const UUIDInternal& UUIDInternal::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSPArchiveMessages_2eproto();
   return *default_instance_;
 }
 
-PackageMetadata* PackageMetadata::default_instance_ = NULL;
+UUIDInternal* UUIDInternal::default_instance_ = NULL;
 
-PackageMetadata* PackageMetadata::New() const {
-  return new PackageMetadata;
+UUIDInternal* UUIDInternal::New() const {
+  return new UUIDInternal;
 }
 
-void PackageMetadata::Clear() {
+void UUIDInternal::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    last_object_identifier_ = GOOGLE_ULONGLONG(0);
+    lower_ = GOOGLE_ULONGLONG(0);
+    upper_ = GOOGLE_ULONGLONG(0);
   }
-  components_.Clear();
-  datas_.Clear();
-  read_version_.Clear();
-  write_version_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool PackageMetadata::MergePartialFromCodedStream(
+bool UUIDInternal::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint64 last_object_identifier = 1;
+      // required uint64 lower = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &last_object_identifier_)));
-          set_has_last_object_identifier();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_components;
-        break;
-      }
-
-      // repeated .TSP.ComponentInfo components = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_components:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_components()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_components;
-        if (input->ExpectTag(34)) goto parse_datas;
-        break;
-      }
-
-      // repeated .TSP.DataInfo datas = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_datas:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_datas()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_datas;
-        if (input->ExpectTag(42)) goto parse_read_version;
-        break;
-      }
-
-      // repeated uint32 read_version = 5 [packed = true];
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_read_version:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, this->mutable_read_version())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 1, 42, input, this->mutable_read_version())));
+                 input, &lower_)));
+          set_has_lower();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_write_version;
+        if (input->ExpectTag(16)) goto parse_upper;
         break;
       }
 
-      // repeated uint32 write_version = 6 [packed = true];
-      case 6: {
+      // required uint64 upper = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_write_version:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, this->mutable_write_version())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 1, 50, input, this->mutable_write_version())));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_upper:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &upper_)));
+          set_has_upper();
         } else {
           goto handle_uninterpreted;
         }
@@ -3213,43 +3244,16 @@ bool PackageMetadata::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void PackageMetadata::SerializeWithCachedSizes(
+void UUIDInternal::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint64 last_object_identifier = 1;
-  if (has_last_object_identifier()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->last_object_identifier(), output);
-  }
-
-  // repeated .TSP.ComponentInfo components = 3;
-  for (int i = 0; i < this->components_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->components(i), output);
-  }
-
-  // repeated .TSP.DataInfo datas = 4;
-  for (int i = 0; i < this->datas_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->datas(i), output);
-  }
-
-  // repeated uint32 read_version = 5 [packed = true];
-  if (this->read_version_size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteTag(5, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
-    output->WriteVarint32(_read_version_cached_byte_size_);
-  }
-  for (int i = 0; i < this->read_version_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag(
-      this->read_version(i), output);
+  // required uint64 lower = 1;
+  if (has_lower()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->lower(), output);
   }
 
-  // repeated uint32 write_version = 6 [packed = true];
-  if (this->write_version_size() > 0) {
-    ::google::protobuf::internal::WireFormatLite::WriteTag(6, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
-    output->WriteVarint32(_write_version_cached_byte_size_);
-  }
-  for (int i = 0; i < this->write_version_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag(
-      this->write_version(i), output);
+  // required uint64 upper = 2;
+  if (has_upper()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->upper(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -3258,53 +3262,16 @@ void PackageMetadata::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* PackageMetadata::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* UUIDInternal::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required uint64 last_object_identifier = 1;
-  if (has_last_object_identifier()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->last_object_identifier(), target);
-  }
-
-  // repeated .TSP.ComponentInfo components = 3;
-  for (int i = 0; i < this->components_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->components(i), target);
-  }
-
-  // repeated .TSP.DataInfo datas = 4;
-  for (int i = 0; i < this->datas_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->datas(i), target);
+  // required uint64 lower = 1;
+  if (has_lower()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->lower(), target);
   }
 
-  // repeated uint32 read_version = 5 [packed = true];
-  if (this->read_version_size() > 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
-      5,
-      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-      target);
-    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
-      _read_version_cached_byte_size_, target);
-  }
-  for (int i = 0; i < this->read_version_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteUInt32NoTagToArray(this->read_version(i), target);
-  }
-
-  // repeated uint32 write_version = 6 [packed = true];
-  if (this->write_version_size() > 0) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
-      6,
-      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-      target);
-    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
-      _write_version_cached_byte_size_, target);
-  }
-  for (int i = 0; i < this->write_version_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteUInt32NoTagToArray(this->write_version(i), target);
+  // required uint64 upper = 2;
+  if (has_upper()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->upper(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -3314,19 +3281,774 @@ ::google::protobuf::uint8* PackageMetadata::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int PackageMetadata::ByteSize() const {
+int UUIDInternal::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint64 last_object_identifier = 1;
-    if (has_last_object_identifier()) {
+    // required uint64 lower = 1;
+    if (has_lower()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt64Size(
-          this->last_object_identifier());
+          this->lower());
     }
 
-  }
-  // repeated .TSP.ComponentInfo components = 3;
+    // required uint64 upper = 2;
+    if (has_upper()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->upper());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void UUIDInternal::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const UUIDInternal* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const UUIDInternal*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void UUIDInternal::MergeFrom(const UUIDInternal& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_lower()) {
+      set_lower(from.lower());
+    }
+    if (from.has_upper()) {
+      set_upper(from.upper());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void UUIDInternal::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void UUIDInternal::CopyFrom(const UUIDInternal& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool UUIDInternal::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  return true;
+}
+
+void UUIDInternal::Swap(UUIDInternal* other) {
+  if (other != this) {
+    std::swap(lower_, other->lower_);
+    std::swap(upper_, other->upper_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata UUIDInternal::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = UUIDInternal_descriptor_;
+  metadata.reflection = UUIDInternal_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int ObjectUUIDMapEntry::kIdentifierFieldNumber;
+const int ObjectUUIDMapEntry::kUuidFieldNumber;
+#endif  // !_MSC_VER
+
+ObjectUUIDMapEntry::ObjectUUIDMapEntry()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ObjectUUIDMapEntry::InitAsDefaultInstance() {
+  uuid_ = const_cast< ::TSP::UUIDInternal*>(&::TSP::UUIDInternal::default_instance());
+}
+
+ObjectUUIDMapEntry::ObjectUUIDMapEntry(const ObjectUUIDMapEntry& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ObjectUUIDMapEntry::SharedCtor() {
+  _cached_size_ = 0;
+  identifier_ = GOOGLE_ULONGLONG(0);
+  uuid_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ObjectUUIDMapEntry::~ObjectUUIDMapEntry() {
+  SharedDtor();
+}
+
+void ObjectUUIDMapEntry::SharedDtor() {
+  if (this != default_instance_) {
+    delete uuid_;
+  }
+}
+
+void ObjectUUIDMapEntry::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ObjectUUIDMapEntry::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ObjectUUIDMapEntry_descriptor_;
+}
+
+const ObjectUUIDMapEntry& ObjectUUIDMapEntry::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSPArchiveMessages_2eproto();
+  return *default_instance_;
+}
+
+ObjectUUIDMapEntry* ObjectUUIDMapEntry::default_instance_ = NULL;
+
+ObjectUUIDMapEntry* ObjectUUIDMapEntry::New() const {
+  return new ObjectUUIDMapEntry;
+}
+
+void ObjectUUIDMapEntry::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    identifier_ = GOOGLE_ULONGLONG(0);
+    if (has_uuid()) {
+      if (uuid_ != NULL) uuid_->::TSP::UUIDInternal::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ObjectUUIDMapEntry::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required uint64 identifier = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &identifier_)));
+          set_has_identifier();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_uuid;
+        break;
+      }
+
+      // required .TSP.UUIDInternal uuid = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_uuid:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_uuid()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void ObjectUUIDMapEntry::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required uint64 identifier = 1;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->identifier(), output);
+  }
+
+  // required .TSP.UUIDInternal uuid = 2;
+  if (has_uuid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->uuid(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ObjectUUIDMapEntry::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required uint64 identifier = 1;
+  if (has_identifier()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->identifier(), target);
+  }
+
+  // required .TSP.UUIDInternal uuid = 2;
+  if (has_uuid()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->uuid(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ObjectUUIDMapEntry::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required uint64 identifier = 1;
+    if (has_identifier()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->identifier());
+    }
+
+    // required .TSP.UUIDInternal uuid = 2;
+    if (has_uuid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->uuid());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void ObjectUUIDMapEntry::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ObjectUUIDMapEntry* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ObjectUUIDMapEntry*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ObjectUUIDMapEntry::MergeFrom(const ObjectUUIDMapEntry& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_identifier()) {
+      set_identifier(from.identifier());
+    }
+    if (from.has_uuid()) {
+      mutable_uuid()->::TSP::UUIDInternal::MergeFrom(from.uuid());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ObjectUUIDMapEntry::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ObjectUUIDMapEntry::CopyFrom(const ObjectUUIDMapEntry& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ObjectUUIDMapEntry::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_uuid()) {
+    if (!this->uuid().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void ObjectUUIDMapEntry::Swap(ObjectUUIDMapEntry* other) {
+  if (other != this) {
+    std::swap(identifier_, other->identifier_);
+    std::swap(uuid_, other->uuid_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata ObjectUUIDMapEntry::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ObjectUUIDMapEntry_descriptor_;
+  metadata.reflection = ObjectUUIDMapEntry_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int PackageMetadata::kLastObjectIdentifierFieldNumber;
+const int PackageMetadata::kRevisionFieldNumber;
+const int PackageMetadata::kComponentsFieldNumber;
+const int PackageMetadata::kDatasFieldNumber;
+const int PackageMetadata::kReadVersionFieldNumber;
+const int PackageMetadata::kWriteVersionFieldNumber;
+const int PackageMetadata::kFileFormatVersionFieldNumber;
+const int PackageMetadata::kSaveTokenFieldNumber;
+#endif  // !_MSC_VER
+
+PackageMetadata::PackageMetadata()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void PackageMetadata::InitAsDefaultInstance() {
+  revision_ = const_cast< ::TSP::DocumentRevision*>(&::TSP::DocumentRevision::default_instance());
+}
+
+PackageMetadata::PackageMetadata(const PackageMetadata& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void PackageMetadata::SharedCtor() {
+  _cached_size_ = 0;
+  last_object_identifier_ = GOOGLE_ULONGLONG(0);
+  revision_ = NULL;
+  save_token_ = GOOGLE_ULONGLONG(0);
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+PackageMetadata::~PackageMetadata() {
+  SharedDtor();
+}
+
+void PackageMetadata::SharedDtor() {
+  if (this != default_instance_) {
+    delete revision_;
+  }
+}
+
+void PackageMetadata::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* PackageMetadata::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return PackageMetadata_descriptor_;
+}
+
+const PackageMetadata& PackageMetadata::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSPArchiveMessages_2eproto();
+  return *default_instance_;
+}
+
+PackageMetadata* PackageMetadata::default_instance_ = NULL;
+
+PackageMetadata* PackageMetadata::New() const {
+  return new PackageMetadata;
+}
+
+void PackageMetadata::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    last_object_identifier_ = GOOGLE_ULONGLONG(0);
+    if (has_revision()) {
+      if (revision_ != NULL) revision_->::TSP::DocumentRevision::Clear();
+    }
+    save_token_ = GOOGLE_ULONGLONG(0);
+  }
+  components_.Clear();
+  datas_.Clear();
+  read_version_.Clear();
+  write_version_.Clear();
+  file_format_version_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool PackageMetadata::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required uint64 last_object_identifier = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &last_object_identifier_)));
+          set_has_last_object_identifier();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_revision;
+        break;
+      }
+
+      // optional .TSP.DocumentRevision revision = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_revision:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_revision()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_components;
+        break;
+      }
+
+      // repeated .TSP.ComponentInfo components = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_components:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_components()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_components;
+        if (input->ExpectTag(34)) goto parse_datas;
+        break;
+      }
+
+      // repeated .TSP.DataInfo datas = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_datas:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_datas()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_datas;
+        if (input->ExpectTag(42)) goto parse_read_version;
+        break;
+      }
+
+      // repeated uint32 read_version = 5 [packed = true];
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_read_version:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_read_version())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 1, 42, input, this->mutable_read_version())));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_write_version;
+        break;
+      }
+
+      // repeated uint32 write_version = 6 [packed = true];
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_write_version:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_write_version())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 1, 50, input, this->mutable_write_version())));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_file_format_version;
+        break;
+      }
+
+      // repeated uint32 file_format_version = 7 [packed = true];
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_file_format_version:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_file_format_version())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 1, 58, input, this->mutable_file_format_version())));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_save_token;
+        break;
+      }
+
+      // optional uint64 save_token = 8 [default = 0];
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_save_token:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &save_token_)));
+          set_has_save_token();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void PackageMetadata::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required uint64 last_object_identifier = 1;
+  if (has_last_object_identifier()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->last_object_identifier(), output);
+  }
+
+  // optional .TSP.DocumentRevision revision = 2;
+  if (has_revision()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->revision(), output);
+  }
+
+  // repeated .TSP.ComponentInfo components = 3;
+  for (int i = 0; i < this->components_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->components(i), output);
+  }
+
+  // repeated .TSP.DataInfo datas = 4;
+  for (int i = 0; i < this->datas_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->datas(i), output);
+  }
+
+  // repeated uint32 read_version = 5 [packed = true];
+  if (this->read_version_size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteTag(5, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
+    output->WriteVarint32(_read_version_cached_byte_size_);
+  }
+  for (int i = 0; i < this->read_version_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag(
+      this->read_version(i), output);
+  }
+
+  // repeated uint32 write_version = 6 [packed = true];
+  if (this->write_version_size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteTag(6, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
+    output->WriteVarint32(_write_version_cached_byte_size_);
+  }
+  for (int i = 0; i < this->write_version_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag(
+      this->write_version(i), output);
+  }
+
+  // repeated uint32 file_format_version = 7 [packed = true];
+  if (this->file_format_version_size() > 0) {
+    ::google::protobuf::internal::WireFormatLite::WriteTag(7, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
+    output->WriteVarint32(_file_format_version_cached_byte_size_);
+  }
+  for (int i = 0; i < this->file_format_version_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32NoTag(
+      this->file_format_version(i), output);
+  }
+
+  // optional uint64 save_token = 8 [default = 0];
+  if (has_save_token()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(8, this->save_token(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* PackageMetadata::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required uint64 last_object_identifier = 1;
+  if (has_last_object_identifier()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->last_object_identifier(), target);
+  }
+
+  // optional .TSP.DocumentRevision revision = 2;
+  if (has_revision()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->revision(), target);
+  }
+
+  // repeated .TSP.ComponentInfo components = 3;
+  for (int i = 0; i < this->components_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->components(i), target);
+  }
+
+  // repeated .TSP.DataInfo datas = 4;
+  for (int i = 0; i < this->datas_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->datas(i), target);
+  }
+
+  // repeated uint32 read_version = 5 [packed = true];
+  if (this->read_version_size() > 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
+      5,
+      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
+      target);
+    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
+      _read_version_cached_byte_size_, target);
+  }
+  for (int i = 0; i < this->read_version_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteUInt32NoTagToArray(this->read_version(i), target);
+  }
+
+  // repeated uint32 write_version = 6 [packed = true];
+  if (this->write_version_size() > 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
+      6,
+      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
+      target);
+    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
+      _write_version_cached_byte_size_, target);
+  }
+  for (int i = 0; i < this->write_version_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteUInt32NoTagToArray(this->write_version(i), target);
+  }
+
+  // repeated uint32 file_format_version = 7 [packed = true];
+  if (this->file_format_version_size() > 0) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
+      7,
+      ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
+      target);
+    target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
+      _file_format_version_cached_byte_size_, target);
+  }
+  for (int i = 0; i < this->file_format_version_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteUInt32NoTagToArray(this->file_format_version(i), target);
+  }
+
+  // optional uint64 save_token = 8 [default = 0];
+  if (has_save_token()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(8, this->save_token(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int PackageMetadata::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required uint64 last_object_identifier = 1;
+    if (has_last_object_identifier()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->last_object_identifier());
+    }
+
+    // optional .TSP.DocumentRevision revision = 2;
+    if (has_revision()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->revision());
+    }
+
+    // optional uint64 save_token = 8 [default = 0];
+    if (has_save_token()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->save_token());
+    }
+
+  }
+  // repeated .TSP.ComponentInfo components = 3;
   total_size += 1 * this->components_size();
   for (int i = 0; i < this->components_size(); i++) {
     total_size +=
@@ -3376,6 +4098,23 @@ int PackageMetadata::ByteSize() const {
     total_size += data_size;
   }
 
+  // repeated uint32 file_format_version = 7 [packed = true];
+  {
+    int data_size = 0;
+    for (int i = 0; i < this->file_format_version_size(); i++) {
+      data_size += ::google::protobuf::internal::WireFormatLite::
+        UInt32Size(this->file_format_version(i));
+    }
+    if (data_size > 0) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);
+    }
+    GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+    _file_format_version_cached_byte_size_ = data_size;
+    GOOGLE_SAFE_CONCURRENT_WRITES_END();
+    total_size += data_size;
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -3405,10 +4144,17 @@ void PackageMetadata::MergeFrom(const PackageMetadata& from) {
   datas_.MergeFrom(from.datas_);
   read_version_.MergeFrom(from.read_version_);
   write_version_.MergeFrom(from.write_version_);
+  file_format_version_.MergeFrom(from.file_format_version_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_last_object_identifier()) {
       set_last_object_identifier(from.last_object_identifier());
     }
+    if (from.has_revision()) {
+      mutable_revision()->::TSP::DocumentRevision::MergeFrom(from.revision());
+    }
+    if (from.has_save_token()) {
+      set_save_token(from.save_token());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -3440,10 +4186,13 @@ bool PackageMetadata::IsInitialized() const {
 void PackageMetadata::Swap(PackageMetadata* other) {
   if (other != this) {
     std::swap(last_object_identifier_, other->last_object_identifier_);
+    std::swap(revision_, other->revision_);
     components_.Swap(&other->components_);
     datas_.Swap(&other->datas_);
     read_version_.Swap(&other->read_version_);
     write_version_.Swap(&other->write_version_);
+    file_format_version_.Swap(&other->file_format_version_);
+    std::swap(save_token_, other->save_token_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -3459,6 +4208,271 @@ ::google::protobuf::Metadata PackageMetadata::GetMetadata() const {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int DocumentRevision::kSequenceFieldNumber;
+const int DocumentRevision::kIdentifierFieldNumber;
+#endif  // !_MSC_VER
+
+DocumentRevision::DocumentRevision()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void DocumentRevision::InitAsDefaultInstance() {
+}
+
+DocumentRevision::DocumentRevision(const DocumentRevision& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void DocumentRevision::SharedCtor() {
+  _cached_size_ = 0;
+  sequence_ = GOOGLE_ULONGLONG(0);
+  identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+DocumentRevision::~DocumentRevision() {
+  SharedDtor();
+}
+
+void DocumentRevision::SharedDtor() {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete identifier_;
+  }
+  if (this != default_instance_) {
+  }
+}
+
+void DocumentRevision::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* DocumentRevision::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return DocumentRevision_descriptor_;
+}
+
+const DocumentRevision& DocumentRevision::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSPArchiveMessages_2eproto();
+  return *default_instance_;
+}
+
+DocumentRevision* DocumentRevision::default_instance_ = NULL;
+
+DocumentRevision* DocumentRevision::New() const {
+  return new DocumentRevision;
+}
+
+void DocumentRevision::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    sequence_ = GOOGLE_ULONGLONG(0);
+    if (has_identifier()) {
+      if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+        identifier_->clear();
+      }
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool DocumentRevision::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional uint64 sequence = 1 [default = 0];
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &sequence_)));
+          set_has_sequence();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_identifier;
+        break;
+      }
+
+      // optional string identifier = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_identifier:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_identifier()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->identifier().data(), this->identifier().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void DocumentRevision::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional uint64 sequence = 1 [default = 0];
+  if (has_sequence()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->sequence(), output);
+  }
+
+  // optional string identifier = 2;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->identifier().data(), this->identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      2, this->identifier(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* DocumentRevision::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional uint64 sequence = 1 [default = 0];
+  if (has_sequence()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->sequence(), target);
+  }
+
+  // optional string identifier = 2;
+  if (has_identifier()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->identifier().data(), this->identifier().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->identifier(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int DocumentRevision::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional uint64 sequence = 1 [default = 0];
+    if (has_sequence()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->sequence());
+    }
+
+    // optional string identifier = 2;
+    if (has_identifier()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->identifier());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void DocumentRevision::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const DocumentRevision* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const DocumentRevision*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void DocumentRevision::MergeFrom(const DocumentRevision& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_sequence()) {
+      set_sequence(from.sequence());
+    }
+    if (from.has_identifier()) {
+      set_identifier(from.identifier());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void DocumentRevision::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void DocumentRevision::CopyFrom(const DocumentRevision& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool DocumentRevision::IsInitialized() const {
+
+  return true;
+}
+
+void DocumentRevision::Swap(DocumentRevision* other) {
+  if (other != this) {
+    std::swap(sequence_, other->sequence_);
+    std::swap(identifier_, other->identifier_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata DocumentRevision::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = DocumentRevision_descriptor_;
+  metadata.reflection = DocumentRevision_reflection_;
+  return metadata;
+}
+
+
 // ===================================================================
 
 #ifndef _MSC_VER
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.h
index 65705b9..dff6c1e 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSPArchiveMessages.pb.h
@@ -41,7 +41,10 @@ class FieldPath;
 class ComponentInfo;
 class ComponentExternalReference;
 class ComponentDataReference;
+class UUIDInternal;
+class ObjectUUIDMapEntry;
 class PackageMetadata;
+class DocumentRevision;
 class PasteboardMetadata;
 class DataInfo;
 class ViewStateMetadata;
@@ -735,19 +738,17 @@ class ComponentInfo : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::TSP::ComponentDataReference >*
       mutable_data_references();
 
-  // optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-  inline bool has_allows_duplicates_outside_of_document_package() const;
-  inline void clear_allows_duplicates_outside_of_document_package();
-  static const int kAllowsDuplicatesOutsideOfDocumentPackageFieldNumber = 8;
-  inline bool allows_duplicates_outside_of_document_package() const;
-  inline void set_allows_duplicates_outside_of_document_package(bool value);
-
-  // optional bool dirties_document_package = 9 [default = true];
-  inline bool has_dirties_document_package() const;
-  inline void clear_dirties_document_package();
-  static const int kDirtiesDocumentPackageFieldNumber = 9;
-  inline bool dirties_document_package() const;
-  inline void set_dirties_document_package(bool value);
+  // repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
+  inline int object_uuid_map_entries_size() const;
+  inline void clear_object_uuid_map_entries();
+  static const int kObjectUuidMapEntriesFieldNumber = 11;
+  inline const ::TSP::ObjectUUIDMapEntry& object_uuid_map_entries(int index) const;
+  inline ::TSP::ObjectUUIDMapEntry* mutable_object_uuid_map_entries(int index);
+  inline ::TSP::ObjectUUIDMapEntry* add_object_uuid_map_entries();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::ObjectUUIDMapEntry >&
+      object_uuid_map_entries() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::ObjectUUIDMapEntry >*
+      mutable_object_uuid_map_entries();
 
   // optional bool is_stored_outside_object_archive = 10 [default = false];
   inline bool has_is_stored_outside_object_archive() const;
@@ -756,6 +757,13 @@ class ComponentInfo : public ::google::protobuf::Message {
   inline bool is_stored_outside_object_archive() const;
   inline void set_is_stored_outside_object_archive(bool value);
 
+  // optional uint64 save_token = 12 [default = 0];
+  inline bool has_save_token() const;
+  inline void clear_save_token();
+  static const int kSaveTokenFieldNumber = 12;
+  inline ::google::protobuf::uint64 save_token() const;
+  inline void set_save_token(::google::protobuf::uint64 value);
+
   // @@protoc_insertion_point(class_scope:TSP.ComponentInfo)
  private:
   inline void set_has_identifier();
@@ -764,12 +772,10 @@ class ComponentInfo : public ::google::protobuf::Message {
   inline void clear_has_preferred_locator();
   inline void set_has_locator();
   inline void clear_has_locator();
-  inline void set_has_allows_duplicates_outside_of_document_package();
-  inline void clear_has_allows_duplicates_outside_of_document_package();
-  inline void set_has_dirties_document_package();
-  inline void clear_has_dirties_document_package();
   inline void set_has_is_stored_outside_object_archive();
   inline void clear_has_is_stored_outside_object_archive();
+  inline void set_has_save_token();
+  inline void clear_has_save_token();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -782,8 +788,8 @@ class ComponentInfo : public ::google::protobuf::Message {
   mutable int _write_version_cached_byte_size_;
   ::google::protobuf::RepeatedPtrField< ::TSP::ComponentExternalReference > external_references_;
   ::google::protobuf::RepeatedPtrField< ::TSP::ComponentDataReference > data_references_;
-  bool allows_duplicates_outside_of_document_package_;
-  bool dirties_document_package_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::ObjectUUIDMapEntry > object_uuid_map_entries_;
+  ::google::protobuf::uint64 save_token_;
   bool is_stored_outside_object_archive_;
 
   mutable int _cached_size_;
@@ -982,6 +988,192 @@ class ComponentDataReference : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class UUIDInternal : public ::google::protobuf::Message {
+ public:
+  UUIDInternal();
+  virtual ~UUIDInternal();
+
+  UUIDInternal(const UUIDInternal& from);
+
+  inline UUIDInternal& operator=(const UUIDInternal& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const UUIDInternal& default_instance();
+
+  void Swap(UUIDInternal* other);
+
+  // implements Message ----------------------------------------------
+
+  UUIDInternal* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const UUIDInternal& from);
+  void MergeFrom(const UUIDInternal& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required uint64 lower = 1;
+  inline bool has_lower() const;
+  inline void clear_lower();
+  static const int kLowerFieldNumber = 1;
+  inline ::google::protobuf::uint64 lower() const;
+  inline void set_lower(::google::protobuf::uint64 value);
+
+  // required uint64 upper = 2;
+  inline bool has_upper() const;
+  inline void clear_upper();
+  static const int kUpperFieldNumber = 2;
+  inline ::google::protobuf::uint64 upper() const;
+  inline void set_upper(::google::protobuf::uint64 value);
+
+  // @@protoc_insertion_point(class_scope:TSP.UUIDInternal)
+ private:
+  inline void set_has_lower();
+  inline void clear_has_lower();
+  inline void set_has_upper();
+  inline void clear_has_upper();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint64 lower_;
+  ::google::protobuf::uint64 upper_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSPArchiveMessages_2eproto();
+  friend void protobuf_AssignDesc_TSPArchiveMessages_2eproto();
+  friend void protobuf_ShutdownFile_TSPArchiveMessages_2eproto();
+
+  void InitAsDefaultInstance();
+  static UUIDInternal* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ObjectUUIDMapEntry : public ::google::protobuf::Message {
+ public:
+  ObjectUUIDMapEntry();
+  virtual ~ObjectUUIDMapEntry();
+
+  ObjectUUIDMapEntry(const ObjectUUIDMapEntry& from);
+
+  inline ObjectUUIDMapEntry& operator=(const ObjectUUIDMapEntry& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ObjectUUIDMapEntry& default_instance();
+
+  void Swap(ObjectUUIDMapEntry* other);
+
+  // implements Message ----------------------------------------------
+
+  ObjectUUIDMapEntry* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ObjectUUIDMapEntry& from);
+  void MergeFrom(const ObjectUUIDMapEntry& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required uint64 identifier = 1;
+  inline bool has_identifier() const;
+  inline void clear_identifier();
+  static const int kIdentifierFieldNumber = 1;
+  inline ::google::protobuf::uint64 identifier() const;
+  inline void set_identifier(::google::protobuf::uint64 value);
+
+  // required .TSP.UUIDInternal uuid = 2;
+  inline bool has_uuid() const;
+  inline void clear_uuid();
+  static const int kUuidFieldNumber = 2;
+  inline const ::TSP::UUIDInternal& uuid() const;
+  inline ::TSP::UUIDInternal* mutable_uuid();
+  inline ::TSP::UUIDInternal* release_uuid();
+  inline void set_allocated_uuid(::TSP::UUIDInternal* uuid);
+
+  // @@protoc_insertion_point(class_scope:TSP.ObjectUUIDMapEntry)
+ private:
+  inline void set_has_identifier();
+  inline void clear_has_identifier();
+  inline void set_has_uuid();
+  inline void clear_has_uuid();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint64 identifier_;
+  ::TSP::UUIDInternal* uuid_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSPArchiveMessages_2eproto();
+  friend void protobuf_AssignDesc_TSPArchiveMessages_2eproto();
+  friend void protobuf_ShutdownFile_TSPArchiveMessages_2eproto();
+
+  void InitAsDefaultInstance();
+  static ObjectUUIDMapEntry* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class PackageMetadata : public ::google::protobuf::Message {
  public:
   PackageMetadata();
@@ -1043,6 +1235,15 @@ class PackageMetadata : public ::google::protobuf::Message {
   inline ::google::protobuf::uint64 last_object_identifier() const;
   inline void set_last_object_identifier(::google::protobuf::uint64 value);
 
+  // optional .TSP.DocumentRevision revision = 2;
+  inline bool has_revision() const;
+  inline void clear_revision();
+  static const int kRevisionFieldNumber = 2;
+  inline const ::TSP::DocumentRevision& revision() const;
+  inline ::TSP::DocumentRevision* mutable_revision();
+  inline ::TSP::DocumentRevision* release_revision();
+  inline void set_allocated_revision(::TSP::DocumentRevision* revision);
+
   // repeated .TSP.ComponentInfo components = 3;
   inline int components_size() const;
   inline void clear_components();
@@ -1091,23 +1292,50 @@ class PackageMetadata : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
       mutable_write_version();
 
+  // repeated uint32 file_format_version = 7 [packed = true];
+  inline int file_format_version_size() const;
+  inline void clear_file_format_version();
+  static const int kFileFormatVersionFieldNumber = 7;
+  inline ::google::protobuf::uint32 file_format_version(int index) const;
+  inline void set_file_format_version(int index, ::google::protobuf::uint32 value);
+  inline void add_file_format_version(::google::protobuf::uint32 value);
+  inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+      file_format_version() const;
+  inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+      mutable_file_format_version();
+
+  // optional uint64 save_token = 8 [default = 0];
+  inline bool has_save_token() const;
+  inline void clear_save_token();
+  static const int kSaveTokenFieldNumber = 8;
+  inline ::google::protobuf::uint64 save_token() const;
+  inline void set_save_token(::google::protobuf::uint64 value);
+
   // @@protoc_insertion_point(class_scope:TSP.PackageMetadata)
  private:
   inline void set_has_last_object_identifier();
   inline void clear_has_last_object_identifier();
+  inline void set_has_revision();
+  inline void clear_has_revision();
+  inline void set_has_save_token();
+  inline void clear_has_save_token();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::google::protobuf::uint64 last_object_identifier_;
+  ::TSP::DocumentRevision* revision_;
   ::google::protobuf::RepeatedPtrField< ::TSP::ComponentInfo > components_;
   ::google::protobuf::RepeatedPtrField< ::TSP::DataInfo > datas_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > read_version_;
   mutable int _read_version_cached_byte_size_;
   ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > write_version_;
   mutable int _write_version_cached_byte_size_;
+  ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > file_format_version_;
+  mutable int _file_format_version_cached_byte_size_;
+  ::google::protobuf::uint64 save_token_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSPArchiveMessages_2eproto();
   friend void protobuf_AssignDesc_TSPArchiveMessages_2eproto();
@@ -1118,6 +1346,103 @@ class PackageMetadata : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class DocumentRevision : public ::google::protobuf::Message {
+ public:
+  DocumentRevision();
+  virtual ~DocumentRevision();
+
+  DocumentRevision(const DocumentRevision& from);
+
+  inline DocumentRevision& operator=(const DocumentRevision& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const DocumentRevision& default_instance();
+
+  void Swap(DocumentRevision* other);
+
+  // implements Message ----------------------------------------------
+
+  DocumentRevision* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const DocumentRevision& from);
+  void MergeFrom(const DocumentRevision& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional uint64 sequence = 1 [default = 0];
+  inline bool has_sequence() const;
+  inline void clear_sequence();
+  static const int kSequenceFieldNumber = 1;
+  inline ::google::protobuf::uint64 sequence() const;
+  inline void set_sequence(::google::protobuf::uint64 value);
+
+  // optional string identifier = 2;
+  inline bool has_identifier() const;
+  inline void clear_identifier();
+  static const int kIdentifierFieldNumber = 2;
+  inline const ::std::string& identifier() const;
+  inline void set_identifier(const ::std::string& value);
+  inline void set_identifier(const char* value);
+  inline void set_identifier(const char* value, size_t size);
+  inline ::std::string* mutable_identifier();
+  inline ::std::string* release_identifier();
+  inline void set_allocated_identifier(::std::string* identifier);
+
+  // @@protoc_insertion_point(class_scope:TSP.DocumentRevision)
+ private:
+  inline void set_has_sequence();
+  inline void clear_has_sequence();
+  inline void set_has_identifier();
+  inline void clear_has_identifier();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint64 sequence_;
+  ::std::string* identifier_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSPArchiveMessages_2eproto();
+  friend void protobuf_AssignDesc_TSPArchiveMessages_2eproto();
+  friend void protobuf_ShutdownFile_TSPArchiveMessages_2eproto();
+
+  void InitAsDefaultInstance();
+  static DocumentRevision* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class PasteboardMetadata : public ::google::protobuf::Message {
  public:
   PasteboardMetadata();
@@ -2165,59 +2490,40 @@ ComponentInfo::mutable_data_references() {
   return &data_references_;
 }
 
-// optional bool allows_duplicates_outside_of_document_package = 8 [default = false];
-inline bool ComponentInfo::has_allows_duplicates_outside_of_document_package() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+// repeated .TSP.ObjectUUIDMapEntry object_uuid_map_entries = 11;
+inline int ComponentInfo::object_uuid_map_entries_size() const {
+  return object_uuid_map_entries_.size();
 }
-inline void ComponentInfo::set_has_allows_duplicates_outside_of_document_package() {
-  _has_bits_[0] |= 0x00000080u;
+inline void ComponentInfo::clear_object_uuid_map_entries() {
+  object_uuid_map_entries_.Clear();
 }
-inline void ComponentInfo::clear_has_allows_duplicates_outside_of_document_package() {
-  _has_bits_[0] &= ~0x00000080u;
+inline const ::TSP::ObjectUUIDMapEntry& ComponentInfo::object_uuid_map_entries(int index) const {
+  return object_uuid_map_entries_.Get(index);
 }
-inline void ComponentInfo::clear_allows_duplicates_outside_of_document_package() {
-  allows_duplicates_outside_of_document_package_ = false;
-  clear_has_allows_duplicates_outside_of_document_package();
+inline ::TSP::ObjectUUIDMapEntry* ComponentInfo::mutable_object_uuid_map_entries(int index) {
+  return object_uuid_map_entries_.Mutable(index);
 }
-inline bool ComponentInfo::allows_duplicates_outside_of_document_package() const {
-  return allows_duplicates_outside_of_document_package_;
+inline ::TSP::ObjectUUIDMapEntry* ComponentInfo::add_object_uuid_map_entries() {
+  return object_uuid_map_entries_.Add();
 }
-inline void ComponentInfo::set_allows_duplicates_outside_of_document_package(bool value) {
-  set_has_allows_duplicates_outside_of_document_package();
-  allows_duplicates_outside_of_document_package_ = value;
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::ObjectUUIDMapEntry >&
+ComponentInfo::object_uuid_map_entries() const {
+  return object_uuid_map_entries_;
 }
-
-// optional bool dirties_document_package = 9 [default = true];
-inline bool ComponentInfo::has_dirties_document_package() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
-}
-inline void ComponentInfo::set_has_dirties_document_package() {
-  _has_bits_[0] |= 0x00000100u;
-}
-inline void ComponentInfo::clear_has_dirties_document_package() {
-  _has_bits_[0] &= ~0x00000100u;
-}
-inline void ComponentInfo::clear_dirties_document_package() {
-  dirties_document_package_ = true;
-  clear_has_dirties_document_package();
-}
-inline bool ComponentInfo::dirties_document_package() const {
-  return dirties_document_package_;
-}
-inline void ComponentInfo::set_dirties_document_package(bool value) {
-  set_has_dirties_document_package();
-  dirties_document_package_ = value;
+inline ::google::protobuf::RepeatedPtrField< ::TSP::ObjectUUIDMapEntry >*
+ComponentInfo::mutable_object_uuid_map_entries() {
+  return &object_uuid_map_entries_;
 }
 
 // optional bool is_stored_outside_object_archive = 10 [default = false];
 inline bool ComponentInfo::has_is_stored_outside_object_archive() const {
-  return (_has_bits_[0] & 0x00000200u) != 0;
+  return (_has_bits_[0] & 0x00000100u) != 0;
 }
 inline void ComponentInfo::set_has_is_stored_outside_object_archive() {
-  _has_bits_[0] |= 0x00000200u;
+  _has_bits_[0] |= 0x00000100u;
 }
 inline void ComponentInfo::clear_has_is_stored_outside_object_archive() {
-  _has_bits_[0] &= ~0x00000200u;
+  _has_bits_[0] &= ~0x00000100u;
 }
 inline void ComponentInfo::clear_is_stored_outside_object_archive() {
   is_stored_outside_object_archive_ = false;
@@ -2231,6 +2537,28 @@ inline void ComponentInfo::set_is_stored_outside_object_archive(bool value) {
   is_stored_outside_object_archive_ = value;
 }
 
+// optional uint64 save_token = 12 [default = 0];
+inline bool ComponentInfo::has_save_token() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void ComponentInfo::set_has_save_token() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void ComponentInfo::clear_has_save_token() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void ComponentInfo::clear_save_token() {
+  save_token_ = GOOGLE_ULONGLONG(0);
+  clear_has_save_token();
+}
+inline ::google::protobuf::uint64 ComponentInfo::save_token() const {
+  return save_token_;
+}
+inline void ComponentInfo::set_save_token(::google::protobuf::uint64 value) {
+  set_has_save_token();
+  save_token_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // ComponentExternalReference
@@ -2329,6 +2657,118 @@ inline void ComponentDataReference::set_data_identifier(::google::protobuf::uint
 
 // -------------------------------------------------------------------
 
+// UUIDInternal
+
+// required uint64 lower = 1;
+inline bool UUIDInternal::has_lower() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void UUIDInternal::set_has_lower() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void UUIDInternal::clear_has_lower() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void UUIDInternal::clear_lower() {
+  lower_ = GOOGLE_ULONGLONG(0);
+  clear_has_lower();
+}
+inline ::google::protobuf::uint64 UUIDInternal::lower() const {
+  return lower_;
+}
+inline void UUIDInternal::set_lower(::google::protobuf::uint64 value) {
+  set_has_lower();
+  lower_ = value;
+}
+
+// required uint64 upper = 2;
+inline bool UUIDInternal::has_upper() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void UUIDInternal::set_has_upper() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void UUIDInternal::clear_has_upper() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void UUIDInternal::clear_upper() {
+  upper_ = GOOGLE_ULONGLONG(0);
+  clear_has_upper();
+}
+inline ::google::protobuf::uint64 UUIDInternal::upper() const {
+  return upper_;
+}
+inline void UUIDInternal::set_upper(::google::protobuf::uint64 value) {
+  set_has_upper();
+  upper_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// ObjectUUIDMapEntry
+
+// required uint64 identifier = 1;
+inline bool ObjectUUIDMapEntry::has_identifier() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ObjectUUIDMapEntry::set_has_identifier() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ObjectUUIDMapEntry::clear_has_identifier() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ObjectUUIDMapEntry::clear_identifier() {
+  identifier_ = GOOGLE_ULONGLONG(0);
+  clear_has_identifier();
+}
+inline ::google::protobuf::uint64 ObjectUUIDMapEntry::identifier() const {
+  return identifier_;
+}
+inline void ObjectUUIDMapEntry::set_identifier(::google::protobuf::uint64 value) {
+  set_has_identifier();
+  identifier_ = value;
+}
+
+// required .TSP.UUIDInternal uuid = 2;
+inline bool ObjectUUIDMapEntry::has_uuid() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ObjectUUIDMapEntry::set_has_uuid() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ObjectUUIDMapEntry::clear_has_uuid() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ObjectUUIDMapEntry::clear_uuid() {
+  if (uuid_ != NULL) uuid_->::TSP::UUIDInternal::Clear();
+  clear_has_uuid();
+}
+inline const ::TSP::UUIDInternal& ObjectUUIDMapEntry::uuid() const {
+  return uuid_ != NULL ? *uuid_ : *default_instance_->uuid_;
+}
+inline ::TSP::UUIDInternal* ObjectUUIDMapEntry::mutable_uuid() {
+  set_has_uuid();
+  if (uuid_ == NULL) uuid_ = new ::TSP::UUIDInternal;
+  return uuid_;
+}
+inline ::TSP::UUIDInternal* ObjectUUIDMapEntry::release_uuid() {
+  clear_has_uuid();
+  ::TSP::UUIDInternal* temp = uuid_;
+  uuid_ = NULL;
+  return temp;
+}
+inline void ObjectUUIDMapEntry::set_allocated_uuid(::TSP::UUIDInternal* uuid) {
+  delete uuid_;
+  uuid_ = uuid;
+  if (uuid) {
+    set_has_uuid();
+  } else {
+    clear_has_uuid();
+  }
+}
+
+// -------------------------------------------------------------------
+
 // PackageMetadata
 
 // required uint64 last_object_identifier = 1;
@@ -2353,6 +2793,44 @@ inline void PackageMetadata::set_last_object_identifier(::google::protobuf::uint
   last_object_identifier_ = value;
 }
 
+// optional .TSP.DocumentRevision revision = 2;
+inline bool PackageMetadata::has_revision() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void PackageMetadata::set_has_revision() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void PackageMetadata::clear_has_revision() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void PackageMetadata::clear_revision() {
+  if (revision_ != NULL) revision_->::TSP::DocumentRevision::Clear();
+  clear_has_revision();
+}
+inline const ::TSP::DocumentRevision& PackageMetadata::revision() const {
+  return revision_ != NULL ? *revision_ : *default_instance_->revision_;
+}
+inline ::TSP::DocumentRevision* PackageMetadata::mutable_revision() {
+  set_has_revision();
+  if (revision_ == NULL) revision_ = new ::TSP::DocumentRevision;
+  return revision_;
+}
+inline ::TSP::DocumentRevision* PackageMetadata::release_revision() {
+  clear_has_revision();
+  ::TSP::DocumentRevision* temp = revision_;
+  revision_ = NULL;
+  return temp;
+}
+inline void PackageMetadata::set_allocated_revision(::TSP::DocumentRevision* revision) {
+  delete revision_;
+  revision_ = revision;
+  if (revision) {
+    set_has_revision();
+  } else {
+    clear_has_revision();
+  }
+}
+
 // repeated .TSP.ComponentInfo components = 3;
 inline int PackageMetadata::components_size() const {
   return components_.size();
@@ -2453,6 +2931,149 @@ PackageMetadata::mutable_write_version() {
   return &write_version_;
 }
 
+// repeated uint32 file_format_version = 7 [packed = true];
+inline int PackageMetadata::file_format_version_size() const {
+  return file_format_version_.size();
+}
+inline void PackageMetadata::clear_file_format_version() {
+  file_format_version_.Clear();
+}
+inline ::google::protobuf::uint32 PackageMetadata::file_format_version(int index) const {
+  return file_format_version_.Get(index);
+}
+inline void PackageMetadata::set_file_format_version(int index, ::google::protobuf::uint32 value) {
+  file_format_version_.Set(index, value);
+}
+inline void PackageMetadata::add_file_format_version(::google::protobuf::uint32 value) {
+  file_format_version_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+PackageMetadata::file_format_version() const {
+  return file_format_version_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+PackageMetadata::mutable_file_format_version() {
+  return &file_format_version_;
+}
+
+// optional uint64 save_token = 8 [default = 0];
+inline bool PackageMetadata::has_save_token() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void PackageMetadata::set_has_save_token() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void PackageMetadata::clear_has_save_token() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void PackageMetadata::clear_save_token() {
+  save_token_ = GOOGLE_ULONGLONG(0);
+  clear_has_save_token();
+}
+inline ::google::protobuf::uint64 PackageMetadata::save_token() const {
+  return save_token_;
+}
+inline void PackageMetadata::set_save_token(::google::protobuf::uint64 value) {
+  set_has_save_token();
+  save_token_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// DocumentRevision
+
+// optional uint64 sequence = 1 [default = 0];
+inline bool DocumentRevision::has_sequence() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void DocumentRevision::set_has_sequence() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void DocumentRevision::clear_has_sequence() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void DocumentRevision::clear_sequence() {
+  sequence_ = GOOGLE_ULONGLONG(0);
+  clear_has_sequence();
+}
+inline ::google::protobuf::uint64 DocumentRevision::sequence() const {
+  return sequence_;
+}
+inline void DocumentRevision::set_sequence(::google::protobuf::uint64 value) {
+  set_has_sequence();
+  sequence_ = value;
+}
+
+// optional string identifier = 2;
+inline bool DocumentRevision::has_identifier() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void DocumentRevision::set_has_identifier() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void DocumentRevision::clear_has_identifier() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void DocumentRevision::clear_identifier() {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    identifier_->clear();
+  }
+  clear_has_identifier();
+}
+inline const ::std::string& DocumentRevision::identifier() const {
+  return *identifier_;
+}
+inline void DocumentRevision::set_identifier(const ::std::string& value) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(value);
+}
+inline void DocumentRevision::set_identifier(const char* value) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(value);
+}
+inline void DocumentRevision::set_identifier(const char* value, size_t size) {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  identifier_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* DocumentRevision::mutable_identifier() {
+  set_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    identifier_ = new ::std::string;
+  }
+  return identifier_;
+}
+inline ::std::string* DocumentRevision::release_identifier() {
+  clear_has_identifier();
+  if (identifier_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = identifier_;
+    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void DocumentRevision::set_allocated_identifier(::std::string* identifier) {
+  if (identifier_ != &::google::protobuf::internal::kEmptyString) {
+    delete identifier_;
+  }
+  if (identifier) {
+    set_has_identifier();
+    identifier_ = identifier;
+  } else {
+    clear_has_identifier();
+    identifier_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
 // -------------------------------------------------------------------
 
 // PasteboardMetadata
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.cc
index c36c9f1..834225b 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.cc
@@ -58,6 +58,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ReferenceDictionary_Entry_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ReferenceDictionary_Entry_reflection_ = NULL;
+const ::google::protobuf::Descriptor* UUID_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  UUID_reflection_ = NULL;
+const ::google::protobuf::Descriptor* UUIDPath_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  UUIDPath_reflection_ = NULL;
 const ::google::protobuf::Descriptor* PasteboardObject_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PasteboardObject_reflection_ = NULL;
@@ -272,7 +278,38 @@ void protobuf_AssignDesc_TSPMessages_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ReferenceDictionary_Entry));
-  PasteboardObject_descriptor_ = file->message_type(10);
+  UUID_descriptor_ = file->message_type(10);
+  static const int UUID_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUID, lower_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUID, upper_),
+  };
+  UUID_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      UUID_descriptor_,
+      UUID::default_instance_,
+      UUID_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUID, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUID, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(UUID));
+  UUIDPath_descriptor_ = file->message_type(11);
+  static const int UUIDPath_offsets_[1] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDPath, uuids_),
+  };
+  UUIDPath_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      UUIDPath_descriptor_,
+      UUIDPath::default_instance_,
+      UUIDPath_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDPath, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UUIDPath, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(UUIDPath));
+  PasteboardObject_descriptor_ = file->message_type(12);
   static const int PasteboardObject_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardObject, stylesheet_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PasteboardObject, drawables_),
@@ -295,7 +332,7 @@ void protobuf_AssignDesc_TSPMessages_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PasteboardObject));
-  ObjectContainer_descriptor_ = file->message_type(11);
+  ObjectContainer_descriptor_ = file->message_type(13);
   static const int ObjectContainer_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ObjectContainer, identifier_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ObjectContainer, objects_),
@@ -347,6 +384,10 @@ void protobuf_RegisterTypes(const ::std::string&) {
     ReferenceDictionary_descriptor_, &ReferenceDictionary::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ReferenceDictionary_Entry_descriptor_, &ReferenceDictionary_Entry::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    UUID_descriptor_, &UUID::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    UUIDPath_descriptor_, &UUIDPath::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PasteboardObject_descriptor_, &PasteboardObject::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -380,6 +421,10 @@ void protobuf_ShutdownFile_TSPMessages_2eproto() {
   delete ReferenceDictionary_reflection_;
   delete ReferenceDictionary_Entry::default_instance_;
   delete ReferenceDictionary_Entry_reflection_;
+  delete UUID::default_instance_;
+  delete UUID_reflection_;
+  delete UUIDPath::default_instance_;
+  delete UUIDPath_reflection_;
   delete PasteboardObject::default_instance_;
   delete PasteboardObject_reflection_;
   delete ObjectContainer::default_instance_;
@@ -414,17 +459,19 @@ void protobuf_AddDesc_TSPMessages_2eproto() {
     "oseSubpath\020\005\"\213\001\n\023ReferenceDictionary\022/\n\007"
     "entries\030\001 \003(\0132\036.TSP.ReferenceDictionary."
     "Entry\032C\n\005Entry\022\033\n\003key\030\001 \002(\0132\016.TSP.Refere"
-    "nce\022\035\n\005value\030\002 \002(\0132\016.TSP.Reference\"\307\002\n\020P"
-    "asteboardObject\022\"\n\nstylesheet\030\001 \001(\0132\016.TS"
-    "P.Reference\022!\n\tdrawables\030\002 \003(\0132\016.TSP.Ref"
-    "erence\022\036\n\006styles\030\003 \003(\0132\016.TSP.Reference\022\035"
-    "\n\005theme\030\004 \001(\0132\016.TSP.Reference\022\"\n\nwp_stor"
-    "age\030\005 \001(\0132\016.TSP.Reference\022%\n\rguide_stora"
-    "ge\030\t \001(\0132\016.TSP.Reference\022)\n\021app_native_o"
-    "bject\030\006 \001(\0132\016.TSP.Reference\022\036\n\017is_text_p"
-    "rimary\030\007 \001(\010:\005false\022\027\n\010is_smart\030\010 \001(\010:\005f"
-    "alse\"F\n\017ObjectContainer\022\022\n\nidentifier\030\001 "
-    "\001(\r\022\037\n\007objects\030\002 \003(\0132\016.TSP.Reference", 1276);
+    "nce\022\035\n\005value\030\002 \002(\0132\016.TSP.Reference\"$\n\004UU"
+    "ID\022\r\n\005lower\030\001 \002(\004\022\r\n\005upper\030\002 \002(\004\"$\n\010UUID"
+    "Path\022\030\n\005uuids\030\001 \003(\0132\t.TSP.UUID\"\307\002\n\020Paste"
+    "boardObject\022\"\n\nstylesheet\030\001 \001(\0132\016.TSP.Re"
+    "ference\022!\n\tdrawables\030\002 \003(\0132\016.TSP.Referen"
+    "ce\022\036\n\006styles\030\003 \003(\0132\016.TSP.Reference\022\035\n\005th"
+    "eme\030\004 \001(\0132\016.TSP.Reference\022\"\n\nwp_storage\030"
+    "\005 \001(\0132\016.TSP.Reference\022%\n\rguide_storage\030\t"
+    " \001(\0132\016.TSP.Reference\022)\n\021app_native_objec"
+    "t\030\006 \001(\0132\016.TSP.Reference\022\036\n\017is_text_prima"
+    "ry\030\007 \001(\010:\005false\022\027\n\010is_smart\030\010 \001(\010:\005false"
+    "\"F\n\017ObjectContainer\022\022\n\nidentifier\030\001 \001(\r\022"
+    "\037\n\007objects\030\002 \003(\0132\016.TSP.Reference", 1352);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSPMessages.proto", &protobuf_RegisterTypes);
   Reference::default_instance_ = new Reference();
@@ -439,6 +486,8 @@ void protobuf_AddDesc_TSPMessages_2eproto() {
   Path_Element::default_instance_ = new Path_Element();
   ReferenceDictionary::default_instance_ = new ReferenceDictionary();
   ReferenceDictionary_Entry::default_instance_ = new ReferenceDictionary_Entry();
+  UUID::default_instance_ = new UUID();
+  UUIDPath::default_instance_ = new UUIDPath();
   PasteboardObject::default_instance_ = new PasteboardObject();
   ObjectContainer::default_instance_ = new ObjectContainer();
   Reference::default_instance_->InitAsDefaultInstance();
@@ -453,6 +502,8 @@ void protobuf_AddDesc_TSPMessages_2eproto() {
   Path_Element::default_instance_->InitAsDefaultInstance();
   ReferenceDictionary::default_instance_->InitAsDefaultInstance();
   ReferenceDictionary_Entry::default_instance_->InitAsDefaultInstance();
+  UUID::default_instance_->InitAsDefaultInstance();
+  UUIDPath::default_instance_->InitAsDefaultInstance();
   PasteboardObject::default_instance_->InitAsDefaultInstance();
   ObjectContainer::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_TSPMessages_2eproto);
@@ -3661,6 +3712,461 @@ ::google::protobuf::Metadata ReferenceDictionary::GetMetadata() const {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int UUID::kLowerFieldNumber;
+const int UUID::kUpperFieldNumber;
+#endif  // !_MSC_VER
+
+UUID::UUID()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void UUID::InitAsDefaultInstance() {
+}
+
+UUID::UUID(const UUID& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void UUID::SharedCtor() {
+  _cached_size_ = 0;
+  lower_ = GOOGLE_ULONGLONG(0);
+  upper_ = GOOGLE_ULONGLONG(0);
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+UUID::~UUID() {
+  SharedDtor();
+}
+
+void UUID::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void UUID::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* UUID::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return UUID_descriptor_;
+}
+
+const UUID& UUID::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSPMessages_2eproto();
+  return *default_instance_;
+}
+
+UUID* UUID::default_instance_ = NULL;
+
+UUID* UUID::New() const {
+  return new UUID;
+}
+
+void UUID::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    lower_ = GOOGLE_ULONGLONG(0);
+    upper_ = GOOGLE_ULONGLONG(0);
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool UUID::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required uint64 lower = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &lower_)));
+          set_has_lower();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_upper;
+        break;
+      }
+
+      // required uint64 upper = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_upper:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
+                 input, &upper_)));
+          set_has_upper();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void UUID::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required uint64 lower = 1;
+  if (has_lower()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->lower(), output);
+  }
+
+  // required uint64 upper = 2;
+  if (has_upper()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->upper(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* UUID::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required uint64 lower = 1;
+  if (has_lower()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->lower(), target);
+  }
+
+  // required uint64 upper = 2;
+  if (has_upper()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->upper(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int UUID::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required uint64 lower = 1;
+    if (has_lower()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->lower());
+    }
+
+    // required uint64 upper = 2;
+    if (has_upper()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt64Size(
+          this->upper());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void UUID::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const UUID* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const UUID*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void UUID::MergeFrom(const UUID& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_lower()) {
+      set_lower(from.lower());
+    }
+    if (from.has_upper()) {
+      set_upper(from.upper());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void UUID::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void UUID::CopyFrom(const UUID& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool UUID::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  return true;
+}
+
+void UUID::Swap(UUID* other) {
+  if (other != this) {
+    std::swap(lower_, other->lower_);
+    std::swap(upper_, other->upper_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata UUID::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = UUID_descriptor_;
+  metadata.reflection = UUID_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int UUIDPath::kUuidsFieldNumber;
+#endif  // !_MSC_VER
+
+UUIDPath::UUIDPath()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void UUIDPath::InitAsDefaultInstance() {
+}
+
+UUIDPath::UUIDPath(const UUIDPath& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void UUIDPath::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+UUIDPath::~UUIDPath() {
+  SharedDtor();
+}
+
+void UUIDPath::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void UUIDPath::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* UUIDPath::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return UUIDPath_descriptor_;
+}
+
+const UUIDPath& UUIDPath::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSPMessages_2eproto();
+  return *default_instance_;
+}
+
+UUIDPath* UUIDPath::default_instance_ = NULL;
+
+UUIDPath* UUIDPath::New() const {
+  return new UUIDPath;
+}
+
+void UUIDPath::Clear() {
+  uuids_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool UUIDPath::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TSP.UUID uuids = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_uuids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_uuids()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_uuids;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void UUIDPath::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TSP.UUID uuids = 1;
+  for (int i = 0; i < this->uuids_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->uuids(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* UUIDPath::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TSP.UUID uuids = 1;
+  for (int i = 0; i < this->uuids_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->uuids(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int UUIDPath::ByteSize() const {
+  int total_size = 0;
+
+  // repeated .TSP.UUID uuids = 1;
+  total_size += 1 * this->uuids_size();
+  for (int i = 0; i < this->uuids_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->uuids(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void UUIDPath::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const UUIDPath* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const UUIDPath*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void UUIDPath::MergeFrom(const UUIDPath& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  uuids_.MergeFrom(from.uuids_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void UUIDPath::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void UUIDPath::CopyFrom(const UUIDPath& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool UUIDPath::IsInitialized() const {
+
+  for (int i = 0; i < uuids_size(); i++) {
+    if (!this->uuids(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void UUIDPath::Swap(UUIDPath* other) {
+  if (other != this) {
+    uuids_.Swap(&other->uuids_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata UUIDPath::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = UUIDPath_descriptor_;
+  metadata.reflection = UUIDPath_reflection_;
+  return metadata;
+}
+
+
 // ===================================================================
 
 #ifndef _MSC_VER
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.h
index 5bd0a6a..96dcecf 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSPMessages.pb.h
@@ -46,6 +46,8 @@ class Path;
 class Path_Element;
 class ReferenceDictionary;
 class ReferenceDictionary_Entry;
+class UUID;
+class UUIDPath;
 class PasteboardObject;
 class ObjectContainer;
 
@@ -1309,6 +1311,183 @@ class ReferenceDictionary : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class UUID : public ::google::protobuf::Message {
+ public:
+  UUID();
+  virtual ~UUID();
+
+  UUID(const UUID& from);
+
+  inline UUID& operator=(const UUID& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const UUID& default_instance();
+
+  void Swap(UUID* other);
+
+  // implements Message ----------------------------------------------
+
+  UUID* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const UUID& from);
+  void MergeFrom(const UUID& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required uint64 lower = 1;
+  inline bool has_lower() const;
+  inline void clear_lower();
+  static const int kLowerFieldNumber = 1;
+  inline ::google::protobuf::uint64 lower() const;
+  inline void set_lower(::google::protobuf::uint64 value);
+
+  // required uint64 upper = 2;
+  inline bool has_upper() const;
+  inline void clear_upper();
+  static const int kUpperFieldNumber = 2;
+  inline ::google::protobuf::uint64 upper() const;
+  inline void set_upper(::google::protobuf::uint64 value);
+
+  // @@protoc_insertion_point(class_scope:TSP.UUID)
+ private:
+  inline void set_has_lower();
+  inline void clear_has_lower();
+  inline void set_has_upper();
+  inline void clear_has_upper();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::uint64 lower_;
+  ::google::protobuf::uint64 upper_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSPMessages_2eproto();
+  friend void protobuf_AssignDesc_TSPMessages_2eproto();
+  friend void protobuf_ShutdownFile_TSPMessages_2eproto();
+
+  void InitAsDefaultInstance();
+  static UUID* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class UUIDPath : public ::google::protobuf::Message {
+ public:
+  UUIDPath();
+  virtual ~UUIDPath();
+
+  UUIDPath(const UUIDPath& from);
+
+  inline UUIDPath& operator=(const UUIDPath& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const UUIDPath& default_instance();
+
+  void Swap(UUIDPath* other);
+
+  // implements Message ----------------------------------------------
+
+  UUIDPath* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const UUIDPath& from);
+  void MergeFrom(const UUIDPath& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // repeated .TSP.UUID uuids = 1;
+  inline int uuids_size() const;
+  inline void clear_uuids();
+  static const int kUuidsFieldNumber = 1;
+  inline const ::TSP::UUID& uuids(int index) const;
+  inline ::TSP::UUID* mutable_uuids(int index);
+  inline ::TSP::UUID* add_uuids();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::UUID >&
+      uuids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::UUID >*
+      mutable_uuids();
+
+  // @@protoc_insertion_point(class_scope:TSP.UUIDPath)
+ private:
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedPtrField< ::TSP::UUID > uuids_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSPMessages_2eproto();
+  friend void protobuf_AssignDesc_TSPMessages_2eproto();
+  friend void protobuf_ShutdownFile_TSPMessages_2eproto();
+
+  void InitAsDefaultInstance();
+  static UUIDPath* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class PasteboardObject : public ::google::protobuf::Message {
  public:
   PasteboardObject();
@@ -2295,6 +2474,83 @@ ReferenceDictionary::mutable_entries() {
 
 // -------------------------------------------------------------------
 
+// UUID
+
+// required uint64 lower = 1;
+inline bool UUID::has_lower() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void UUID::set_has_lower() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void UUID::clear_has_lower() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void UUID::clear_lower() {
+  lower_ = GOOGLE_ULONGLONG(0);
+  clear_has_lower();
+}
+inline ::google::protobuf::uint64 UUID::lower() const {
+  return lower_;
+}
+inline void UUID::set_lower(::google::protobuf::uint64 value) {
+  set_has_lower();
+  lower_ = value;
+}
+
+// required uint64 upper = 2;
+inline bool UUID::has_upper() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void UUID::set_has_upper() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void UUID::clear_has_upper() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void UUID::clear_upper() {
+  upper_ = GOOGLE_ULONGLONG(0);
+  clear_has_upper();
+}
+inline ::google::protobuf::uint64 UUID::upper() const {
+  return upper_;
+}
+inline void UUID::set_upper(::google::protobuf::uint64 value) {
+  set_has_upper();
+  upper_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// UUIDPath
+
+// repeated .TSP.UUID uuids = 1;
+inline int UUIDPath::uuids_size() const {
+  return uuids_.size();
+}
+inline void UUIDPath::clear_uuids() {
+  uuids_.Clear();
+}
+inline const ::TSP::UUID& UUIDPath::uuids(int index) const {
+  return uuids_.Get(index);
+}
+inline ::TSP::UUID* UUIDPath::mutable_uuids(int index) {
+  return uuids_.Mutable(index);
+}
+inline ::TSP::UUID* UUIDPath::add_uuids() {
+  return uuids_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::UUID >&
+UUIDPath::uuids() const {
+  return uuids_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::UUID >*
+UUIDPath::mutable_uuids() {
+  return &uuids_;
+}
+
+// -------------------------------------------------------------------
+
 // PasteboardObject
 
 // optional .TSP.Reference stylesheet = 1;
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.cc
index 070539f..66d41d1 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.cc
@@ -68,6 +68,7 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* ThemeReplaceStylePresetCommandArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ThemeReplaceStylePresetCommandArchive_reflection_ = NULL;
+const ::google::protobuf::EnumDescriptor* ValueType_descriptor_ = NULL;
 
 }  // namespace
 
@@ -367,6 +368,7 @@ void protobuf_AssignDesc_TSSArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ThemeReplaceStylePresetCommandArchive));
+  ValueType_descriptor_ = file->enum_type(0);
 }
 
 namespace {
@@ -527,7 +529,9 @@ void protobuf_AddDesc_TSSArchives_2eproto() {
     "laceStylePresetCommandArchive\022\"\n\005super\030\001"
     " \002(\0132\023.TSK.CommandArchive\022\036\n\006preset\030\003 \002("
     "\0132\016.TSP.Reference\022\"\n\nold_preset\030\004 \002(\0132\016."
-    "TSP.Reference", 2733);
+    "TSP.Reference*G\n\tValueType\022\016\n\nObjectType"
+    "\020\000\022\013\n\007IntType\020\001\022\r\n\tFloatType\020\002\022\016\n\nDouble"
+    "Type\020\003", 2806);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSSArchives.proto", &protobuf_RegisterTypes);
   StyleArchive::default_instance_ = new StyleArchive();
@@ -571,6 +575,22 @@ struct StaticDescriptorInitializer_TSSArchives_2eproto {
     protobuf_AddDesc_TSSArchives_2eproto();
   }
 } static_descriptor_initializer_TSSArchives_2eproto_;
+const ::google::protobuf::EnumDescriptor* ValueType_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ValueType_descriptor_;
+}
+bool ValueType_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+      return true;
+    default:
+      return false;
+  }
+}
+
 
 // ===================================================================
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.h
index 83864af..50b2061 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSSArchives.pb.h
@@ -23,6 +23,7 @@
 #include <google/protobuf/message.h>
 #include <google/protobuf/repeated_field.h>
 #include <google/protobuf/extension_set.h>
+#include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 #include "TSPMessages.pb.h"
 #include "TSKArchives.pb.h"
@@ -52,6 +53,27 @@ class ThemeRemoveStylePresetCommandArchive;
 class ThemeMovePresetCommandArchive;
 class ThemeReplaceStylePresetCommandArchive;
 
+enum ValueType {
+  ObjectType = 0,
+  IntType = 1,
+  FloatType = 2,
+  DoubleType = 3
+};
+bool ValueType_IsValid(int value);
+const ValueType ValueType_MIN = ObjectType;
+const ValueType ValueType_MAX = DoubleType;
+const int ValueType_ARRAYSIZE = ValueType_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* ValueType_descriptor();
+inline const ::std::string& ValueType_Name(ValueType value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    ValueType_descriptor(), value);
+}
+inline bool ValueType_Parse(
+    const ::std::string& name, ValueType* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<ValueType>(
+    ValueType_descriptor(), name, value);
+}
 // ===================================================================
 
 class StyleArchive : public ::google::protobuf::Message {
@@ -4577,6 +4599,10 @@ inline void ThemeReplaceStylePresetCommandArchive::set_allocated_old_preset(::TS
 namespace google {
 namespace protobuf {
 
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::TSS::ValueType>() {
+  return ::TSS::ValueType_descriptor();
+}
 
 }  // namespace google
 }  // namespace protobuf
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.cc
index ffad505..d35d11a 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.cc
@@ -51,6 +51,13 @@ const ::google::protobuf::Descriptor* PopUpMenuModel_CellValue_descriptor_ = NUL
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PopUpMenuModel_CellValue_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* PopUpMenuModel_CellValueType_descriptor_ = NULL;
+const ::google::protobuf::Descriptor* ImportWarningSetArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ImportWarningSetArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ImportWarningSetArchive_FormulaImportWarning_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ImportWarningSetArchive_FormulaImportWarning_reflection_ = NULL;
+const ::google::protobuf::EnumDescriptor* ImportWarningSetArchive_FormulaWarningType_descriptor_ = NULL;
 const ::google::protobuf::Descriptor* TableDataList_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   TableDataList_reflection_ = NULL;
@@ -88,6 +95,17 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* TableStyleNetworkArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   TableStyleNetworkArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* TableSortOrderArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  TableSortOrderArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* TableSortOrderArchive_SortRuleArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  TableSortOrderArchive_SortRuleArchive_reflection_ = NULL;
+const ::google::protobuf::EnumDescriptor* TableSortOrderArchive_SortRuleArchive_Direction_descriptor_ = NULL;
+const ::google::protobuf::EnumDescriptor* TableSortOrderArchive_SortType_descriptor_ = NULL;
+const ::google::protobuf::Descriptor* SortRuleReferenceTrackerArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  SortRuleReferenceTrackerArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* TableModelArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   TableModelArchive_reflection_ = NULL;
@@ -106,6 +124,24 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CellMapArchive_CellMapEntry_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CellMapArchive_CellMapEntry_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CellMapTileArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CellMapTileArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CellMapTileArchive_CellMapEntry_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CellMapTileArchive_CellMapEntry_reflection_ = NULL;
+const ::google::protobuf::Descriptor* TiledCellMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  TiledCellMapArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* PropertyMapEntryArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  PropertyMapEntryArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CellDiffArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CellDiffArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CellDiffMapArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CellDiffMapArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* DoubleStyleMapArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   DoubleStyleMapArchive_reflection_ = NULL;
@@ -220,6 +256,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CellRegion_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CellRegion_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CellFillStandIn_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CellFillStandIn_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* CellType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* CellValueType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* SelectionTypeArchive_descriptor_ = NULL;
@@ -406,7 +445,54 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PopUpMenuModel_CellValue));
   PopUpMenuModel_CellValueType_descriptor_ = PopUpMenuModel_descriptor_->enum_type(0);
-  TableDataList_descriptor_ = file->message_type(8);
+  ImportWarningSetArchive_descriptor_ = file->message_type(8);
+  static const int ImportWarningSetArchive_offsets_[15] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, formula_import_warning_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_above_avg_equal_avg_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_above_avg_std_dev_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_complex_formula_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_contains_errors_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_expr_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_not_contains_errors_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_parameters_not_all_same_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_stop_if_true_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_unsupported_operator_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_unsupported_styling_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, cond_format_unsupported_time_period_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, error_cell_with_no_formula_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, unsupported_cond_format_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, original_data_format_),
+  };
+  ImportWarningSetArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ImportWarningSetArchive_descriptor_,
+      ImportWarningSetArchive::default_instance_,
+      ImportWarningSetArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ImportWarningSetArchive));
+  ImportWarningSetArchive_FormulaImportWarning_descriptor_ = ImportWarningSetArchive_descriptor_->nested_type(0);
+  static const int ImportWarningSetArchive_FormulaImportWarning_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive_FormulaImportWarning, formula_warning_type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive_FormulaImportWarning, original_formula_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive_FormulaImportWarning, supplementary_text_),
+  };
+  ImportWarningSetArchive_FormulaImportWarning_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ImportWarningSetArchive_FormulaImportWarning_descriptor_,
+      ImportWarningSetArchive_FormulaImportWarning::default_instance_,
+      ImportWarningSetArchive_FormulaImportWarning_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive_FormulaImportWarning, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ImportWarningSetArchive_FormulaImportWarning, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ImportWarningSetArchive_FormulaImportWarning));
+  ImportWarningSetArchive_FormulaWarningType_descriptor_ = ImportWarningSetArchive_descriptor_->enum_type(0);
+  TableDataList_descriptor_ = file->message_type(9);
   static const int TableDataList_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList, listtype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList, nextlistid_),
@@ -424,7 +510,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableDataList));
   TableDataList_ListEntry_descriptor_ = TableDataList_descriptor_->nested_type(0);
-  static const int TableDataList_ListEntry_offsets_[10] = {
+  static const int TableDataList_ListEntry_offsets_[11] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, key_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, refcount_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, string_),
@@ -435,6 +521,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, custom_format_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, richtextpayload_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, comment_storage_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableDataList_ListEntry, import_warning_set_),
   };
   TableDataList_ListEntry_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -448,7 +535,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableDataList_ListEntry));
   TableDataList_ListType_descriptor_ = TableDataList_descriptor_->enum_type(0);
-  TableRBTree_descriptor_ = file->message_type(9);
+  TableRBTree_descriptor_ = file->message_type(10);
   static const int TableRBTree_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableRBTree, nodes_),
   };
@@ -479,7 +566,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableRBTree_Node));
-  HeaderStorageBucket_descriptor_ = file->message_type(10);
+  HeaderStorageBucket_descriptor_ = file->message_type(11);
   static const int HeaderStorageBucket_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(HeaderStorageBucket, buckethashfunction_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(HeaderStorageBucket, headers_),
@@ -515,7 +602,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(HeaderStorageBucket_Header));
-  HeaderStorage_descriptor_ = file->message_type(11);
+  HeaderStorage_descriptor_ = file->message_type(12);
   static const int HeaderStorage_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(HeaderStorage, buckethashfunction_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(HeaderStorage, buckets_),
@@ -531,8 +618,8 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(HeaderStorage));
-  DataStore_descriptor_ = file->message_type(12);
-  static const int DataStore_offsets_[19] = {
+  DataStore_descriptor_ = file->message_type(13);
+  static const int DataStore_offsets_[20] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, rowheaders_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, columnheaders_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, tiles_),
@@ -552,6 +639,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, richtextpayloadtable_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, conditionalstyletable_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, commentstoragetable_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DataStore, importwarningsettable_),
   };
   DataStore_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -564,7 +652,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DataStore));
-  TableInfoArchive_descriptor_ = file->message_type(13);
+  TableInfoArchive_descriptor_ = file->message_type(14);
   static const int TableInfoArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableInfoArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableInfoArchive, tablemodel_),
@@ -581,7 +669,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableInfoArchive));
-  EditingStateArchive_descriptor_ = file->message_type(14);
+  EditingStateArchive_descriptor_ = file->message_type(15);
   static const int EditingStateArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditingStateArchive, editingstorage_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EditingStateArchive, editingcell_),
@@ -602,7 +690,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(EditingStateArchive));
-  WPTableInfoArchive_descriptor_ = file->message_type(15);
+  WPTableInfoArchive_descriptor_ = file->message_type(16);
   static const int WPTableInfoArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WPTableInfoArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WPTableInfoArchive, storage_),
@@ -618,7 +706,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(WPTableInfoArchive));
-  TableStyleNetworkArchive_descriptor_ = file->message_type(16);
+  TableStyleNetworkArchive_descriptor_ = file->message_type(17);
   static const int TableStyleNetworkArchive_offsets_[12] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableStyleNetworkArchive, table_style_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableStyleNetworkArchive, body_text_style_),
@@ -644,8 +732,57 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableStyleNetworkArchive));
-  TableModelArchive_descriptor_ = file->message_type(17);
-  static const int TableModelArchive_offsets_[42] = {
+  TableSortOrderArchive_descriptor_ = file->message_type(18);
+  static const int TableSortOrderArchive_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive, type_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive, rules_),
+  };
+  TableSortOrderArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      TableSortOrderArchive_descriptor_,
+      TableSortOrderArchive::default_instance_,
+      TableSortOrderArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(TableSortOrderArchive));
+  TableSortOrderArchive_SortRuleArchive_descriptor_ = TableSortOrderArchive_descriptor_->nested_type(0);
+  static const int TableSortOrderArchive_SortRuleArchive_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive_SortRuleArchive, column_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive_SortRuleArchive, direction_),
+  };
+  TableSortOrderArchive_SortRuleArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      TableSortOrderArchive_SortRuleArchive_descriptor_,
+      TableSortOrderArchive_SortRuleArchive::default_instance_,
+      TableSortOrderArchive_SortRuleArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive_SortRuleArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableSortOrderArchive_SortRuleArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(TableSortOrderArchive_SortRuleArchive));
+  TableSortOrderArchive_SortRuleArchive_Direction_descriptor_ = TableSortOrderArchive_SortRuleArchive_descriptor_->enum_type(0);
+  TableSortOrderArchive_SortType_descriptor_ = TableSortOrderArchive_descriptor_->enum_type(0);
+  SortRuleReferenceTrackerArchive_descriptor_ = file->message_type(19);
+  static const int SortRuleReferenceTrackerArchive_offsets_[1] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SortRuleReferenceTrackerArchive, reference_tracker_),
+  };
+  SortRuleReferenceTrackerArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      SortRuleReferenceTrackerArchive_descriptor_,
+      SortRuleReferenceTrackerArchive::default_instance_,
+      SortRuleReferenceTrackerArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SortRuleReferenceTrackerArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SortRuleReferenceTrackerArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(SortRuleReferenceTrackerArchive));
+  TableModelArchive_descriptor_ = file->message_type(20);
+  static const int TableModelArchive_offsets_[44] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, table_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, from_table_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, table_style_),
@@ -687,7 +824,9 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, hidden_state_formula_owner_for_columns_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, hidden_state_formula_owner_for_rows_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, filter_set_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, sort_order_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, conditional_style_formula_owner_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableModelArchive, sort_rule_reference_tracker_),
   };
   TableModelArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -700,7 +839,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableModelArchive));
-  DurationWrapperArchive_descriptor_ = file->message_type(18);
+  DurationWrapperArchive_descriptor_ = file->message_type(21);
   static const int DurationWrapperArchive_offsets_[1] = {
   };
   DurationWrapperArchive_reflection_ =
@@ -714,8 +853,8 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DurationWrapperArchive));
-  Cell_descriptor_ = file->message_type(19);
-  static const int Cell_offsets_[23] = {
+  Cell_descriptor_ = file->message_type(22);
+  static const int Cell_offsets_[24] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, valuetype_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, numbervalue_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, stringvalue_),
@@ -739,6 +878,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, multiple_choice_list_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, comment_storage_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, conditional_style_applied_rule_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Cell, import_warning_set_),
   };
   Cell_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -751,7 +891,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(Cell));
-  MergeRegionMapArchive_descriptor_ = file->message_type(20);
+  MergeRegionMapArchive_descriptor_ = file->message_type(23);
   static const int MergeRegionMapArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MergeRegionMapArchive, cell_range_),
   };
@@ -766,7 +906,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MergeRegionMapArchive));
-  CellMapArchive_descriptor_ = file->message_type(21);
+  CellMapArchive_descriptor_ = file->message_type(24);
   static const int CellMapArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapArchive, capacity_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapArchive, count_),
@@ -802,7 +942,111 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CellMapArchive_CellMapEntry));
-  DoubleStyleMapArchive_descriptor_ = file->message_type(22);
+  CellMapTileArchive_descriptor_ = file->message_type(25);
+  static const int CellMapTileArchive_offsets_[1] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive, cellmap_entry_),
+  };
+  CellMapTileArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CellMapTileArchive_descriptor_,
+      CellMapTileArchive::default_instance_,
+      CellMapTileArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CellMapTileArchive));
+  CellMapTileArchive_CellMapEntry_descriptor_ = CellMapTileArchive_descriptor_->nested_type(0);
+  static const int CellMapTileArchive_CellMapEntry_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive_CellMapEntry, cellid_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive_CellMapEntry, cell_),
+  };
+  CellMapTileArchive_CellMapEntry_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CellMapTileArchive_CellMapEntry_descriptor_,
+      CellMapTileArchive_CellMapEntry::default_instance_,
+      CellMapTileArchive_CellMapEntry_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive_CellMapEntry, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellMapTileArchive_CellMapEntry, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CellMapTileArchive_CellMapEntry));
+  TiledCellMapArchive_descriptor_ = file->message_type(26);
+  static const int TiledCellMapArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TiledCellMapArchive, cellmap_tile_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TiledCellMapArchive, may_modify_formulas_in_cells_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TiledCellMapArchive, may_modify_values_referenced_by_formulas_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TiledCellMapArchive, applies_to_hidden_),
+  };
+  TiledCellMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      TiledCellMapArchive_descriptor_,
+      TiledCellMapArchive::default_instance_,
+      TiledCellMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TiledCellMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TiledCellMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(TiledCellMapArchive));
+  PropertyMapEntryArchive_descriptor_ = file->message_type(27);
+  static const int PropertyMapEntryArchive_offsets_[9] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, property_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, valuetype_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, int_value_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, float_value_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, double_value_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, is_nsnull_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, tsp_reference_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, fill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, import_warning_set_),
+  };
+  PropertyMapEntryArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      PropertyMapEntryArchive_descriptor_,
+      PropertyMapEntryArchive::default_instance_,
+      PropertyMapEntryArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PropertyMapEntryArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(PropertyMapEntryArchive));
+  CellDiffArchive_descriptor_ = file->message_type(28);
+  static const int CellDiffArchive_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffArchive, property_map_to_set_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffArchive, property_map_to_reset_),
+  };
+  CellDiffArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CellDiffArchive_descriptor_,
+      CellDiffArchive::default_instance_,
+      CellDiffArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CellDiffArchive));
+  CellDiffMapArchive_descriptor_ = file->message_type(29);
+  static const int CellDiffMapArchive_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffMapArchive, cell_ids_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffMapArchive, cell_diffs_),
+  };
+  CellDiffMapArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CellDiffMapArchive_descriptor_,
+      CellDiffMapArchive::default_instance_,
+      CellDiffMapArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffMapArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellDiffMapArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CellDiffMapArchive));
+  DoubleStyleMapArchive_descriptor_ = file->message_type(30);
   static const int DoubleStyleMapArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DoubleStyleMapArchive, capacity_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DoubleStyleMapArchive, count_),
@@ -836,7 +1080,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DoubleStyleMapArchive_DoubleStyleMapEntryArchive));
-  StyleTableMapArchive_descriptor_ = file->message_type(23);
+  StyleTableMapArchive_descriptor_ = file->message_type(31);
   static const int StyleTableMapArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StyleTableMapArchive, capacity_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StyleTableMapArchive, count_),
@@ -870,7 +1114,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StyleTableMapArchive_StyleTableMapEntryArchive));
-  SelectionArchive_descriptor_ = file->message_type(24);
+  SelectionArchive_descriptor_ = file->message_type(32);
   static const int SelectionArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SelectionArchive, tablemodel_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SelectionArchive, selection_type_),
@@ -890,7 +1134,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SelectionArchive));
-  FilterRuleArchive_descriptor_ = file->message_type(25);
+  FilterRuleArchive_descriptor_ = file->message_type(33);
   static const int FilterRuleArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FilterRuleArchive, predicate_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FilterRuleArchive, disabled_),
@@ -906,7 +1150,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FilterRuleArchive));
-  TableStyleArchive_descriptor_ = file->message_type(26);
+  TableStyleArchive_descriptor_ = file->message_type(34);
   static const int TableStyleArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableStyleArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableStyleArchive, override_count_),
@@ -923,7 +1167,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableStyleArchive));
-  CellStyleArchive_descriptor_ = file->message_type(27);
+  CellStyleArchive_descriptor_ = file->message_type(35);
   static const int CellStyleArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellStyleArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellStyleArchive, override_count_),
@@ -940,7 +1184,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CellStyleArchive));
-  FormulaPredicateArchive_descriptor_ = file->message_type(28);
+  FormulaPredicateArchive_descriptor_ = file->message_type(36);
   static const int FormulaPredicateArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaPredicateArchive, formula_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaPredicateArchive, predicate_type_),
@@ -963,7 +1207,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       sizeof(FormulaPredicateArchive));
   FormulaPredicateArchive_FormulaPredicateType_descriptor_ = FormulaPredicateArchive_descriptor_->enum_type(0);
   FormulaPredicateArchive_QualifierType_descriptor_ = FormulaPredicateArchive_descriptor_->enum_type(1);
-  ConditionalStyleSetArchive_descriptor_ = file->message_type(29);
+  ConditionalStyleSetArchive_descriptor_ = file->message_type(37);
   static const int ConditionalStyleSetArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ConditionalStyleSetArchive, rulecount_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ConditionalStyleSetArchive, rules_),
@@ -997,7 +1241,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ConditionalStyleSetArchive_ConditionalStyleRule));
-  FilterSetArchive_descriptor_ = file->message_type(30);
+  FilterSetArchive_descriptor_ = file->message_type(38);
   static const int FilterSetArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FilterSetArchive, type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FilterSetArchive, is_enabled_),
@@ -1018,7 +1262,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FilterSetArchive));
   FilterSetArchive_FilterSetType_descriptor_ = FilterSetArchive_descriptor_->enum_type(0);
-  TokenAttachmentArchive_descriptor_ = file->message_type(31);
+  TokenAttachmentArchive_descriptor_ = file->message_type(39);
   static const int TokenAttachmentArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TokenAttachmentArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TokenAttachmentArchive, expressionnode_),
@@ -1034,7 +1278,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TokenAttachmentArchive));
-  FormulaArchive_descriptor_ = file->message_type(32);
+  FormulaArchive_descriptor_ = file->message_type(40);
   static const int FormulaArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaArchive, expressiontree_),
   };
@@ -1049,7 +1293,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FormulaArchive));
-  ExpressionNodeArchive_descriptor_ = file->message_type(33);
+  ExpressionNodeArchive_descriptor_ = file->message_type(41);
   static const int ExpressionNodeArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExpressionNodeArchive, children_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExpressionNodeArchive, first_index_),
@@ -1066,7 +1310,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ExpressionNodeArchive));
-  BooleanNodeArchive_descriptor_ = file->message_type(34);
+  BooleanNodeArchive_descriptor_ = file->message_type(42);
   static const int BooleanNodeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BooleanNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(BooleanNodeArchive, value_),
@@ -1082,7 +1326,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BooleanNodeArchive));
-  NumberNodeArchive_descriptor_ = file->message_type(35);
+  NumberNodeArchive_descriptor_ = file->message_type(43);
   static const int NumberNodeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NumberNodeArchive, number_),
@@ -1098,7 +1342,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(NumberNodeArchive));
-  StringNodeArchive_descriptor_ = file->message_type(36);
+  StringNodeArchive_descriptor_ = file->message_type(44);
   static const int StringNodeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StringNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StringNodeArchive, value_),
@@ -1114,7 +1358,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StringNodeArchive));
-  IdentifierNodeArchive_descriptor_ = file->message_type(37);
+  IdentifierNodeArchive_descriptor_ = file->message_type(45);
   static const int IdentifierNodeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IdentifierNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(IdentifierNodeArchive, identifier_),
@@ -1130,7 +1374,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(IdentifierNodeArchive));
-  ArrayNodeArchive_descriptor_ = file->message_type(38);
+  ArrayNodeArchive_descriptor_ = file->message_type(46);
   static const int ArrayNodeArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ArrayNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ArrayNodeArchive, columns_),
@@ -1147,7 +1391,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ArrayNodeArchive));
-  ListNodeArchive_descriptor_ = file->message_type(39);
+  ListNodeArchive_descriptor_ = file->message_type(47);
   static const int ListNodeArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ListNodeArchive, super_),
   };
@@ -1162,7 +1406,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ListNodeArchive));
-  OperatorNodeArchive_descriptor_ = file->message_type(40);
+  OperatorNodeArchive_descriptor_ = file->message_type(48);
   static const int OperatorNodeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorNodeArchive, operatorchar_),
@@ -1178,7 +1422,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(OperatorNodeArchive));
-  PostfixOperatorNodeArchive_descriptor_ = file->message_type(41);
+  PostfixOperatorNodeArchive_descriptor_ = file->message_type(49);
   static const int PostfixOperatorNodeArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PostfixOperatorNodeArchive, super_),
   };
@@ -1193,7 +1437,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PostfixOperatorNodeArchive));
-  PrefixOperatorNodeArchive_descriptor_ = file->message_type(42);
+  PrefixOperatorNodeArchive_descriptor_ = file->message_type(50);
   static const int PrefixOperatorNodeArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PrefixOperatorNodeArchive, super_),
   };
@@ -1208,7 +1452,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PrefixOperatorNodeArchive));
-  FunctionNodeArchive_descriptor_ = file->message_type(43);
+  FunctionNodeArchive_descriptor_ = file->message_type(51);
   static const int FunctionNodeArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FunctionNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FunctionNodeArchive, functionindex_),
@@ -1225,7 +1469,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FunctionNodeArchive));
-  FunctionEndNodeArchive_descriptor_ = file->message_type(44);
+  FunctionEndNodeArchive_descriptor_ = file->message_type(52);
   static const int FunctionEndNodeArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FunctionEndNodeArchive, super_),
   };
@@ -1240,7 +1484,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FunctionEndNodeArchive));
-  DateNodeArchive_descriptor_ = file->message_type(45);
+  DateNodeArchive_descriptor_ = file->message_type(53);
   static const int DateNodeArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DateNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DateNodeArchive, value_),
@@ -1257,7 +1501,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DateNodeArchive));
-  ReferenceNodeArchive_descriptor_ = file->message_type(46);
+  ReferenceNodeArchive_descriptor_ = file->message_type(54);
   static const int ReferenceNodeArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReferenceNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ReferenceNodeArchive, rangereference_),
@@ -1275,7 +1519,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ReferenceNodeArchive));
-  DurationNodeArchive_descriptor_ = file->message_type(47);
+  DurationNodeArchive_descriptor_ = file->message_type(55);
   static const int DurationNodeArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DurationNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DurationNodeArchive, timeinterval_),
@@ -1294,7 +1538,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DurationNodeArchive));
-  ArgumentPlaceholderNodeArchive_descriptor_ = file->message_type(48);
+  ArgumentPlaceholderNodeArchive_descriptor_ = file->message_type(56);
   static const int ArgumentPlaceholderNodeArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ArgumentPlaceholderNodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ArgumentPlaceholderNodeArchive, functionindex_),
@@ -1312,7 +1556,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ArgumentPlaceholderNodeArchive));
-  EmptyExpressionNodeArchive_descriptor_ = file->message_type(49);
+  EmptyExpressionNodeArchive_descriptor_ = file->message_type(57);
   static const int EmptyExpressionNodeArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(EmptyExpressionNodeArchive, super_),
   };
@@ -1327,7 +1571,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(EmptyExpressionNodeArchive));
-  LayoutHintArchive_descriptor_ = file->message_type(50);
+  LayoutHintArchive_descriptor_ = file->message_type(58);
   static const int LayoutHintArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LayoutHintArchive, isvalid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(LayoutHintArchive, cellrange_),
@@ -1349,7 +1593,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(LayoutHintArchive));
-  CompletionTokenAttachmentArchive_descriptor_ = file->message_type(51);
+  CompletionTokenAttachmentArchive_descriptor_ = file->message_type(59);
   static const int CompletionTokenAttachmentArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CompletionTokenAttachmentArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CompletionTokenAttachmentArchive, completiontext_),
@@ -1367,7 +1611,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CompletionTokenAttachmentArchive));
-  HiddenStateFormulaOwnerArchive_descriptor_ = file->message_type(52);
+  HiddenStateFormulaOwnerArchive_descriptor_ = file->message_type(60);
   static const int HiddenStateFormulaOwnerArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(HiddenStateFormulaOwnerArchive, owner_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(HiddenStateFormulaOwnerArchive, threshold_value_),
@@ -1384,7 +1628,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(HiddenStateFormulaOwnerArchive));
-  RichTextPayloadArchive_descriptor_ = file->message_type(53);
+  RichTextPayloadArchive_descriptor_ = file->message_type(61);
   static const int RichTextPayloadArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RichTextPayloadArchive, storage_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RichTextPayloadArchive, range_),
@@ -1401,7 +1645,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RichTextPayloadArchive));
-  FormulaEqualsTokenAttachmentArchive_descriptor_ = file->message_type(54);
+  FormulaEqualsTokenAttachmentArchive_descriptor_ = file->message_type(62);
   static const int FormulaEqualsTokenAttachmentArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaEqualsTokenAttachmentArchive, super_),
   };
@@ -1416,7 +1660,7 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FormulaEqualsTokenAttachmentArchive));
-  CellRegion_descriptor_ = file->message_type(55);
+  CellRegion_descriptor_ = file->message_type(63);
   static const int CellRegion_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellRegion, cell_ranges_),
   };
@@ -1431,6 +1675,40 @@ void protobuf_AssignDesc_TSTArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CellRegion));
+  CellFillStandIn_descriptor_ = file->message_type(64);
+  static const int CellFillStandIn_offsets_[20] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, fill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, type_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, color_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, color_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, first_color_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, first_color_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, last_color_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, last_color_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, gradient_type_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, gradient_type_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, gradient_angle_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, gradient_angle_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, image_data_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, image_data_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, tint_color_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, tint_color_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, scale_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, scale_is_mixed_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, technique_has_been_modified_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, technique_is_mixed_),
+  };
+  CellFillStandIn_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CellFillStandIn_descriptor_,
+      CellFillStandIn::default_instance_,
+      CellFillStandIn_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CellFillStandIn, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CellFillStandIn));
   CellType_descriptor_ = file->enum_type(0);
   CellValueType_descriptor_ = file->enum_type(1);
   SelectionTypeArchive_descriptor_ = file->enum_type(2);
@@ -1469,6 +1747,10 @@ void protobuf_RegisterTypes(const ::std::string&) {
     PopUpMenuModel_descriptor_, &PopUpMenuModel::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PopUpMenuModel_CellValue_descriptor_, &PopUpMenuModel_CellValue::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ImportWarningSetArchive_descriptor_, &ImportWarningSetArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ImportWarningSetArchive_FormulaImportWarning_descriptor_, &ImportWarningSetArchive_FormulaImportWarning::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     TableDataList_descriptor_, &TableDataList::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -1493,6 +1775,12 @@ void protobuf_RegisterTypes(const ::std::string&) {
     WPTableInfoArchive_descriptor_, &WPTableInfoArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     TableStyleNetworkArchive_descriptor_, &TableStyleNetworkArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    TableSortOrderArchive_descriptor_, &TableSortOrderArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    TableSortOrderArchive_SortRuleArchive_descriptor_, &TableSortOrderArchive_SortRuleArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    SortRuleReferenceTrackerArchive_descriptor_, &SortRuleReferenceTrackerArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     TableModelArchive_descriptor_, &TableModelArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -1505,6 +1793,18 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CellMapArchive_descriptor_, &CellMapArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CellMapArchive_CellMapEntry_descriptor_, &CellMapArchive_CellMapEntry::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CellMapTileArchive_descriptor_, &CellMapTileArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CellMapTileArchive_CellMapEntry_descriptor_, &CellMapTileArchive_CellMapEntry::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    TiledCellMapArchive_descriptor_, &TiledCellMapArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    PropertyMapEntryArchive_descriptor_, &PropertyMapEntryArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CellDiffArchive_descriptor_, &CellDiffArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CellDiffMapArchive_descriptor_, &CellDiffMapArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     DoubleStyleMapArchive_descriptor_, &DoubleStyleMapArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -1579,6 +1879,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
     FormulaEqualsTokenAttachmentArchive_descriptor_, &FormulaEqualsTokenAttachmentArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CellRegion_descriptor_, &CellRegion::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CellFillStandIn_descriptor_, &CellFillStandIn::default_instance());
 }
 
 }  // namespace
@@ -1604,6 +1906,10 @@ void protobuf_ShutdownFile_TSTArchives_2eproto() {
   delete PopUpMenuModel_reflection_;
   delete PopUpMenuModel_CellValue::default_instance_;
   delete PopUpMenuModel_CellValue_reflection_;
+  delete ImportWarningSetArchive::default_instance_;
+  delete ImportWarningSetArchive_reflection_;
+  delete ImportWarningSetArchive_FormulaImportWarning::default_instance_;
+  delete ImportWarningSetArchive_FormulaImportWarning_reflection_;
   delete TableDataList::default_instance_;
   delete TableDataList_reflection_;
   delete TableDataList_ListEntry::default_instance_;
@@ -1628,6 +1934,12 @@ void protobuf_ShutdownFile_TSTArchives_2eproto() {
   delete WPTableInfoArchive_reflection_;
   delete TableStyleNetworkArchive::default_instance_;
   delete TableStyleNetworkArchive_reflection_;
+  delete TableSortOrderArchive::default_instance_;
+  delete TableSortOrderArchive_reflection_;
+  delete TableSortOrderArchive_SortRuleArchive::default_instance_;
+  delete TableSortOrderArchive_SortRuleArchive_reflection_;
+  delete SortRuleReferenceTrackerArchive::default_instance_;
+  delete SortRuleReferenceTrackerArchive_reflection_;
   delete TableModelArchive::default_instance_;
   delete TableModelArchive_reflection_;
   delete DurationWrapperArchive::default_instance_;
@@ -1640,6 +1952,18 @@ void protobuf_ShutdownFile_TSTArchives_2eproto() {
   delete CellMapArchive_reflection_;
   delete CellMapArchive_CellMapEntry::default_instance_;
   delete CellMapArchive_CellMapEntry_reflection_;
+  delete CellMapTileArchive::default_instance_;
+  delete CellMapTileArchive_reflection_;
+  delete CellMapTileArchive_CellMapEntry::default_instance_;
+  delete CellMapTileArchive_CellMapEntry_reflection_;
+  delete TiledCellMapArchive::default_instance_;
+  delete TiledCellMapArchive_reflection_;
+  delete PropertyMapEntryArchive::default_instance_;
+  delete PropertyMapEntryArchive_reflection_;
+  delete CellDiffArchive::default_instance_;
+  delete CellDiffArchive_reflection_;
+  delete CellDiffMapArchive::default_instance_;
+  delete CellDiffMapArchive_reflection_;
   delete DoubleStyleMapArchive::default_instance_;
   delete DoubleStyleMapArchive_reflection_;
   delete DoubleStyleMapArchive_DoubleStyleMapEntryArchive::default_instance_;
@@ -1714,6 +2038,8 @@ void protobuf_ShutdownFile_TSTArchives_2eproto() {
   delete FormulaEqualsTokenAttachmentArchive_reflection_;
   delete CellRegion::default_instance_;
   delete CellRegion_reflection_;
+  delete CellFillStandIn::default_instance_;
+  delete CellFillStandIn_reflection_;
 }
 
 void protobuf_AddDesc_TSTArchives_2eproto() {
@@ -1763,323 +2089,410 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
     "ive\0222\n\014string_value\030\005 \001(\0132\034.TSCE.StringC"
     "ellValueArchive\"`\n\rCellValueType\022\014\n\010NIL_"
     "TYPE\020\001\022\020\n\014BOOLEAN_TYPE\020\002\022\r\n\tDATE_TYPE\020\003\022"
-    "\017\n\013NUMBER_TYPE\020\004\022\017\n\013STRING_TYPE\020\005\"\234\005\n\rTa"
-    "bleDataList\022-\n\010listType\030\001 \002(\0162\033.TST.Tabl"
-    "eDataList.ListType\022\022\n\nnextListID\030\002 \002(\r\022-"
-    "\n\007entries\030\003 \003(\0132\034.TST.TableDataList.List"
-    "Entry\032\321\002\n\tListEntry\022\013\n\003key\030\001 \002(\r\022\020\n\010refc"
-    "ount\030\002 \002(\r\022\016\n\006string\030\003 \001(\t\022!\n\treference\030"
-    "\004 \001(\0132\016.TSP.Reference\022%\n\007formula\030\005 \001(\0132\024"
-    ".TSCE.FormulaArchive\022(\n\006format\030\006 \001(\0132\030.T"
-    "SK.FormatStructArchive\022\036\n\006region\030\007 \001(\0132\016"
-    ".TST.CellRange\022/\n\rcustom_format\030\010 \001(\0132\030."
-    "TSK.CustomFormatArchive\022\'\n\017richTextPaylo"
-    "ad\030\t \001(\0132\016.TSP.Reference\022\'\n\017comment_stor"
-    "age\030\n \001(\0132\016.TSP.Reference\"\304\001\n\010ListType\022\n"
+    "\017\n\013NUMBER_TYPE\020\004\022\017\n\013STRING_TYPE\020\005\"\303\t\n\027Im"
+    "portWarningSetArchive\022Q\n\026formula_import_"
+    "warning\030\001 \001(\01321.TST.ImportWarningSetArch"
+    "ive.FormulaImportWarning\022.\n\037cond_format_"
+    "above_avg_equal_avg\030\002 \001(\010:\005false\022,\n\035cond"
+    "_format_above_avg_std_dev\030\003 \001(\010:\005false\022*"
+    "\n\033cond_format_complex_formula\030\004 \001(\010:\005fal"
+    "se\022*\n\033cond_format_contains_errors\030\005 \001(\010:"
+    "\005false\022\037\n\020cond_format_expr\030\006 \001(\010:\005false\022"
+    ".\n\037cond_format_not_contains_errors\030\007 \001(\010"
+    ":\005false\0227\n(cond_format_parameters_not_al"
+    "l_same_type\030\010 \001(\010:\005false\022\'\n\030cond_format_"
+    "stop_if_true\030\t \001(\010:\005false\022/\n cond_format"
+    "_unsupported_operator\030\n \001(\010:\005false\022.\n\037co"
+    "nd_format_unsupported_styling\030\013 \001(\010:\005fal"
+    "se\0222\n#cond_format_unsupported_time_perio"
+    "d\030\014 \001(\010:\005false\022)\n\032error_cell_with_no_for"
+    "mula\030\r \001(\010:\005false\022&\n\027unsupported_cond_fo"
+    "rmat\030\016 \001(\010:\005false\022\034\n\024original_data_forma"
+    "t\030\017 \001(\t\032\233\001\n\024FormulaImportWarning\022M\n\024form"
+    "ula_warning_type\030\001 \002(\0162/.TST.ImportWarni"
+    "ngSetArchive.FormulaWarningType\022\030\n\020origi"
+    "nal_formula\030\002 \001(\t\022\032\n\022supplementary_text\030"
+    "\003 \001(\t\"\307\002\n\022FormulaWarningType\022\025\n\021THREE_D_"
+    "REFERENCE\020\001\022\023\n\017ARRAYED_FORMULA\020\002\022#\n\037DIFF"
+    "ERENT_BEHAVIOR_FOR_FUNCTION\020\003\022\017\n\013ERROR_T"
+    "OKEN\020\004\022\026\n\022EXTERNAL_REFERENCE\020\005\022\034\n\030NATURA"
+    "L_LANGUAGE_FORMULA\020\006\022\033\n\027REFERENCE_OUT_OF"
+    "_BOUNDS\020\007\022!\n\035SHARED_FORMULA_BASE_NOT_FOU"
+    "ND\020\010\022\020\n\014UNKNOWN_NAME\020\t\022\027\n\023UNSUPPORTED_FO"
+    "RMULA\020\n\022\030\n\024UNSUPPORTED_FUNCTION\020\013\022\024\n\020UNS"
+    "UPPORTED_NAME\020\014\"\352\005\n\rTableDataList\022-\n\010lis"
+    "tType\030\001 \002(\0162\033.TST.TableDataList.ListType"
+    "\022\022\n\nnextListID\030\002 \002(\r\022-\n\007entries\030\003 \003(\0132\034."
+    "TST.TableDataList.ListEntry\032\213\003\n\tListEntr"
+    "y\022\013\n\003key\030\001 \002(\r\022\020\n\010refcount\030\002 \002(\r\022\016\n\006stri"
+    "ng\030\003 \001(\t\022!\n\treference\030\004 \001(\0132\016.TSP.Refere"
+    "nce\022%\n\007formula\030\005 \001(\0132\024.TSCE.FormulaArchi"
+    "ve\022(\n\006format\030\006 \001(\0132\030.TSK.FormatStructArc"
+    "hive\022\036\n\006region\030\007 \001(\0132\016.TST.CellRange\022/\n\r"
+    "custom_format\030\010 \001(\0132\030.TSK.CustomFormatAr"
+    "chive\022\'\n\017richTextPayload\030\t \001(\0132\016.TSP.Ref"
+    "erence\022\'\n\017comment_storage\030\n \001(\0132\016.TSP.Re"
+    "ference\0228\n\022import_warning_set\030\013 \001(\0132\034.TS"
+    "T.ImportWarningSetArchive\"\330\001\n\010ListType\022\n"
     "\n\006STRING\020\001\022\n\n\006FORMAT\020\002\022\013\n\007FORMULA\020\003\022\t\n\005S"
     "TYLE\020\004\022\021\n\rFORMULA_ERROR\020\005\022\021\n\rCUSTOM_FORM"
     "AT\020\006\022\037\n\033MULTIPLE_CHOICE_LIST_FORMAT\020\007\022\025\n"
     "\021RICH_TEXT_PAYLOAD\020\010\022\025\n\021CONDITIONAL_STYL"
-    "E\020\t\022\023\n\017COMMENT_STORAGE\020\n\"W\n\013TableRBTree\022"
-    "$\n\005nodes\030\001 \003(\0132\025.TST.TableRBTree.Node\032\"\n"
-    "\004Node\022\013\n\003key\030\001 \002(\r\022\r\n\005value\030\002 \002(\r\"\377\001\n\023He"
-    "aderStorageBucket\022\032\n\022bucketHashFunction\030"
-    "\001 \002(\r\0220\n\007headers\030\002 \003(\0132\037.TST.HeaderStora"
-    "geBucket.Header\032\231\001\n\006Header\022\r\n\005index\030\001 \002("
-    "\r\022\014\n\004size\030\002 \002(\002\022\023\n\013hidingState\030\003 \002(\r\022\025\n\r"
-    "numberOfCells\030\004 \002(\r\022\"\n\ncell_style\030\005 \001(\0132"
-    "\016.TSP.Reference\022\"\n\ntext_style\030\006 \001(\0132\016.TS"
-    "P.Reference\"L\n\rHeaderStorage\022\032\n\022bucketHa"
-    "shFunction\030\001 \002(\r\022\037\n\007buckets\030\002 \003(\0132\016.TSP."
-    "Reference\"\355\005\n\tDataStore\022&\n\nrowHeaders\030\001 "
-    "\002(\0132\022.TST.HeaderStorage\022%\n\rcolumnHeaders"
-    "\030\002 \002(\0132\016.TSP.Reference\022\037\n\005tiles\030\003 \002(\0132\020."
-    "TST.TileStorage\022#\n\013stringTable\030\004 \002(\0132\016.T"
-    "SP.Reference\022\"\n\nstyleTable\030\005 \002(\0132\016.TSP.R"
-    "eference\022$\n\014formulaTable\030\006 \002(\0132\016.TSP.Ref"
-    "erence\022)\n\021formulaErrorTable\030\014 \001(\0132\016.TSP."
-    "Reference\022#\n\013formatTable\030\013 \002(\0132\016.TSP.Ref"
-    "erence\0225\n\035multipleChoiceListFormatTable\030"
-    "\020 \001(\0132\016.TSP.Reference\022(\n\020merge_region_ma"
-    "p\030\r \001(\0132\016.TSP.Reference\022)\n\021customFormatT"
-    "able\030\017 \001(\0132\016.TSP.Reference\022\026\n\016nextRowStr"
-    "ipID\030\007 \002(\r\022\031\n\021nextColumnStripID\030\010 \002(\r\022%\n"
-    "\013rowTileTree\030\t \002(\0132\020.TST.TableRBTree\022(\n\016"
-    "columnTileTree\030\n \002(\0132\020.TST.TableRBTree\022\027"
-    "\n\017storage_version\030\016 \001(\r\022,\n\024richTextPaylo"
-    "adTable\030\021 \001(\0132\016.TSP.Reference\022-\n\025conditi"
-    "onalstyletable\030\022 \001(\0132\016.TSP.Reference\022+\n\023"
-    "commentStorageTable\030\023 \001(\0132\016.TSP.Referenc"
-    "e\"\201\001\n\020TableInfoArchive\022#\n\005super\030\001 \002(\0132\024."
-    "TSD.DrawableArchive\022\"\n\ntableModel\030\002 \002(\0132"
-    "\016.TSP.Reference\022$\n\014editingState\030\003 \001(\0132\016."
-    "TSP.Reference\"\310\002\n\023EditingStateArchive\022&\n"
-    "\016editingStorage\030\001 \001(\0132\016.TSP.Reference\022\036\n"
-    "\013editingCell\030\002 \002(\0132\t.TST.Cell\022(\n\tselecti"
-    "on\030\003 \001(\0132\025.TST.SelectionArchive\022&\n\021laste"
-    "ditingcellid\030\004 \001(\0132\013.TST.CellID\022\"\n\rediti"
-    "ngcellid\030\005 \001(\0132\013.TST.CellID\022G\n(deprecate"
-    "d_setup_textUndoRedoTransaction\030\006 \001(\0132\025."
-    "TSWP.UndoTransaction\022*\n\"cell_was_edited_"
-    "in_current_session\030\007 \001(\010\"[\n\022WPTableInfoA"
-    "rchive\022$\n\005super\030\001 \002(\0132\025.TST.TableInfoArc"
-    "hive\022\037\n\007storage\030\002 \001(\0132\016.TSP.Reference\"\222\004"
-    "\n\030TableStyleNetworkArchive\022#\n\013table_styl"
-    "e\030\t \002(\0132\016.TSP.Reference\022\'\n\017body_text_sty"
-    "le\030\001 \002(\0132\016.TSP.Reference\022-\n\025header_row_t"
-    "ext_style\030\002 \002(\0132\016.TSP.Reference\0220\n\030heade"
-    "r_column_text_style\030\003 \002(\0132\016.TSP.Referenc"
-    "e\022-\n\025footer_row_text_style\030\004 \002(\0132\016.TSP.R"
-    "eference\022\'\n\017body_cell_style\030\005 \002(\0132\016.TSP."
-    "Reference\022(\n\020header_row_style\030\006 \002(\0132\016.TS"
-    "P.Reference\022+\n\023header_column_style\030\007 \002(\013"
-    "2\016.TSP.Reference\022(\n\020footer_row_style\030\010 \002"
-    "(\0132\016.TSP.Reference\022(\n\020table_name_style\030\n"
-    " \001(\0132\016.TSP.Reference\022.\n\026table_name_shape"
-    "_style\030\013 \001(\0132\016.TSP.Reference\022\024\n\014preset_i"
-    "ndex\030\014 \001(\r\"\230\014\n\021TableModelArchive\022\020\n\010tabl"
-    "e_id\030\001 \002(\t\022\025\n\rfrom_table_id\030+ \001(\t\022#\n\013tab"
-    "le_style\030\003 \002(\0132\016.TSP.Reference\022\'\n\017body_t"
-    "ext_style\030\030 \002(\0132\016.TSP.Reference\022-\n\025heade"
-    "r_row_text_style\030\031 \002(\0132\016.TSP.Reference\0220"
-    "\n\030header_column_text_style\030\032 \002(\0132\016.TSP.R"
-    "eference\022-\n\025footer_row_text_style\030\033 \002(\0132"
-    "\016.TSP.Reference\022\'\n\017body_cell_style\030\022 \002(\013"
-    "2\016.TSP.Reference\022(\n\020header_row_style\030\023 \002"
-    "(\0132\016.TSP.Reference\022+\n\023header_column_styl"
-    "e\030\024 \002(\0132\016.TSP.Reference\022(\n\020footer_row_st"
-    "yle\030\025 \002(\0132\016.TSP.Reference\022(\n\020table_name_"
-    "style\030\036 \001(\0132\016.TSP.Reference\022.\n\026table_nam"
-    "e_shape_style\030$ \001(\0132\016.TSP.Reference\022\"\n\nd"
-    "ata_store\030\004 \002(\0132\016.TST.DataStore\022 \n\010provi"
-    "der\030\005 \001(\0132\016.TSP.Reference\022\026\n\016number_of_r"
-    "ows\030\006 \002(\r\022\031\n\021number_of_columns\030\007 \002(\r\022\022\n\n"
-    "table_name\030\010 \002(\t\022\032\n\022table_name_enabled\030\026"
-    " \001(\010\022\031\n\021table_name_height\030! \001(\001\022!\n\031table"
-    "_name_border_enabled\030% \001(\010\022\035\n\025number_of_"
-    "header_rows\030\t \001(\r\022 \n\030number_of_header_co"
-    "lumns\030\n \001(\r\022\035\n\025number_of_footer_rows\030\013 \001"
-    "(\r\022\032\n\022header_rows_frozen\030\014 \001(\010\022\035\n\025header"
-    "_columns_frozen\030\r \001(\010\022\035\n\025number_of_hidde"
-    "n_rows\030\016 \001(\r\022 \n\030number_of_hidden_columns"
-    "\030\017 \001(\r\022\"\n\032number_of_user_hidden_rows\030) \001"
-    "(\r\022%\n\035number_of_user_hidden_columns\030* \001("
-    "\r\022\037\n\027number_of_filtered_rows\030( \001(\r\022\032\n\022de"
-    "fault_row_height\030\020 \002(\001\022\034\n\024default_column"
-    "_width\030\021 \002(\001\022&\n\rorigin_offset\030\027 \001(\0132\013.TS"
-    "T.CellIDB\002\030\001\022\024\n\014preset_index\030\034 \002(\r\022%\n\035re"
-    "peating_header_rows_enabled\030\035 \001(\010\022(\n rep"
-    "eating_header_columns_enabled\030  \001(\010\022\036\n\026s"
-    "tyle_apply_clears_all\030\037 \001(\010\022>\n&hidden_st"
-    "ate_formula_owner_for_columns\030\" \001(\0132\016.TS"
-    "P.Reference\022;\n#hidden_state_formula_owne"
-    "r_for_rows\030# \001(\0132\016.TSP.Reference\022\"\n\nfilt"
-    "er_set\030& \001(\0132\016.TSP.Reference\022\?\n\"conditio"
-    "nal_style_formula_owner_id\030\' \001(\0132\023.TSCE."
-    "CFUUIDArchive\"\030\n\026DurationWrapperArchive\""
-    "\272\007\n\004Cell\022%\n\tvalueType\030\002 \002(\0162\022.TST.CellVa"
-    "lueType\022\023\n\013numberValue\030\005 \001(\001\022\023\n\013stringVa"
-    "lue\030\006 \001(\t\022\021\n\tboolValue\030\007 \001(\010\022\"\n\ncell_sty"
-    "le\030\003 \001(\0132\016.TSP.Reference\022\"\n\ntext_style\030\004"
-    " \001(\0132\016.TSP.Reference\022%\n\007formula\030\010 \001(\0132\024."
-    "TSCE.FormulaArchive\022$\n\014formulaError\030\n \001("
-    "\0132\016.TSP.Reference\0220\n\016current_format\030\t \001("
-    "\0132\030.TSK.FormatStructArchive\022/\n\rnumber_fo"
-    "rmat\030\013 \001(\0132\030.TSK.FormatStructArchive\0221\n\017"
-    "currency_format\030\014 \001(\0132\030.TSK.FormatStruct"
-    "Archive\0221\n\017duration_format\030\r \001(\0132\030.TSK.F"
-    "ormatStructArchive\022-\n\013date_format\030\016 \001(\0132"
-    "\030.TSK.FormatStructArchive\0220\n\016control_for"
-    "mat\030\017 \001(\0132\030.TSK.FormatStructArchive\022/\n\rc"
-    "ustom_format\030\020 \001(\0132\030.TSK.FormatStructArc"
-    "hive\022-\n\013base_format\030\021 \001(\0132\030.TSK.FormatSt"
-    "ructArchive\022=\n\033multiple_choice_list_form"
-    "at\030\022 \001(\0132\030.TSK.FormatStructArchive\022\035\n\025ex"
-    "plicit_format_flags\030\023 \001(\r\022\'\n\017richTextPay"
-    "load\030\024 \001(\0132\016.TSP.Reference\022)\n\021conditiona"
-    "l_style\030\025 \001(\0132\016.TSP.Reference\022,\n\024multipl"
-    "e_choice_list\030\026 \001(\0132\016.TSP.Reference\022\'\n\017c"
-    "omment_storage\030\027 \001(\0132\016.TSP.Reference\022&\n\036"
-    "conditional_style_applied_rule\030\030 \001(\r\";\n\025"
-    "MergeRegionMapArchive\022\"\n\ncell_range\030\001 \003("
-    "\0132\016.TST.CellRange\"\265\002\n\016CellMapArchive\022\020\n\010"
-    "capacity\030\001 \002(\r\022\r\n\005count\030\002 \002(\r\0226\n\014cellMap"
-    "Entry\030\003 \003(\0132 .TST.CellMapArchive.CellMap"
-    "Entry\022*\n\034may_modify_formulas_in_cells\030\004 "
+    "E\020\t\022\023\n\017COMMENT_STORAGE\020\n\022\022\n\016IMPORT_WARNI"
+    "NG\020\013\"W\n\013TableRBTree\022$\n\005nodes\030\001 \003(\0132\025.TST"
+    ".TableRBTree.Node\032\"\n\004Node\022\013\n\003key\030\001 \002(\r\022\r"
+    "\n\005value\030\002 \002(\r\"\377\001\n\023HeaderStorageBucket\022\032\n"
+    "\022bucketHashFunction\030\001 \002(\r\0220\n\007headers\030\002 \003"
+    "(\0132\037.TST.HeaderStorageBucket.Header\032\231\001\n\006"
+    "Header\022\r\n\005index\030\001 \002(\r\022\014\n\004size\030\002 \002(\002\022\023\n\013h"
+    "idingState\030\003 \002(\r\022\025\n\rnumberOfCells\030\004 \002(\r\022"
+    "\"\n\ncell_style\030\005 \001(\0132\016.TSP.Reference\022\"\n\nt"
+    "ext_style\030\006 \001(\0132\016.TSP.Reference\"L\n\rHeade"
+    "rStorage\022\032\n\022bucketHashFunction\030\001 \002(\r\022\037\n\007"
+    "buckets\030\002 \003(\0132\016.TSP.Reference\"\234\006\n\tDataSt"
+    "ore\022&\n\nrowHeaders\030\001 \002(\0132\022.TST.HeaderStor"
+    "age\022%\n\rcolumnHeaders\030\002 \002(\0132\016.TSP.Referen"
+    "ce\022\037\n\005tiles\030\003 \002(\0132\020.TST.TileStorage\022#\n\013s"
+    "tringTable\030\004 \002(\0132\016.TSP.Reference\022\"\n\nstyl"
+    "eTable\030\005 \002(\0132\016.TSP.Reference\022$\n\014formulaT"
+    "able\030\006 \002(\0132\016.TSP.Reference\022)\n\021formulaErr"
+    "orTable\030\014 \001(\0132\016.TSP.Reference\022#\n\013formatT"
+    "able\030\013 \002(\0132\016.TSP.Reference\0225\n\035multipleCh"
+    "oiceListFormatTable\030\020 \001(\0132\016.TSP.Referenc"
+    "e\022(\n\020merge_region_map\030\r \001(\0132\016.TSP.Refere"
+    "nce\022)\n\021customFormatTable\030\017 \001(\0132\016.TSP.Ref"
+    "erence\022\026\n\016nextRowStripID\030\007 \002(\r\022\031\n\021nextCo"
+    "lumnStripID\030\010 \002(\r\022%\n\013rowTileTree\030\t \002(\0132\020"
+    ".TST.TableRBTree\022(\n\016columnTileTree\030\n \002(\013"
+    "2\020.TST.TableRBTree\022\027\n\017storage_version\030\016 "
+    "\001(\r\022,\n\024richTextPayloadTable\030\021 \001(\0132\016.TSP."
+    "Reference\022-\n\025conditionalstyletable\030\022 \001(\013"
+    "2\016.TSP.Reference\022+\n\023commentStorageTable\030"
+    "\023 \001(\0132\016.TSP.Reference\022-\n\025importWarningSe"
+    "tTable\030\024 \001(\0132\016.TSP.Reference\"\201\001\n\020TableIn"
+    "foArchive\022#\n\005super\030\001 \002(\0132\024.TSD.DrawableA"
+    "rchive\022\"\n\ntableModel\030\002 \002(\0132\016.TSP.Referen"
+    "ce\022$\n\014editingState\030\003 \001(\0132\016.TSP.Reference"
+    "\"\310\002\n\023EditingStateArchive\022&\n\016editingStora"
+    "ge\030\001 \001(\0132\016.TSP.Reference\022\036\n\013editingCell\030"
+    "\002 \002(\0132\t.TST.Cell\022(\n\tselection\030\003 \001(\0132\025.TS"
+    "T.SelectionArchive\022&\n\021lasteditingcellid\030"
+    "\004 \001(\0132\013.TST.CellID\022\"\n\reditingcellid\030\005 \001("
+    "\0132\013.TST.CellID\022G\n(deprecated_setup_textU"
+    "ndoRedoTransaction\030\006 \001(\0132\025.TSWP.UndoTran"
+    "saction\022*\n\"cell_was_edited_in_current_se"
+    "ssion\030\007 \001(\010\"[\n\022WPTableInfoArchive\022$\n\005sup"
+    "er\030\001 \002(\0132\025.TST.TableInfoArchive\022\037\n\007stora"
+    "ge\030\002 \001(\0132\016.TSP.Reference\"\222\004\n\030TableStyleN"
+    "etworkArchive\022#\n\013table_style\030\t \002(\0132\016.TSP"
+    ".Reference\022\'\n\017body_text_style\030\001 \002(\0132\016.TS"
+    "P.Reference\022-\n\025header_row_text_style\030\002 \002"
+    "(\0132\016.TSP.Reference\0220\n\030header_column_text"
+    "_style\030\003 \002(\0132\016.TSP.Reference\022-\n\025footer_r"
+    "ow_text_style\030\004 \002(\0132\016.TSP.Reference\022\'\n\017b"
+    "ody_cell_style\030\005 \002(\0132\016.TSP.Reference\022(\n\020"
+    "header_row_style\030\006 \002(\0132\016.TSP.Reference\022+"
+    "\n\023header_column_style\030\007 \002(\0132\016.TSP.Refere"
+    "nce\022(\n\020footer_row_style\030\010 \002(\0132\016.TSP.Refe"
+    "rence\022(\n\020table_name_style\030\n \001(\0132\016.TSP.Re"
+    "ference\022.\n\026table_name_shape_style\030\013 \001(\0132"
+    "\016.TSP.Reference\022\024\n\014preset_index\030\014 \001(\r\"\313\002"
+    "\n\025TableSortOrderArchive\0221\n\004type\030\001 \002(\0162#."
+    "TST.TableSortOrderArchive.SortType\0229\n\005ru"
+    "les\030\002 \003(\0132*.TST.TableSortOrderArchive.So"
+    "rtRuleArchive\032\226\001\n\017SortRuleArchive\022\016\n\006col"
+    "umn\030\001 \002(\r\022G\n\tdirection\030\002 \002(\01624.TST.Table"
+    "SortOrderArchive.SortRuleArchive.Directi"
+    "on\"*\n\tDirection\022\r\n\tascending\020\000\022\016\n\ndescen"
+    "ding\020\001\"+\n\010SortType\022\020\n\014entire_table\020\000\022\r\n\t"
+    "row_range\020\001\"L\n\037SortRuleReferenceTrackerA"
+    "rchive\022)\n\021reference_tracker\030\001 \002(\0132\016.TSP."
+    "Reference\"\223\r\n\021TableModelArchive\022\020\n\010table"
+    "_id\030\001 \002(\t\022\025\n\rfrom_table_id\030+ \001(\t\022#\n\013tabl"
+    "e_style\030\003 \002(\0132\016.TSP.Reference\022\'\n\017body_te"
+    "xt_style\030\030 \002(\0132\016.TSP.Reference\022-\n\025header"
+    "_row_text_style\030\031 \002(\0132\016.TSP.Reference\0220\n"
+    "\030header_column_text_style\030\032 \002(\0132\016.TSP.Re"
+    "ference\022-\n\025footer_row_text_style\030\033 \002(\0132\016"
+    ".TSP.Reference\022\'\n\017body_cell_style\030\022 \002(\0132"
+    "\016.TSP.Reference\022(\n\020header_row_style\030\023 \002("
+    "\0132\016.TSP.Reference\022+\n\023header_column_style"
+    "\030\024 \002(\0132\016.TSP.Reference\022(\n\020footer_row_sty"
+    "le\030\025 \002(\0132\016.TSP.Reference\022(\n\020table_name_s"
+    "tyle\030\036 \001(\0132\016.TSP.Reference\022.\n\026table_name"
+    "_shape_style\030$ \001(\0132\016.TSP.Reference\022\"\n\nda"
+    "ta_store\030\004 \002(\0132\016.TST.DataStore\022 \n\010provid"
+    "er\030\005 \001(\0132\016.TSP.Reference\022\026\n\016number_of_ro"
+    "ws\030\006 \002(\r\022\031\n\021number_of_columns\030\007 \002(\r\022\022\n\nt"
+    "able_name\030\010 \002(\t\022\032\n\022table_name_enabled\030\026 "
+    "\001(\010\022\031\n\021table_name_height\030! \001(\001\022!\n\031table_"
+    "name_border_enabled\030% \001(\010\022\035\n\025number_of_h"
+    "eader_rows\030\t \001(\r\022 \n\030number_of_header_col"
+    "umns\030\n \001(\r\022\035\n\025number_of_footer_rows\030\013 \001("
+    "\r\022\032\n\022header_rows_frozen\030\014 \001(\010\022\035\n\025header_"
+    "columns_frozen\030\r \001(\010\022\035\n\025number_of_hidden"
+    "_rows\030\016 \001(\r\022 \n\030number_of_hidden_columns\030"
+    "\017 \001(\r\022\"\n\032number_of_user_hidden_rows\030) \001("
+    "\r\022%\n\035number_of_user_hidden_columns\030* \001(\r"
+    "\022\037\n\027number_of_filtered_rows\030( \001(\r\022\032\n\022def"
+    "ault_row_height\030\020 \002(\001\022\034\n\024default_column_"
+    "width\030\021 \002(\001\022&\n\rorigin_offset\030\027 \001(\0132\013.TST"
+    ".CellIDB\002\030\001\022\024\n\014preset_index\030\034 \002(\r\022%\n\035rep"
+    "eating_header_rows_enabled\030\035 \001(\010\022(\n repe"
+    "ating_header_columns_enabled\030  \001(\010\022\036\n\026st"
+    "yle_apply_clears_all\030\037 \001(\010\022>\n&hidden_sta"
+    "te_formula_owner_for_columns\030\" \001(\0132\016.TSP"
+    ".Reference\022;\n#hidden_state_formula_owner"
+    "_for_rows\030# \001(\0132\016.TSP.Reference\022\"\n\nfilte"
+    "r_set\030& \001(\0132\016.TSP.Reference\022.\n\nsort_orde"
+    "r\030, \001(\0132\032.TST.TableSortOrderArchive\022\?\n\"c"
+    "onditional_style_formula_owner_id\030\' \001(\0132"
+    "\023.TSCE.CFUUIDArchive\022I\n\033sort_rule_refere"
+    "nce_tracker\030- \001(\0132$.TST.SortRuleReferenc"
+    "eTrackerArchive\"\030\n\026DurationWrapperArchiv"
+    "e\"\364\007\n\004Cell\022%\n\tvalueType\030\002 \002(\0162\022.TST.Cell"
+    "ValueType\022\023\n\013numberValue\030\005 \001(\001\022\023\n\013string"
+    "Value\030\006 \001(\t\022\021\n\tboolValue\030\007 \001(\010\022\"\n\ncell_s"
+    "tyle\030\003 \001(\0132\016.TSP.Reference\022\"\n\ntext_style"
+    "\030\004 \001(\0132\016.TSP.Reference\022%\n\007formula\030\010 \001(\0132"
+    "\024.TSCE.FormulaArchive\022$\n\014formulaError\030\n "
+    "\001(\0132\016.TSP.Reference\0220\n\016current_format\030\t "
+    "\001(\0132\030.TSK.FormatStructArchive\022/\n\rnumber_"
+    "format\030\013 \001(\0132\030.TSK.FormatStructArchive\0221"
+    "\n\017currency_format\030\014 \001(\0132\030.TSK.FormatStru"
+    "ctArchive\0221\n\017duration_format\030\r \001(\0132\030.TSK"
+    ".FormatStructArchive\022-\n\013date_format\030\016 \001("
+    "\0132\030.TSK.FormatStructArchive\0220\n\016control_f"
+    "ormat\030\017 \001(\0132\030.TSK.FormatStructArchive\022/\n"
+    "\rcustom_format\030\020 \001(\0132\030.TSK.FormatStructA"
+    "rchive\022-\n\013base_format\030\021 \001(\0132\030.TSK.Format"
+    "StructArchive\022=\n\033multiple_choice_list_fo"
+    "rmat\030\022 \001(\0132\030.TSK.FormatStructArchive\022\035\n\025"
+    "explicit_format_flags\030\023 \001(\r\022\'\n\017richTextP"
+    "ayload\030\024 \001(\0132\016.TSP.Reference\022)\n\021conditio"
+    "nal_style\030\025 \001(\0132\016.TSP.Reference\022,\n\024multi"
+    "ple_choice_list\030\026 \001(\0132\016.TSP.Reference\022\'\n"
+    "\017comment_storage\030\027 \001(\0132\016.TSP.Reference\022&"
+    "\n\036conditional_style_applied_rule\030\030 \001(\r\0228"
+    "\n\022import_warning_set\030\031 \001(\0132\034.TST.ImportW"
+    "arningSetArchive\";\n\025MergeRegionMapArchiv"
+    "e\022\"\n\ncell_range\030\001 \003(\0132\016.TST.CellRange\"\265\002"
+    "\n\016CellMapArchive\022\020\n\010capacity\030\001 \002(\r\022\r\n\005co"
+    "unt\030\002 \002(\r\0226\n\014cellMapEntry\030\003 \003(\0132 .TST.Ce"
+    "llMapArchive.CellMapEntry\022*\n\034may_modify_"
+    "formulas_in_cells\030\004 \001(\010:\004true\0226\n(may_mod"
+    "ify_values_referenced_by_formulas\030\005 \001(\010:"
+    "\004true\022 \n\021applies_to_hidden\030\006 \001(\010:\005false\032"
+    "D\n\014CellMapEntry\022\033\n\006cellID\030\001 \002(\0132\013.TST.Ce"
+    "llID\022\027\n\004cell\030\002 \001(\0132\t.TST.Cell\"\227\001\n\022CellMa"
+    "pTileArchive\022;\n\rcellmap_entry\030\002 \003(\0132$.TS"
+    "T.CellMapTileArchive.CellMapEntry\032D\n\014Cel"
+    "lMapEntry\022\033\n\006cellID\030\001 \002(\0132\013.TST.CellID\022\027"
+    "\n\004cell\030\002 \001(\0132\t.TST.Cell\"\301\001\n\023TiledCellMap"
+    "Archive\022$\n\014cellmap_tile\030\001 \003(\0132\016.TSP.Refe"
+    "rence\022*\n\034may_modify_formulas_in_cells\030\002 "
     "\001(\010:\004true\0226\n(may_modify_values_reference"
-    "d_by_formulas\030\005 \001(\010:\004true\022 \n\021applies_to_"
-    "hidden\030\006 \001(\010:\005false\032D\n\014CellMapEntry\022\033\n\006c"
-    "ellID\030\001 \002(\0132\013.TST.CellID\022\027\n\004cell\030\002 \001(\0132\t"
-    ".TST.Cell\"\212\002\n\025DoubleStyleMapArchive\022\020\n\010c"
-    "apacity\030\001 \002(\r\022\r\n\005count\030\002 \002(\r\022M\n\016cell_map"
-    "_entry\030\003 \003(\01325.TST.DoubleStyleMapArchive"
-    ".DoubleStyleMapEntryArchive\032\200\001\n\032DoubleSt"
-    "yleMapEntryArchive\022\034\n\007cell_id\030\001 \002(\0132\013.TS"
-    "T.CellID\022!\n\told_style\030\002 \002(\0132\016.TSP.Refere"
-    "nce\022!\n\tnew_style\030\003 \002(\0132\016.TSP.Reference\"\357"
-    "\001\n\024StyleTableMapArchive\022\020\n\010capacity\030\001 \002("
-    "\r\022\r\n\005count\030\002 \002(\r\022F\n\tmap_entry\030\003 \003(\01323.TS"
-    "T.StyleTableMapArchive.StyleTableMapEntr"
-    "yArchive\032n\n\031StyleTableMapEntryArchive\022\013\n"
-    "\003key\030\001 \002(\r\022!\n\told_style\030\002 \002(\0132\016.TSP.Refe"
-    "rence\022!\n\tnew_style\030\003 \002(\0132\016.TSP.Reference"
-    "\"\373\001\n\020SelectionArchive\022&\n\ntableModel\030\001 \001("
-    "\0132\016.TSP.ReferenceB\002\030\001\0221\n\016selection_type\030"
-    "\004 \002(\0162\031.TST.SelectionTypeArchive\022 \n\013anch"
-    "or_cell\030\005 \001(\0132\013.TST.CellID\022#\n\013cell_range"
-    "s\030\006 \003(\0132\016.TST.CellRange\022#\n\013base_ranges\030\007"
-    " \003(\0132\016.TST.CellRange\022 \n\013cursor_cell\030\010 \001("
-    "\0132\013.TST.CellID\"V\n\021FilterRuleArchive\022/\n\tp"
-    "redicate\030\001 \002(\0132\034.TST.FormulaPredicateArc"
-    "hive\022\020\n\010disabled\030\002 \001(\010\"\214\001\n\021TableStyleArc"
-    "hive\022 \n\005super\030\001 \002(\0132\021.TSS.StyleArchive\022\031"
-    "\n\016override_count\030\n \001(\r:\0010\022:\n\020table_prope"
-    "rties\030\013 \001(\0132 .TST.TableStylePropertiesAr"
-    "chive\"\211\001\n\020CellStyleArchive\022 \n\005super\030\001 \002("
-    "\0132\021.TSS.StyleArchive\022\031\n\016override_count\030\n"
-    " \001(\r:\0010\0228\n\017cell_properties\030\013 \001(\0132\037.TST.C"
-    "ellStylePropertiesArchive\"\342\013\n\027FormulaPre"
-    "dicateArchive\022%\n\007formula\030\001 \002(\0132\024.TSCE.Fo"
-    "rmulaArchive\022I\n\016predicate_type\030\002 \002(\01621.T"
-    "ST.FormulaPredicateArchive.FormulaPredic"
-    "ateType\022>\n\nqualifier1\030\003 \002(\0162*.TST.Formul"
-    "aPredicateArchive.QualifierType\022>\n\nquali"
-    "fier2\030\004 \002(\0162*.TST.FormulaPredicateArchiv"
-    "e.QualifierType\022\024\n\014param_index1\030\005 \002(\005\022\024\n"
-    "\014param_index2\030\006 \002(\005\022\024\n\014param_index0\030\007 \002("
-    "\005\"\211\010\n\024FormulaPredicateType\022\014\n\010PredNone\020\000"
-    "\022\022\n\016TextStartsWith\020\001\022\020\n\014TextEndsWith\020\002\022\020"
-    "\n\014TextContains\020\003\022\026\n\022TextDoesNotContain\020\004"
-    "\022\016\n\nValueEqual\020\005\022\021\n\rValueNotEqual\020\006\022\024\n\020V"
-    "alueGreaterThan\020\007\022\033\n\027ValueGreaterThanOrE"
-    "qual\020\010\022\021\n\rValueLessThan\020\t\022\030\n\024ValueLessTh"
-    "anOrEqual\020\n\022\025\n\021ValueAboveAverage\020\013\022\025\n\021Va"
-    "lueBelowAverage\020\014\022\020\n\014ValueBetween\020\r\022\013\n\007F"
-    "ormula\020\016\022\016\n\nDuplicates\020\017\022\013\n\007Uniques\020\020\022\017\n"
-    "\013DateIsToday\020\021\022\023\n\017DateIsYesterday\020\022\022\022\n\016D"
-    "ateIsTomorrow\020\023\022\021\n\rDateIsTheDate\020\024\022\025\n\021Da"
-    "teBeforeTheDate\020\025\022\024\n\020DateAfterTheDate\020\026\022"
-    "\024\n\020DateIsInTheRange\020\027\022\021\n\rDateInTheNext\020\030"
-    "\022\021\n\rDateInTheLast\020\031\022\021\n\rDateIsExactly\020\032\022\026"
-    "\n\022DateBeforeRelative\020\033\022\025\n\021DateAfterRelat"
-    "ive\020\034\022\027\n\023DateBetweenRelative\020\035\022\014\n\010ValueT"
-    "op\020\036\022\017\n\013ValueBottom\020\037\022\023\n\017ValueNotBetween"
-    "\020 \022\016\n\nDateInThis\020!\022\013\n\007IsBlank\020\"\022\016\n\nIsNot"
-    "Blank\020#\022\n\n\006TextIs\020$\022\r\n\tTextIsNot\020%\022\021\n\rDu"
-    "rationEqual\020&\022\024\n\020DurationNotEqual\020\'\022\027\n\023D"
-    "urationGreaterThan\020(\022\036\n\032DurationGreaterT"
-    "hanOrEqual\020)\022\024\n\020DurationLessThan\020*\022\033\n\027Du"
-    "rationLessThanOrEqual\020+\022\023\n\017DurationBetwe"
-    "en\020,\022\026\n\022DurationNotBetween\020-\022\030\n\024Duration"
-    "AboveAverage\020.\022\030\n\024DurationBelowAverage\020/"
-    "\022\017\n\013DurationTop\0200\022\022\n\016DurationBottom\0201\"\206\001"
-    "\n\rQualifierType\022\014\n\010QualNone\020\000\022\010\n\004Days\020\002\022"
-    "\t\n\005Weeks\020\003\022\n\n\006Months\020\004\022\t\n\005Years\020\005\022\007\n\003Ago"
-    "\020\006\022\013\n\007FromNow\020\007\022\014\n\010Quarters\020\010\022\013\n\007Percent"
-    "\020\t\022\n\n\006Values\020\n\"\243\002\n\032ConditionalStyleSetAr"
-    "chive\022\021\n\truleCount\030\001 \002(\r\022C\n\005rules\030\002 \003(\0132"
-    "4.TST.ConditionalStyleSetArchive.Conditi"
-    "onalStyleRule\022\033\n\006cellID\030\003 \001(\0132\013.TST.Cell"
-    "ID\032\217\001\n\024ConditionalStyleRule\022/\n\tpredicate"
-    "\030\001 \002(\0132\034.TST.FormulaPredicateArchive\022\"\n\n"
-    "cell_style\030\002 \002(\0132\016.TSP.Reference\022\"\n\ntext"
-    "_style\030\003 \002(\0132\016.TSP.Reference\"\322\002\n\020FilterS"
-    "etArchive\022J\n\004type\030\001 \001(\0162#.TST.FilterSetA"
-    "rchive.FilterSetType:\027FilterSetArchiveTy"
-    "peAll\022\030\n\nis_enabled\030\002 \001(\010:\004true\022,\n\014filte"
-    "r_rules\030\003 \003(\0132\026.TST.FilterRuleArchive\022/\n"
-    " needs_formula_rewrite_for_import\030\004 \001(\010:"
-    "\005false\022\026\n\016filter_offsets\030\005 \003(\r\022\026\n\016filter"
-    "_enabled\030\006 \003(\010\"I\n\rFilterSetType\022\033\n\027Filte"
-    "rSetArchiveTypeAll\020\000\022\033\n\027FilterSetArchive"
-    "TypeAny\020\001\"l\n\026TokenAttachmentArchive\022*\n\005s"
-    "uper\030\001 \002(\0132\033.TSWP.UIGraphicalAttachment\022"
-    "&\n\016expressionNode\030\002 \001(\0132\016.TSP.Reference\""
-    "8\n\016FormulaArchive\022&\n\016expressionTree\030\001 \001("
-    "\0132\016.TSP.Reference\"h\n\025ExpressionNodeArchi"
-    "ve\022 \n\010children\030\001 \003(\0132\016.TSP.Reference\022\026\n\013"
-    "first_index\030\002 \001(\004:\0010\022\025\n\nlast_index\030\003 \001(\004"
-    ":\0010\"N\n\022BooleanNodeArchive\022)\n\005super\030\001 \002(\013"
-    "2\032.TST.ExpressionNodeArchive\022\r\n\005value\030\002 "
-    "\002(\010\"N\n\021NumberNodeArchive\022)\n\005super\030\001 \002(\0132"
-    "\032.TST.ExpressionNodeArchive\022\016\n\006number\030\002 "
-    "\002(\001\"M\n\021StringNodeArchive\022)\n\005super\030\001 \002(\0132"
-    "\032.TST.ExpressionNodeArchive\022\r\n\005value\030\002 \002"
-    "(\t\"V\n\025IdentifierNodeArchive\022)\n\005super\030\001 \002"
-    "(\0132\032.TST.ExpressionNodeArchive\022\022\n\nidenti"
-    "fier\030\002 \001(\t\"\\\n\020ArrayNodeArchive\022)\n\005super\030"
-    "\001 \002(\0132\032.TST.ExpressionNodeArchive\022\017\n\007col"
-    "umns\030\002 \001(\r\022\014\n\004rows\030\003 \001(\r\"<\n\017ListNodeArch"
-    "ive\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNodeA"
-    "rchive\"V\n\023OperatorNodeArchive\022)\n\005super\030\001"
-    " \002(\0132\032.TST.ExpressionNodeArchive\022\024\n\014oper"
-    "atorChar\030\002 \002(\r\"E\n\032PostfixOperatorNodeArc"
-    "hive\022\'\n\005super\030\001 \002(\0132\030.TST.OperatorNodeAr"
-    "chive\"D\n\031PrefixOperatorNodeArchive\022\'\n\005su"
-    "per\030\001 \002(\0132\030.TST.OperatorNodeArchive\"t\n\023F"
-    "unctionNodeArchive\022)\n\005super\030\001 \002(\0132\032.TST."
-    "ExpressionNodeArchive\022\025\n\rfunctionIndex\030\002"
-    " \002(\r\022\033\n\023invalidFunctionName\030\003 \001(\t\"C\n\026Fun"
-    "ctionEndNodeArchive\022)\n\005super\030\001 \002(\0132\032.TST"
-    ".ExpressionNodeArchive\"[\n\017DateNodeArchiv"
+    "d_by_formulas\030\003 \001(\010:\004true\022 \n\021applies_to_"
+    "hidden\030\004 \001(\010:\005false\"\247\002\n\027PropertyMapEntry"
+    "Archive\022\020\n\010property\030\001 \002(\r\022!\n\tvalueType\030\002"
+    " \002(\0162\016.TSS.ValueType\022\021\n\tint_value\030\003 \001(\005\022"
+    "\023\n\013float_value\030\004 \001(\002\022\024\n\014double_value\030\005 \001"
+    "(\001\022\030\n\tis_nsnull\030\006 \001(\010:\005false\022%\n\rtsp_refe"
+    "rence\030\007 \001(\0132\016.TSP.Reference\022\036\n\004fill\030\010 \001("
+    "\0132\020.TSD.FillArchive\0228\n\022import_warning_se"
+    "t\030\t \001(\0132\034.TST.ImportWarningSetArchive\"\211\001"
+    "\n\017CellDiffArchive\0229\n\023property_map_to_set"
+    "\030\001 \003(\0132\034.TST.PropertyMapEntryArchive\022;\n\025"
+    "property_map_to_reset\030\002 \003(\0132\034.TST.Proper"
+    "tyMapEntryArchive\"W\n\022CellDiffMapArchive\022"
+    "\035\n\010cell_ids\030\001 \003(\0132\013.TST.CellID\022\"\n\ncell_d"
+    "iffs\030\002 \003(\0132\016.TSP.Reference\"\212\002\n\025DoubleSty"
+    "leMapArchive\022\020\n\010capacity\030\001 \002(\r\022\r\n\005count\030"
+    "\002 \002(\r\022M\n\016cell_map_entry\030\003 \003(\01325.TST.Doub"
+    "leStyleMapArchive.DoubleStyleMapEntryArc"
+    "hive\032\200\001\n\032DoubleStyleMapEntryArchive\022\034\n\007c"
+    "ell_id\030\001 \002(\0132\013.TST.CellID\022!\n\told_style\030\002"
+    " \002(\0132\016.TSP.Reference\022!\n\tnew_style\030\003 \002(\0132"
+    "\016.TSP.Reference\"\357\001\n\024StyleTableMapArchive"
+    "\022\020\n\010capacity\030\001 \002(\r\022\r\n\005count\030\002 \002(\r\022F\n\tmap"
+    "_entry\030\003 \003(\01323.TST.StyleTableMapArchive."
+    "StyleTableMapEntryArchive\032n\n\031StyleTableM"
+    "apEntryArchive\022\013\n\003key\030\001 \002(\r\022!\n\told_style"
+    "\030\002 \002(\0132\016.TSP.Reference\022!\n\tnew_style\030\003 \002("
+    "\0132\016.TSP.Reference\"\373\001\n\020SelectionArchive\022&"
+    "\n\ntableModel\030\001 \001(\0132\016.TSP.ReferenceB\002\030\001\0221"
+    "\n\016selection_type\030\004 \002(\0162\031.TST.SelectionTy"
+    "peArchive\022 \n\013anchor_cell\030\005 \001(\0132\013.TST.Cel"
+    "lID\022#\n\013cell_ranges\030\006 \003(\0132\016.TST.CellRange"
+    "\022#\n\013base_ranges\030\007 \003(\0132\016.TST.CellRange\022 \n"
+    "\013cursor_cell\030\010 \001(\0132\013.TST.CellID\"V\n\021Filte"
+    "rRuleArchive\022/\n\tpredicate\030\001 \002(\0132\034.TST.Fo"
+    "rmulaPredicateArchive\022\020\n\010disabled\030\002 \001(\010\""
+    "\214\001\n\021TableStyleArchive\022 \n\005super\030\001 \002(\0132\021.T"
+    "SS.StyleArchive\022\031\n\016override_count\030\n \001(\r:"
+    "\0010\022:\n\020table_properties\030\013 \001(\0132 .TST.Table"
+    "StylePropertiesArchive\"\211\001\n\020CellStyleArch"
+    "ive\022 \n\005super\030\001 \002(\0132\021.TSS.StyleArchive\022\031\n"
+    "\016override_count\030\n \001(\r:\0010\0228\n\017cell_propert"
+    "ies\030\013 \001(\0132\037.TST.CellStylePropertiesArchi"
+    "ve\"\342\013\n\027FormulaPredicateArchive\022%\n\007formul"
+    "a\030\001 \002(\0132\024.TSCE.FormulaArchive\022I\n\016predica"
+    "te_type\030\002 \002(\01621.TST.FormulaPredicateArch"
+    "ive.FormulaPredicateType\022>\n\nqualifier1\030\003"
+    " \002(\0162*.TST.FormulaPredicateArchive.Quali"
+    "fierType\022>\n\nqualifier2\030\004 \002(\0162*.TST.Formu"
+    "laPredicateArchive.QualifierType\022\024\n\014para"
+    "m_index1\030\005 \002(\005\022\024\n\014param_index2\030\006 \002(\005\022\024\n\014"
+    "param_index0\030\007 \002(\005\"\211\010\n\024FormulaPredicateT"
+    "ype\022\014\n\010PredNone\020\000\022\022\n\016TextStartsWith\020\001\022\020\n"
+    "\014TextEndsWith\020\002\022\020\n\014TextContains\020\003\022\026\n\022Tex"
+    "tDoesNotContain\020\004\022\016\n\nValueEqual\020\005\022\021\n\rVal"
+    "ueNotEqual\020\006\022\024\n\020ValueGreaterThan\020\007\022\033\n\027Va"
+    "lueGreaterThanOrEqual\020\010\022\021\n\rValueLessThan"
+    "\020\t\022\030\n\024ValueLessThanOrEqual\020\n\022\025\n\021ValueAbo"
+    "veAverage\020\013\022\025\n\021ValueBelowAverage\020\014\022\020\n\014Va"
+    "lueBetween\020\r\022\013\n\007Formula\020\016\022\016\n\nDuplicates\020"
+    "\017\022\013\n\007Uniques\020\020\022\017\n\013DateIsToday\020\021\022\023\n\017DateI"
+    "sYesterday\020\022\022\022\n\016DateIsTomorrow\020\023\022\021\n\rDate"
+    "IsTheDate\020\024\022\025\n\021DateBeforeTheDate\020\025\022\024\n\020Da"
+    "teAfterTheDate\020\026\022\024\n\020DateIsInTheRange\020\027\022\021"
+    "\n\rDateInTheNext\020\030\022\021\n\rDateInTheLast\020\031\022\021\n\r"
+    "DateIsExactly\020\032\022\026\n\022DateBeforeRelative\020\033\022"
+    "\025\n\021DateAfterRelative\020\034\022\027\n\023DateBetweenRel"
+    "ative\020\035\022\014\n\010ValueTop\020\036\022\017\n\013ValueBottom\020\037\022\023"
+    "\n\017ValueNotBetween\020 \022\016\n\nDateInThis\020!\022\013\n\007I"
+    "sBlank\020\"\022\016\n\nIsNotBlank\020#\022\n\n\006TextIs\020$\022\r\n\t"
+    "TextIsNot\020%\022\021\n\rDurationEqual\020&\022\024\n\020Durati"
+    "onNotEqual\020\'\022\027\n\023DurationGreaterThan\020(\022\036\n"
+    "\032DurationGreaterThanOrEqual\020)\022\024\n\020Duratio"
+    "nLessThan\020*\022\033\n\027DurationLessThanOrEqual\020+"
+    "\022\023\n\017DurationBetween\020,\022\026\n\022DurationNotBetw"
+    "een\020-\022\030\n\024DurationAboveAverage\020.\022\030\n\024Durat"
+    "ionBelowAverage\020/\022\017\n\013DurationTop\0200\022\022\n\016Du"
+    "rationBottom\0201\"\206\001\n\rQualifierType\022\014\n\010Qual"
+    "None\020\000\022\010\n\004Days\020\002\022\t\n\005Weeks\020\003\022\n\n\006Months\020\004\022"
+    "\t\n\005Years\020\005\022\007\n\003Ago\020\006\022\013\n\007FromNow\020\007\022\014\n\010Quar"
+    "ters\020\010\022\013\n\007Percent\020\t\022\n\n\006Values\020\n\"\243\002\n\032Cond"
+    "itionalStyleSetArchive\022\021\n\truleCount\030\001 \002("
+    "\r\022C\n\005rules\030\002 \003(\01324.TST.ConditionalStyleS"
+    "etArchive.ConditionalStyleRule\022\033\n\006cellID"
+    "\030\003 \001(\0132\013.TST.CellID\032\217\001\n\024ConditionalStyle"
+    "Rule\022/\n\tpredicate\030\001 \002(\0132\034.TST.FormulaPre"
+    "dicateArchive\022\"\n\ncell_style\030\002 \002(\0132\016.TSP."
+    "Reference\022\"\n\ntext_style\030\003 \002(\0132\016.TSP.Refe"
+    "rence\"\322\002\n\020FilterSetArchive\022J\n\004type\030\001 \001(\016"
+    "2#.TST.FilterSetArchive.FilterSetType:\027F"
+    "ilterSetArchiveTypeAll\022\030\n\nis_enabled\030\002 \001"
+    "(\010:\004true\022,\n\014filter_rules\030\003 \003(\0132\026.TST.Fil"
+    "terRuleArchive\022/\n needs_formula_rewrite_"
+    "for_import\030\004 \001(\010:\005false\022\026\n\016filter_offset"
+    "s\030\005 \003(\r\022\026\n\016filter_enabled\030\006 \003(\010\"I\n\rFilte"
+    "rSetType\022\033\n\027FilterSetArchiveTypeAll\020\000\022\033\n"
+    "\027FilterSetArchiveTypeAny\020\001\"l\n\026TokenAttac"
+    "hmentArchive\022*\n\005super\030\001 \002(\0132\033.TSWP.UIGra"
+    "phicalAttachment\022&\n\016expressionNode\030\002 \001(\013"
+    "2\016.TSP.Reference\"8\n\016FormulaArchive\022&\n\016ex"
+    "pressionTree\030\001 \001(\0132\016.TSP.Reference\"h\n\025Ex"
+    "pressionNodeArchive\022 \n\010children\030\001 \003(\0132\016."
+    "TSP.Reference\022\026\n\013first_index\030\002 \001(\004:\0010\022\025\n"
+    "\nlast_index\030\003 \001(\004:\0010\"N\n\022BooleanNodeArchi"
+    "ve\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNodeAr"
+    "chive\022\r\n\005value\030\002 \002(\010\"N\n\021NumberNodeArchiv"
     "e\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNodeArc"
-    "hive\022\r\n\005value\030\002 \002(\t\022\016\n\006format\030\003 \001(\t\"\237\001\n\024"
-    "ReferenceNodeArchive\022)\n\005super\030\001 \002(\0132\032.TS"
-    "T.ExpressionNodeArchive\0223\n\016rangeReferenc"
-    "e\030\002 \002(\0132\033.TSCE.RangeReferenceArchive\022\022\n\n"
-    "stickyBits\030\003 \002(\r\022\023\n\013hostTableID\030\004 \001(\t\"\210\001"
-    "\n\023DurationNodeArchive\022)\n\005super\030\001 \002(\0132\032.T"
-    "ST.ExpressionNodeArchive\022\024\n\014timeinterval"
-    "\030\002 \002(\001\022\020\n\010smallest\030\003 \002(\r\022\017\n\007largest\030\004 \002("
-    "\r\022\r\n\005style\030\005 \002(\r\"\207\001\n\036ArgumentPlaceholder"
-    "NodeArchive\022)\n\005super\030\001 \002(\0132\032.TST.Express"
-    "ionNodeArchive\022\025\n\rfunctionIndex\030\002 \002(\r\022\025\n"
-    "\rargumentIndex\030\003 \002(\r\022\014\n\004mode\030\004 \001(\r\"G\n\032Em"
-    "ptyExpressionNodeArchive\022)\n\005super\030\001 \002(\0132"
-    "\032.TST.ExpressionNodeArchive\"\357\001\n\021LayoutHi"
-    "ntArchive\022\017\n\007isValid\030\001 \002(\010\022!\n\tcellRange\030"
-    "\002 \002(\0132\016.TST.CellRange\022\033\n\006hintID\030\003 \002(\0132\013."
-    "TST.CellID\022\036\n\013maximumSize\030\004 \002(\0132\t.TSP.Si"
-    "ze\022\031\n\021partitionPosition\030\005 \002(\r\022\022\n\nhorizon"
-    "tal\030\006 \002(\010\022 \n\reffectiveSize\030\007 \001(\0132\t.TSP.S"
-    "ize\022\030\n\020partitioningPass\030\010 \001(\r\"\222\001\n Comple"
-    "tionTokenAttachmentArchive\022*\n\005super\030\001 \002("
-    "\0132\033.TST.TokenAttachmentArchive\022\026\n\016comple"
-    "tionText\030\002 \001(\t\022\025\n\rcaretPosition\030\003 \001(\r\022\023\n"
-    "\013prefixStart\030\004 \001(\r\"\256\001\n\036HiddenStateFormul"
-    "aOwnerArchive\022%\n\010owner_id\030\001 \001(\0132\023.TSCE.C"
-    "FUUIDArchive\022/\n\017threshold_value\030\002 \003(\0132\026."
-    "TSCE.CellValueArchive\0224\n%needs_to_update"
-    "_filter_set_for_import\030\003 \001(\010:\005false\"q\n\026R"
-    "ichTextPayloadArchive\022\037\n\007storage\030\001 \002(\0132\016"
-    ".TSP.Reference\022\031\n\005range\030\002 \001(\0132\n.TSP.Rang"
-    "e\022\033\n\006cellid\030\003 \002(\0132\013.TST.CellID\"Q\n#Formul"
-    "aEqualsTokenAttachmentArchive\022*\n\005super\030\001"
-    " \002(\0132\033.TSWP.UIGraphicalAttachment\"1\n\nCel"
-    "lRegion\022#\n\013cell_ranges\030\001 \003(\0132\016.TST.CellR"
-    "ange*\327\001\n\010CellType\022\023\n\017genericCellType\020\000\022\020"
-    "\n\014spanCellType\020\001\022\022\n\016numberCellType\020\002\022\020\n\014"
-    "textCellType\020\003\022\023\n\017formulaCellType\020\004\022\020\n\014d"
-    "ateCellType\020\005\022\020\n\014boolCellType\020\006\022\024\n\020durat"
-    "ionCellType\020\007\022\030\n\024formulaErrorCellType\020\010\022"
-    "\025\n\021automaticCellType\020\t*\353\001\n\rCellValueType"
-    "\022\026\n\022emptyCellValueType\020\000\022\027\n\023numberCellVa"
-    "lueType\020\001\022\027\n\023stringCellValueType\020\002\022\031\n\025pr"
-    "ovidedCellValueType\020\003\022\025\n\021dateCellValueTy"
-    "pe\020\004\022\025\n\021boolCellValueType\020\005\022\031\n\025durationC"
-    "ellValueType\020\006\022\026\n\022errorCellValueType\020\007\022\024"
-    "\n\020richTextCellType\020\010*\256\001\n\024SelectionTypeAr"
-    "chive\022\025\n\021cellSelectionType\020\000\022\024\n\020rowSelec"
-    "tionType\020\001\022\027\n\023columnSelectionType\020\002\022\034\n\030c"
-    "ellEditingSelectionType\020\003\022\032\n\026tableNameSe"
-    "lectionType\020\004\022\026\n\022tableSelectionType\020\005*y\n"
-    "\024FillDirectionArchive\022\027\n\023kTSTFillDownArc"
-    "hive\020\001\022\025\n\021kTSTFillUpArchive\020\002\022\030\n\024kTSTFil"
-    "lRightArchive\020\003\022\027\n\023kTSTFillLeftArchive\020\004"
-    "*B\n\022MergeActionArchive\022\024\n\020mergeActionMer"
-    "ge\020\000\022\026\n\022mergeActionUnmerge\020\001*G\n\025HideShow"
-    "ActionArchive\022\026\n\022hideShowActionHide\020\000\022\026\n"
-    "\022hideShowActionShow\020\001", 13981);
+    "hive\022\016\n\006number\030\002 \002(\001\"M\n\021StringNodeArchiv"
+    "e\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNodeArc"
+    "hive\022\r\n\005value\030\002 \002(\t\"V\n\025IdentifierNodeArc"
+    "hive\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNode"
+    "Archive\022\022\n\nidentifier\030\002 \001(\t\"\\\n\020ArrayNode"
+    "Archive\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionN"
+    "odeArchive\022\017\n\007columns\030\002 \001(\r\022\014\n\004rows\030\003 \001("
+    "\r\"<\n\017ListNodeArchive\022)\n\005super\030\001 \002(\0132\032.TS"
+    "T.ExpressionNodeArchive\"V\n\023OperatorNodeA"
+    "rchive\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNo"
+    "deArchive\022\024\n\014operatorChar\030\002 \002(\r\"E\n\032Postf"
+    "ixOperatorNodeArchive\022\'\n\005super\030\001 \002(\0132\030.T"
+    "ST.OperatorNodeArchive\"D\n\031PrefixOperator"
+    "NodeArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Operato"
+    "rNodeArchive\"t\n\023FunctionNodeArchive\022)\n\005s"
+    "uper\030\001 \002(\0132\032.TST.ExpressionNodeArchive\022\025"
+    "\n\rfunctionIndex\030\002 \002(\r\022\033\n\023invalidFunction"
+    "Name\030\003 \001(\t\"C\n\026FunctionEndNodeArchive\022)\n\005"
+    "super\030\001 \002(\0132\032.TST.ExpressionNodeArchive\""
+    "[\n\017DateNodeArchive\022)\n\005super\030\001 \002(\0132\032.TST."
+    "ExpressionNodeArchive\022\r\n\005value\030\002 \002(\t\022\016\n\006"
+    "format\030\003 \001(\t\"\237\001\n\024ReferenceNodeArchive\022)\n"
+    "\005super\030\001 \002(\0132\032.TST.ExpressionNodeArchive"
+    "\0223\n\016rangeReference\030\002 \002(\0132\033.TSCE.RangeRef"
+    "erenceArchive\022\022\n\nstickyBits\030\003 \002(\r\022\023\n\013hos"
+    "tTableID\030\004 \001(\t\"\210\001\n\023DurationNodeArchive\022)"
+    "\n\005super\030\001 \002(\0132\032.TST.ExpressionNodeArchiv"
+    "e\022\024\n\014timeinterval\030\002 \002(\001\022\020\n\010smallest\030\003 \002("
+    "\r\022\017\n\007largest\030\004 \002(\r\022\r\n\005style\030\005 \002(\r\"\207\001\n\036Ar"
+    "gumentPlaceholderNodeArchive\022)\n\005super\030\001 "
+    "\002(\0132\032.TST.ExpressionNodeArchive\022\025\n\rfunct"
+    "ionIndex\030\002 \002(\r\022\025\n\rargumentIndex\030\003 \002(\r\022\014\n"
+    "\004mode\030\004 \001(\r\"G\n\032EmptyExpressionNodeArchiv"
+    "e\022)\n\005super\030\001 \002(\0132\032.TST.ExpressionNodeArc"
+    "hive\"\357\001\n\021LayoutHintArchive\022\017\n\007isValid\030\001 "
+    "\002(\010\022!\n\tcellRange\030\002 \002(\0132\016.TST.CellRange\022\033"
+    "\n\006hintID\030\003 \002(\0132\013.TST.CellID\022\036\n\013maximumSi"
+    "ze\030\004 \002(\0132\t.TSP.Size\022\031\n\021partitionPosition"
+    "\030\005 \002(\r\022\022\n\nhorizontal\030\006 \002(\010\022 \n\reffectiveS"
+    "ize\030\007 \001(\0132\t.TSP.Size\022\030\n\020partitioningPass"
+    "\030\010 \001(\r\"\222\001\n CompletionTokenAttachmentArch"
+    "ive\022*\n\005super\030\001 \002(\0132\033.TST.TokenAttachment"
+    "Archive\022\026\n\016completionText\030\002 \001(\t\022\025\n\rcaret"
+    "Position\030\003 \001(\r\022\023\n\013prefixStart\030\004 \001(\r\"\256\001\n\036"
+    "HiddenStateFormulaOwnerArchive\022%\n\010owner_"
+    "id\030\001 \001(\0132\023.TSCE.CFUUIDArchive\022/\n\017thresho"
+    "ld_value\030\002 \003(\0132\026.TSCE.CellValueArchive\0224"
+    "\n%needs_to_update_filter_set_for_import\030"
+    "\003 \001(\010:\005false\"q\n\026RichTextPayloadArchive\022\037"
+    "\n\007storage\030\001 \002(\0132\016.TSP.Reference\022\031\n\005range"
+    "\030\002 \001(\0132\n.TSP.Range\022\033\n\006cellid\030\003 \002(\0132\013.TST"
+    ".CellID\"Q\n#FormulaEqualsTokenAttachmentA"
+    "rchive\022*\n\005super\030\001 \002(\0132\033.TSWP.UIGraphical"
+    "Attachment\"1\n\nCellRegion\022#\n\013cell_ranges\030"
+    "\001 \003(\0132\016.TST.CellRange\"\235\005\n\017CellFillStandI"
+    "n\022\036\n\004fill\030\001 \002(\0132\020.TSD.FillArchive\022\025\n\rtyp"
+    "e_is_mixed\030\002 \001(\010\022\037\n\027color_has_been_modif"
+    "ied\030\003 \001(\010\022\026\n\016color_is_mixed\030\004 \001(\010\022%\n\035fir"
+    "st_color_has_been_modified\030\005 \001(\010\022\034\n\024firs"
+    "t_color_is_mixed\030\006 \001(\010\022$\n\034last_color_has"
+    "_been_modified\030\007 \001(\010\022\033\n\023last_color_is_mi"
+    "xed\030\010 \001(\010\022\'\n\037gradient_type_has_been_modi"
+    "fied\030\t \001(\010\022\036\n\026gradient_type_is_mixed\030\n \001"
+    "(\010\022(\n gradient_angle_has_been_modified\030\013"
+    " \001(\010\022\037\n\027gradient_angle_is_mixed\030\014 \001(\010\022$\n"
+    "\034image_data_has_been_modified\030\r \001(\010\022\033\n\023i"
+    "mage_data_is_mixed\030\016 \001(\010\022$\n\034tint_color_h"
+    "as_been_modified\030\017 \001(\010\022\033\n\023tint_color_is_"
+    "mixed\030\020 \001(\010\022\037\n\027scale_has_been_modified\030\021"
+    " \001(\010\022\026\n\016scale_is_mixed\030\022 \001(\010\022#\n\033techniqu"
+    "e_has_been_modified\030\023 \001(\010\022\032\n\022technique_i"
+    "s_mixed\030\024 \001(\010*\327\001\n\010CellType\022\023\n\017genericCel"
+    "lType\020\000\022\020\n\014spanCellType\020\001\022\022\n\016numberCellT"
+    "ype\020\002\022\020\n\014textCellType\020\003\022\023\n\017formulaCellTy"
+    "pe\020\004\022\020\n\014dateCellType\020\005\022\020\n\014boolCellType\020\006"
+    "\022\024\n\020durationCellType\020\007\022\030\n\024formulaErrorCe"
+    "llType\020\010\022\025\n\021automaticCellType\020\t*\353\001\n\rCell"
+    "ValueType\022\026\n\022emptyCellValueType\020\000\022\027\n\023num"
+    "berCellValueType\020\001\022\027\n\023stringCellValueTyp"
+    "e\020\002\022\031\n\025providedCellValueType\020\003\022\025\n\021dateCe"
+    "llValueType\020\004\022\025\n\021boolCellValueType\020\005\022\031\n\025"
+    "durationCellValueType\020\006\022\026\n\022errorCellValu"
+    "eType\020\007\022\024\n\020richTextCellType\020\010*\256\001\n\024Select"
+    "ionTypeArchive\022\025\n\021cellSelectionType\020\000\022\024\n"
+    "\020rowSelectionType\020\001\022\027\n\023columnSelectionTy"
+    "pe\020\002\022\034\n\030cellEditingSelectionType\020\003\022\032\n\026ta"
+    "bleNameSelectionType\020\004\022\026\n\022tableSelection"
+    "Type\020\005*y\n\024FillDirectionArchive\022\027\n\023kTSTFi"
+    "llDownArchive\020\001\022\025\n\021kTSTFillUpArchive\020\002\022\030"
+    "\n\024kTSTFillRightArchive\020\003\022\027\n\023kTSTFillLeft"
+    "Archive\020\004*B\n\022MergeActionArchive\022\024\n\020merge"
+    "ActionMerge\020\000\022\026\n\022mergeActionUnmerge\020\001*G\n"
+    "\025HideShowActionArchive\022\026\n\022hideShowAction"
+    "Hide\020\000\022\026\n\022hideShowActionShow\020\001", 17470);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSTArchives.proto", &protobuf_RegisterTypes);
   CellID::default_instance_ = new CellID();
@@ -2092,6 +2505,8 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
   TileStorage_Tile::default_instance_ = new TileStorage_Tile();
   PopUpMenuModel::default_instance_ = new PopUpMenuModel();
   PopUpMenuModel_CellValue::default_instance_ = new PopUpMenuModel_CellValue();
+  ImportWarningSetArchive::default_instance_ = new ImportWarningSetArchive();
+  ImportWarningSetArchive_FormulaImportWarning::default_instance_ = new ImportWarningSetArchive_FormulaImportWarning();
   TableDataList::default_instance_ = new TableDataList();
   TableDataList_ListEntry::default_instance_ = new TableDataList_ListEntry();
   TableRBTree::default_instance_ = new TableRBTree();
@@ -2104,12 +2519,21 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
   EditingStateArchive::default_instance_ = new EditingStateArchive();
   WPTableInfoArchive::default_instance_ = new WPTableInfoArchive();
   TableStyleNetworkArchive::default_instance_ = new TableStyleNetworkArchive();
+  TableSortOrderArchive::default_instance_ = new TableSortOrderArchive();
+  TableSortOrderArchive_SortRuleArchive::default_instance_ = new TableSortOrderArchive_SortRuleArchive();
+  SortRuleReferenceTrackerArchive::default_instance_ = new SortRuleReferenceTrackerArchive();
   TableModelArchive::default_instance_ = new TableModelArchive();
   DurationWrapperArchive::default_instance_ = new DurationWrapperArchive();
   Cell::default_instance_ = new Cell();
   MergeRegionMapArchive::default_instance_ = new MergeRegionMapArchive();
   CellMapArchive::default_instance_ = new CellMapArchive();
   CellMapArchive_CellMapEntry::default_instance_ = new CellMapArchive_CellMapEntry();
+  CellMapTileArchive::default_instance_ = new CellMapTileArchive();
+  CellMapTileArchive_CellMapEntry::default_instance_ = new CellMapTileArchive_CellMapEntry();
+  TiledCellMapArchive::default_instance_ = new TiledCellMapArchive();
+  PropertyMapEntryArchive::default_instance_ = new PropertyMapEntryArchive();
+  CellDiffArchive::default_instance_ = new CellDiffArchive();
+  CellDiffMapArchive::default_instance_ = new CellDiffMapArchive();
   DoubleStyleMapArchive::default_instance_ = new DoubleStyleMapArchive();
   DoubleStyleMapArchive_DoubleStyleMapEntryArchive::default_instance_ = new DoubleStyleMapArchive_DoubleStyleMapEntryArchive();
   StyleTableMapArchive::default_instance_ = new StyleTableMapArchive();
@@ -2147,6 +2571,7 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
   RichTextPayloadArchive::default_instance_ = new RichTextPayloadArchive();
   FormulaEqualsTokenAttachmentArchive::default_instance_ = new FormulaEqualsTokenAttachmentArchive();
   CellRegion::default_instance_ = new CellRegion();
+  CellFillStandIn::default_instance_ = new CellFillStandIn();
   CellID::default_instance_->InitAsDefaultInstance();
   TableSize::default_instance_->InitAsDefaultInstance();
   CellRange::default_instance_->InitAsDefaultInstance();
@@ -2157,6 +2582,8 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
   TileStorage_Tile::default_instance_->InitAsDefaultInstance();
   PopUpMenuModel::default_instance_->InitAsDefaultInstance();
   PopUpMenuModel_CellValue::default_instance_->InitAsDefaultInstance();
+  ImportWarningSetArchive::default_instance_->InitAsDefaultInstance();
+  ImportWarningSetArchive_FormulaImportWarning::default_instance_->InitAsDefaultInstance();
   TableDataList::default_instance_->InitAsDefaultInstance();
   TableDataList_ListEntry::default_instance_->InitAsDefaultInstance();
   TableRBTree::default_instance_->InitAsDefaultInstance();
@@ -2169,12 +2596,21 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
   EditingStateArchive::default_instance_->InitAsDefaultInstance();
   WPTableInfoArchive::default_instance_->InitAsDefaultInstance();
   TableStyleNetworkArchive::default_instance_->InitAsDefaultInstance();
+  TableSortOrderArchive::default_instance_->InitAsDefaultInstance();
+  TableSortOrderArchive_SortRuleArchive::default_instance_->InitAsDefaultInstance();
+  SortRuleReferenceTrackerArchive::default_instance_->InitAsDefaultInstance();
   TableModelArchive::default_instance_->InitAsDefaultInstance();
   DurationWrapperArchive::default_instance_->InitAsDefaultInstance();
   Cell::default_instance_->InitAsDefaultInstance();
   MergeRegionMapArchive::default_instance_->InitAsDefaultInstance();
   CellMapArchive::default_instance_->InitAsDefaultInstance();
   CellMapArchive_CellMapEntry::default_instance_->InitAsDefaultInstance();
+  CellMapTileArchive::default_instance_->InitAsDefaultInstance();
+  CellMapTileArchive_CellMapEntry::default_instance_->InitAsDefaultInstance();
+  TiledCellMapArchive::default_instance_->InitAsDefaultInstance();
+  PropertyMapEntryArchive::default_instance_->InitAsDefaultInstance();
+  CellDiffArchive::default_instance_->InitAsDefaultInstance();
+  CellDiffMapArchive::default_instance_->InitAsDefaultInstance();
   DoubleStyleMapArchive::default_instance_->InitAsDefaultInstance();
   DoubleStyleMapArchive_DoubleStyleMapEntryArchive::default_instance_->InitAsDefaultInstance();
   StyleTableMapArchive::default_instance_->InitAsDefaultInstance();
@@ -2212,6 +2648,7 @@ void protobuf_AddDesc_TSTArchives_2eproto() {
   RichTextPayloadArchive::default_instance_->InitAsDefaultInstance();
   FormulaEqualsTokenAttachmentArchive::default_instance_->InitAsDefaultInstance();
   CellRegion::default_instance_->InitAsDefaultInstance();
+  CellFillStandIn::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_TSTArchives_2eproto);
 }
 
@@ -5300,11 +5737,11 @@ ::google::protobuf::Metadata PopUpMenuModel::GetMetadata() const {
 
 // ===================================================================
 
-const ::google::protobuf::EnumDescriptor* TableDataList_ListType_descriptor() {
+const ::google::protobuf::EnumDescriptor* ImportWarningSetArchive_FormulaWarningType_descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableDataList_ListType_descriptor_;
+  return ImportWarningSetArchive_FormulaWarningType_descriptor_;
 }
-bool TableDataList_ListType_IsValid(int value) {
+bool ImportWarningSetArchive_FormulaWarningType_IsValid(int value) {
   switch(value) {
     case 1:
     case 2:
@@ -5316,6 +5753,8 @@ bool TableDataList_ListType_IsValid(int value) {
     case 8:
     case 9:
     case 10:
+    case 11:
+    case 12:
       return true;
     default:
       return false;
@@ -5323,375 +5762,204 @@ bool TableDataList_ListType_IsValid(int value) {
 }
 
 #ifndef _MSC_VER
-const TableDataList_ListType TableDataList::STRING;
-const TableDataList_ListType TableDataList::FORMAT;
-const TableDataList_ListType TableDataList::FORMULA;
-const TableDataList_ListType TableDataList::STYLE;
-const TableDataList_ListType TableDataList::FORMULA_ERROR;
-const TableDataList_ListType TableDataList::CUSTOM_FORMAT;
-const TableDataList_ListType TableDataList::MULTIPLE_CHOICE_LIST_FORMAT;
-const TableDataList_ListType TableDataList::RICH_TEXT_PAYLOAD;
-const TableDataList_ListType TableDataList::CONDITIONAL_STYLE;
-const TableDataList_ListType TableDataList::COMMENT_STORAGE;
-const TableDataList_ListType TableDataList::ListType_MIN;
-const TableDataList_ListType TableDataList::ListType_MAX;
-const int TableDataList::ListType_ARRAYSIZE;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::THREE_D_REFERENCE;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::ARRAYED_FORMULA;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::DIFFERENT_BEHAVIOR_FOR_FUNCTION;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::ERROR_TOKEN;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::EXTERNAL_REFERENCE;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::NATURAL_LANGUAGE_FORMULA;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::REFERENCE_OUT_OF_BOUNDS;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::SHARED_FORMULA_BASE_NOT_FOUND;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::UNKNOWN_NAME;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::UNSUPPORTED_FORMULA;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::UNSUPPORTED_FUNCTION;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::UNSUPPORTED_NAME;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::FormulaWarningType_MIN;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive::FormulaWarningType_MAX;
+const int ImportWarningSetArchive::FormulaWarningType_ARRAYSIZE;
 #endif  // _MSC_VER
 #ifndef _MSC_VER
-const int TableDataList_ListEntry::kKeyFieldNumber;
-const int TableDataList_ListEntry::kRefcountFieldNumber;
-const int TableDataList_ListEntry::kStringFieldNumber;
-const int TableDataList_ListEntry::kReferenceFieldNumber;
-const int TableDataList_ListEntry::kFormulaFieldNumber;
-const int TableDataList_ListEntry::kFormatFieldNumber;
-const int TableDataList_ListEntry::kRegionFieldNumber;
-const int TableDataList_ListEntry::kCustomFormatFieldNumber;
-const int TableDataList_ListEntry::kRichTextPayloadFieldNumber;
-const int TableDataList_ListEntry::kCommentStorageFieldNumber;
+const int ImportWarningSetArchive_FormulaImportWarning::kFormulaWarningTypeFieldNumber;
+const int ImportWarningSetArchive_FormulaImportWarning::kOriginalFormulaFieldNumber;
+const int ImportWarningSetArchive_FormulaImportWarning::kSupplementaryTextFieldNumber;
 #endif  // !_MSC_VER
 
-TableDataList_ListEntry::TableDataList_ListEntry()
+ImportWarningSetArchive_FormulaImportWarning::ImportWarningSetArchive_FormulaImportWarning()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableDataList_ListEntry::InitAsDefaultInstance() {
-  reference_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  formula_ = const_cast< ::TSCE::FormulaArchive*>(&::TSCE::FormulaArchive::default_instance());
-  format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  region_ = const_cast< ::TST::CellRange*>(&::TST::CellRange::default_instance());
-  custom_format_ = const_cast< ::TSK::CustomFormatArchive*>(&::TSK::CustomFormatArchive::default_instance());
-  richtextpayload_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void ImportWarningSetArchive_FormulaImportWarning::InitAsDefaultInstance() {
 }
 
-TableDataList_ListEntry::TableDataList_ListEntry(const TableDataList_ListEntry& from)
+ImportWarningSetArchive_FormulaImportWarning::ImportWarningSetArchive_FormulaImportWarning(const ImportWarningSetArchive_FormulaImportWarning& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableDataList_ListEntry::SharedCtor() {
+void ImportWarningSetArchive_FormulaImportWarning::SharedCtor() {
   _cached_size_ = 0;
-  key_ = 0u;
-  refcount_ = 0u;
-  string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  reference_ = NULL;
-  formula_ = NULL;
-  format_ = NULL;
-  region_ = NULL;
-  custom_format_ = NULL;
-  richtextpayload_ = NULL;
-  comment_storage_ = NULL;
+  formula_warning_type_ = 1;
+  original_formula_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  supplementary_text_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableDataList_ListEntry::~TableDataList_ListEntry() {
+ImportWarningSetArchive_FormulaImportWarning::~ImportWarningSetArchive_FormulaImportWarning() {
   SharedDtor();
 }
 
-void TableDataList_ListEntry::SharedDtor() {
-  if (string_ != &::google::protobuf::internal::kEmptyString) {
-    delete string_;
+void ImportWarningSetArchive_FormulaImportWarning::SharedDtor() {
+  if (original_formula_ != &::google::protobuf::internal::kEmptyString) {
+    delete original_formula_;
+  }
+  if (supplementary_text_ != &::google::protobuf::internal::kEmptyString) {
+    delete supplementary_text_;
   }
   if (this != default_instance_) {
-    delete reference_;
-    delete formula_;
-    delete format_;
-    delete region_;
-    delete custom_format_;
-    delete richtextpayload_;
-    delete comment_storage_;
   }
 }
 
-void TableDataList_ListEntry::SetCachedSize(int size) const {
+void ImportWarningSetArchive_FormulaImportWarning::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableDataList_ListEntry::descriptor() {
+const ::google::protobuf::Descriptor* ImportWarningSetArchive_FormulaImportWarning::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableDataList_ListEntry_descriptor_;
+  return ImportWarningSetArchive_FormulaImportWarning_descriptor_;
 }
 
-const TableDataList_ListEntry& TableDataList_ListEntry::default_instance() {
+const ImportWarningSetArchive_FormulaImportWarning& ImportWarningSetArchive_FormulaImportWarning::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-TableDataList_ListEntry* TableDataList_ListEntry::default_instance_ = NULL;
+ImportWarningSetArchive_FormulaImportWarning* ImportWarningSetArchive_FormulaImportWarning::default_instance_ = NULL;
 
-TableDataList_ListEntry* TableDataList_ListEntry::New() const {
-  return new TableDataList_ListEntry;
+ImportWarningSetArchive_FormulaImportWarning* ImportWarningSetArchive_FormulaImportWarning::New() const {
+  return new ImportWarningSetArchive_FormulaImportWarning;
 }
 
-void TableDataList_ListEntry::Clear() {
+void ImportWarningSetArchive_FormulaImportWarning::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    key_ = 0u;
-    refcount_ = 0u;
-    if (has_string()) {
-      if (string_ != &::google::protobuf::internal::kEmptyString) {
-        string_->clear();
+    formula_warning_type_ = 1;
+    if (has_original_formula()) {
+      if (original_formula_ != &::google::protobuf::internal::kEmptyString) {
+        original_formula_->clear();
       }
     }
-    if (has_reference()) {
-      if (reference_ != NULL) reference_->::TSP::Reference::Clear();
-    }
-    if (has_formula()) {
-      if (formula_ != NULL) formula_->::TSCE::FormulaArchive::Clear();
-    }
-    if (has_format()) {
-      if (format_ != NULL) format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_region()) {
-      if (region_ != NULL) region_->::TST::CellRange::Clear();
-    }
-    if (has_custom_format()) {
-      if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
-    }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_richtextpayload()) {
-      if (richtextpayload_ != NULL) richtextpayload_->::TSP::Reference::Clear();
-    }
-    if (has_comment_storage()) {
-      if (comment_storage_ != NULL) comment_storage_->::TSP::Reference::Clear();
+    if (has_supplementary_text()) {
+      if (supplementary_text_ != &::google::protobuf::internal::kEmptyString) {
+        supplementary_text_->clear();
+      }
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableDataList_ListEntry::MergePartialFromCodedStream(
+bool ImportWarningSetArchive_FormulaImportWarning::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint32 key = 1;
+      // required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &key_)));
-          set_has_key();
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::ImportWarningSetArchive_FormulaWarningType_IsValid(value)) {
+            set_formula_warning_type(static_cast< ::TST::ImportWarningSetArchive_FormulaWarningType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_refcount;
+        if (input->ExpectTag(18)) goto parse_original_formula;
         break;
       }
 
-      // required uint32 refcount = 2;
+      // optional string original_formula = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_refcount:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &refcount_)));
-          set_has_refcount();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_original_formula:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_original_formula()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->original_formula().data(), this->original_formula().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_string;
+        if (input->ExpectTag(26)) goto parse_supplementary_text;
         break;
       }
 
-      // optional string string = 3;
+      // optional string supplementary_text = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_string:
+         parse_supplementary_text:
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_string()));
+                input, this->mutable_supplementary_text()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->string().data(), this->string().length(),
+            this->supplementary_text().data(), this->supplementary_text().length(),
             ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_reference;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // optional .TSP.Reference reference = 4;
-      case 4: {
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_reference:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_reference()));
-        } else {
-          goto handle_uninterpreted;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
         }
-        if (input->ExpectTag(42)) goto parse_formula;
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
 
-      // optional .TSCE.FormulaArchive formula = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_format;
-        break;
-      }
+void ImportWarningSetArchive_FormulaImportWarning::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
+  if (has_formula_warning_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->formula_warning_type(), output);
+  }
 
-      // optional .TSK.FormatStructArchive format = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_region;
-        break;
-      }
-
-      // optional .TST.CellRange region = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_region:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_region()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_custom_format;
-        break;
-      }
-
-      // optional .TSK.CustomFormatArchive custom_format = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_custom_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_custom_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(74)) goto parse_richTextPayload;
-        break;
-      }
-
-      // optional .TSP.Reference richTextPayload = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_richTextPayload:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_richtextpayload()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(82)) goto parse_comment_storage;
-        break;
-      }
-
-      // optional .TSP.Reference comment_storage = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_comment_storage:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_comment_storage()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void TableDataList_ListEntry::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 key = 1;
-  if (has_key()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->key(), output);
-  }
-
-  // required uint32 refcount = 2;
-  if (has_refcount()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->refcount(), output);
-  }
-
-  // optional string string = 3;
-  if (has_string()) {
+  // optional string original_formula = 2;
+  if (has_original_formula()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->string().data(), this->string().length(),
+      this->original_formula().data(), this->original_formula().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->string(), output);
-  }
-
-  // optional .TSP.Reference reference = 4;
-  if (has_reference()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->reference(), output);
-  }
-
-  // optional .TSCE.FormulaArchive formula = 5;
-  if (has_formula()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->formula(), output);
-  }
-
-  // optional .TSK.FormatStructArchive format = 6;
-  if (has_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->format(), output);
-  }
-
-  // optional .TST.CellRange region = 7;
-  if (has_region()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->region(), output);
-  }
-
-  // optional .TSK.CustomFormatArchive custom_format = 8;
-  if (has_custom_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->custom_format(), output);
-  }
-
-  // optional .TSP.Reference richTextPayload = 9;
-  if (has_richtextpayload()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->richtextpayload(), output);
+      2, this->original_formula(), output);
   }
 
-  // optional .TSP.Reference comment_storage = 10;
-  if (has_comment_storage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->comment_storage(), output);
+  // optional string supplementary_text = 3;
+  if (has_supplementary_text()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->supplementary_text().data(), this->supplementary_text().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->supplementary_text(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -5700,75 +5968,32 @@ void TableDataList_ListEntry::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* TableDataList_ListEntry::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* ImportWarningSetArchive_FormulaImportWarning::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required uint32 key = 1;
-  if (has_key()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->key(), target);
-  }
-
-  // required uint32 refcount = 2;
-  if (has_refcount()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->refcount(), target);
+  // required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
+  if (has_formula_warning_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->formula_warning_type(), target);
   }
 
-  // optional string string = 3;
-  if (has_string()) {
+  // optional string original_formula = 2;
+  if (has_original_formula()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->string().data(), this->string().length(),
+      this->original_formula().data(), this->original_formula().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->string(), target);
-  }
-
-  // optional .TSP.Reference reference = 4;
-  if (has_reference()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->reference(), target);
-  }
-
-  // optional .TSCE.FormulaArchive formula = 5;
-  if (has_formula()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->formula(), target);
-  }
-
-  // optional .TSK.FormatStructArchive format = 6;
-  if (has_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->format(), target);
-  }
-
-  // optional .TST.CellRange region = 7;
-  if (has_region()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->region(), target);
-  }
-
-  // optional .TSK.CustomFormatArchive custom_format = 8;
-  if (has_custom_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->custom_format(), target);
-  }
-
-  // optional .TSP.Reference richTextPayload = 9;
-  if (has_richtextpayload()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        9, this->richtextpayload(), target);
+        2, this->original_formula(), target);
   }
 
-  // optional .TSP.Reference comment_storage = 10;
-  if (has_comment_storage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        10, this->comment_storage(), target);
+  // optional string supplementary_text = 3;
+  if (has_supplementary_text()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->supplementary_text().data(), this->supplementary_text().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->supplementary_text(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -5778,207 +6003,104 @@ ::google::protobuf::uint8* TableDataList_ListEntry::SerializeWithCachedSizesToAr
   return target;
 }
 
-int TableDataList_ListEntry::ByteSize() const {
+int ImportWarningSetArchive_FormulaImportWarning::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 key = 1;
-    if (has_key()) {
+    // required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
+    if (has_formula_warning_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->key());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->formula_warning_type());
     }
 
-    // required uint32 refcount = 2;
-    if (has_refcount()) {
+    // optional string original_formula = 2;
+    if (has_original_formula()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->refcount());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->original_formula());
     }
 
-    // optional string string = 3;
-    if (has_string()) {
+    // optional string supplementary_text = 3;
+    if (has_supplementary_text()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->string());
+          this->supplementary_text());
     }
 
-    // optional .TSP.Reference reference = 4;
-    if (has_reference()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->reference());
-    }
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
 
-    // optional .TSCE.FormulaArchive formula = 5;
-    if (has_formula()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula());
-    }
+void ImportWarningSetArchive_FormulaImportWarning::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ImportWarningSetArchive_FormulaImportWarning* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ImportWarningSetArchive_FormulaImportWarning*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
 
-    // optional .TSK.FormatStructArchive format = 6;
-    if (has_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->format());
+void ImportWarningSetArchive_FormulaImportWarning::MergeFrom(const ImportWarningSetArchive_FormulaImportWarning& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_formula_warning_type()) {
+      set_formula_warning_type(from.formula_warning_type());
     }
-
-    // optional .TST.CellRange region = 7;
-    if (has_region()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->region());
-    }
-
-    // optional .TSK.CustomFormatArchive custom_format = 8;
-    if (has_custom_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->custom_format());
-    }
-
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional .TSP.Reference richTextPayload = 9;
-    if (has_richtextpayload()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->richtextpayload());
-    }
-
-    // optional .TSP.Reference comment_storage = 10;
-    if (has_comment_storage()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->comment_storage());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void TableDataList_ListEntry::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const TableDataList_ListEntry* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableDataList_ListEntry*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void TableDataList_ListEntry::MergeFrom(const TableDataList_ListEntry& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_key()) {
-      set_key(from.key());
-    }
-    if (from.has_refcount()) {
-      set_refcount(from.refcount());
-    }
-    if (from.has_string()) {
-      set_string(from.string());
+    if (from.has_original_formula()) {
+      set_original_formula(from.original_formula());
     }
-    if (from.has_reference()) {
-      mutable_reference()->::TSP::Reference::MergeFrom(from.reference());
-    }
-    if (from.has_formula()) {
-      mutable_formula()->::TSCE::FormulaArchive::MergeFrom(from.formula());
-    }
-    if (from.has_format()) {
-      mutable_format()->::TSK::FormatStructArchive::MergeFrom(from.format());
-    }
-    if (from.has_region()) {
-      mutable_region()->::TST::CellRange::MergeFrom(from.region());
-    }
-    if (from.has_custom_format()) {
-      mutable_custom_format()->::TSK::CustomFormatArchive::MergeFrom(from.custom_format());
-    }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_richtextpayload()) {
-      mutable_richtextpayload()->::TSP::Reference::MergeFrom(from.richtextpayload());
-    }
-    if (from.has_comment_storage()) {
-      mutable_comment_storage()->::TSP::Reference::MergeFrom(from.comment_storage());
+    if (from.has_supplementary_text()) {
+      set_supplementary_text(from.supplementary_text());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void TableDataList_ListEntry::CopyFrom(const ::google::protobuf::Message& from) {
+void ImportWarningSetArchive_FormulaImportWarning::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableDataList_ListEntry::CopyFrom(const TableDataList_ListEntry& from) {
+void ImportWarningSetArchive_FormulaImportWarning::CopyFrom(const ImportWarningSetArchive_FormulaImportWarning& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableDataList_ListEntry::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool ImportWarningSetArchive_FormulaImportWarning::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  if (has_reference()) {
-    if (!this->reference().IsInitialized()) return false;
-  }
-  if (has_formula()) {
-    if (!this->formula().IsInitialized()) return false;
-  }
-  if (has_format()) {
-    if (!this->format().IsInitialized()) return false;
-  }
-  if (has_region()) {
-    if (!this->region().IsInitialized()) return false;
-  }
-  if (has_custom_format()) {
-    if (!this->custom_format().IsInitialized()) return false;
-  }
-  if (has_richtextpayload()) {
-    if (!this->richtextpayload().IsInitialized()) return false;
-  }
-  if (has_comment_storage()) {
-    if (!this->comment_storage().IsInitialized()) return false;
-  }
   return true;
 }
 
-void TableDataList_ListEntry::Swap(TableDataList_ListEntry* other) {
+void ImportWarningSetArchive_FormulaImportWarning::Swap(ImportWarningSetArchive_FormulaImportWarning* other) {
   if (other != this) {
-    std::swap(key_, other->key_);
-    std::swap(refcount_, other->refcount_);
-    std::swap(string_, other->string_);
-    std::swap(reference_, other->reference_);
-    std::swap(formula_, other->formula_);
-    std::swap(format_, other->format_);
-    std::swap(region_, other->region_);
-    std::swap(custom_format_, other->custom_format_);
-    std::swap(richtextpayload_, other->richtextpayload_);
-    std::swap(comment_storage_, other->comment_storage_);
+    std::swap(formula_warning_type_, other->formula_warning_type_);
+    std::swap(original_formula_, other->original_formula_);
+    std::swap(supplementary_text_, other->supplementary_text_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableDataList_ListEntry::GetMetadata() const {
+::google::protobuf::Metadata ImportWarningSetArchive_FormulaImportWarning::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableDataList_ListEntry_descriptor_;
-  metadata.reflection = TableDataList_ListEntry_reflection_;
+  metadata.descriptor = ImportWarningSetArchive_FormulaImportWarning_descriptor_;
+  metadata.reflection = ImportWarningSetArchive_FormulaImportWarning_reflection_;
   return metadata;
 }
 
@@ -5986,188 +6108,552 @@ ::google::protobuf::Metadata TableDataList_ListEntry::GetMetadata() const {
 // -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int TableDataList::kListTypeFieldNumber;
-const int TableDataList::kNextListIDFieldNumber;
-const int TableDataList::kEntriesFieldNumber;
+const int ImportWarningSetArchive::kFormulaImportWarningFieldNumber;
+const int ImportWarningSetArchive::kCondFormatAboveAvgEqualAvgFieldNumber;
+const int ImportWarningSetArchive::kCondFormatAboveAvgStdDevFieldNumber;
+const int ImportWarningSetArchive::kCondFormatComplexFormulaFieldNumber;
+const int ImportWarningSetArchive::kCondFormatContainsErrorsFieldNumber;
+const int ImportWarningSetArchive::kCondFormatExprFieldNumber;
+const int ImportWarningSetArchive::kCondFormatNotContainsErrorsFieldNumber;
+const int ImportWarningSetArchive::kCondFormatParametersNotAllSameTypeFieldNumber;
+const int ImportWarningSetArchive::kCondFormatStopIfTrueFieldNumber;
+const int ImportWarningSetArchive::kCondFormatUnsupportedOperatorFieldNumber;
+const int ImportWarningSetArchive::kCondFormatUnsupportedStylingFieldNumber;
+const int ImportWarningSetArchive::kCondFormatUnsupportedTimePeriodFieldNumber;
+const int ImportWarningSetArchive::kErrorCellWithNoFormulaFieldNumber;
+const int ImportWarningSetArchive::kUnsupportedCondFormatFieldNumber;
+const int ImportWarningSetArchive::kOriginalDataFormatFieldNumber;
 #endif  // !_MSC_VER
 
-TableDataList::TableDataList()
+ImportWarningSetArchive::ImportWarningSetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableDataList::InitAsDefaultInstance() {
+void ImportWarningSetArchive::InitAsDefaultInstance() {
+  formula_import_warning_ = const_cast< ::TST::ImportWarningSetArchive_FormulaImportWarning*>(&::TST::ImportWarningSetArchive_FormulaImportWarning::default_instance());
 }
 
-TableDataList::TableDataList(const TableDataList& from)
+ImportWarningSetArchive::ImportWarningSetArchive(const ImportWarningSetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableDataList::SharedCtor() {
+void ImportWarningSetArchive::SharedCtor() {
   _cached_size_ = 0;
-  listtype_ = 1;
-  nextlistid_ = 0u;
+  formula_import_warning_ = NULL;
+  cond_format_above_avg_equal_avg_ = false;
+  cond_format_above_avg_std_dev_ = false;
+  cond_format_complex_formula_ = false;
+  cond_format_contains_errors_ = false;
+  cond_format_expr_ = false;
+  cond_format_not_contains_errors_ = false;
+  cond_format_parameters_not_all_same_type_ = false;
+  cond_format_stop_if_true_ = false;
+  cond_format_unsupported_operator_ = false;
+  cond_format_unsupported_styling_ = false;
+  cond_format_unsupported_time_period_ = false;
+  error_cell_with_no_formula_ = false;
+  unsupported_cond_format_ = false;
+  original_data_format_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableDataList::~TableDataList() {
+ImportWarningSetArchive::~ImportWarningSetArchive() {
   SharedDtor();
 }
 
-void TableDataList::SharedDtor() {
+void ImportWarningSetArchive::SharedDtor() {
+  if (original_data_format_ != &::google::protobuf::internal::kEmptyString) {
+    delete original_data_format_;
+  }
   if (this != default_instance_) {
+    delete formula_import_warning_;
   }
 }
 
-void TableDataList::SetCachedSize(int size) const {
+void ImportWarningSetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableDataList::descriptor() {
+const ::google::protobuf::Descriptor* ImportWarningSetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableDataList_descriptor_;
+  return ImportWarningSetArchive_descriptor_;
 }
 
-const TableDataList& TableDataList::default_instance() {
+const ImportWarningSetArchive& ImportWarningSetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-TableDataList* TableDataList::default_instance_ = NULL;
+ImportWarningSetArchive* ImportWarningSetArchive::default_instance_ = NULL;
 
-TableDataList* TableDataList::New() const {
-  return new TableDataList;
+ImportWarningSetArchive* ImportWarningSetArchive::New() const {
+  return new ImportWarningSetArchive;
 }
 
-void TableDataList::Clear() {
+void ImportWarningSetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    listtype_ = 1;
-    nextlistid_ = 0u;
+    if (has_formula_import_warning()) {
+      if (formula_import_warning_ != NULL) formula_import_warning_->::TST::ImportWarningSetArchive_FormulaImportWarning::Clear();
+    }
+    cond_format_above_avg_equal_avg_ = false;
+    cond_format_above_avg_std_dev_ = false;
+    cond_format_complex_formula_ = false;
+    cond_format_contains_errors_ = false;
+    cond_format_expr_ = false;
+    cond_format_not_contains_errors_ = false;
+    cond_format_parameters_not_all_same_type_ = false;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    cond_format_stop_if_true_ = false;
+    cond_format_unsupported_operator_ = false;
+    cond_format_unsupported_styling_ = false;
+    cond_format_unsupported_time_period_ = false;
+    error_cell_with_no_formula_ = false;
+    unsupported_cond_format_ = false;
+    if (has_original_data_format()) {
+      if (original_data_format_ != &::google::protobuf::internal::kEmptyString) {
+        original_data_format_->clear();
+      }
+    }
   }
-  entries_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableDataList::MergePartialFromCodedStream(
+bool ImportWarningSetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableDataList.ListType listType = 1;
+      // optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::TableDataList_ListType_IsValid(value)) {
-            set_listtype(static_cast< ::TST::TableDataList_ListType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formula_import_warning()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_nextListID;
+        if (input->ExpectTag(16)) goto parse_cond_format_above_avg_equal_avg;
         break;
       }
 
-      // required uint32 nextListID = 2;
+      // optional bool cond_format_above_avg_equal_avg = 2 [default = false];
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_nextListID:
+         parse_cond_format_above_avg_equal_avg:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &nextlistid_)));
-          set_has_nextlistid();
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_above_avg_equal_avg_)));
+          set_has_cond_format_above_avg_equal_avg();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_entries;
+        if (input->ExpectTag(24)) goto parse_cond_format_above_avg_std_dev;
         break;
       }
 
-      // repeated .TST.TableDataList.ListEntry entries = 3;
+      // optional bool cond_format_above_avg_std_dev = 3 [default = false];
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_entries:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_entries()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_above_avg_std_dev:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_above_avg_std_dev_)));
+          set_has_cond_format_above_avg_std_dev();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_entries;
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectTag(32)) goto parse_cond_format_complex_formula;
         break;
       }
 
-      default: {
-      handle_uninterpreted:
+      // optional bool cond_format_complex_formula = 4 [default = false];
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_complex_formula:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_complex_formula_)));
+          set_has_cond_format_complex_formula();
+        } else {
+          goto handle_uninterpreted;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        if (input->ExpectTag(40)) goto parse_cond_format_contains_errors;
         break;
       }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void TableDataList::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableDataList.ListType listType = 1;
-  if (has_listtype()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->listtype(), output);
-  }
 
-  // required uint32 nextListID = 2;
-  if (has_nextlistid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->nextlistid(), output);
-  }
+      // optional bool cond_format_contains_errors = 5 [default = false];
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_contains_errors:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_contains_errors_)));
+          set_has_cond_format_contains_errors();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_cond_format_expr;
+        break;
+      }
 
-  // repeated .TST.TableDataList.ListEntry entries = 3;
-  for (int i = 0; i < this->entries_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->entries(i), output);
-  }
+      // optional bool cond_format_expr = 6 [default = false];
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_expr:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_expr_)));
+          set_has_cond_format_expr();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_cond_format_not_contains_errors;
+        break;
+      }
 
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
+      // optional bool cond_format_not_contains_errors = 7 [default = false];
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_not_contains_errors:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_not_contains_errors_)));
+          set_has_cond_format_not_contains_errors();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_cond_format_parameters_not_all_same_type;
+        break;
+      }
 
-::google::protobuf::uint8* TableDataList::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .TST.TableDataList.ListType listType = 1;
-  if (has_listtype()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->listtype(), target);
+      // optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_parameters_not_all_same_type:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_parameters_not_all_same_type_)));
+          set_has_cond_format_parameters_not_all_same_type();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_cond_format_stop_if_true;
+        break;
+      }
+
+      // optional bool cond_format_stop_if_true = 9 [default = false];
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_stop_if_true:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_stop_if_true_)));
+          set_has_cond_format_stop_if_true();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_cond_format_unsupported_operator;
+        break;
+      }
+
+      // optional bool cond_format_unsupported_operator = 10 [default = false];
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_unsupported_operator:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_unsupported_operator_)));
+          set_has_cond_format_unsupported_operator();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_cond_format_unsupported_styling;
+        break;
+      }
+
+      // optional bool cond_format_unsupported_styling = 11 [default = false];
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_unsupported_styling:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_unsupported_styling_)));
+          set_has_cond_format_unsupported_styling();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(96)) goto parse_cond_format_unsupported_time_period;
+        break;
+      }
+
+      // optional bool cond_format_unsupported_time_period = 12 [default = false];
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cond_format_unsupported_time_period:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cond_format_unsupported_time_period_)));
+          set_has_cond_format_unsupported_time_period();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(104)) goto parse_error_cell_with_no_formula;
+        break;
+      }
+
+      // optional bool error_cell_with_no_formula = 13 [default = false];
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_error_cell_with_no_formula:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &error_cell_with_no_formula_)));
+          set_has_error_cell_with_no_formula();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(112)) goto parse_unsupported_cond_format;
+        break;
+      }
+
+      // optional bool unsupported_cond_format = 14 [default = false];
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_unsupported_cond_format:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &unsupported_cond_format_)));
+          set_has_unsupported_cond_format();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(122)) goto parse_original_data_format;
+        break;
+      }
+
+      // optional string original_data_format = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_original_data_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_original_data_format()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->original_data_format().data(), this->original_data_format().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
   }
+  return true;
+#undef DO_
+}
 
-  // required uint32 nextListID = 2;
-  if (has_nextlistid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->nextlistid(), target);
+void ImportWarningSetArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
+  if (has_formula_import_warning()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->formula_import_warning(), output);
   }
 
-  // repeated .TST.TableDataList.ListEntry entries = 3;
-  for (int i = 0; i < this->entries_size(); i++) {
+  // optional bool cond_format_above_avg_equal_avg = 2 [default = false];
+  if (has_cond_format_above_avg_equal_avg()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->cond_format_above_avg_equal_avg(), output);
+  }
+
+  // optional bool cond_format_above_avg_std_dev = 3 [default = false];
+  if (has_cond_format_above_avg_std_dev()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->cond_format_above_avg_std_dev(), output);
+  }
+
+  // optional bool cond_format_complex_formula = 4 [default = false];
+  if (has_cond_format_complex_formula()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->cond_format_complex_formula(), output);
+  }
+
+  // optional bool cond_format_contains_errors = 5 [default = false];
+  if (has_cond_format_contains_errors()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->cond_format_contains_errors(), output);
+  }
+
+  // optional bool cond_format_expr = 6 [default = false];
+  if (has_cond_format_expr()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->cond_format_expr(), output);
+  }
+
+  // optional bool cond_format_not_contains_errors = 7 [default = false];
+  if (has_cond_format_not_contains_errors()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->cond_format_not_contains_errors(), output);
+  }
+
+  // optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+  if (has_cond_format_parameters_not_all_same_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->cond_format_parameters_not_all_same_type(), output);
+  }
+
+  // optional bool cond_format_stop_if_true = 9 [default = false];
+  if (has_cond_format_stop_if_true()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(9, this->cond_format_stop_if_true(), output);
+  }
+
+  // optional bool cond_format_unsupported_operator = 10 [default = false];
+  if (has_cond_format_unsupported_operator()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->cond_format_unsupported_operator(), output);
+  }
+
+  // optional bool cond_format_unsupported_styling = 11 [default = false];
+  if (has_cond_format_unsupported_styling()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->cond_format_unsupported_styling(), output);
+  }
+
+  // optional bool cond_format_unsupported_time_period = 12 [default = false];
+  if (has_cond_format_unsupported_time_period()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(12, this->cond_format_unsupported_time_period(), output);
+  }
+
+  // optional bool error_cell_with_no_formula = 13 [default = false];
+  if (has_error_cell_with_no_formula()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(13, this->error_cell_with_no_formula(), output);
+  }
+
+  // optional bool unsupported_cond_format = 14 [default = false];
+  if (has_unsupported_cond_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(14, this->unsupported_cond_format(), output);
+  }
+
+  // optional string original_data_format = 15;
+  if (has_original_data_format()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->original_data_format().data(), this->original_data_format().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      15, this->original_data_format(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ImportWarningSetArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
+  if (has_formula_import_warning()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->entries(i), target);
+        1, this->formula_import_warning(), target);
+  }
+
+  // optional bool cond_format_above_avg_equal_avg = 2 [default = false];
+  if (has_cond_format_above_avg_equal_avg()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->cond_format_above_avg_equal_avg(), target);
+  }
+
+  // optional bool cond_format_above_avg_std_dev = 3 [default = false];
+  if (has_cond_format_above_avg_std_dev()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->cond_format_above_avg_std_dev(), target);
+  }
+
+  // optional bool cond_format_complex_formula = 4 [default = false];
+  if (has_cond_format_complex_formula()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->cond_format_complex_formula(), target);
+  }
+
+  // optional bool cond_format_contains_errors = 5 [default = false];
+  if (has_cond_format_contains_errors()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->cond_format_contains_errors(), target);
+  }
+
+  // optional bool cond_format_expr = 6 [default = false];
+  if (has_cond_format_expr()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->cond_format_expr(), target);
+  }
+
+  // optional bool cond_format_not_contains_errors = 7 [default = false];
+  if (has_cond_format_not_contains_errors()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->cond_format_not_contains_errors(), target);
+  }
+
+  // optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+  if (has_cond_format_parameters_not_all_same_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->cond_format_parameters_not_all_same_type(), target);
+  }
+
+  // optional bool cond_format_stop_if_true = 9 [default = false];
+  if (has_cond_format_stop_if_true()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(9, this->cond_format_stop_if_true(), target);
+  }
+
+  // optional bool cond_format_unsupported_operator = 10 [default = false];
+  if (has_cond_format_unsupported_operator()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->cond_format_unsupported_operator(), target);
+  }
+
+  // optional bool cond_format_unsupported_styling = 11 [default = false];
+  if (has_cond_format_unsupported_styling()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->cond_format_unsupported_styling(), target);
+  }
+
+  // optional bool cond_format_unsupported_time_period = 12 [default = false];
+  if (has_cond_format_unsupported_time_period()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(12, this->cond_format_unsupported_time_period(), target);
+  }
+
+  // optional bool error_cell_with_no_formula = 13 [default = false];
+  if (has_error_cell_with_no_formula()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(13, this->error_cell_with_no_formula(), target);
+  }
+
+  // optional bool unsupported_cond_format = 14 [default = false];
+  if (has_unsupported_cond_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(14, this->unsupported_cond_format(), target);
+  }
+
+  // optional string original_data_format = 15;
+  if (has_original_data_format()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->original_data_format().data(), this->original_data_format().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        15, this->original_data_format(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -6177,32 +6663,92 @@ ::google::protobuf::uint8* TableDataList::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int TableDataList::ByteSize() const {
+int ImportWarningSetArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableDataList.ListType listType = 1;
-    if (has_listtype()) {
+    // optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
+    if (has_formula_import_warning()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->listtype());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->formula_import_warning());
     }
 
-    // required uint32 nextListID = 2;
-    if (has_nextlistid()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->nextlistid());
+    // optional bool cond_format_above_avg_equal_avg = 2 [default = false];
+    if (has_cond_format_above_avg_equal_avg()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_above_avg_std_dev = 3 [default = false];
+    if (has_cond_format_above_avg_std_dev()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_complex_formula = 4 [default = false];
+    if (has_cond_format_complex_formula()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_contains_errors = 5 [default = false];
+    if (has_cond_format_contains_errors()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_expr = 6 [default = false];
+    if (has_cond_format_expr()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_not_contains_errors = 7 [default = false];
+    if (has_cond_format_not_contains_errors()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+    if (has_cond_format_parameters_not_all_same_type()) {
+      total_size += 1 + 1;
     }
 
   }
-  // repeated .TST.TableDataList.ListEntry entries = 3;
-  total_size += 1 * this->entries_size();
-  for (int i = 0; i < this->entries_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->entries(i));
-  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional bool cond_format_stop_if_true = 9 [default = false];
+    if (has_cond_format_stop_if_true()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_unsupported_operator = 10 [default = false];
+    if (has_cond_format_unsupported_operator()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_unsupported_styling = 11 [default = false];
+    if (has_cond_format_unsupported_styling()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool cond_format_unsupported_time_period = 12 [default = false];
+    if (has_cond_format_unsupported_time_period()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool error_cell_with_no_formula = 13 [default = false];
+    if (has_error_cell_with_no_formula()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool unsupported_cond_format = 14 [default = false];
+    if (has_unsupported_cond_format()) {
+      total_size += 1 + 1;
+    }
+
+    // optional string original_data_format = 15;
+    if (has_original_data_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->original_data_format());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -6214,10 +6760,10 @@ int TableDataList::ByteSize() const {
   return total_size;
 }
 
-void TableDataList::MergeFrom(const ::google::protobuf::Message& from) {
+void ImportWarningSetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const TableDataList* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableDataList*>(
+  const ImportWarningSetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ImportWarningSetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -6226,129 +6772,287 @@ void TableDataList::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void TableDataList::MergeFrom(const TableDataList& from) {
+void ImportWarningSetArchive::MergeFrom(const ImportWarningSetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  entries_.MergeFrom(from.entries_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_listtype()) {
-      set_listtype(from.listtype());
+    if (from.has_formula_import_warning()) {
+      mutable_formula_import_warning()->::TST::ImportWarningSetArchive_FormulaImportWarning::MergeFrom(from.formula_import_warning());
     }
-    if (from.has_nextlistid()) {
-      set_nextlistid(from.nextlistid());
+    if (from.has_cond_format_above_avg_equal_avg()) {
+      set_cond_format_above_avg_equal_avg(from.cond_format_above_avg_equal_avg());
     }
-  }
+    if (from.has_cond_format_above_avg_std_dev()) {
+      set_cond_format_above_avg_std_dev(from.cond_format_above_avg_std_dev());
+    }
+    if (from.has_cond_format_complex_formula()) {
+      set_cond_format_complex_formula(from.cond_format_complex_formula());
+    }
+    if (from.has_cond_format_contains_errors()) {
+      set_cond_format_contains_errors(from.cond_format_contains_errors());
+    }
+    if (from.has_cond_format_expr()) {
+      set_cond_format_expr(from.cond_format_expr());
+    }
+    if (from.has_cond_format_not_contains_errors()) {
+      set_cond_format_not_contains_errors(from.cond_format_not_contains_errors());
+    }
+    if (from.has_cond_format_parameters_not_all_same_type()) {
+      set_cond_format_parameters_not_all_same_type(from.cond_format_parameters_not_all_same_type());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_cond_format_stop_if_true()) {
+      set_cond_format_stop_if_true(from.cond_format_stop_if_true());
+    }
+    if (from.has_cond_format_unsupported_operator()) {
+      set_cond_format_unsupported_operator(from.cond_format_unsupported_operator());
+    }
+    if (from.has_cond_format_unsupported_styling()) {
+      set_cond_format_unsupported_styling(from.cond_format_unsupported_styling());
+    }
+    if (from.has_cond_format_unsupported_time_period()) {
+      set_cond_format_unsupported_time_period(from.cond_format_unsupported_time_period());
+    }
+    if (from.has_error_cell_with_no_formula()) {
+      set_error_cell_with_no_formula(from.error_cell_with_no_formula());
+    }
+    if (from.has_unsupported_cond_format()) {
+      set_unsupported_cond_format(from.unsupported_cond_format());
+    }
+    if (from.has_original_data_format()) {
+      set_original_data_format(from.original_data_format());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void TableDataList::CopyFrom(const ::google::protobuf::Message& from) {
+void ImportWarningSetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableDataList::CopyFrom(const TableDataList& from) {
+void ImportWarningSetArchive::CopyFrom(const ImportWarningSetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableDataList::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool ImportWarningSetArchive::IsInitialized() const {
 
-  for (int i = 0; i < entries_size(); i++) {
-    if (!this->entries(i).IsInitialized()) return false;
+  if (has_formula_import_warning()) {
+    if (!this->formula_import_warning().IsInitialized()) return false;
   }
   return true;
 }
 
-void TableDataList::Swap(TableDataList* other) {
+void ImportWarningSetArchive::Swap(ImportWarningSetArchive* other) {
   if (other != this) {
-    std::swap(listtype_, other->listtype_);
-    std::swap(nextlistid_, other->nextlistid_);
-    entries_.Swap(&other->entries_);
+    std::swap(formula_import_warning_, other->formula_import_warning_);
+    std::swap(cond_format_above_avg_equal_avg_, other->cond_format_above_avg_equal_avg_);
+    std::swap(cond_format_above_avg_std_dev_, other->cond_format_above_avg_std_dev_);
+    std::swap(cond_format_complex_formula_, other->cond_format_complex_formula_);
+    std::swap(cond_format_contains_errors_, other->cond_format_contains_errors_);
+    std::swap(cond_format_expr_, other->cond_format_expr_);
+    std::swap(cond_format_not_contains_errors_, other->cond_format_not_contains_errors_);
+    std::swap(cond_format_parameters_not_all_same_type_, other->cond_format_parameters_not_all_same_type_);
+    std::swap(cond_format_stop_if_true_, other->cond_format_stop_if_true_);
+    std::swap(cond_format_unsupported_operator_, other->cond_format_unsupported_operator_);
+    std::swap(cond_format_unsupported_styling_, other->cond_format_unsupported_styling_);
+    std::swap(cond_format_unsupported_time_period_, other->cond_format_unsupported_time_period_);
+    std::swap(error_cell_with_no_formula_, other->error_cell_with_no_formula_);
+    std::swap(unsupported_cond_format_, other->unsupported_cond_format_);
+    std::swap(original_data_format_, other->original_data_format_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableDataList::GetMetadata() const {
+::google::protobuf::Metadata ImportWarningSetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableDataList_descriptor_;
-  metadata.reflection = TableDataList_reflection_;
+  metadata.descriptor = ImportWarningSetArchive_descriptor_;
+  metadata.reflection = ImportWarningSetArchive_reflection_;
   return metadata;
 }
 
 
 // ===================================================================
 
+const ::google::protobuf::EnumDescriptor* TableDataList_ListType_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableDataList_ListType_descriptor_;
+}
+bool TableDataList_ListType_IsValid(int value) {
+  switch(value) {
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+    case 11:
+      return true;
+    default:
+      return false;
+  }
+}
+
 #ifndef _MSC_VER
-const int TableRBTree_Node::kKeyFieldNumber;
-const int TableRBTree_Node::kValueFieldNumber;
+const TableDataList_ListType TableDataList::STRING;
+const TableDataList_ListType TableDataList::FORMAT;
+const TableDataList_ListType TableDataList::FORMULA;
+const TableDataList_ListType TableDataList::STYLE;
+const TableDataList_ListType TableDataList::FORMULA_ERROR;
+const TableDataList_ListType TableDataList::CUSTOM_FORMAT;
+const TableDataList_ListType TableDataList::MULTIPLE_CHOICE_LIST_FORMAT;
+const TableDataList_ListType TableDataList::RICH_TEXT_PAYLOAD;
+const TableDataList_ListType TableDataList::CONDITIONAL_STYLE;
+const TableDataList_ListType TableDataList::COMMENT_STORAGE;
+const TableDataList_ListType TableDataList::IMPORT_WARNING;
+const TableDataList_ListType TableDataList::ListType_MIN;
+const TableDataList_ListType TableDataList::ListType_MAX;
+const int TableDataList::ListType_ARRAYSIZE;
+#endif  // _MSC_VER
+#ifndef _MSC_VER
+const int TableDataList_ListEntry::kKeyFieldNumber;
+const int TableDataList_ListEntry::kRefcountFieldNumber;
+const int TableDataList_ListEntry::kStringFieldNumber;
+const int TableDataList_ListEntry::kReferenceFieldNumber;
+const int TableDataList_ListEntry::kFormulaFieldNumber;
+const int TableDataList_ListEntry::kFormatFieldNumber;
+const int TableDataList_ListEntry::kRegionFieldNumber;
+const int TableDataList_ListEntry::kCustomFormatFieldNumber;
+const int TableDataList_ListEntry::kRichTextPayloadFieldNumber;
+const int TableDataList_ListEntry::kCommentStorageFieldNumber;
+const int TableDataList_ListEntry::kImportWarningSetFieldNumber;
 #endif  // !_MSC_VER
 
-TableRBTree_Node::TableRBTree_Node()
+TableDataList_ListEntry::TableDataList_ListEntry()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableRBTree_Node::InitAsDefaultInstance() {
+void TableDataList_ListEntry::InitAsDefaultInstance() {
+  reference_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formula_ = const_cast< ::TSCE::FormulaArchive*>(&::TSCE::FormulaArchive::default_instance());
+  format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  region_ = const_cast< ::TST::CellRange*>(&::TST::CellRange::default_instance());
+  custom_format_ = const_cast< ::TSK::CustomFormatArchive*>(&::TSK::CustomFormatArchive::default_instance());
+  richtextpayload_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  import_warning_set_ = const_cast< ::TST::ImportWarningSetArchive*>(&::TST::ImportWarningSetArchive::default_instance());
 }
 
-TableRBTree_Node::TableRBTree_Node(const TableRBTree_Node& from)
+TableDataList_ListEntry::TableDataList_ListEntry(const TableDataList_ListEntry& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableRBTree_Node::SharedCtor() {
+void TableDataList_ListEntry::SharedCtor() {
   _cached_size_ = 0;
   key_ = 0u;
-  value_ = 0u;
+  refcount_ = 0u;
+  string_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  reference_ = NULL;
+  formula_ = NULL;
+  format_ = NULL;
+  region_ = NULL;
+  custom_format_ = NULL;
+  richtextpayload_ = NULL;
+  comment_storage_ = NULL;
+  import_warning_set_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableRBTree_Node::~TableRBTree_Node() {
+TableDataList_ListEntry::~TableDataList_ListEntry() {
   SharedDtor();
 }
 
-void TableRBTree_Node::SharedDtor() {
+void TableDataList_ListEntry::SharedDtor() {
+  if (string_ != &::google::protobuf::internal::kEmptyString) {
+    delete string_;
+  }
   if (this != default_instance_) {
+    delete reference_;
+    delete formula_;
+    delete format_;
+    delete region_;
+    delete custom_format_;
+    delete richtextpayload_;
+    delete comment_storage_;
+    delete import_warning_set_;
   }
 }
 
-void TableRBTree_Node::SetCachedSize(int size) const {
+void TableDataList_ListEntry::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableRBTree_Node::descriptor() {
+const ::google::protobuf::Descriptor* TableDataList_ListEntry::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableRBTree_Node_descriptor_;
+  return TableDataList_ListEntry_descriptor_;
 }
 
-const TableRBTree_Node& TableRBTree_Node::default_instance() {
+const TableDataList_ListEntry& TableDataList_ListEntry::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-TableRBTree_Node* TableRBTree_Node::default_instance_ = NULL;
+TableDataList_ListEntry* TableDataList_ListEntry::default_instance_ = NULL;
 
-TableRBTree_Node* TableRBTree_Node::New() const {
-  return new TableRBTree_Node;
+TableDataList_ListEntry* TableDataList_ListEntry::New() const {
+  return new TableDataList_ListEntry;
 }
 
-void TableRBTree_Node::Clear() {
+void TableDataList_ListEntry::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     key_ = 0u;
-    value_ = 0u;
+    refcount_ = 0u;
+    if (has_string()) {
+      if (string_ != &::google::protobuf::internal::kEmptyString) {
+        string_->clear();
+      }
+    }
+    if (has_reference()) {
+      if (reference_ != NULL) reference_->::TSP::Reference::Clear();
+    }
+    if (has_formula()) {
+      if (formula_ != NULL) formula_->::TSCE::FormulaArchive::Clear();
+    }
+    if (has_format()) {
+      if (format_ != NULL) format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_region()) {
+      if (region_ != NULL) region_->::TST::CellRange::Clear();
+    }
+    if (has_custom_format()) {
+      if (custom_format_ != NULL) custom_format_->::TSK::CustomFormatArchive::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_richtextpayload()) {
+      if (richtextpayload_ != NULL) richtextpayload_->::TSP::Reference::Clear();
+    }
+    if (has_comment_storage()) {
+      if (comment_storage_ != NULL) comment_storage_->::TSP::Reference::Clear();
+    }
+    if (has_import_warning_set()) {
+      if (import_warning_set_ != NULL) import_warning_set_->::TST::ImportWarningSetArchive::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableRBTree_Node::MergePartialFromCodedStream(
+bool TableDataList_ListEntry::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -6365,249 +7069,151 @@ bool TableRBTree_Node::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_value;
+        if (input->ExpectTag(16)) goto parse_refcount;
         break;
       }
 
-      // required uint32 value = 2;
+      // required uint32 refcount = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_value:
+         parse_refcount:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &value_)));
-          set_has_value();
+                 input, &refcount_)));
+          set_has_refcount();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectTag(26)) goto parse_string;
         break;
       }
 
-      default: {
-      handle_uninterpreted:
+      // optional string string = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_string:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_string()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->string().data(), this->string().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        if (input->ExpectTag(34)) goto parse_reference;
         break;
       }
-    }
-  }
-  return true;
-#undef DO_
-}
 
-void TableRBTree_Node::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 key = 1;
-  if (has_key()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->key(), output);
-  }
+      // optional .TSP.Reference reference = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_reference:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_reference()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_formula;
+        break;
+      }
 
-  // required uint32 value = 2;
-  if (has_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->value(), output);
-  }
+      // optional .TSCE.FormulaArchive formula = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formula:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formula()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_format;
+        break;
+      }
 
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
+      // optional .TSK.FormatStructArchive format = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_region;
+        break;
+      }
 
-::google::protobuf::uint8* TableRBTree_Node::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required uint32 key = 1;
-  if (has_key()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->key(), target);
-  }
-
-  // required uint32 value = 2;
-  if (has_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->value(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int TableRBTree_Node::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 key = 1;
-    if (has_key()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->key());
-    }
-
-    // required uint32 value = 2;
-    if (has_value()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->value());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void TableRBTree_Node::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const TableRBTree_Node* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableRBTree_Node*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void TableRBTree_Node::MergeFrom(const TableRBTree_Node& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_key()) {
-      set_key(from.key());
-    }
-    if (from.has_value()) {
-      set_value(from.value());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void TableRBTree_Node::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void TableRBTree_Node::CopyFrom(const TableRBTree_Node& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool TableRBTree_Node::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
-
-  return true;
-}
-
-void TableRBTree_Node::Swap(TableRBTree_Node* other) {
-  if (other != this) {
-    std::swap(key_, other->key_);
-    std::swap(value_, other->value_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata TableRBTree_Node::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableRBTree_Node_descriptor_;
-  metadata.reflection = TableRBTree_Node_reflection_;
-  return metadata;
-}
-
-
-// -------------------------------------------------------------------
-
-#ifndef _MSC_VER
-const int TableRBTree::kNodesFieldNumber;
-#endif  // !_MSC_VER
-
-TableRBTree::TableRBTree()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void TableRBTree::InitAsDefaultInstance() {
-}
-
-TableRBTree::TableRBTree(const TableRBTree& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void TableRBTree::SharedCtor() {
-  _cached_size_ = 0;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-TableRBTree::~TableRBTree() {
-  SharedDtor();
-}
-
-void TableRBTree::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void TableRBTree::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* TableRBTree::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return TableRBTree_descriptor_;
-}
-
-const TableRBTree& TableRBTree::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
-  return *default_instance_;
-}
+      // optional .TST.CellRange region = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_region:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_region()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_custom_format;
+        break;
+      }
 
-TableRBTree* TableRBTree::default_instance_ = NULL;
+      // optional .TSK.CustomFormatArchive custom_format = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_custom_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_custom_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_richTextPayload;
+        break;
+      }
 
-TableRBTree* TableRBTree::New() const {
-  return new TableRBTree;
-}
+      // optional .TSP.Reference richTextPayload = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_richTextPayload:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_richtextpayload()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(82)) goto parse_comment_storage;
+        break;
+      }
 
-void TableRBTree::Clear() {
-  nodes_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
+      // optional .TSP.Reference comment_storage = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_comment_storage:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_comment_storage()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(90)) goto parse_import_warning_set;
+        break;
+      }
 
-bool TableRBTree::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .TST.TableRBTree.Node nodes = 1;
-      case 1: {
+      // optional .TST.ImportWarningSetArchive import_warning_set = 11;
+      case 11: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_nodes:
+         parse_import_warning_set:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_nodes()));
+               input, mutable_import_warning_set()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(10)) goto parse_nodes;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -6628,457 +7234,265 @@ bool TableRBTree::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void TableRBTree::SerializeWithCachedSizes(
+void TableDataList_ListEntry::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated .TST.TableRBTree.Node nodes = 1;
-  for (int i = 0; i < this->nodes_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->nodes(i), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
+  // required uint32 key = 1;
+  if (has_key()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->key(), output);
   }
-}
 
-::google::protobuf::uint8* TableRBTree::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // repeated .TST.TableRBTree.Node nodes = 1;
-  for (int i = 0; i < this->nodes_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->nodes(i), target);
+  // required uint32 refcount = 2;
+  if (has_refcount()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->refcount(), output);
   }
 
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
+  // optional string string = 3;
+  if (has_string()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->string().data(), this->string().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->string(), output);
   }
-  return target;
-}
 
-int TableRBTree::ByteSize() const {
-  int total_size = 0;
-
-  // repeated .TST.TableRBTree.Node nodes = 1;
-  total_size += 1 * this->nodes_size();
-  for (int i = 0; i < this->nodes_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->nodes(i));
+  // optional .TSP.Reference reference = 4;
+  if (has_reference()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->reference(), output);
   }
 
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
+  // optional .TSCE.FormulaArchive formula = 5;
+  if (has_formula()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->formula(), output);
   }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
 
-void TableRBTree::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const TableRBTree* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableRBTree*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
+  // optional .TSK.FormatStructArchive format = 6;
+  if (has_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->format(), output);
   }
-}
 
-void TableRBTree::MergeFrom(const TableRBTree& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  nodes_.MergeFrom(from.nodes_);
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
+  // optional .TST.CellRange region = 7;
+  if (has_region()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->region(), output);
+  }
 
-void TableRBTree::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
+  // optional .TSK.CustomFormatArchive custom_format = 8;
+  if (has_custom_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->custom_format(), output);
+  }
 
-void TableRBTree::CopyFrom(const TableRBTree& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
+  // optional .TSP.Reference richTextPayload = 9;
+  if (has_richtextpayload()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->richtextpayload(), output);
+  }
 
-bool TableRBTree::IsInitialized() const {
+  // optional .TSP.Reference comment_storage = 10;
+  if (has_comment_storage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      10, this->comment_storage(), output);
+  }
 
-  for (int i = 0; i < nodes_size(); i++) {
-    if (!this->nodes(i).IsInitialized()) return false;
+  // optional .TST.ImportWarningSetArchive import_warning_set = 11;
+  if (has_import_warning_set()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      11, this->import_warning_set(), output);
   }
-  return true;
-}
 
-void TableRBTree::Swap(TableRBTree* other) {
-  if (other != this) {
-    nodes_.Swap(&other->nodes_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
   }
 }
 
-::google::protobuf::Metadata TableRBTree::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableRBTree_descriptor_;
-  metadata.reflection = TableRBTree_reflection_;
-  return metadata;
-}
+::google::protobuf::uint8* TableDataList_ListEntry::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required uint32 key = 1;
+  if (has_key()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->key(), target);
+  }
 
+  // required uint32 refcount = 2;
+  if (has_refcount()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->refcount(), target);
+  }
 
-// ===================================================================
+  // optional string string = 3;
+  if (has_string()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->string().data(), this->string().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->string(), target);
+  }
 
-#ifndef _MSC_VER
-const int HeaderStorageBucket_Header::kIndexFieldNumber;
-const int HeaderStorageBucket_Header::kSizeFieldNumber;
-const int HeaderStorageBucket_Header::kHidingStateFieldNumber;
-const int HeaderStorageBucket_Header::kNumberOfCellsFieldNumber;
-const int HeaderStorageBucket_Header::kCellStyleFieldNumber;
-const int HeaderStorageBucket_Header::kTextStyleFieldNumber;
-#endif  // !_MSC_VER
+  // optional .TSP.Reference reference = 4;
+  if (has_reference()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->reference(), target);
+  }
 
-HeaderStorageBucket_Header::HeaderStorageBucket_Header()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
+  // optional .TSCE.FormulaArchive formula = 5;
+  if (has_formula()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->formula(), target);
+  }
 
-void HeaderStorageBucket_Header::InitAsDefaultInstance() {
-  cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-}
+  // optional .TSK.FormatStructArchive format = 6;
+  if (has_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->format(), target);
+  }
 
-HeaderStorageBucket_Header::HeaderStorageBucket_Header(const HeaderStorageBucket_Header& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
+  // optional .TST.CellRange region = 7;
+  if (has_region()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->region(), target);
+  }
 
-void HeaderStorageBucket_Header::SharedCtor() {
-  _cached_size_ = 0;
-  index_ = 0u;
-  size_ = 0;
-  hidingstate_ = 0u;
-  numberofcells_ = 0u;
-  cell_style_ = NULL;
-  text_style_ = NULL;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
+  // optional .TSK.CustomFormatArchive custom_format = 8;
+  if (has_custom_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->custom_format(), target);
+  }
 
-HeaderStorageBucket_Header::~HeaderStorageBucket_Header() {
-  SharedDtor();
-}
+  // optional .TSP.Reference richTextPayload = 9;
+  if (has_richtextpayload()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->richtextpayload(), target);
+  }
 
-void HeaderStorageBucket_Header::SharedDtor() {
-  if (this != default_instance_) {
-    delete cell_style_;
-    delete text_style_;
+  // optional .TSP.Reference comment_storage = 10;
+  if (has_comment_storage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        10, this->comment_storage(), target);
   }
-}
 
-void HeaderStorageBucket_Header::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* HeaderStorageBucket_Header::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return HeaderStorageBucket_Header_descriptor_;
-}
+  // optional .TST.ImportWarningSetArchive import_warning_set = 11;
+  if (has_import_warning_set()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        11, this->import_warning_set(), target);
+  }
 
-const HeaderStorageBucket_Header& HeaderStorageBucket_Header::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
-  return *default_instance_;
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
 }
 
-HeaderStorageBucket_Header* HeaderStorageBucket_Header::default_instance_ = NULL;
-
-HeaderStorageBucket_Header* HeaderStorageBucket_Header::New() const {
-  return new HeaderStorageBucket_Header;
-}
+int TableDataList_ListEntry::ByteSize() const {
+  int total_size = 0;
 
-void HeaderStorageBucket_Header::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    index_ = 0u;
-    size_ = 0;
-    hidingstate_ = 0u;
-    numberofcells_ = 0u;
-    if (has_cell_style()) {
-      if (cell_style_ != NULL) cell_style_->::TSP::Reference::Clear();
-    }
-    if (has_text_style()) {
-      if (text_style_ != NULL) text_style_->::TSP::Reference::Clear();
+    // required uint32 key = 1;
+    if (has_key()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->key());
     }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
 
-bool HeaderStorageBucket_Header::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint32 index = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &index_)));
-          set_has_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(21)) goto parse_size;
-        break;
-      }
-
-      // required float size = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
-         parse_size:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
-                 input, &size_)));
-          set_has_size();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_hidingState;
-        break;
-      }
-
-      // required uint32 hidingState = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_hidingState:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &hidingstate_)));
-          set_has_hidingstate();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_numberOfCells;
-        break;
-      }
-
-      // required uint32 numberOfCells = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_numberOfCells:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &numberofcells_)));
-          set_has_numberofcells();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_cell_style;
-        break;
-      }
-
-      // optional .TSP.Reference cell_style = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cell_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_text_style;
-        break;
-      }
-
-      // optional .TSP.Reference text_style = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_text_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_text_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
+    // required uint32 refcount = 2;
+    if (has_refcount()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->refcount());
     }
-  }
-  return true;
-#undef DO_
-}
-
-void HeaderStorageBucket_Header::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 index = 1;
-  if (has_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->index(), output);
-  }
-
-  // required float size = 2;
-  if (has_size()) {
-    ::google::protobuf::internal::WireFormatLite::WriteFloat(2, this->size(), output);
-  }
-
-  // required uint32 hidingState = 3;
-  if (has_hidingstate()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->hidingstate(), output);
-  }
-
-  // required uint32 numberOfCells = 4;
-  if (has_numberofcells()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->numberofcells(), output);
-  }
-
-  // optional .TSP.Reference cell_style = 5;
-  if (has_cell_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->cell_style(), output);
-  }
-
-  // optional .TSP.Reference text_style = 6;
-  if (has_text_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->text_style(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* HeaderStorageBucket_Header::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required uint32 index = 1;
-  if (has_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->index(), target);
-  }
-
-  // required float size = 2;
-  if (has_size()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(2, this->size(), target);
-  }
-
-  // required uint32 hidingState = 3;
-  if (has_hidingstate()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->hidingstate(), target);
-  }
-
-  // required uint32 numberOfCells = 4;
-  if (has_numberofcells()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->numberofcells(), target);
-  }
-
-  // optional .TSP.Reference cell_style = 5;
-  if (has_cell_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->cell_style(), target);
-  }
-
-  // optional .TSP.Reference text_style = 6;
-  if (has_text_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->text_style(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int HeaderStorageBucket_Header::ByteSize() const {
-  int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 index = 1;
-    if (has_index()) {
+    // optional string string = 3;
+    if (has_string()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->index());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->string());
     }
 
-    // required float size = 2;
-    if (has_size()) {
-      total_size += 1 + 4;
+    // optional .TSP.Reference reference = 4;
+    if (has_reference()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->reference());
     }
 
-    // required uint32 hidingState = 3;
-    if (has_hidingstate()) {
+    // optional .TSCE.FormulaArchive formula = 5;
+    if (has_formula()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->hidingstate());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->formula());
     }
 
-    // required uint32 numberOfCells = 4;
-    if (has_numberofcells()) {
+    // optional .TSK.FormatStructArchive format = 6;
+    if (has_format()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->numberofcells());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->format());
     }
 
-    // optional .TSP.Reference cell_style = 5;
-    if (has_cell_style()) {
+    // optional .TST.CellRange region = 7;
+    if (has_region()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cell_style());
+          this->region());
     }
 
-    // optional .TSP.Reference text_style = 6;
-    if (has_text_style()) {
+    // optional .TSK.CustomFormatArchive custom_format = 8;
+    if (has_custom_format()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->text_style());
+          this->custom_format());
     }
 
   }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional .TSP.Reference richTextPayload = 9;
+    if (has_richtextpayload()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->richtextpayload());
+    }
 
-void HeaderStorageBucket_Header::MergeFrom(const ::google::protobuf::Message& from) {
+    // optional .TSP.Reference comment_storage = 10;
+    if (has_comment_storage()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->comment_storage());
+    }
+
+    // optional .TST.ImportWarningSetArchive import_warning_set = 11;
+    if (has_import_warning_set()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->import_warning_set());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableDataList_ListEntry::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const HeaderStorageBucket_Header* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const HeaderStorageBucket_Header*>(
+  const TableDataList_ListEntry* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableDataList_ListEntry*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -7087,74 +7501,114 @@ void HeaderStorageBucket_Header::MergeFrom(const ::google::protobuf::Message& fr
   }
 }
 
-void HeaderStorageBucket_Header::MergeFrom(const HeaderStorageBucket_Header& from) {
+void TableDataList_ListEntry::MergeFrom(const TableDataList_ListEntry& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_index()) {
-      set_index(from.index());
+    if (from.has_key()) {
+      set_key(from.key());
     }
-    if (from.has_size()) {
-      set_size(from.size());
+    if (from.has_refcount()) {
+      set_refcount(from.refcount());
     }
-    if (from.has_hidingstate()) {
-      set_hidingstate(from.hidingstate());
+    if (from.has_string()) {
+      set_string(from.string());
     }
-    if (from.has_numberofcells()) {
-      set_numberofcells(from.numberofcells());
+    if (from.has_reference()) {
+      mutable_reference()->::TSP::Reference::MergeFrom(from.reference());
     }
-    if (from.has_cell_style()) {
-      mutable_cell_style()->::TSP::Reference::MergeFrom(from.cell_style());
+    if (from.has_formula()) {
+      mutable_formula()->::TSCE::FormulaArchive::MergeFrom(from.formula());
     }
-    if (from.has_text_style()) {
-      mutable_text_style()->::TSP::Reference::MergeFrom(from.text_style());
+    if (from.has_format()) {
+      mutable_format()->::TSK::FormatStructArchive::MergeFrom(from.format());
+    }
+    if (from.has_region()) {
+      mutable_region()->::TST::CellRange::MergeFrom(from.region());
+    }
+    if (from.has_custom_format()) {
+      mutable_custom_format()->::TSK::CustomFormatArchive::MergeFrom(from.custom_format());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_richtextpayload()) {
+      mutable_richtextpayload()->::TSP::Reference::MergeFrom(from.richtextpayload());
+    }
+    if (from.has_comment_storage()) {
+      mutable_comment_storage()->::TSP::Reference::MergeFrom(from.comment_storage());
+    }
+    if (from.has_import_warning_set()) {
+      mutable_import_warning_set()->::TST::ImportWarningSetArchive::MergeFrom(from.import_warning_set());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void HeaderStorageBucket_Header::CopyFrom(const ::google::protobuf::Message& from) {
+void TableDataList_ListEntry::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void HeaderStorageBucket_Header::CopyFrom(const HeaderStorageBucket_Header& from) {
+void TableDataList_ListEntry::CopyFrom(const TableDataList_ListEntry& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool HeaderStorageBucket_Header::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool TableDataList_ListEntry::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  if (has_cell_style()) {
-    if (!this->cell_style().IsInitialized()) return false;
+  if (has_reference()) {
+    if (!this->reference().IsInitialized()) return false;
   }
-  if (has_text_style()) {
-    if (!this->text_style().IsInitialized()) return false;
+  if (has_formula()) {
+    if (!this->formula().IsInitialized()) return false;
+  }
+  if (has_format()) {
+    if (!this->format().IsInitialized()) return false;
+  }
+  if (has_region()) {
+    if (!this->region().IsInitialized()) return false;
+  }
+  if (has_custom_format()) {
+    if (!this->custom_format().IsInitialized()) return false;
+  }
+  if (has_richtextpayload()) {
+    if (!this->richtextpayload().IsInitialized()) return false;
+  }
+  if (has_comment_storage()) {
+    if (!this->comment_storage().IsInitialized()) return false;
+  }
+  if (has_import_warning_set()) {
+    if (!this->import_warning_set().IsInitialized()) return false;
   }
   return true;
 }
 
-void HeaderStorageBucket_Header::Swap(HeaderStorageBucket_Header* other) {
+void TableDataList_ListEntry::Swap(TableDataList_ListEntry* other) {
   if (other != this) {
-    std::swap(index_, other->index_);
-    std::swap(size_, other->size_);
-    std::swap(hidingstate_, other->hidingstate_);
-    std::swap(numberofcells_, other->numberofcells_);
-    std::swap(cell_style_, other->cell_style_);
-    std::swap(text_style_, other->text_style_);
+    std::swap(key_, other->key_);
+    std::swap(refcount_, other->refcount_);
+    std::swap(string_, other->string_);
+    std::swap(reference_, other->reference_);
+    std::swap(formula_, other->formula_);
+    std::swap(format_, other->format_);
+    std::swap(region_, other->region_);
+    std::swap(custom_format_, other->custom_format_);
+    std::swap(richtextpayload_, other->richtextpayload_);
+    std::swap(comment_storage_, other->comment_storage_);
+    std::swap(import_warning_set_, other->import_warning_set_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata HeaderStorageBucket_Header::GetMetadata() const {
+::google::protobuf::Metadata TableDataList_ListEntry::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = HeaderStorageBucket_Header_descriptor_;
-  metadata.reflection = HeaderStorageBucket_Header_reflection_;
+  metadata.descriptor = TableDataList_ListEntry_descriptor_;
+  metadata.reflection = TableDataList_ListEntry_reflection_;
   return metadata;
 }
 
@@ -7162,101 +7616,125 @@ ::google::protobuf::Metadata HeaderStorageBucket_Header::GetMetadata() const {
 // -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int HeaderStorageBucket::kBucketHashFunctionFieldNumber;
-const int HeaderStorageBucket::kHeadersFieldNumber;
+const int TableDataList::kListTypeFieldNumber;
+const int TableDataList::kNextListIDFieldNumber;
+const int TableDataList::kEntriesFieldNumber;
 #endif  // !_MSC_VER
 
-HeaderStorageBucket::HeaderStorageBucket()
+TableDataList::TableDataList()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void HeaderStorageBucket::InitAsDefaultInstance() {
+void TableDataList::InitAsDefaultInstance() {
 }
 
-HeaderStorageBucket::HeaderStorageBucket(const HeaderStorageBucket& from)
+TableDataList::TableDataList(const TableDataList& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void HeaderStorageBucket::SharedCtor() {
+void TableDataList::SharedCtor() {
   _cached_size_ = 0;
-  buckethashfunction_ = 0u;
+  listtype_ = 1;
+  nextlistid_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-HeaderStorageBucket::~HeaderStorageBucket() {
+TableDataList::~TableDataList() {
   SharedDtor();
 }
 
-void HeaderStorageBucket::SharedDtor() {
+void TableDataList::SharedDtor() {
   if (this != default_instance_) {
   }
 }
 
-void HeaderStorageBucket::SetCachedSize(int size) const {
+void TableDataList::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* HeaderStorageBucket::descriptor() {
+const ::google::protobuf::Descriptor* TableDataList::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return HeaderStorageBucket_descriptor_;
+  return TableDataList_descriptor_;
 }
 
-const HeaderStorageBucket& HeaderStorageBucket::default_instance() {
+const TableDataList& TableDataList::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-HeaderStorageBucket* HeaderStorageBucket::default_instance_ = NULL;
+TableDataList* TableDataList::default_instance_ = NULL;
 
-HeaderStorageBucket* HeaderStorageBucket::New() const {
-  return new HeaderStorageBucket;
+TableDataList* TableDataList::New() const {
+  return new TableDataList;
 }
 
-void HeaderStorageBucket::Clear() {
+void TableDataList::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    buckethashfunction_ = 0u;
+    listtype_ = 1;
+    nextlistid_ = 0u;
   }
-  headers_.Clear();
+  entries_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool HeaderStorageBucket::MergePartialFromCodedStream(
+bool TableDataList::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint32 bucketHashFunction = 1;
+      // required .TST.TableDataList.ListType listType = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &buckethashfunction_)));
-          set_has_buckethashfunction();
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::TableDataList_ListType_IsValid(value)) {
+            set_listtype(static_cast< ::TST::TableDataList_ListType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_headers;
+        if (input->ExpectTag(16)) goto parse_nextListID;
         break;
       }
 
-      // repeated .TST.HeaderStorageBucket.Header headers = 2;
+      // required uint32 nextListID = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_nextListID:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &nextlistid_)));
+          set_has_nextlistid();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_entries;
+        break;
+      }
+
+      // repeated .TST.TableDataList.ListEntry entries = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_headers:
+         parse_entries:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_headers()));
+                input, add_entries()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_headers;
+        if (input->ExpectTag(26)) goto parse_entries;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -7277,17 +7755,23 @@ bool HeaderStorageBucket::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void HeaderStorageBucket::SerializeWithCachedSizes(
+void TableDataList::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 bucketHashFunction = 1;
-  if (has_buckethashfunction()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->buckethashfunction(), output);
+  // required .TST.TableDataList.ListType listType = 1;
+  if (has_listtype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->listtype(), output);
   }
 
-  // repeated .TST.HeaderStorageBucket.Header headers = 2;
-  for (int i = 0; i < this->headers_size(); i++) {
+  // required uint32 nextListID = 2;
+  if (has_nextlistid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->nextlistid(), output);
+  }
+
+  // repeated .TST.TableDataList.ListEntry entries = 3;
+  for (int i = 0; i < this->entries_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->headers(i), output);
+      3, this->entries(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -7296,18 +7780,24 @@ void HeaderStorageBucket::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* HeaderStorageBucket::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* TableDataList::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required uint32 bucketHashFunction = 1;
-  if (has_buckethashfunction()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->buckethashfunction(), target);
+  // required .TST.TableDataList.ListType listType = 1;
+  if (has_listtype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->listtype(), target);
   }
 
-  // repeated .TST.HeaderStorageBucket.Header headers = 2;
-  for (int i = 0; i < this->headers_size(); i++) {
+  // required uint32 nextListID = 2;
+  if (has_nextlistid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->nextlistid(), target);
+  }
+
+  // repeated .TST.TableDataList.ListEntry entries = 3;
+  for (int i = 0; i < this->entries_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->headers(i), target);
+        3, this->entries(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -7317,24 +7807,30 @@ ::google::protobuf::uint8* HeaderStorageBucket::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int HeaderStorageBucket::ByteSize() const {
+int TableDataList::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 bucketHashFunction = 1;
-    if (has_buckethashfunction()) {
+    // required .TST.TableDataList.ListType listType = 1;
+    if (has_listtype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->listtype());
+    }
+
+    // required uint32 nextListID = 2;
+    if (has_nextlistid()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->buckethashfunction());
+          this->nextlistid());
     }
 
   }
-  // repeated .TST.HeaderStorageBucket.Header headers = 2;
-  total_size += 1 * this->headers_size();
-  for (int i = 0; i < this->headers_size(); i++) {
+  // repeated .TST.TableDataList.ListEntry entries = 3;
+  total_size += 1 * this->entries_size();
+  for (int i = 0; i < this->entries_size(); i++) {
     total_size +=
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->headers(i));
+        this->entries(i));
   }
 
   if (!unknown_fields().empty()) {
@@ -7348,10 +7844,10 @@ int HeaderStorageBucket::ByteSize() const {
   return total_size;
 }
 
-void HeaderStorageBucket::MergeFrom(const ::google::protobuf::Message& from) {
+void TableDataList::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const HeaderStorageBucket* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const HeaderStorageBucket*>(
+  const TableDataList* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableDataList*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -7360,53 +7856,57 @@ void HeaderStorageBucket::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void HeaderStorageBucket::MergeFrom(const HeaderStorageBucket& from) {
+void TableDataList::MergeFrom(const TableDataList& from) {
   GOOGLE_CHECK_NE(&from, this);
-  headers_.MergeFrom(from.headers_);
+  entries_.MergeFrom(from.entries_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_buckethashfunction()) {
-      set_buckethashfunction(from.buckethashfunction());
+    if (from.has_listtype()) {
+      set_listtype(from.listtype());
+    }
+    if (from.has_nextlistid()) {
+      set_nextlistid(from.nextlistid());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void HeaderStorageBucket::CopyFrom(const ::google::protobuf::Message& from) {
+void TableDataList::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void HeaderStorageBucket::CopyFrom(const HeaderStorageBucket& from) {
+void TableDataList::CopyFrom(const TableDataList& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool HeaderStorageBucket::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool TableDataList::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  for (int i = 0; i < headers_size(); i++) {
-    if (!this->headers(i).IsInitialized()) return false;
+  for (int i = 0; i < entries_size(); i++) {
+    if (!this->entries(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void HeaderStorageBucket::Swap(HeaderStorageBucket* other) {
+void TableDataList::Swap(TableDataList* other) {
   if (other != this) {
-    std::swap(buckethashfunction_, other->buckethashfunction_);
-    headers_.Swap(&other->headers_);
+    std::swap(listtype_, other->listtype_);
+    std::swap(nextlistid_, other->nextlistid_);
+    entries_.Swap(&other->entries_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata HeaderStorageBucket::GetMetadata() const {
+::google::protobuf::Metadata TableDataList::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = HeaderStorageBucket_descriptor_;
-  metadata.reflection = HeaderStorageBucket_reflection_;
+  metadata.descriptor = TableDataList_descriptor_;
+  metadata.reflection = TableDataList_reflection_;
   return metadata;
 }
 
@@ -7414,101 +7914,103 @@ ::google::protobuf::Metadata HeaderStorageBucket::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int HeaderStorage::kBucketHashFunctionFieldNumber;
-const int HeaderStorage::kBucketsFieldNumber;
+const int TableRBTree_Node::kKeyFieldNumber;
+const int TableRBTree_Node::kValueFieldNumber;
 #endif  // !_MSC_VER
 
-HeaderStorage::HeaderStorage()
+TableRBTree_Node::TableRBTree_Node()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void HeaderStorage::InitAsDefaultInstance() {
+void TableRBTree_Node::InitAsDefaultInstance() {
 }
 
-HeaderStorage::HeaderStorage(const HeaderStorage& from)
+TableRBTree_Node::TableRBTree_Node(const TableRBTree_Node& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void HeaderStorage::SharedCtor() {
+void TableRBTree_Node::SharedCtor() {
   _cached_size_ = 0;
-  buckethashfunction_ = 0u;
+  key_ = 0u;
+  value_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-HeaderStorage::~HeaderStorage() {
+TableRBTree_Node::~TableRBTree_Node() {
   SharedDtor();
 }
 
-void HeaderStorage::SharedDtor() {
+void TableRBTree_Node::SharedDtor() {
   if (this != default_instance_) {
   }
 }
 
-void HeaderStorage::SetCachedSize(int size) const {
+void TableRBTree_Node::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* HeaderStorage::descriptor() {
+const ::google::protobuf::Descriptor* TableRBTree_Node::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return HeaderStorage_descriptor_;
+  return TableRBTree_Node_descriptor_;
 }
 
-const HeaderStorage& HeaderStorage::default_instance() {
+const TableRBTree_Node& TableRBTree_Node::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-HeaderStorage* HeaderStorage::default_instance_ = NULL;
+TableRBTree_Node* TableRBTree_Node::default_instance_ = NULL;
 
-HeaderStorage* HeaderStorage::New() const {
-  return new HeaderStorage;
+TableRBTree_Node* TableRBTree_Node::New() const {
+  return new TableRBTree_Node;
 }
 
-void HeaderStorage::Clear() {
+void TableRBTree_Node::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    buckethashfunction_ = 0u;
+    key_ = 0u;
+    value_ = 0u;
   }
-  buckets_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool HeaderStorage::MergePartialFromCodedStream(
+bool TableRBTree_Node::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint32 bucketHashFunction = 1;
+      // required uint32 key = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &buckethashfunction_)));
-          set_has_buckethashfunction();
+                 input, &key_)));
+          set_has_key();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_buckets;
+        if (input->ExpectTag(16)) goto parse_value;
         break;
       }
 
-      // repeated .TSP.Reference buckets = 2;
+      // required uint32 value = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_buckets:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_buckets()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &value_)));
+          set_has_value();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_buckets;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -7529,17 +8031,16 @@ bool HeaderStorage::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void HeaderStorage::SerializeWithCachedSizes(
+void TableRBTree_Node::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 bucketHashFunction = 1;
-  if (has_buckethashfunction()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->buckethashfunction(), output);
+  // required uint32 key = 1;
+  if (has_key()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->key(), output);
   }
 
-  // repeated .TSP.Reference buckets = 2;
-  for (int i = 0; i < this->buckets_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->buckets(i), output);
+  // required uint32 value = 2;
+  if (has_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->value(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -7548,18 +8049,16 @@ void HeaderStorage::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* HeaderStorage::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* TableRBTree_Node::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required uint32 bucketHashFunction = 1;
-  if (has_buckethashfunction()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->buckethashfunction(), target);
+  // required uint32 key = 1;
+  if (has_key()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->key(), target);
   }
 
-  // repeated .TSP.Reference buckets = 2;
-  for (int i = 0; i < this->buckets_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->buckets(i), target);
+  // required uint32 value = 2;
+  if (has_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->value(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -7569,26 +8068,25 @@ ::google::protobuf::uint8* HeaderStorage::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int HeaderStorage::ByteSize() const {
+int TableRBTree_Node::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 bucketHashFunction = 1;
-    if (has_buckethashfunction()) {
+    // required uint32 key = 1;
+    if (has_key()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->buckethashfunction());
+          this->key());
     }
 
-  }
-  // repeated .TSP.Reference buckets = 2;
-  total_size += 1 * this->buckets_size();
-  for (int i = 0; i < this->buckets_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->buckets(i));
-  }
+    // required uint32 value = 2;
+    if (has_value()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->value());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -7600,10 +8098,10 @@ int HeaderStorage::ByteSize() const {
   return total_size;
 }
 
-void HeaderStorage::MergeFrom(const ::google::protobuf::Message& from) {
+void TableRBTree_Node::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const HeaderStorage* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const HeaderStorage*>(
+  const TableRBTree_Node* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableRBTree_Node*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -7612,522 +8110,448 @@ void HeaderStorage::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void HeaderStorage::MergeFrom(const HeaderStorage& from) {
+void TableRBTree_Node::MergeFrom(const TableRBTree_Node& from) {
   GOOGLE_CHECK_NE(&from, this);
-  buckets_.MergeFrom(from.buckets_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_buckethashfunction()) {
-      set_buckethashfunction(from.buckethashfunction());
+    if (from.has_key()) {
+      set_key(from.key());
+    }
+    if (from.has_value()) {
+      set_value(from.value());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void HeaderStorage::CopyFrom(const ::google::protobuf::Message& from) {
+void TableRBTree_Node::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void HeaderStorage::CopyFrom(const HeaderStorage& from) {
+void TableRBTree_Node::CopyFrom(const TableRBTree_Node& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool HeaderStorage::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool TableRBTree_Node::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  for (int i = 0; i < buckets_size(); i++) {
-    if (!this->buckets(i).IsInitialized()) return false;
-  }
   return true;
 }
 
-void HeaderStorage::Swap(HeaderStorage* other) {
+void TableRBTree_Node::Swap(TableRBTree_Node* other) {
   if (other != this) {
-    std::swap(buckethashfunction_, other->buckethashfunction_);
-    buckets_.Swap(&other->buckets_);
+    std::swap(key_, other->key_);
+    std::swap(value_, other->value_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata HeaderStorage::GetMetadata() const {
+::google::protobuf::Metadata TableRBTree_Node::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = HeaderStorage_descriptor_;
-  metadata.reflection = HeaderStorage_reflection_;
+  metadata.descriptor = TableRBTree_Node_descriptor_;
+  metadata.reflection = TableRBTree_Node_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int DataStore::kRowHeadersFieldNumber;
-const int DataStore::kColumnHeadersFieldNumber;
-const int DataStore::kTilesFieldNumber;
-const int DataStore::kStringTableFieldNumber;
-const int DataStore::kStyleTableFieldNumber;
-const int DataStore::kFormulaTableFieldNumber;
-const int DataStore::kFormulaErrorTableFieldNumber;
-const int DataStore::kFormatTableFieldNumber;
-const int DataStore::kMultipleChoiceListFormatTableFieldNumber;
-const int DataStore::kMergeRegionMapFieldNumber;
-const int DataStore::kCustomFormatTableFieldNumber;
-const int DataStore::kNextRowStripIDFieldNumber;
-const int DataStore::kNextColumnStripIDFieldNumber;
-const int DataStore::kRowTileTreeFieldNumber;
-const int DataStore::kColumnTileTreeFieldNumber;
-const int DataStore::kStorageVersionFieldNumber;
-const int DataStore::kRichTextPayloadTableFieldNumber;
-const int DataStore::kConditionalstyletableFieldNumber;
-const int DataStore::kCommentStorageTableFieldNumber;
+const int TableRBTree::kNodesFieldNumber;
 #endif  // !_MSC_VER
 
-DataStore::DataStore()
+TableRBTree::TableRBTree()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void DataStore::InitAsDefaultInstance() {
-  rowheaders_ = const_cast< ::TST::HeaderStorage*>(&::TST::HeaderStorage::default_instance());
-  columnheaders_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  tiles_ = const_cast< ::TST::TileStorage*>(&::TST::TileStorage::default_instance());
-  stringtable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  styletable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  formulatable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  formulaerrortable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  formattable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  multiplechoicelistformattable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  merge_region_map_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  customformattable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  rowtiletree_ = const_cast< ::TST::TableRBTree*>(&::TST::TableRBTree::default_instance());
-  columntiletree_ = const_cast< ::TST::TableRBTree*>(&::TST::TableRBTree::default_instance());
-  richtextpayloadtable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  conditionalstyletable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  commentstoragetable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void TableRBTree::InitAsDefaultInstance() {
 }
 
-DataStore::DataStore(const DataStore& from)
+TableRBTree::TableRBTree(const TableRBTree& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void DataStore::SharedCtor() {
+void TableRBTree::SharedCtor() {
   _cached_size_ = 0;
-  rowheaders_ = NULL;
-  columnheaders_ = NULL;
-  tiles_ = NULL;
-  stringtable_ = NULL;
-  styletable_ = NULL;
-  formulatable_ = NULL;
-  formulaerrortable_ = NULL;
-  formattable_ = NULL;
-  multiplechoicelistformattable_ = NULL;
-  merge_region_map_ = NULL;
-  customformattable_ = NULL;
-  nextrowstripid_ = 0u;
-  nextcolumnstripid_ = 0u;
-  rowtiletree_ = NULL;
-  columntiletree_ = NULL;
-  storage_version_ = 0u;
-  richtextpayloadtable_ = NULL;
-  conditionalstyletable_ = NULL;
-  commentstoragetable_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-DataStore::~DataStore() {
+TableRBTree::~TableRBTree() {
   SharedDtor();
 }
 
-void DataStore::SharedDtor() {
+void TableRBTree::SharedDtor() {
   if (this != default_instance_) {
-    delete rowheaders_;
-    delete columnheaders_;
-    delete tiles_;
-    delete stringtable_;
-    delete styletable_;
-    delete formulatable_;
-    delete formulaerrortable_;
-    delete formattable_;
-    delete multiplechoicelistformattable_;
-    delete merge_region_map_;
-    delete customformattable_;
-    delete rowtiletree_;
-    delete columntiletree_;
-    delete richtextpayloadtable_;
-    delete conditionalstyletable_;
-    delete commentstoragetable_;
   }
 }
 
-void DataStore::SetCachedSize(int size) const {
+void TableRBTree::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* DataStore::descriptor() {
+const ::google::protobuf::Descriptor* TableRBTree::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return DataStore_descriptor_;
+  return TableRBTree_descriptor_;
 }
 
-const DataStore& DataStore::default_instance() {
+const TableRBTree& TableRBTree::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-DataStore* DataStore::default_instance_ = NULL;
+TableRBTree* TableRBTree::default_instance_ = NULL;
 
-DataStore* DataStore::New() const {
-  return new DataStore;
+TableRBTree* TableRBTree::New() const {
+  return new TableRBTree;
 }
 
-void DataStore::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_rowheaders()) {
-      if (rowheaders_ != NULL) rowheaders_->::TST::HeaderStorage::Clear();
-    }
-    if (has_columnheaders()) {
-      if (columnheaders_ != NULL) columnheaders_->::TSP::Reference::Clear();
-    }
-    if (has_tiles()) {
-      if (tiles_ != NULL) tiles_->::TST::TileStorage::Clear();
-    }
-    if (has_stringtable()) {
-      if (stringtable_ != NULL) stringtable_->::TSP::Reference::Clear();
-    }
-    if (has_styletable()) {
-      if (styletable_ != NULL) styletable_->::TSP::Reference::Clear();
-    }
-    if (has_formulatable()) {
-      if (formulatable_ != NULL) formulatable_->::TSP::Reference::Clear();
-    }
-    if (has_formulaerrortable()) {
-      if (formulaerrortable_ != NULL) formulaerrortable_->::TSP::Reference::Clear();
-    }
-    if (has_formattable()) {
-      if (formattable_ != NULL) formattable_->::TSP::Reference::Clear();
-    }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_multiplechoicelistformattable()) {
-      if (multiplechoicelistformattable_ != NULL) multiplechoicelistformattable_->::TSP::Reference::Clear();
-    }
-    if (has_merge_region_map()) {
-      if (merge_region_map_ != NULL) merge_region_map_->::TSP::Reference::Clear();
-    }
-    if (has_customformattable()) {
-      if (customformattable_ != NULL) customformattable_->::TSP::Reference::Clear();
-    }
-    nextrowstripid_ = 0u;
-    nextcolumnstripid_ = 0u;
-    if (has_rowtiletree()) {
-      if (rowtiletree_ != NULL) rowtiletree_->::TST::TableRBTree::Clear();
-    }
-    if (has_columntiletree()) {
-      if (columntiletree_ != NULL) columntiletree_->::TST::TableRBTree::Clear();
-    }
-    storage_version_ = 0u;
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    if (has_richtextpayloadtable()) {
-      if (richtextpayloadtable_ != NULL) richtextpayloadtable_->::TSP::Reference::Clear();
-    }
-    if (has_conditionalstyletable()) {
-      if (conditionalstyletable_ != NULL) conditionalstyletable_->::TSP::Reference::Clear();
-    }
-    if (has_commentstoragetable()) {
-      if (commentstoragetable_ != NULL) commentstoragetable_->::TSP::Reference::Clear();
-    }
-  }
+void TableRBTree::Clear() {
+  nodes_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool DataStore::MergePartialFromCodedStream(
+bool TableRBTree::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.HeaderStorage rowHeaders = 1;
+      // repeated .TST.TableRBTree.Node nodes = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_nodes:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_rowheaders()));
+                input, add_nodes()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_columnHeaders;
+        if (input->ExpectTag(10)) goto parse_nodes;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // required .TSP.Reference columnHeaders = 2;
-      case 2: {
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_columnHeaders:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_columnheaders()));
-        } else {
-          goto handle_uninterpreted;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
         }
-        if (input->ExpectTag(26)) goto parse_tiles;
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
 
-      // required .TST.TileStorage tiles = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tiles:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tiles()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_stringTable;
-        break;
-      }
+void TableRBTree::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TST.TableRBTree.Node nodes = 1;
+  for (int i = 0; i < this->nodes_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->nodes(i), output);
+  }
 
-      // required .TSP.Reference stringTable = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_stringTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_stringtable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_styleTable;
-        break;
-      }
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
 
-      // required .TSP.Reference styleTable = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_styleTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_styletable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_formulaTable;
-        break;
-      }
+::google::protobuf::uint8* TableRBTree::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TST.TableRBTree.Node nodes = 1;
+  for (int i = 0; i < this->nodes_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->nodes(i), target);
+  }
 
-      // required .TSP.Reference formulaTable = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formulaTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formulatable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_nextRowStripID;
-        break;
-      }
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
 
-      // required uint32 nextRowStripID = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_nextRowStripID:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &nextrowstripid_)));
-          set_has_nextrowstripid();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(64)) goto parse_nextColumnStripID;
-        break;
-      }
+int TableRBTree::ByteSize() const {
+  int total_size = 0;
 
-      // required uint32 nextColumnStripID = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_nextColumnStripID:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &nextcolumnstripid_)));
-          set_has_nextcolumnstripid();
-        } else {
+  // repeated .TST.TableRBTree.Node nodes = 1;
+  total_size += 1 * this->nodes_size();
+  for (int i = 0; i < this->nodes_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->nodes(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableRBTree::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TableRBTree* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableRBTree*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TableRBTree::MergeFrom(const TableRBTree& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  nodes_.MergeFrom(from.nodes_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TableRBTree::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TableRBTree::CopyFrom(const TableRBTree& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TableRBTree::IsInitialized() const {
+
+  for (int i = 0; i < nodes_size(); i++) {
+    if (!this->nodes(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void TableRBTree::Swap(TableRBTree* other) {
+  if (other != this) {
+    nodes_.Swap(&other->nodes_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TableRBTree::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TableRBTree_descriptor_;
+  metadata.reflection = TableRBTree_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int HeaderStorageBucket_Header::kIndexFieldNumber;
+const int HeaderStorageBucket_Header::kSizeFieldNumber;
+const int HeaderStorageBucket_Header::kHidingStateFieldNumber;
+const int HeaderStorageBucket_Header::kNumberOfCellsFieldNumber;
+const int HeaderStorageBucket_Header::kCellStyleFieldNumber;
+const int HeaderStorageBucket_Header::kTextStyleFieldNumber;
+#endif  // !_MSC_VER
+
+HeaderStorageBucket_Header::HeaderStorageBucket_Header()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void HeaderStorageBucket_Header::InitAsDefaultInstance() {
+  cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+HeaderStorageBucket_Header::HeaderStorageBucket_Header(const HeaderStorageBucket_Header& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void HeaderStorageBucket_Header::SharedCtor() {
+  _cached_size_ = 0;
+  index_ = 0u;
+  size_ = 0;
+  hidingstate_ = 0u;
+  numberofcells_ = 0u;
+  cell_style_ = NULL;
+  text_style_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+HeaderStorageBucket_Header::~HeaderStorageBucket_Header() {
+  SharedDtor();
+}
+
+void HeaderStorageBucket_Header::SharedDtor() {
+  if (this != default_instance_) {
+    delete cell_style_;
+    delete text_style_;
+  }
+}
+
+void HeaderStorageBucket_Header::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* HeaderStorageBucket_Header::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return HeaderStorageBucket_Header_descriptor_;
+}
+
+const HeaderStorageBucket_Header& HeaderStorageBucket_Header::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+HeaderStorageBucket_Header* HeaderStorageBucket_Header::default_instance_ = NULL;
+
+HeaderStorageBucket_Header* HeaderStorageBucket_Header::New() const {
+  return new HeaderStorageBucket_Header;
+}
+
+void HeaderStorageBucket_Header::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    index_ = 0u;
+    size_ = 0;
+    hidingstate_ = 0u;
+    numberofcells_ = 0u;
+    if (has_cell_style()) {
+      if (cell_style_ != NULL) cell_style_->::TSP::Reference::Clear();
+    }
+    if (has_text_style()) {
+      if (text_style_ != NULL) text_style_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool HeaderStorageBucket_Header::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required uint32 index = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &index_)));
+          set_has_index();
+        } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(74)) goto parse_rowTileTree;
+        if (input->ExpectTag(21)) goto parse_size;
         break;
       }
 
-      // required .TST.TableRBTree rowTileTree = 9;
-      case 9: {
+      // required float size = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_rowTileTree:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_rowtiletree()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_size:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &size_)));
+          set_has_size();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(82)) goto parse_columnTileTree;
+        if (input->ExpectTag(24)) goto parse_hidingState;
         break;
       }
 
-      // required .TST.TableRBTree columnTileTree = 10;
-      case 10: {
+      // required uint32 hidingState = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_columnTileTree:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_columntiletree()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_hidingState:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &hidingstate_)));
+          set_has_hidingstate();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(90)) goto parse_formatTable;
+        if (input->ExpectTag(32)) goto parse_numberOfCells;
         break;
       }
 
-      // required .TSP.Reference formatTable = 11;
-      case 11: {
+      // required uint32 numberOfCells = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formatTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formattable()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_numberOfCells:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &numberofcells_)));
+          set_has_numberofcells();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(98)) goto parse_formulaErrorTable;
+        if (input->ExpectTag(42)) goto parse_cell_style;
         break;
       }
 
-      // optional .TSP.Reference formulaErrorTable = 12;
-      case 12: {
+      // optional .TSP.Reference cell_style = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formulaErrorTable:
+         parse_cell_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formulaerrortable()));
+               input, mutable_cell_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(106)) goto parse_merge_region_map;
+        if (input->ExpectTag(50)) goto parse_text_style;
         break;
       }
 
-      // optional .TSP.Reference merge_region_map = 13;
-      case 13: {
+      // optional .TSP.Reference text_style = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_merge_region_map:
+         parse_text_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_merge_region_map()));
+               input, mutable_text_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(112)) goto parse_storage_version;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // optional uint32 storage_version = 14;
-      case 14: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_storage_version:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &storage_version_)));
-          set_has_storage_version();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(122)) goto parse_customFormatTable;
-        break;
-      }
-
-      // optional .TSP.Reference customFormatTable = 15;
-      case 15: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_customFormatTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_customformattable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(130)) goto parse_multipleChoiceListFormatTable;
-        break;
-      }
-
-      // optional .TSP.Reference multipleChoiceListFormatTable = 16;
-      case 16: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_multipleChoiceListFormatTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_multiplechoicelistformattable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(138)) goto parse_richTextPayloadTable;
-        break;
-      }
-
-      // optional .TSP.Reference richTextPayloadTable = 17;
-      case 17: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_richTextPayloadTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_richtextpayloadtable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(146)) goto parse_conditionalstyletable;
-        break;
-      }
-
-      // optional .TSP.Reference conditionalstyletable = 18;
-      case 18: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditionalstyletable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditionalstyletable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(154)) goto parse_commentStorageTable;
-        break;
-      }
-
-      // optional .TSP.Reference commentStorageTable = 19;
-      case 19: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_commentStorageTable:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_commentstoragetable()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
           return true;
@@ -8142,117 +8566,38 @@ bool DataStore::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void DataStore::SerializeWithCachedSizes(
+void HeaderStorageBucket_Header::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.HeaderStorage rowHeaders = 1;
-  if (has_rowheaders()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->rowheaders(), output);
-  }
-
-  // required .TSP.Reference columnHeaders = 2;
-  if (has_columnheaders()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->columnheaders(), output);
-  }
-
-  // required .TST.TileStorage tiles = 3;
-  if (has_tiles()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->tiles(), output);
-  }
-
-  // required .TSP.Reference stringTable = 4;
-  if (has_stringtable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->stringtable(), output);
-  }
-
-  // required .TSP.Reference styleTable = 5;
-  if (has_styletable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->styletable(), output);
-  }
-
-  // required .TSP.Reference formulaTable = 6;
-  if (has_formulatable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->formulatable(), output);
-  }
-
-  // required uint32 nextRowStripID = 7;
-  if (has_nextrowstripid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->nextrowstripid(), output);
-  }
-
-  // required uint32 nextColumnStripID = 8;
-  if (has_nextcolumnstripid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->nextcolumnstripid(), output);
-  }
-
-  // required .TST.TableRBTree rowTileTree = 9;
-  if (has_rowtiletree()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->rowtiletree(), output);
-  }
-
-  // required .TST.TableRBTree columnTileTree = 10;
-  if (has_columntiletree()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->columntiletree(), output);
-  }
-
-  // required .TSP.Reference formatTable = 11;
-  if (has_formattable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      11, this->formattable(), output);
-  }
-
-  // optional .TSP.Reference formulaErrorTable = 12;
-  if (has_formulaerrortable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      12, this->formulaerrortable(), output);
-  }
-
-  // optional .TSP.Reference merge_region_map = 13;
-  if (has_merge_region_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      13, this->merge_region_map(), output);
-  }
-
-  // optional uint32 storage_version = 14;
-  if (has_storage_version()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(14, this->storage_version(), output);
+  // required uint32 index = 1;
+  if (has_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->index(), output);
   }
 
-  // optional .TSP.Reference customFormatTable = 15;
-  if (has_customformattable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      15, this->customformattable(), output);
+  // required float size = 2;
+  if (has_size()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(2, this->size(), output);
   }
 
-  // optional .TSP.Reference multipleChoiceListFormatTable = 16;
-  if (has_multiplechoicelistformattable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      16, this->multiplechoicelistformattable(), output);
+  // required uint32 hidingState = 3;
+  if (has_hidingstate()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->hidingstate(), output);
   }
 
-  // optional .TSP.Reference richTextPayloadTable = 17;
-  if (has_richtextpayloadtable()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      17, this->richtextpayloadtable(), output);
+  // required uint32 numberOfCells = 4;
+  if (has_numberofcells()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->numberofcells(), output);
   }
 
-  // optional .TSP.Reference conditionalstyletable = 18;
-  if (has_conditionalstyletable()) {
+  // optional .TSP.Reference cell_style = 5;
+  if (has_cell_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      18, this->conditionalstyletable(), output);
+      5, this->cell_style(), output);
   }
 
-  // optional .TSP.Reference commentStorageTable = 19;
-  if (has_commentstoragetable()) {
+  // optional .TSP.Reference text_style = 6;
+  if (has_text_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      19, this->commentstoragetable(), output);
+      6, this->text_style(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -8261,281 +8606,91 @@ void DataStore::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* DataStore::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* HeaderStorageBucket_Header::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.HeaderStorage rowHeaders = 1;
-  if (has_rowheaders()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->rowheaders(), target);
+  // required uint32 index = 1;
+  if (has_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->index(), target);
   }
 
-  // required .TSP.Reference columnHeaders = 2;
-  if (has_columnheaders()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->columnheaders(), target);
+  // required float size = 2;
+  if (has_size()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(2, this->size(), target);
   }
 
-  // required .TST.TileStorage tiles = 3;
-  if (has_tiles()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->tiles(), target);
+  // required uint32 hidingState = 3;
+  if (has_hidingstate()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->hidingstate(), target);
   }
 
-  // required .TSP.Reference stringTable = 4;
-  if (has_stringtable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->stringtable(), target);
+  // required uint32 numberOfCells = 4;
+  if (has_numberofcells()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->numberofcells(), target);
   }
 
-  // required .TSP.Reference styleTable = 5;
-  if (has_styletable()) {
+  // optional .TSP.Reference cell_style = 5;
+  if (has_cell_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->styletable(), target);
+        5, this->cell_style(), target);
   }
 
-  // required .TSP.Reference formulaTable = 6;
-  if (has_formulatable()) {
+  // optional .TSP.Reference text_style = 6;
+  if (has_text_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->formulatable(), target);
+        6, this->text_style(), target);
   }
 
-  // required uint32 nextRowStripID = 7;
-  if (has_nextrowstripid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->nextrowstripid(), target);
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
   }
+  return target;
+}
 
-  // required uint32 nextColumnStripID = 8;
-  if (has_nextcolumnstripid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->nextcolumnstripid(), target);
-  }
-
-  // required .TST.TableRBTree rowTileTree = 9;
-  if (has_rowtiletree()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        9, this->rowtiletree(), target);
-  }
-
-  // required .TST.TableRBTree columnTileTree = 10;
-  if (has_columntiletree()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        10, this->columntiletree(), target);
-  }
-
-  // required .TSP.Reference formatTable = 11;
-  if (has_formattable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        11, this->formattable(), target);
-  }
-
-  // optional .TSP.Reference formulaErrorTable = 12;
-  if (has_formulaerrortable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        12, this->formulaerrortable(), target);
-  }
-
-  // optional .TSP.Reference merge_region_map = 13;
-  if (has_merge_region_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        13, this->merge_region_map(), target);
-  }
-
-  // optional uint32 storage_version = 14;
-  if (has_storage_version()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(14, this->storage_version(), target);
-  }
-
-  // optional .TSP.Reference customFormatTable = 15;
-  if (has_customformattable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        15, this->customformattable(), target);
-  }
-
-  // optional .TSP.Reference multipleChoiceListFormatTable = 16;
-  if (has_multiplechoicelistformattable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        16, this->multiplechoicelistformattable(), target);
-  }
-
-  // optional .TSP.Reference richTextPayloadTable = 17;
-  if (has_richtextpayloadtable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        17, this->richtextpayloadtable(), target);
-  }
-
-  // optional .TSP.Reference conditionalstyletable = 18;
-  if (has_conditionalstyletable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        18, this->conditionalstyletable(), target);
-  }
-
-  // optional .TSP.Reference commentStorageTable = 19;
-  if (has_commentstoragetable()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        19, this->commentstoragetable(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int DataStore::ByteSize() const {
+int HeaderStorageBucket_Header::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.HeaderStorage rowHeaders = 1;
-    if (has_rowheaders()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->rowheaders());
-    }
-
-    // required .TSP.Reference columnHeaders = 2;
-    if (has_columnheaders()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->columnheaders());
-    }
-
-    // required .TST.TileStorage tiles = 3;
-    if (has_tiles()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->tiles());
-    }
-
-    // required .TSP.Reference stringTable = 4;
-    if (has_stringtable()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->stringtable());
-    }
-
-    // required .TSP.Reference styleTable = 5;
-    if (has_styletable()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->styletable());
-    }
-
-    // required .TSP.Reference formulaTable = 6;
-    if (has_formulatable()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formulatable());
-    }
-
-    // optional .TSP.Reference formulaErrorTable = 12;
-    if (has_formulaerrortable()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formulaerrortable());
-    }
-
-    // required .TSP.Reference formatTable = 11;
-    if (has_formattable()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formattable());
-    }
-
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional .TSP.Reference multipleChoiceListFormatTable = 16;
-    if (has_multiplechoicelistformattable()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->multiplechoicelistformattable());
-    }
-
-    // optional .TSP.Reference merge_region_map = 13;
-    if (has_merge_region_map()) {
+    // required uint32 index = 1;
+    if (has_index()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->merge_region_map());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->index());
     }
 
-    // optional .TSP.Reference customFormatTable = 15;
-    if (has_customformattable()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->customformattable());
+    // required float size = 2;
+    if (has_size()) {
+      total_size += 1 + 4;
     }
 
-    // required uint32 nextRowStripID = 7;
-    if (has_nextrowstripid()) {
+    // required uint32 hidingState = 3;
+    if (has_hidingstate()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->nextrowstripid());
+          this->hidingstate());
     }
 
-    // required uint32 nextColumnStripID = 8;
-    if (has_nextcolumnstripid()) {
+    // required uint32 numberOfCells = 4;
+    if (has_numberofcells()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->nextcolumnstripid());
-    }
-
-    // required .TST.TableRBTree rowTileTree = 9;
-    if (has_rowtiletree()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->rowtiletree());
+          this->numberofcells());
     }
 
-    // required .TST.TableRBTree columnTileTree = 10;
-    if (has_columntiletree()) {
+    // optional .TSP.Reference cell_style = 5;
+    if (has_cell_style()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->columntiletree());
+          this->cell_style());
     }
 
-    // optional uint32 storage_version = 14;
-    if (has_storage_version()) {
+    // optional .TSP.Reference text_style = 6;
+    if (has_text_style()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->storage_version());
-    }
-
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    // optional .TSP.Reference richTextPayloadTable = 17;
-    if (has_richtextpayloadtable()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->richtextpayloadtable());
-    }
-
-    // optional .TSP.Reference conditionalstyletable = 18;
-    if (has_conditionalstyletable()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditionalstyletable());
-    }
-
-    // optional .TSP.Reference commentStorageTable = 19;
-    if (has_commentstoragetable()) {
-      total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->commentstoragetable());
+          this->text_style());
     }
 
   }
@@ -8550,10 +8705,10 @@ int DataStore::ByteSize() const {
   return total_size;
 }
 
-void DataStore::MergeFrom(const ::google::protobuf::Message& from) {
+void HeaderStorageBucket_Header::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const DataStore* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const DataStore*>(
+  const HeaderStorageBucket_Header* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const HeaderStorageBucket_Header*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -8562,301 +8717,176 @@ void DataStore::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void DataStore::MergeFrom(const DataStore& from) {
+void HeaderStorageBucket_Header::MergeFrom(const HeaderStorageBucket_Header& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_rowheaders()) {
-      mutable_rowheaders()->::TST::HeaderStorage::MergeFrom(from.rowheaders());
-    }
-    if (from.has_columnheaders()) {
-      mutable_columnheaders()->::TSP::Reference::MergeFrom(from.columnheaders());
+    if (from.has_index()) {
+      set_index(from.index());
     }
-    if (from.has_tiles()) {
-      mutable_tiles()->::TST::TileStorage::MergeFrom(from.tiles());
+    if (from.has_size()) {
+      set_size(from.size());
     }
-    if (from.has_stringtable()) {
-      mutable_stringtable()->::TSP::Reference::MergeFrom(from.stringtable());
+    if (from.has_hidingstate()) {
+      set_hidingstate(from.hidingstate());
     }
-    if (from.has_styletable()) {
-      mutable_styletable()->::TSP::Reference::MergeFrom(from.styletable());
+    if (from.has_numberofcells()) {
+      set_numberofcells(from.numberofcells());
     }
-    if (from.has_formulatable()) {
-      mutable_formulatable()->::TSP::Reference::MergeFrom(from.formulatable());
+    if (from.has_cell_style()) {
+      mutable_cell_style()->::TSP::Reference::MergeFrom(from.cell_style());
     }
-    if (from.has_formulaerrortable()) {
-      mutable_formulaerrortable()->::TSP::Reference::MergeFrom(from.formulaerrortable());
-    }
-    if (from.has_formattable()) {
-      mutable_formattable()->::TSP::Reference::MergeFrom(from.formattable());
-    }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_multiplechoicelistformattable()) {
-      mutable_multiplechoicelistformattable()->::TSP::Reference::MergeFrom(from.multiplechoicelistformattable());
-    }
-    if (from.has_merge_region_map()) {
-      mutable_merge_region_map()->::TSP::Reference::MergeFrom(from.merge_region_map());
-    }
-    if (from.has_customformattable()) {
-      mutable_customformattable()->::TSP::Reference::MergeFrom(from.customformattable());
-    }
-    if (from.has_nextrowstripid()) {
-      set_nextrowstripid(from.nextrowstripid());
-    }
-    if (from.has_nextcolumnstripid()) {
-      set_nextcolumnstripid(from.nextcolumnstripid());
-    }
-    if (from.has_rowtiletree()) {
-      mutable_rowtiletree()->::TST::TableRBTree::MergeFrom(from.rowtiletree());
-    }
-    if (from.has_columntiletree()) {
-      mutable_columntiletree()->::TST::TableRBTree::MergeFrom(from.columntiletree());
-    }
-    if (from.has_storage_version()) {
-      set_storage_version(from.storage_version());
-    }
-  }
-  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    if (from.has_richtextpayloadtable()) {
-      mutable_richtextpayloadtable()->::TSP::Reference::MergeFrom(from.richtextpayloadtable());
-    }
-    if (from.has_conditionalstyletable()) {
-      mutable_conditionalstyletable()->::TSP::Reference::MergeFrom(from.conditionalstyletable());
-    }
-    if (from.has_commentstoragetable()) {
-      mutable_commentstoragetable()->::TSP::Reference::MergeFrom(from.commentstoragetable());
+    if (from.has_text_style()) {
+      mutable_text_style()->::TSP::Reference::MergeFrom(from.text_style());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void DataStore::CopyFrom(const ::google::protobuf::Message& from) {
+void HeaderStorageBucket_Header::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void DataStore::CopyFrom(const DataStore& from) {
+void HeaderStorageBucket_Header::CopyFrom(const HeaderStorageBucket_Header& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool DataStore::IsInitialized() const {
-  if ((_has_bits_[0] & 0x000078bf) != 0x000078bf) return false;
+bool HeaderStorageBucket_Header::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
-  if (has_rowheaders()) {
-    if (!this->rowheaders().IsInitialized()) return false;
-  }
-  if (has_columnheaders()) {
-    if (!this->columnheaders().IsInitialized()) return false;
-  }
-  if (has_tiles()) {
-    if (!this->tiles().IsInitialized()) return false;
-  }
-  if (has_stringtable()) {
-    if (!this->stringtable().IsInitialized()) return false;
-  }
-  if (has_styletable()) {
-    if (!this->styletable().IsInitialized()) return false;
-  }
-  if (has_formulatable()) {
-    if (!this->formulatable().IsInitialized()) return false;
-  }
-  if (has_formulaerrortable()) {
-    if (!this->formulaerrortable().IsInitialized()) return false;
-  }
-  if (has_formattable()) {
-    if (!this->formattable().IsInitialized()) return false;
-  }
-  if (has_multiplechoicelistformattable()) {
-    if (!this->multiplechoicelistformattable().IsInitialized()) return false;
-  }
-  if (has_merge_region_map()) {
-    if (!this->merge_region_map().IsInitialized()) return false;
-  }
-  if (has_customformattable()) {
-    if (!this->customformattable().IsInitialized()) return false;
-  }
-  if (has_rowtiletree()) {
-    if (!this->rowtiletree().IsInitialized()) return false;
-  }
-  if (has_columntiletree()) {
-    if (!this->columntiletree().IsInitialized()) return false;
-  }
-  if (has_richtextpayloadtable()) {
-    if (!this->richtextpayloadtable().IsInitialized()) return false;
-  }
-  if (has_conditionalstyletable()) {
-    if (!this->conditionalstyletable().IsInitialized()) return false;
+  if (has_cell_style()) {
+    if (!this->cell_style().IsInitialized()) return false;
   }
-  if (has_commentstoragetable()) {
-    if (!this->commentstoragetable().IsInitialized()) return false;
+  if (has_text_style()) {
+    if (!this->text_style().IsInitialized()) return false;
   }
   return true;
 }
 
-void DataStore::Swap(DataStore* other) {
+void HeaderStorageBucket_Header::Swap(HeaderStorageBucket_Header* other) {
   if (other != this) {
-    std::swap(rowheaders_, other->rowheaders_);
-    std::swap(columnheaders_, other->columnheaders_);
-    std::swap(tiles_, other->tiles_);
-    std::swap(stringtable_, other->stringtable_);
-    std::swap(styletable_, other->styletable_);
-    std::swap(formulatable_, other->formulatable_);
-    std::swap(formulaerrortable_, other->formulaerrortable_);
-    std::swap(formattable_, other->formattable_);
-    std::swap(multiplechoicelistformattable_, other->multiplechoicelistformattable_);
-    std::swap(merge_region_map_, other->merge_region_map_);
-    std::swap(customformattable_, other->customformattable_);
-    std::swap(nextrowstripid_, other->nextrowstripid_);
-    std::swap(nextcolumnstripid_, other->nextcolumnstripid_);
-    std::swap(rowtiletree_, other->rowtiletree_);
-    std::swap(columntiletree_, other->columntiletree_);
-    std::swap(storage_version_, other->storage_version_);
-    std::swap(richtextpayloadtable_, other->richtextpayloadtable_);
-    std::swap(conditionalstyletable_, other->conditionalstyletable_);
-    std::swap(commentstoragetable_, other->commentstoragetable_);
+    std::swap(index_, other->index_);
+    std::swap(size_, other->size_);
+    std::swap(hidingstate_, other->hidingstate_);
+    std::swap(numberofcells_, other->numberofcells_);
+    std::swap(cell_style_, other->cell_style_);
+    std::swap(text_style_, other->text_style_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata DataStore::GetMetadata() const {
+::google::protobuf::Metadata HeaderStorageBucket_Header::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = DataStore_descriptor_;
-  metadata.reflection = DataStore_reflection_;
+  metadata.descriptor = HeaderStorageBucket_Header_descriptor_;
+  metadata.reflection = HeaderStorageBucket_Header_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int TableInfoArchive::kSuperFieldNumber;
-const int TableInfoArchive::kTableModelFieldNumber;
-const int TableInfoArchive::kEditingStateFieldNumber;
+const int HeaderStorageBucket::kBucketHashFunctionFieldNumber;
+const int HeaderStorageBucket::kHeadersFieldNumber;
 #endif  // !_MSC_VER
 
-TableInfoArchive::TableInfoArchive()
+HeaderStorageBucket::HeaderStorageBucket()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableInfoArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSD::DrawableArchive*>(&::TSD::DrawableArchive::default_instance());
-  tablemodel_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  editingstate_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void HeaderStorageBucket::InitAsDefaultInstance() {
 }
 
-TableInfoArchive::TableInfoArchive(const TableInfoArchive& from)
+HeaderStorageBucket::HeaderStorageBucket(const HeaderStorageBucket& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableInfoArchive::SharedCtor() {
+void HeaderStorageBucket::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  tablemodel_ = NULL;
-  editingstate_ = NULL;
+  buckethashfunction_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableInfoArchive::~TableInfoArchive() {
+HeaderStorageBucket::~HeaderStorageBucket() {
   SharedDtor();
 }
 
-void TableInfoArchive::SharedDtor() {
+void HeaderStorageBucket::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete tablemodel_;
-    delete editingstate_;
   }
 }
 
-void TableInfoArchive::SetCachedSize(int size) const {
+void HeaderStorageBucket::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableInfoArchive::descriptor() {
+const ::google::protobuf::Descriptor* HeaderStorageBucket::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableInfoArchive_descriptor_;
+  return HeaderStorageBucket_descriptor_;
 }
 
-const TableInfoArchive& TableInfoArchive::default_instance() {
+const HeaderStorageBucket& HeaderStorageBucket::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-TableInfoArchive* TableInfoArchive::default_instance_ = NULL;
+HeaderStorageBucket* HeaderStorageBucket::default_instance_ = NULL;
 
-TableInfoArchive* TableInfoArchive::New() const {
-  return new TableInfoArchive;
+HeaderStorageBucket* HeaderStorageBucket::New() const {
+  return new HeaderStorageBucket;
 }
 
-void TableInfoArchive::Clear() {
+void HeaderStorageBucket::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSD::DrawableArchive::Clear();
-    }
-    if (has_tablemodel()) {
-      if (tablemodel_ != NULL) tablemodel_->::TSP::Reference::Clear();
-    }
-    if (has_editingstate()) {
-      if (editingstate_ != NULL) editingstate_->::TSP::Reference::Clear();
-    }
+    buckethashfunction_ = 0u;
   }
+  headers_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableInfoArchive::MergePartialFromCodedStream(
+bool HeaderStorageBucket::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSD.DrawableArchive super = 1;
+      // required uint32 bucketHashFunction = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &buckethashfunction_)));
+          set_has_buckethashfunction();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_tableModel;
+        if (input->ExpectTag(18)) goto parse_headers;
         break;
       }
 
-      // required .TSP.Reference tableModel = 2;
+      // repeated .TST.HeaderStorageBucket.Header headers = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tableModel:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tablemodel()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_editingState;
-        break;
-      }
-
-      // optional .TSP.Reference editingState = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_editingState:
+         parse_headers:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_editingstate()));
+                input, add_headers()));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_headers;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -8877,24 +8907,17 @@ bool TableInfoArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void TableInfoArchive::SerializeWithCachedSizes(
+void HeaderStorageBucket::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSD.DrawableArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required .TSP.Reference tableModel = 2;
-  if (has_tablemodel()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->tablemodel(), output);
+  // required uint32 bucketHashFunction = 1;
+  if (has_buckethashfunction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->buckethashfunction(), output);
   }
 
-  // optional .TSP.Reference editingState = 3;
-  if (has_editingstate()) {
+  // repeated .TST.HeaderStorageBucket.Header headers = 2;
+  for (int i = 0; i < this->headers_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->editingstate(), output);
+      2, this->headers(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -8903,27 +8926,18 @@ void TableInfoArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* TableInfoArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* HeaderStorageBucket::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSD.DrawableArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+  // required uint32 bucketHashFunction = 1;
+  if (has_buckethashfunction()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->buckethashfunction(), target);
   }
 
-  // required .TSP.Reference tableModel = 2;
-  if (has_tablemodel()) {
+  // repeated .TST.HeaderStorageBucket.Header headers = 2;
+  for (int i = 0; i < this->headers_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->tablemodel(), target);
-  }
-
-  // optional .TSP.Reference editingState = 3;
-  if (has_editingstate()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->editingstate(), target);
+        2, this->headers(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -8933,32 +8947,26 @@ ::google::protobuf::uint8* TableInfoArchive::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int TableInfoArchive::ByteSize() const {
+int HeaderStorageBucket::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSD.DrawableArchive super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // required .TSP.Reference tableModel = 2;
-    if (has_tablemodel()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->tablemodel());
-    }
-
-    // optional .TSP.Reference editingState = 3;
-    if (has_editingstate()) {
+    // required uint32 bucketHashFunction = 1;
+    if (has_buckethashfunction()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->editingstate());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->buckethashfunction());
     }
 
   }
+  // repeated .TST.HeaderStorageBucket.Header headers = 2;
+  total_size += 1 * this->headers_size();
+  for (int i = 0; i < this->headers_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->headers(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -8970,10 +8978,10 @@ int TableInfoArchive::ByteSize() const {
   return total_size;
 }
 
-void TableInfoArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void HeaderStorageBucket::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const TableInfoArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableInfoArchive*>(
+  const HeaderStorageBucket* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const HeaderStorageBucket*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -8982,65 +8990,53 @@ void TableInfoArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void TableInfoArchive::MergeFrom(const TableInfoArchive& from) {
+void HeaderStorageBucket::MergeFrom(const HeaderStorageBucket& from) {
   GOOGLE_CHECK_NE(&from, this);
+  headers_.MergeFrom(from.headers_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSD::DrawableArchive::MergeFrom(from.super());
-    }
-    if (from.has_tablemodel()) {
-      mutable_tablemodel()->::TSP::Reference::MergeFrom(from.tablemodel());
-    }
-    if (from.has_editingstate()) {
-      mutable_editingstate()->::TSP::Reference::MergeFrom(from.editingstate());
+    if (from.has_buckethashfunction()) {
+      set_buckethashfunction(from.buckethashfunction());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void TableInfoArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void HeaderStorageBucket::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableInfoArchive::CopyFrom(const TableInfoArchive& from) {
+void HeaderStorageBucket::CopyFrom(const HeaderStorageBucket& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableInfoArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool HeaderStorageBucket::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_tablemodel()) {
-    if (!this->tablemodel().IsInitialized()) return false;
-  }
-  if (has_editingstate()) {
-    if (!this->editingstate().IsInitialized()) return false;
+  for (int i = 0; i < headers_size(); i++) {
+    if (!this->headers(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void TableInfoArchive::Swap(TableInfoArchive* other) {
+void HeaderStorageBucket::Swap(HeaderStorageBucket* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(tablemodel_, other->tablemodel_);
-    std::swap(editingstate_, other->editingstate_);
+    std::swap(buckethashfunction_, other->buckethashfunction_);
+    headers_.Swap(&other->headers_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableInfoArchive::GetMetadata() const {
+::google::protobuf::Metadata HeaderStorageBucket::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableInfoArchive_descriptor_;
-  metadata.reflection = TableInfoArchive_reflection_;
+  metadata.descriptor = HeaderStorageBucket_descriptor_;
+  metadata.reflection = HeaderStorageBucket_reflection_;
   return metadata;
 }
 
@@ -9048,272 +9044,133 @@ ::google::protobuf::Metadata TableInfoArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int EditingStateArchive::kEditingStorageFieldNumber;
-const int EditingStateArchive::kEditingCellFieldNumber;
-const int EditingStateArchive::kSelectionFieldNumber;
-const int EditingStateArchive::kLasteditingcellidFieldNumber;
-const int EditingStateArchive::kEditingcellidFieldNumber;
-const int EditingStateArchive::kDeprecatedSetupTextUndoRedoTransactionFieldNumber;
-const int EditingStateArchive::kCellWasEditedInCurrentSessionFieldNumber;
+const int HeaderStorage::kBucketHashFunctionFieldNumber;
+const int HeaderStorage::kBucketsFieldNumber;
 #endif  // !_MSC_VER
 
-EditingStateArchive::EditingStateArchive()
+HeaderStorage::HeaderStorage()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void EditingStateArchive::InitAsDefaultInstance() {
-  editingstorage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  editingcell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  lasteditingcellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
-  editingcellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
-  deprecated_setup_textundoredotransaction_ = const_cast< ::TSWP::UndoTransaction*>(&::TSWP::UndoTransaction::default_instance());
+void HeaderStorage::InitAsDefaultInstance() {
 }
 
-EditingStateArchive::EditingStateArchive(const EditingStateArchive& from)
+HeaderStorage::HeaderStorage(const HeaderStorage& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void EditingStateArchive::SharedCtor() {
+void HeaderStorage::SharedCtor() {
   _cached_size_ = 0;
-  editingstorage_ = NULL;
-  editingcell_ = NULL;
-  selection_ = NULL;
-  lasteditingcellid_ = NULL;
-  editingcellid_ = NULL;
-  deprecated_setup_textundoredotransaction_ = NULL;
-  cell_was_edited_in_current_session_ = false;
+  buckethashfunction_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-EditingStateArchive::~EditingStateArchive() {
+HeaderStorage::~HeaderStorage() {
   SharedDtor();
 }
 
-void EditingStateArchive::SharedDtor() {
+void HeaderStorage::SharedDtor() {
   if (this != default_instance_) {
-    delete editingstorage_;
-    delete editingcell_;
-    delete selection_;
-    delete lasteditingcellid_;
-    delete editingcellid_;
-    delete deprecated_setup_textundoredotransaction_;
   }
 }
 
-void EditingStateArchive::SetCachedSize(int size) const {
+void HeaderStorage::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* EditingStateArchive::descriptor() {
+const ::google::protobuf::Descriptor* HeaderStorage::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return EditingStateArchive_descriptor_;
+  return HeaderStorage_descriptor_;
 }
 
-const EditingStateArchive& EditingStateArchive::default_instance() {
+const HeaderStorage& HeaderStorage::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-EditingStateArchive* EditingStateArchive::default_instance_ = NULL;
+HeaderStorage* HeaderStorage::default_instance_ = NULL;
 
-EditingStateArchive* EditingStateArchive::New() const {
-  return new EditingStateArchive;
+HeaderStorage* HeaderStorage::New() const {
+  return new HeaderStorage;
 }
 
-void EditingStateArchive::Clear() {
+void HeaderStorage::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_editingstorage()) {
-      if (editingstorage_ != NULL) editingstorage_->::TSP::Reference::Clear();
-    }
-    if (has_editingcell()) {
-      if (editingcell_ != NULL) editingcell_->::TST::Cell::Clear();
-    }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_lasteditingcellid()) {
-      if (lasteditingcellid_ != NULL) lasteditingcellid_->::TST::CellID::Clear();
-    }
-    if (has_editingcellid()) {
-      if (editingcellid_ != NULL) editingcellid_->::TST::CellID::Clear();
-    }
-    if (has_deprecated_setup_textundoredotransaction()) {
-      if (deprecated_setup_textundoredotransaction_ != NULL) deprecated_setup_textundoredotransaction_->::TSWP::UndoTransaction::Clear();
-    }
-    cell_was_edited_in_current_session_ = false;
+    buckethashfunction_ = 0u;
   }
+  buckets_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool EditingStateArchive::MergePartialFromCodedStream(
+bool HeaderStorage::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .TSP.Reference editingStorage = 1;
+      // required uint32 bucketHashFunction = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_editingstorage()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &buckethashfunction_)));
+          set_has_buckethashfunction();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_editingCell;
+        if (input->ExpectTag(18)) goto parse_buckets;
         break;
       }
 
-      // required .TST.Cell editingCell = 2;
+      // repeated .TSP.Reference buckets = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_editingCell:
+         parse_buckets:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_editingcell()));
+                input, add_buckets()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_selection;
+        if (input->ExpectTag(18)) goto parse_buckets;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // optional .TST.SelectionArchive selection = 3;
-      case 3: {
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
-        } else {
-          goto handle_uninterpreted;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
         }
-        if (input->ExpectTag(34)) goto parse_lasteditingcellid;
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
 
-      // optional .TST.CellID lasteditingcellid = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_lasteditingcellid:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_lasteditingcellid()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_editingcellid;
-        break;
-      }
+void HeaderStorage::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required uint32 bucketHashFunction = 1;
+  if (has_buckethashfunction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->buckethashfunction(), output);
+  }
 
-      // optional .TST.CellID editingcellid = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_editingcellid:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_editingcellid()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_deprecated_setup_textUndoRedoTransaction;
-        break;
-      }
-
-      // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_deprecated_setup_textUndoRedoTransaction:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_deprecated_setup_textundoredotransaction()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_cell_was_edited_in_current_session;
-        break;
-      }
-
-      // optional bool cell_was_edited_in_current_session = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_cell_was_edited_in_current_session:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &cell_was_edited_in_current_session_)));
-          set_has_cell_was_edited_in_current_session();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void EditingStateArchive::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .TSP.Reference editingStorage = 1;
-  if (has_editingstorage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->editingstorage(), output);
-  }
-
-  // required .TST.Cell editingCell = 2;
-  if (has_editingcell()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->editingcell(), output);
-  }
-
-  // optional .TST.SelectionArchive selection = 3;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->selection(), output);
-  }
-
-  // optional .TST.CellID lasteditingcellid = 4;
-  if (has_lasteditingcellid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->lasteditingcellid(), output);
-  }
-
-  // optional .TST.CellID editingcellid = 5;
-  if (has_editingcellid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->editingcellid(), output);
-  }
-
-  // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
-  if (has_deprecated_setup_textundoredotransaction()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->deprecated_setup_textundoredotransaction(), output);
-  }
-
-  // optional bool cell_was_edited_in_current_session = 7;
-  if (has_cell_was_edited_in_current_session()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->cell_was_edited_in_current_session(), output);
-  }
+  // repeated .TSP.Reference buckets = 2;
+  for (int i = 0; i < this->buckets_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->buckets(i), output);
+  }
 
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
@@ -9321,53 +9178,18 @@ void EditingStateArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* EditingStateArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* HeaderStorage::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional .TSP.Reference editingStorage = 1;
-  if (has_editingstorage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->editingstorage(), target);
-  }
-
-  // required .TST.Cell editingCell = 2;
-  if (has_editingcell()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->editingcell(), target);
-  }
-
-  // optional .TST.SelectionArchive selection = 3;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->selection(), target);
-  }
-
-  // optional .TST.CellID lasteditingcellid = 4;
-  if (has_lasteditingcellid()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->lasteditingcellid(), target);
-  }
-
-  // optional .TST.CellID editingcellid = 5;
-  if (has_editingcellid()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->editingcellid(), target);
+  // required uint32 bucketHashFunction = 1;
+  if (has_buckethashfunction()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->buckethashfunction(), target);
   }
 
-  // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
-  if (has_deprecated_setup_textundoredotransaction()) {
+  // repeated .TSP.Reference buckets = 2;
+  for (int i = 0; i < this->buckets_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->deprecated_setup_textundoredotransaction(), target);
-  }
-
-  // optional bool cell_was_edited_in_current_session = 7;
-  if (has_cell_was_edited_in_current_session()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->cell_was_edited_in_current_session(), target);
+        2, this->buckets(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -9377,58 +9199,26 @@ ::google::protobuf::uint8* EditingStateArchive::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int EditingStateArchive::ByteSize() const {
+int HeaderStorage::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .TSP.Reference editingStorage = 1;
-    if (has_editingstorage()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->editingstorage());
-    }
-
-    // required .TST.Cell editingCell = 2;
-    if (has_editingcell()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->editingcell());
-    }
-
-    // optional .TST.SelectionArchive selection = 3;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // optional .TST.CellID lasteditingcellid = 4;
-    if (has_lasteditingcellid()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->lasteditingcellid());
-    }
-
-    // optional .TST.CellID editingcellid = 5;
-    if (has_editingcellid()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->editingcellid());
-    }
-
-    // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
-    if (has_deprecated_setup_textundoredotransaction()) {
+    // required uint32 bucketHashFunction = 1;
+    if (has_buckethashfunction()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->deprecated_setup_textundoredotransaction());
-    }
-
-    // optional bool cell_was_edited_in_current_session = 7;
-    if (has_cell_was_edited_in_current_session()) {
-      total_size += 1 + 1;
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->buckethashfunction());
     }
 
   }
+  // repeated .TSP.Reference buckets = 2;
+  total_size += 1 * this->buckets_size();
+  for (int i = 0; i < this->buckets_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->buckets(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -9440,10 +9230,10 @@ int EditingStateArchive::ByteSize() const {
   return total_size;
 }
 
-void EditingStateArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void HeaderStorage::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const EditingStateArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const EditingStateArchive*>(
+  const HeaderStorage* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const HeaderStorage*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -9452,90 +9242,53 @@ void EditingStateArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void EditingStateArchive::MergeFrom(const EditingStateArchive& from) {
+void HeaderStorage::MergeFrom(const HeaderStorage& from) {
   GOOGLE_CHECK_NE(&from, this);
+  buckets_.MergeFrom(from.buckets_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_editingstorage()) {
-      mutable_editingstorage()->::TSP::Reference::MergeFrom(from.editingstorage());
-    }
-    if (from.has_editingcell()) {
-      mutable_editingcell()->::TST::Cell::MergeFrom(from.editingcell());
-    }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_lasteditingcellid()) {
-      mutable_lasteditingcellid()->::TST::CellID::MergeFrom(from.lasteditingcellid());
-    }
-    if (from.has_editingcellid()) {
-      mutable_editingcellid()->::TST::CellID::MergeFrom(from.editingcellid());
-    }
-    if (from.has_deprecated_setup_textundoredotransaction()) {
-      mutable_deprecated_setup_textundoredotransaction()->::TSWP::UndoTransaction::MergeFrom(from.deprecated_setup_textundoredotransaction());
-    }
-    if (from.has_cell_was_edited_in_current_session()) {
-      set_cell_was_edited_in_current_session(from.cell_was_edited_in_current_session());
+    if (from.has_buckethashfunction()) {
+      set_buckethashfunction(from.buckethashfunction());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void EditingStateArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void HeaderStorage::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void EditingStateArchive::CopyFrom(const EditingStateArchive& from) {
+void HeaderStorage::CopyFrom(const HeaderStorage& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool EditingStateArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000002) != 0x00000002) return false;
+bool HeaderStorage::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  if (has_editingstorage()) {
-    if (!this->editingstorage().IsInitialized()) return false;
-  }
-  if (has_editingcell()) {
-    if (!this->editingcell().IsInitialized()) return false;
-  }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_lasteditingcellid()) {
-    if (!this->lasteditingcellid().IsInitialized()) return false;
-  }
-  if (has_editingcellid()) {
-    if (!this->editingcellid().IsInitialized()) return false;
-  }
-  if (has_deprecated_setup_textundoredotransaction()) {
-    if (!this->deprecated_setup_textundoredotransaction().IsInitialized()) return false;
+  for (int i = 0; i < buckets_size(); i++) {
+    if (!this->buckets(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void EditingStateArchive::Swap(EditingStateArchive* other) {
+void HeaderStorage::Swap(HeaderStorage* other) {
   if (other != this) {
-    std::swap(editingstorage_, other->editingstorage_);
-    std::swap(editingcell_, other->editingcell_);
-    std::swap(selection_, other->selection_);
-    std::swap(lasteditingcellid_, other->lasteditingcellid_);
-    std::swap(editingcellid_, other->editingcellid_);
-    std::swap(deprecated_setup_textundoredotransaction_, other->deprecated_setup_textundoredotransaction_);
-    std::swap(cell_was_edited_in_current_session_, other->cell_was_edited_in_current_session_);
+    std::swap(buckethashfunction_, other->buckethashfunction_);
+    buckets_.Swap(&other->buckets_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata EditingStateArchive::GetMetadata() const {
+::google::protobuf::Metadata HeaderStorage::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = EditingStateArchive_descriptor_;
-  metadata.reflection = EditingStateArchive_reflection_;
+  metadata.descriptor = HeaderStorage_descriptor_;
+  metadata.reflection = HeaderStorage_reflection_;
   return metadata;
 }
 
@@ -9543,673 +9296,620 @@ ::google::protobuf::Metadata EditingStateArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int WPTableInfoArchive::kSuperFieldNumber;
-const int WPTableInfoArchive::kStorageFieldNumber;
+const int DataStore::kRowHeadersFieldNumber;
+const int DataStore::kColumnHeadersFieldNumber;
+const int DataStore::kTilesFieldNumber;
+const int DataStore::kStringTableFieldNumber;
+const int DataStore::kStyleTableFieldNumber;
+const int DataStore::kFormulaTableFieldNumber;
+const int DataStore::kFormulaErrorTableFieldNumber;
+const int DataStore::kFormatTableFieldNumber;
+const int DataStore::kMultipleChoiceListFormatTableFieldNumber;
+const int DataStore::kMergeRegionMapFieldNumber;
+const int DataStore::kCustomFormatTableFieldNumber;
+const int DataStore::kNextRowStripIDFieldNumber;
+const int DataStore::kNextColumnStripIDFieldNumber;
+const int DataStore::kRowTileTreeFieldNumber;
+const int DataStore::kColumnTileTreeFieldNumber;
+const int DataStore::kStorageVersionFieldNumber;
+const int DataStore::kRichTextPayloadTableFieldNumber;
+const int DataStore::kConditionalstyletableFieldNumber;
+const int DataStore::kCommentStorageTableFieldNumber;
+const int DataStore::kImportWarningSetTableFieldNumber;
 #endif  // !_MSC_VER
 
-WPTableInfoArchive::WPTableInfoArchive()
+DataStore::DataStore()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void WPTableInfoArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableInfoArchive*>(&::TST::TableInfoArchive::default_instance());
-  storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void DataStore::InitAsDefaultInstance() {
+  rowheaders_ = const_cast< ::TST::HeaderStorage*>(&::TST::HeaderStorage::default_instance());
+  columnheaders_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  tiles_ = const_cast< ::TST::TileStorage*>(&::TST::TileStorage::default_instance());
+  stringtable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  styletable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formulatable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formulaerrortable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formattable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  multiplechoicelistformattable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  merge_region_map_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  customformattable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  rowtiletree_ = const_cast< ::TST::TableRBTree*>(&::TST::TableRBTree::default_instance());
+  columntiletree_ = const_cast< ::TST::TableRBTree*>(&::TST::TableRBTree::default_instance());
+  richtextpayloadtable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  conditionalstyletable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  commentstoragetable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  importwarningsettable_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-WPTableInfoArchive::WPTableInfoArchive(const WPTableInfoArchive& from)
+DataStore::DataStore(const DataStore& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void WPTableInfoArchive::SharedCtor() {
+void DataStore::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  storage_ = NULL;
+  rowheaders_ = NULL;
+  columnheaders_ = NULL;
+  tiles_ = NULL;
+  stringtable_ = NULL;
+  styletable_ = NULL;
+  formulatable_ = NULL;
+  formulaerrortable_ = NULL;
+  formattable_ = NULL;
+  multiplechoicelistformattable_ = NULL;
+  merge_region_map_ = NULL;
+  customformattable_ = NULL;
+  nextrowstripid_ = 0u;
+  nextcolumnstripid_ = 0u;
+  rowtiletree_ = NULL;
+  columntiletree_ = NULL;
+  storage_version_ = 0u;
+  richtextpayloadtable_ = NULL;
+  conditionalstyletable_ = NULL;
+  commentstoragetable_ = NULL;
+  importwarningsettable_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-WPTableInfoArchive::~WPTableInfoArchive() {
+DataStore::~DataStore() {
   SharedDtor();
 }
 
-void WPTableInfoArchive::SharedDtor() {
+void DataStore::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete storage_;
+    delete rowheaders_;
+    delete columnheaders_;
+    delete tiles_;
+    delete stringtable_;
+    delete styletable_;
+    delete formulatable_;
+    delete formulaerrortable_;
+    delete formattable_;
+    delete multiplechoicelistformattable_;
+    delete merge_region_map_;
+    delete customformattable_;
+    delete rowtiletree_;
+    delete columntiletree_;
+    delete richtextpayloadtable_;
+    delete conditionalstyletable_;
+    delete commentstoragetable_;
+    delete importwarningsettable_;
   }
 }
 
-void WPTableInfoArchive::SetCachedSize(int size) const {
+void DataStore::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* WPTableInfoArchive::descriptor() {
+const ::google::protobuf::Descriptor* DataStore::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return WPTableInfoArchive_descriptor_;
+  return DataStore_descriptor_;
 }
 
-const WPTableInfoArchive& WPTableInfoArchive::default_instance() {
+const DataStore& DataStore::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-WPTableInfoArchive* WPTableInfoArchive::default_instance_ = NULL;
+DataStore* DataStore::default_instance_ = NULL;
 
-WPTableInfoArchive* WPTableInfoArchive::New() const {
-  return new WPTableInfoArchive;
+DataStore* DataStore::New() const {
+  return new DataStore;
 }
 
-void WPTableInfoArchive::Clear() {
+void DataStore::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableInfoArchive::Clear();
+    if (has_rowheaders()) {
+      if (rowheaders_ != NULL) rowheaders_->::TST::HeaderStorage::Clear();
     }
-    if (has_storage()) {
-      if (storage_ != NULL) storage_->::TSP::Reference::Clear();
+    if (has_columnheaders()) {
+      if (columnheaders_ != NULL) columnheaders_->::TSP::Reference::Clear();
+    }
+    if (has_tiles()) {
+      if (tiles_ != NULL) tiles_->::TST::TileStorage::Clear();
+    }
+    if (has_stringtable()) {
+      if (stringtable_ != NULL) stringtable_->::TSP::Reference::Clear();
+    }
+    if (has_styletable()) {
+      if (styletable_ != NULL) styletable_->::TSP::Reference::Clear();
+    }
+    if (has_formulatable()) {
+      if (formulatable_ != NULL) formulatable_->::TSP::Reference::Clear();
+    }
+    if (has_formulaerrortable()) {
+      if (formulaerrortable_ != NULL) formulaerrortable_->::TSP::Reference::Clear();
+    }
+    if (has_formattable()) {
+      if (formattable_ != NULL) formattable_->::TSP::Reference::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_multiplechoicelistformattable()) {
+      if (multiplechoicelistformattable_ != NULL) multiplechoicelistformattable_->::TSP::Reference::Clear();
+    }
+    if (has_merge_region_map()) {
+      if (merge_region_map_ != NULL) merge_region_map_->::TSP::Reference::Clear();
+    }
+    if (has_customformattable()) {
+      if (customformattable_ != NULL) customformattable_->::TSP::Reference::Clear();
+    }
+    nextrowstripid_ = 0u;
+    nextcolumnstripid_ = 0u;
+    if (has_rowtiletree()) {
+      if (rowtiletree_ != NULL) rowtiletree_->::TST::TableRBTree::Clear();
+    }
+    if (has_columntiletree()) {
+      if (columntiletree_ != NULL) columntiletree_->::TST::TableRBTree::Clear();
+    }
+    storage_version_ = 0u;
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (has_richtextpayloadtable()) {
+      if (richtextpayloadtable_ != NULL) richtextpayloadtable_->::TSP::Reference::Clear();
+    }
+    if (has_conditionalstyletable()) {
+      if (conditionalstyletable_ != NULL) conditionalstyletable_->::TSP::Reference::Clear();
+    }
+    if (has_commentstoragetable()) {
+      if (commentstoragetable_ != NULL) commentstoragetable_->::TSP::Reference::Clear();
+    }
+    if (has_importwarningsettable()) {
+      if (importwarningsettable_ != NULL) importwarningsettable_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool WPTableInfoArchive::MergePartialFromCodedStream(
+bool DataStore::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableInfoArchive super = 1;
+      // required .TST.HeaderStorage rowHeaders = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_rowheaders()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_storage;
+        if (input->ExpectTag(18)) goto parse_columnHeaders;
         break;
       }
 
-      // optional .TSP.Reference storage = 2;
+      // required .TSP.Reference columnHeaders = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_storage:
+         parse_columnHeaders:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_storage()));
+               input, mutable_columnheaders()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectAtEnd()) return true;
+        if (input->ExpectTag(26)) goto parse_tiles;
         break;
       }
 
-      default: {
-      handle_uninterpreted:
+      // required .TST.TileStorage tiles = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tiles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tiles()));
+        } else {
+          goto handle_uninterpreted;
         }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
+        if (input->ExpectTag(34)) goto parse_stringTable;
         break;
       }
-    }
-  }
-  return true;
-#undef DO_
-}
 
-void WPTableInfoArchive::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableInfoArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // optional .TSP.Reference storage = 2;
-  if (has_storage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->storage(), output);
-  }
+      // required .TSP.Reference stringTable = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_stringTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_stringtable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_styleTable;
+        break;
+      }
 
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
+      // required .TSP.Reference styleTable = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_styleTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_styletable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_formulaTable;
+        break;
+      }
 
-::google::protobuf::uint8* WPTableInfoArchive::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .TST.TableInfoArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // optional .TSP.Reference storage = 2;
-  if (has_storage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->storage(), target);
-  }
+      // required .TSP.Reference formulaTable = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formulaTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formulatable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_nextRowStripID;
+        break;
+      }
 
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
+      // required uint32 nextRowStripID = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_nextRowStripID:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &nextrowstripid_)));
+          set_has_nextrowstripid();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_nextColumnStripID;
+        break;
+      }
 
-int WPTableInfoArchive::ByteSize() const {
-  int total_size = 0;
+      // required uint32 nextColumnStripID = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_nextColumnStripID:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &nextcolumnstripid_)));
+          set_has_nextcolumnstripid();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_rowTileTree;
+        break;
+      }
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableInfoArchive super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
+      // required .TST.TableRBTree rowTileTree = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rowTileTree:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_rowtiletree()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(82)) goto parse_columnTileTree;
+        break;
+      }
 
-    // optional .TSP.Reference storage = 2;
-    if (has_storage()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->storage());
-    }
+      // required .TST.TableRBTree columnTileTree = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_columnTileTree:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_columntiletree()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(90)) goto parse_formatTable;
+        break;
+      }
 
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
+      // required .TSP.Reference formatTable = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formatTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formattable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(98)) goto parse_formulaErrorTable;
+        break;
+      }
 
-void WPTableInfoArchive::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const WPTableInfoArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const WPTableInfoArchive*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
+      // optional .TSP.Reference formulaErrorTable = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formulaErrorTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formulaerrortable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(106)) goto parse_merge_region_map;
+        break;
+      }
 
-void WPTableInfoArchive::MergeFrom(const WPTableInfoArchive& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TST::TableInfoArchive::MergeFrom(from.super());
-    }
-    if (from.has_storage()) {
-      mutable_storage()->::TSP::Reference::MergeFrom(from.storage());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
+      // optional .TSP.Reference merge_region_map = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_merge_region_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_merge_region_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(112)) goto parse_storage_version;
+        break;
+      }
 
-void WPTableInfoArchive::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
+      // optional uint32 storage_version = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_storage_version:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &storage_version_)));
+          set_has_storage_version();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(122)) goto parse_customFormatTable;
+        break;
+      }
 
-void WPTableInfoArchive::CopyFrom(const WPTableInfoArchive& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
+      // optional .TSP.Reference customFormatTable = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_customFormatTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_customformattable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(130)) goto parse_multipleChoiceListFormatTable;
+        break;
+      }
 
-bool WPTableInfoArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+      // optional .TSP.Reference multipleChoiceListFormatTable = 16;
+      case 16: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_multipleChoiceListFormatTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_multiplechoicelistformattable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(138)) goto parse_richTextPayloadTable;
+        break;
+      }
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_storage()) {
-    if (!this->storage().IsInitialized()) return false;
-  }
-  return true;
-}
+      // optional .TSP.Reference richTextPayloadTable = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_richTextPayloadTable:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_richtextpayloadtable()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(146)) goto parse_conditionalstyletable;
+        break;
+      }
 
-void WPTableInfoArchive::Swap(WPTableInfoArchive* other) {
-  if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(storage_, other->storage_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata WPTableInfoArchive::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = WPTableInfoArchive_descriptor_;
-  metadata.reflection = WPTableInfoArchive_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int TableStyleNetworkArchive::kTableStyleFieldNumber;
-const int TableStyleNetworkArchive::kBodyTextStyleFieldNumber;
-const int TableStyleNetworkArchive::kHeaderRowTextStyleFieldNumber;
-const int TableStyleNetworkArchive::kHeaderColumnTextStyleFieldNumber;
-const int TableStyleNetworkArchive::kFooterRowTextStyleFieldNumber;
-const int TableStyleNetworkArchive::kBodyCellStyleFieldNumber;
-const int TableStyleNetworkArchive::kHeaderRowStyleFieldNumber;
-const int TableStyleNetworkArchive::kHeaderColumnStyleFieldNumber;
-const int TableStyleNetworkArchive::kFooterRowStyleFieldNumber;
-const int TableStyleNetworkArchive::kTableNameStyleFieldNumber;
-const int TableStyleNetworkArchive::kTableNameShapeStyleFieldNumber;
-const int TableStyleNetworkArchive::kPresetIndexFieldNumber;
-#endif  // !_MSC_VER
-
-TableStyleNetworkArchive::TableStyleNetworkArchive()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void TableStyleNetworkArchive::InitAsDefaultInstance() {
-  table_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  body_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_column_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  footer_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  body_cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_column_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  footer_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  table_name_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  table_name_shape_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-}
-
-TableStyleNetworkArchive::TableStyleNetworkArchive(const TableStyleNetworkArchive& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void TableStyleNetworkArchive::SharedCtor() {
-  _cached_size_ = 0;
-  table_style_ = NULL;
-  body_text_style_ = NULL;
-  header_row_text_style_ = NULL;
-  header_column_text_style_ = NULL;
-  footer_row_text_style_ = NULL;
-  body_cell_style_ = NULL;
-  header_row_style_ = NULL;
-  header_column_style_ = NULL;
-  footer_row_style_ = NULL;
-  table_name_style_ = NULL;
-  table_name_shape_style_ = NULL;
-  preset_index_ = 0u;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-TableStyleNetworkArchive::~TableStyleNetworkArchive() {
-  SharedDtor();
-}
-
-void TableStyleNetworkArchive::SharedDtor() {
-  if (this != default_instance_) {
-    delete table_style_;
-    delete body_text_style_;
-    delete header_row_text_style_;
-    delete header_column_text_style_;
-    delete footer_row_text_style_;
-    delete body_cell_style_;
-    delete header_row_style_;
-    delete header_column_style_;
-    delete footer_row_style_;
-    delete table_name_style_;
-    delete table_name_shape_style_;
-  }
-}
-
-void TableStyleNetworkArchive::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* TableStyleNetworkArchive::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return TableStyleNetworkArchive_descriptor_;
-}
-
-const TableStyleNetworkArchive& TableStyleNetworkArchive::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
-  return *default_instance_;
-}
-
-TableStyleNetworkArchive* TableStyleNetworkArchive::default_instance_ = NULL;
-
-TableStyleNetworkArchive* TableStyleNetworkArchive::New() const {
-  return new TableStyleNetworkArchive;
-}
-
-void TableStyleNetworkArchive::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_table_style()) {
-      if (table_style_ != NULL) table_style_->::TSP::Reference::Clear();
-    }
-    if (has_body_text_style()) {
-      if (body_text_style_ != NULL) body_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_row_text_style()) {
-      if (header_row_text_style_ != NULL) header_row_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_column_text_style()) {
-      if (header_column_text_style_ != NULL) header_column_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_footer_row_text_style()) {
-      if (footer_row_text_style_ != NULL) footer_row_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_body_cell_style()) {
-      if (body_cell_style_ != NULL) body_cell_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_row_style()) {
-      if (header_row_style_ != NULL) header_row_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_column_style()) {
-      if (header_column_style_ != NULL) header_column_style_->::TSP::Reference::Clear();
-    }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_footer_row_style()) {
-      if (footer_row_style_ != NULL) footer_row_style_->::TSP::Reference::Clear();
-    }
-    if (has_table_name_style()) {
-      if (table_name_style_ != NULL) table_name_style_->::TSP::Reference::Clear();
-    }
-    if (has_table_name_shape_style()) {
-      if (table_name_shape_style_ != NULL) table_name_shape_style_->::TSP::Reference::Clear();
-    }
-    preset_index_ = 0u;
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool TableStyleNetworkArchive::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSP.Reference body_text_style = 1;
-      case 1: {
+      // optional .TSP.Reference conditionalstyletable = 18;
+      case 18: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_conditionalstyletable:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_body_text_style()));
+               input, mutable_conditionalstyletable()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_header_row_text_style;
+        if (input->ExpectTag(154)) goto parse_commentStorageTable;
         break;
       }
 
-      // required .TSP.Reference header_row_text_style = 2;
-      case 2: {
+      // optional .TSP.Reference commentStorageTable = 19;
+      case 19: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_row_text_style:
+         parse_commentStorageTable:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_row_text_style()));
+               input, mutable_commentstoragetable()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_header_column_text_style;
+        if (input->ExpectTag(162)) goto parse_importWarningSetTable;
         break;
       }
 
-      // required .TSP.Reference header_column_text_style = 3;
-      case 3: {
+      // optional .TSP.Reference importWarningSetTable = 20;
+      case 20: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_column_text_style:
+         parse_importWarningSetTable:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_column_text_style()));
+               input, mutable_importwarningsettable()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_footer_row_text_style;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // required .TSP.Reference footer_row_text_style = 4;
-      case 4: {
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_footer_row_text_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_footer_row_text_style()));
-        } else {
-          goto handle_uninterpreted;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
         }
-        if (input->ExpectTag(42)) goto parse_body_cell_style;
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
 
-      // required .TSP.Reference body_cell_style = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_body_cell_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_body_cell_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_header_row_style;
-        break;
-      }
+void DataStore::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.HeaderStorage rowHeaders = 1;
+  if (has_rowheaders()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->rowheaders(), output);
+  }
 
-      // required .TSP.Reference header_row_style = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_row_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_row_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_header_column_style;
-        break;
-      }
+  // required .TSP.Reference columnHeaders = 2;
+  if (has_columnheaders()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->columnheaders(), output);
+  }
 
-      // required .TSP.Reference header_column_style = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_column_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_column_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_footer_row_style;
-        break;
-      }
-
-      // required .TSP.Reference footer_row_style = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_footer_row_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_footer_row_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(74)) goto parse_table_style;
-        break;
-      }
+  // required .TST.TileStorage tiles = 3;
+  if (has_tiles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->tiles(), output);
+  }
 
-      // required .TSP.Reference table_style = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(82)) goto parse_table_name_style;
-        break;
-      }
+  // required .TSP.Reference stringTable = 4;
+  if (has_stringtable()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->stringtable(), output);
+  }
 
-      // optional .TSP.Reference table_name_style = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_name_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_name_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(90)) goto parse_table_name_shape_style;
-        break;
-      }
+  // required .TSP.Reference styleTable = 5;
+  if (has_styletable()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->styletable(), output);
+  }
 
-      // optional .TSP.Reference table_name_shape_style = 11;
-      case 11: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_name_shape_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_name_shape_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(96)) goto parse_preset_index;
-        break;
-      }
+  // required .TSP.Reference formulaTable = 6;
+  if (has_formulatable()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->formulatable(), output);
+  }
 
-      // optional uint32 preset_index = 12;
-      case 12: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_preset_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &preset_index_)));
-          set_has_preset_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
+  // required uint32 nextRowStripID = 7;
+  if (has_nextrowstripid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->nextrowstripid(), output);
+  }
 
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
+  // required uint32 nextColumnStripID = 8;
+  if (has_nextcolumnstripid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->nextcolumnstripid(), output);
   }
-  return true;
-#undef DO_
-}
 
-void TableStyleNetworkArchive::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSP.Reference body_text_style = 1;
-  if (has_body_text_style()) {
+  // required .TST.TableRBTree rowTileTree = 9;
+  if (has_rowtiletree()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->body_text_style(), output);
+      9, this->rowtiletree(), output);
   }
 
-  // required .TSP.Reference header_row_text_style = 2;
-  if (has_header_row_text_style()) {
+  // required .TST.TableRBTree columnTileTree = 10;
+  if (has_columntiletree()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->header_row_text_style(), output);
+      10, this->columntiletree(), output);
   }
 
-  // required .TSP.Reference header_column_text_style = 3;
-  if (has_header_column_text_style()) {
+  // required .TSP.Reference formatTable = 11;
+  if (has_formattable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->header_column_text_style(), output);
+      11, this->formattable(), output);
   }
 
-  // required .TSP.Reference footer_row_text_style = 4;
-  if (has_footer_row_text_style()) {
+  // optional .TSP.Reference formulaErrorTable = 12;
+  if (has_formulaerrortable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->footer_row_text_style(), output);
+      12, this->formulaerrortable(), output);
   }
 
-  // required .TSP.Reference body_cell_style = 5;
-  if (has_body_cell_style()) {
+  // optional .TSP.Reference merge_region_map = 13;
+  if (has_merge_region_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->body_cell_style(), output);
+      13, this->merge_region_map(), output);
   }
 
-  // required .TSP.Reference header_row_style = 6;
-  if (has_header_row_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->header_row_style(), output);
+  // optional uint32 storage_version = 14;
+  if (has_storage_version()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(14, this->storage_version(), output);
   }
 
-  // required .TSP.Reference header_column_style = 7;
-  if (has_header_column_style()) {
+  // optional .TSP.Reference customFormatTable = 15;
+  if (has_customformattable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->header_column_style(), output);
+      15, this->customformattable(), output);
   }
 
-  // required .TSP.Reference footer_row_style = 8;
-  if (has_footer_row_style()) {
+  // optional .TSP.Reference multipleChoiceListFormatTable = 16;
+  if (has_multiplechoicelistformattable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->footer_row_style(), output);
+      16, this->multiplechoicelistformattable(), output);
   }
 
-  // required .TSP.Reference table_style = 9;
-  if (has_table_style()) {
+  // optional .TSP.Reference richTextPayloadTable = 17;
+  if (has_richtextpayloadtable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->table_style(), output);
+      17, this->richtextpayloadtable(), output);
   }
 
-  // optional .TSP.Reference table_name_style = 10;
-  if (has_table_name_style()) {
+  // optional .TSP.Reference conditionalstyletable = 18;
+  if (has_conditionalstyletable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->table_name_style(), output);
+      18, this->conditionalstyletable(), output);
   }
 
-  // optional .TSP.Reference table_name_shape_style = 11;
-  if (has_table_name_shape_style()) {
+  // optional .TSP.Reference commentStorageTable = 19;
+  if (has_commentstoragetable()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      11, this->table_name_shape_style(), output);
+      19, this->commentstoragetable(), output);
   }
 
-  // optional uint32 preset_index = 12;
-  if (has_preset_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(12, this->preset_index(), output);
+  // optional .TSP.Reference importWarningSetTable = 20;
+  if (has_importwarningsettable()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->importwarningsettable(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -10218,88 +9918,140 @@ void TableStyleNetworkArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* TableStyleNetworkArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* DataStore::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSP.Reference body_text_style = 1;
-  if (has_body_text_style()) {
+  // required .TST.HeaderStorage rowHeaders = 1;
+  if (has_rowheaders()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->body_text_style(), target);
+        1, this->rowheaders(), target);
   }
 
-  // required .TSP.Reference header_row_text_style = 2;
-  if (has_header_row_text_style()) {
+  // required .TSP.Reference columnHeaders = 2;
+  if (has_columnheaders()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->header_row_text_style(), target);
+        2, this->columnheaders(), target);
   }
 
-  // required .TSP.Reference header_column_text_style = 3;
-  if (has_header_column_text_style()) {
+  // required .TST.TileStorage tiles = 3;
+  if (has_tiles()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->header_column_text_style(), target);
+        3, this->tiles(), target);
   }
 
-  // required .TSP.Reference footer_row_text_style = 4;
-  if (has_footer_row_text_style()) {
+  // required .TSP.Reference stringTable = 4;
+  if (has_stringtable()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->footer_row_text_style(), target);
+        4, this->stringtable(), target);
   }
 
-  // required .TSP.Reference body_cell_style = 5;
-  if (has_body_cell_style()) {
+  // required .TSP.Reference styleTable = 5;
+  if (has_styletable()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->body_cell_style(), target);
+        5, this->styletable(), target);
   }
 
-  // required .TSP.Reference header_row_style = 6;
-  if (has_header_row_style()) {
+  // required .TSP.Reference formulaTable = 6;
+  if (has_formulatable()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->header_row_style(), target);
+        6, this->formulatable(), target);
   }
 
-  // required .TSP.Reference header_column_style = 7;
-  if (has_header_column_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->header_column_style(), target);
+  // required uint32 nextRowStripID = 7;
+  if (has_nextrowstripid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->nextrowstripid(), target);
   }
 
-  // required .TSP.Reference footer_row_style = 8;
-  if (has_footer_row_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->footer_row_style(), target);
+  // required uint32 nextColumnStripID = 8;
+  if (has_nextcolumnstripid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->nextcolumnstripid(), target);
   }
 
-  // required .TSP.Reference table_style = 9;
-  if (has_table_style()) {
+  // required .TST.TableRBTree rowTileTree = 9;
+  if (has_rowtiletree()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        9, this->table_style(), target);
+        9, this->rowtiletree(), target);
   }
 
-  // optional .TSP.Reference table_name_style = 10;
-  if (has_table_name_style()) {
+  // required .TST.TableRBTree columnTileTree = 10;
+  if (has_columntiletree()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        10, this->table_name_style(), target);
+        10, this->columntiletree(), target);
   }
 
-  // optional .TSP.Reference table_name_shape_style = 11;
-  if (has_table_name_shape_style()) {
+  // required .TSP.Reference formatTable = 11;
+  if (has_formattable()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        11, this->table_name_shape_style(), target);
+        11, this->formattable(), target);
   }
 
-  // optional uint32 preset_index = 12;
-  if (has_preset_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(12, this->preset_index(), target);
+  // optional .TSP.Reference formulaErrorTable = 12;
+  if (has_formulaerrortable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        12, this->formulaerrortable(), target);
+  }
+
+  // optional .TSP.Reference merge_region_map = 13;
+  if (has_merge_region_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        13, this->merge_region_map(), target);
+  }
+
+  // optional uint32 storage_version = 14;
+  if (has_storage_version()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(14, this->storage_version(), target);
+  }
+
+  // optional .TSP.Reference customFormatTable = 15;
+  if (has_customformattable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        15, this->customformattable(), target);
+  }
+
+  // optional .TSP.Reference multipleChoiceListFormatTable = 16;
+  if (has_multiplechoicelistformattable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        16, this->multiplechoicelistformattable(), target);
+  }
+
+  // optional .TSP.Reference richTextPayloadTable = 17;
+  if (has_richtextpayloadtable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        17, this->richtextpayloadtable(), target);
+  }
+
+  // optional .TSP.Reference conditionalstyletable = 18;
+  if (has_conditionalstyletable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        18, this->conditionalstyletable(), target);
+  }
+
+  // optional .TSP.Reference commentStorageTable = 19;
+  if (has_commentstoragetable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        19, this->commentstoragetable(), target);
+  }
+
+  // optional .TSP.Reference importWarningSetTable = 20;
+  if (has_importwarningsettable()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->importwarningsettable(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -10309,94 +10061,152 @@ ::google::protobuf::uint8* TableStyleNetworkArchive::SerializeWithCachedSizesToA
   return target;
 }
 
-int TableStyleNetworkArchive::ByteSize() const {
+int DataStore::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSP.Reference table_style = 9;
-    if (has_table_style()) {
+    // required .TST.HeaderStorage rowHeaders = 1;
+    if (has_rowheaders()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_style());
+          this->rowheaders());
     }
 
-    // required .TSP.Reference body_text_style = 1;
-    if (has_body_text_style()) {
+    // required .TSP.Reference columnHeaders = 2;
+    if (has_columnheaders()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->body_text_style());
+          this->columnheaders());
     }
 
-    // required .TSP.Reference header_row_text_style = 2;
-    if (has_header_row_text_style()) {
+    // required .TST.TileStorage tiles = 3;
+    if (has_tiles()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_row_text_style());
+          this->tiles());
     }
 
-    // required .TSP.Reference header_column_text_style = 3;
-    if (has_header_column_text_style()) {
+    // required .TSP.Reference stringTable = 4;
+    if (has_stringtable()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_column_text_style());
+          this->stringtable());
     }
 
-    // required .TSP.Reference footer_row_text_style = 4;
-    if (has_footer_row_text_style()) {
+    // required .TSP.Reference styleTable = 5;
+    if (has_styletable()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->footer_row_text_style());
+          this->styletable());
     }
 
-    // required .TSP.Reference body_cell_style = 5;
-    if (has_body_cell_style()) {
+    // required .TSP.Reference formulaTable = 6;
+    if (has_formulatable()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->body_cell_style());
+          this->formulatable());
     }
 
-    // required .TSP.Reference header_row_style = 6;
-    if (has_header_row_style()) {
+    // optional .TSP.Reference formulaErrorTable = 12;
+    if (has_formulaerrortable()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_row_style());
+          this->formulaerrortable());
     }
 
-    // required .TSP.Reference header_column_style = 7;
-    if (has_header_column_style()) {
+    // required .TSP.Reference formatTable = 11;
+    if (has_formattable()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_column_style());
+          this->formattable());
     }
 
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // required .TSP.Reference footer_row_style = 8;
-    if (has_footer_row_style()) {
+    // optional .TSP.Reference multipleChoiceListFormatTable = 16;
+    if (has_multiplechoicelistformattable()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->multiplechoicelistformattable());
+    }
+
+    // optional .TSP.Reference merge_region_map = 13;
+    if (has_merge_region_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->footer_row_style());
+          this->merge_region_map());
     }
 
-    // optional .TSP.Reference table_name_style = 10;
-    if (has_table_name_style()) {
+    // optional .TSP.Reference customFormatTable = 15;
+    if (has_customformattable()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_name_style());
+          this->customformattable());
     }
 
-    // optional .TSP.Reference table_name_shape_style = 11;
-    if (has_table_name_shape_style()) {
+    // required uint32 nextRowStripID = 7;
+    if (has_nextrowstripid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->nextrowstripid());
+    }
+
+    // required uint32 nextColumnStripID = 8;
+    if (has_nextcolumnstripid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->nextcolumnstripid());
+    }
+
+    // required .TST.TableRBTree rowTileTree = 9;
+    if (has_rowtiletree()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_name_shape_style());
+          this->rowtiletree());
     }
 
-    // optional uint32 preset_index = 12;
-    if (has_preset_index()) {
+    // required .TST.TableRBTree columnTileTree = 10;
+    if (has_columntiletree()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->columntiletree());
+    }
+
+    // optional uint32 storage_version = 14;
+    if (has_storage_version()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->preset_index());
+          this->storage_version());
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional .TSP.Reference richTextPayloadTable = 17;
+    if (has_richtextpayloadtable()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->richtextpayloadtable());
+    }
+
+    // optional .TSP.Reference conditionalstyletable = 18;
+    if (has_conditionalstyletable()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->conditionalstyletable());
+    }
+
+    // optional .TSP.Reference commentStorageTable = 19;
+    if (has_commentstoragetable()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->commentstoragetable());
+    }
+
+    // optional .TSP.Reference importWarningSetTable = 20;
+    if (has_importwarningsettable()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->importwarningsettable());
     }
 
   }
@@ -10411,10 +10221,10 @@ int TableStyleNetworkArchive::ByteSize() const {
   return total_size;
 }
 
-void TableStyleNetworkArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void DataStore::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const TableStyleNetworkArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableStyleNetworkArchive*>(
+  const DataStore* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const DataStore*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -10423,127 +10233,179 @@ void TableStyleNetworkArchive::MergeFrom(const ::google::protobuf::Message& from
   }
 }
 
-void TableStyleNetworkArchive::MergeFrom(const TableStyleNetworkArchive& from) {
+void DataStore::MergeFrom(const DataStore& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_table_style()) {
-      mutable_table_style()->::TSP::Reference::MergeFrom(from.table_style());
+    if (from.has_rowheaders()) {
+      mutable_rowheaders()->::TST::HeaderStorage::MergeFrom(from.rowheaders());
     }
-    if (from.has_body_text_style()) {
-      mutable_body_text_style()->::TSP::Reference::MergeFrom(from.body_text_style());
+    if (from.has_columnheaders()) {
+      mutable_columnheaders()->::TSP::Reference::MergeFrom(from.columnheaders());
     }
-    if (from.has_header_row_text_style()) {
-      mutable_header_row_text_style()->::TSP::Reference::MergeFrom(from.header_row_text_style());
+    if (from.has_tiles()) {
+      mutable_tiles()->::TST::TileStorage::MergeFrom(from.tiles());
     }
-    if (from.has_header_column_text_style()) {
-      mutable_header_column_text_style()->::TSP::Reference::MergeFrom(from.header_column_text_style());
+    if (from.has_stringtable()) {
+      mutable_stringtable()->::TSP::Reference::MergeFrom(from.stringtable());
     }
-    if (from.has_footer_row_text_style()) {
-      mutable_footer_row_text_style()->::TSP::Reference::MergeFrom(from.footer_row_text_style());
+    if (from.has_styletable()) {
+      mutable_styletable()->::TSP::Reference::MergeFrom(from.styletable());
     }
-    if (from.has_body_cell_style()) {
-      mutable_body_cell_style()->::TSP::Reference::MergeFrom(from.body_cell_style());
+    if (from.has_formulatable()) {
+      mutable_formulatable()->::TSP::Reference::MergeFrom(from.formulatable());
     }
-    if (from.has_header_row_style()) {
-      mutable_header_row_style()->::TSP::Reference::MergeFrom(from.header_row_style());
+    if (from.has_formulaerrortable()) {
+      mutable_formulaerrortable()->::TSP::Reference::MergeFrom(from.formulaerrortable());
     }
-    if (from.has_header_column_style()) {
-      mutable_header_column_style()->::TSP::Reference::MergeFrom(from.header_column_style());
+    if (from.has_formattable()) {
+      mutable_formattable()->::TSP::Reference::MergeFrom(from.formattable());
     }
   }
   if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_footer_row_style()) {
-      mutable_footer_row_style()->::TSP::Reference::MergeFrom(from.footer_row_style());
+    if (from.has_multiplechoicelistformattable()) {
+      mutable_multiplechoicelistformattable()->::TSP::Reference::MergeFrom(from.multiplechoicelistformattable());
     }
-    if (from.has_table_name_style()) {
-      mutable_table_name_style()->::TSP::Reference::MergeFrom(from.table_name_style());
+    if (from.has_merge_region_map()) {
+      mutable_merge_region_map()->::TSP::Reference::MergeFrom(from.merge_region_map());
     }
-    if (from.has_table_name_shape_style()) {
-      mutable_table_name_shape_style()->::TSP::Reference::MergeFrom(from.table_name_shape_style());
+    if (from.has_customformattable()) {
+      mutable_customformattable()->::TSP::Reference::MergeFrom(from.customformattable());
     }
-    if (from.has_preset_index()) {
-      set_preset_index(from.preset_index());
+    if (from.has_nextrowstripid()) {
+      set_nextrowstripid(from.nextrowstripid());
+    }
+    if (from.has_nextcolumnstripid()) {
+      set_nextcolumnstripid(from.nextcolumnstripid());
+    }
+    if (from.has_rowtiletree()) {
+      mutable_rowtiletree()->::TST::TableRBTree::MergeFrom(from.rowtiletree());
+    }
+    if (from.has_columntiletree()) {
+      mutable_columntiletree()->::TST::TableRBTree::MergeFrom(from.columntiletree());
+    }
+    if (from.has_storage_version()) {
+      set_storage_version(from.storage_version());
     }
   }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_richtextpayloadtable()) {
+      mutable_richtextpayloadtable()->::TSP::Reference::MergeFrom(from.richtextpayloadtable());
+    }
+    if (from.has_conditionalstyletable()) {
+      mutable_conditionalstyletable()->::TSP::Reference::MergeFrom(from.conditionalstyletable());
+    }
+    if (from.has_commentstoragetable()) {
+      mutable_commentstoragetable()->::TSP::Reference::MergeFrom(from.commentstoragetable());
+    }
+    if (from.has_importwarningsettable()) {
+      mutable_importwarningsettable()->::TSP::Reference::MergeFrom(from.importwarningsettable());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
 
-void TableStyleNetworkArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void DataStore::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableStyleNetworkArchive::CopyFrom(const TableStyleNetworkArchive& from) {
+void DataStore::CopyFrom(const DataStore& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableStyleNetworkArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x000001ff) != 0x000001ff) return false;
+bool DataStore::IsInitialized() const {
+  if ((_has_bits_[0] & 0x000078bf) != 0x000078bf) return false;
 
-  if (has_table_style()) {
-    if (!this->table_style().IsInitialized()) return false;
+  if (has_rowheaders()) {
+    if (!this->rowheaders().IsInitialized()) return false;
   }
-  if (has_body_text_style()) {
-    if (!this->body_text_style().IsInitialized()) return false;
+  if (has_columnheaders()) {
+    if (!this->columnheaders().IsInitialized()) return false;
   }
-  if (has_header_row_text_style()) {
-    if (!this->header_row_text_style().IsInitialized()) return false;
+  if (has_tiles()) {
+    if (!this->tiles().IsInitialized()) return false;
   }
-  if (has_header_column_text_style()) {
-    if (!this->header_column_text_style().IsInitialized()) return false;
+  if (has_stringtable()) {
+    if (!this->stringtable().IsInitialized()) return false;
   }
-  if (has_footer_row_text_style()) {
-    if (!this->footer_row_text_style().IsInitialized()) return false;
+  if (has_styletable()) {
+    if (!this->styletable().IsInitialized()) return false;
   }
-  if (has_body_cell_style()) {
-    if (!this->body_cell_style().IsInitialized()) return false;
+  if (has_formulatable()) {
+    if (!this->formulatable().IsInitialized()) return false;
   }
-  if (has_header_row_style()) {
-    if (!this->header_row_style().IsInitialized()) return false;
+  if (has_formulaerrortable()) {
+    if (!this->formulaerrortable().IsInitialized()) return false;
   }
-  if (has_header_column_style()) {
-    if (!this->header_column_style().IsInitialized()) return false;
+  if (has_formattable()) {
+    if (!this->formattable().IsInitialized()) return false;
   }
-  if (has_footer_row_style()) {
-    if (!this->footer_row_style().IsInitialized()) return false;
+  if (has_multiplechoicelistformattable()) {
+    if (!this->multiplechoicelistformattable().IsInitialized()) return false;
   }
-  if (has_table_name_style()) {
-    if (!this->table_name_style().IsInitialized()) return false;
+  if (has_merge_region_map()) {
+    if (!this->merge_region_map().IsInitialized()) return false;
   }
-  if (has_table_name_shape_style()) {
-    if (!this->table_name_shape_style().IsInitialized()) return false;
+  if (has_customformattable()) {
+    if (!this->customformattable().IsInitialized()) return false;
+  }
+  if (has_rowtiletree()) {
+    if (!this->rowtiletree().IsInitialized()) return false;
+  }
+  if (has_columntiletree()) {
+    if (!this->columntiletree().IsInitialized()) return false;
+  }
+  if (has_richtextpayloadtable()) {
+    if (!this->richtextpayloadtable().IsInitialized()) return false;
+  }
+  if (has_conditionalstyletable()) {
+    if (!this->conditionalstyletable().IsInitialized()) return false;
+  }
+  if (has_commentstoragetable()) {
+    if (!this->commentstoragetable().IsInitialized()) return false;
+  }
+  if (has_importwarningsettable()) {
+    if (!this->importwarningsettable().IsInitialized()) return false;
   }
   return true;
 }
 
-void TableStyleNetworkArchive::Swap(TableStyleNetworkArchive* other) {
+void DataStore::Swap(DataStore* other) {
   if (other != this) {
-    std::swap(table_style_, other->table_style_);
-    std::swap(body_text_style_, other->body_text_style_);
-    std::swap(header_row_text_style_, other->header_row_text_style_);
-    std::swap(header_column_text_style_, other->header_column_text_style_);
-    std::swap(footer_row_text_style_, other->footer_row_text_style_);
-    std::swap(body_cell_style_, other->body_cell_style_);
-    std::swap(header_row_style_, other->header_row_style_);
-    std::swap(header_column_style_, other->header_column_style_);
-    std::swap(footer_row_style_, other->footer_row_style_);
-    std::swap(table_name_style_, other->table_name_style_);
-    std::swap(table_name_shape_style_, other->table_name_shape_style_);
-    std::swap(preset_index_, other->preset_index_);
+    std::swap(rowheaders_, other->rowheaders_);
+    std::swap(columnheaders_, other->columnheaders_);
+    std::swap(tiles_, other->tiles_);
+    std::swap(stringtable_, other->stringtable_);
+    std::swap(styletable_, other->styletable_);
+    std::swap(formulatable_, other->formulatable_);
+    std::swap(formulaerrortable_, other->formulaerrortable_);
+    std::swap(formattable_, other->formattable_);
+    std::swap(multiplechoicelistformattable_, other->multiplechoicelistformattable_);
+    std::swap(merge_region_map_, other->merge_region_map_);
+    std::swap(customformattable_, other->customformattable_);
+    std::swap(nextrowstripid_, other->nextrowstripid_);
+    std::swap(nextcolumnstripid_, other->nextcolumnstripid_);
+    std::swap(rowtiletree_, other->rowtiletree_);
+    std::swap(columntiletree_, other->columntiletree_);
+    std::swap(storage_version_, other->storage_version_);
+    std::swap(richtextpayloadtable_, other->richtextpayloadtable_);
+    std::swap(conditionalstyletable_, other->conditionalstyletable_);
+    std::swap(commentstoragetable_, other->commentstoragetable_);
+    std::swap(importwarningsettable_, other->importwarningsettable_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableStyleNetworkArchive::GetMetadata() const {
+::google::protobuf::Metadata DataStore::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableStyleNetworkArchive_descriptor_;
-  metadata.reflection = TableStyleNetworkArchive_reflection_;
+  metadata.descriptor = DataStore_descriptor_;
+  metadata.reflection = DataStore_reflection_;
   return metadata;
 }
 
@@ -10551,930 +10413,5464 @@ ::google::protobuf::Metadata TableStyleNetworkArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int TableModelArchive::kTableIdFieldNumber;
-const int TableModelArchive::kFromTableIdFieldNumber;
-const int TableModelArchive::kTableStyleFieldNumber;
-const int TableModelArchive::kBodyTextStyleFieldNumber;
-const int TableModelArchive::kHeaderRowTextStyleFieldNumber;
-const int TableModelArchive::kHeaderColumnTextStyleFieldNumber;
-const int TableModelArchive::kFooterRowTextStyleFieldNumber;
-const int TableModelArchive::kBodyCellStyleFieldNumber;
-const int TableModelArchive::kHeaderRowStyleFieldNumber;
-const int TableModelArchive::kHeaderColumnStyleFieldNumber;
-const int TableModelArchive::kFooterRowStyleFieldNumber;
-const int TableModelArchive::kTableNameStyleFieldNumber;
-const int TableModelArchive::kTableNameShapeStyleFieldNumber;
-const int TableModelArchive::kDataStoreFieldNumber;
-const int TableModelArchive::kProviderFieldNumber;
-const int TableModelArchive::kNumberOfRowsFieldNumber;
-const int TableModelArchive::kNumberOfColumnsFieldNumber;
-const int TableModelArchive::kTableNameFieldNumber;
-const int TableModelArchive::kTableNameEnabledFieldNumber;
-const int TableModelArchive::kTableNameHeightFieldNumber;
-const int TableModelArchive::kTableNameBorderEnabledFieldNumber;
-const int TableModelArchive::kNumberOfHeaderRowsFieldNumber;
-const int TableModelArchive::kNumberOfHeaderColumnsFieldNumber;
-const int TableModelArchive::kNumberOfFooterRowsFieldNumber;
-const int TableModelArchive::kHeaderRowsFrozenFieldNumber;
-const int TableModelArchive::kHeaderColumnsFrozenFieldNumber;
-const int TableModelArchive::kNumberOfHiddenRowsFieldNumber;
-const int TableModelArchive::kNumberOfHiddenColumnsFieldNumber;
-const int TableModelArchive::kNumberOfUserHiddenRowsFieldNumber;
-const int TableModelArchive::kNumberOfUserHiddenColumnsFieldNumber;
-const int TableModelArchive::kNumberOfFilteredRowsFieldNumber;
-const int TableModelArchive::kDefaultRowHeightFieldNumber;
-const int TableModelArchive::kDefaultColumnWidthFieldNumber;
-const int TableModelArchive::kOriginOffsetFieldNumber;
-const int TableModelArchive::kPresetIndexFieldNumber;
-const int TableModelArchive::kRepeatingHeaderRowsEnabledFieldNumber;
-const int TableModelArchive::kRepeatingHeaderColumnsEnabledFieldNumber;
-const int TableModelArchive::kStyleApplyClearsAllFieldNumber;
-const int TableModelArchive::kHiddenStateFormulaOwnerForColumnsFieldNumber;
-const int TableModelArchive::kHiddenStateFormulaOwnerForRowsFieldNumber;
-const int TableModelArchive::kFilterSetFieldNumber;
-const int TableModelArchive::kConditionalStyleFormulaOwnerIdFieldNumber;
+const int TableInfoArchive::kSuperFieldNumber;
+const int TableInfoArchive::kTableModelFieldNumber;
+const int TableInfoArchive::kEditingStateFieldNumber;
 #endif  // !_MSC_VER
 
-TableModelArchive::TableModelArchive()
+TableInfoArchive::TableInfoArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableModelArchive::InitAsDefaultInstance() {
-  table_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  body_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_column_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  footer_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  body_cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  header_column_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  footer_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  table_name_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  table_name_shape_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  data_store_ = const_cast< ::TST::DataStore*>(&::TST::DataStore::default_instance());
-  provider_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  origin_offset_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
-  hidden_state_formula_owner_for_columns_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  hidden_state_formula_owner_for_rows_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  filter_set_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  conditional_style_formula_owner_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
+void TableInfoArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSD::DrawableArchive*>(&::TSD::DrawableArchive::default_instance());
+  tablemodel_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  editingstate_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-TableModelArchive::TableModelArchive(const TableModelArchive& from)
+TableInfoArchive::TableInfoArchive(const TableInfoArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableModelArchive::SharedCtor() {
+void TableInfoArchive::SharedCtor() {
   _cached_size_ = 0;
-  table_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  from_table_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  table_style_ = NULL;
-  body_text_style_ = NULL;
-  header_row_text_style_ = NULL;
-  header_column_text_style_ = NULL;
-  footer_row_text_style_ = NULL;
-  body_cell_style_ = NULL;
-  header_row_style_ = NULL;
-  header_column_style_ = NULL;
-  footer_row_style_ = NULL;
-  table_name_style_ = NULL;
-  table_name_shape_style_ = NULL;
-  data_store_ = NULL;
-  provider_ = NULL;
-  number_of_rows_ = 0u;
-  number_of_columns_ = 0u;
-  table_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  table_name_enabled_ = false;
-  table_name_height_ = 0;
-  table_name_border_enabled_ = false;
-  number_of_header_rows_ = 0u;
-  number_of_header_columns_ = 0u;
-  number_of_footer_rows_ = 0u;
-  header_rows_frozen_ = false;
-  header_columns_frozen_ = false;
-  number_of_hidden_rows_ = 0u;
-  number_of_hidden_columns_ = 0u;
-  number_of_user_hidden_rows_ = 0u;
-  number_of_user_hidden_columns_ = 0u;
-  number_of_filtered_rows_ = 0u;
-  default_row_height_ = 0;
-  default_column_width_ = 0;
-  origin_offset_ = NULL;
-  preset_index_ = 0u;
-  repeating_header_rows_enabled_ = false;
-  repeating_header_columns_enabled_ = false;
-  style_apply_clears_all_ = false;
-  hidden_state_formula_owner_for_columns_ = NULL;
-  hidden_state_formula_owner_for_rows_ = NULL;
-  filter_set_ = NULL;
-  conditional_style_formula_owner_id_ = NULL;
+  super_ = NULL;
+  tablemodel_ = NULL;
+  editingstate_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableModelArchive::~TableModelArchive() {
+TableInfoArchive::~TableInfoArchive() {
   SharedDtor();
 }
 
-void TableModelArchive::SharedDtor() {
-  if (table_id_ != &::google::protobuf::internal::kEmptyString) {
-    delete table_id_;
-  }
-  if (from_table_id_ != &::google::protobuf::internal::kEmptyString) {
-    delete from_table_id_;
-  }
-  if (table_name_ != &::google::protobuf::internal::kEmptyString) {
-    delete table_name_;
-  }
+void TableInfoArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete table_style_;
-    delete body_text_style_;
-    delete header_row_text_style_;
-    delete header_column_text_style_;
-    delete footer_row_text_style_;
-    delete body_cell_style_;
-    delete header_row_style_;
-    delete header_column_style_;
-    delete footer_row_style_;
-    delete table_name_style_;
-    delete table_name_shape_style_;
-    delete data_store_;
-    delete provider_;
-    delete origin_offset_;
-    delete hidden_state_formula_owner_for_columns_;
-    delete hidden_state_formula_owner_for_rows_;
-    delete filter_set_;
-    delete conditional_style_formula_owner_id_;
+    delete super_;
+    delete tablemodel_;
+    delete editingstate_;
   }
 }
 
-void TableModelArchive::SetCachedSize(int size) const {
+void TableInfoArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableModelArchive::descriptor() {
+const ::google::protobuf::Descriptor* TableInfoArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableModelArchive_descriptor_;
+  return TableInfoArchive_descriptor_;
 }
 
-const TableModelArchive& TableModelArchive::default_instance() {
+const TableInfoArchive& TableInfoArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-TableModelArchive* TableModelArchive::default_instance_ = NULL;
+TableInfoArchive* TableInfoArchive::default_instance_ = NULL;
 
-TableModelArchive* TableModelArchive::New() const {
-  return new TableModelArchive;
+TableInfoArchive* TableInfoArchive::New() const {
+  return new TableInfoArchive;
 }
 
-void TableModelArchive::Clear() {
+void TableInfoArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_table_id()) {
-      if (table_id_ != &::google::protobuf::internal::kEmptyString) {
-        table_id_->clear();
-      }
-    }
-    if (has_from_table_id()) {
-      if (from_table_id_ != &::google::protobuf::internal::kEmptyString) {
-        from_table_id_->clear();
-      }
-    }
-    if (has_table_style()) {
-      if (table_style_ != NULL) table_style_->::TSP::Reference::Clear();
-    }
-    if (has_body_text_style()) {
-      if (body_text_style_ != NULL) body_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_row_text_style()) {
-      if (header_row_text_style_ != NULL) header_row_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_column_text_style()) {
-      if (header_column_text_style_ != NULL) header_column_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_footer_row_text_style()) {
-      if (footer_row_text_style_ != NULL) footer_row_text_style_->::TSP::Reference::Clear();
-    }
-    if (has_body_cell_style()) {
-      if (body_cell_style_ != NULL) body_cell_style_->::TSP::Reference::Clear();
-    }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_header_row_style()) {
-      if (header_row_style_ != NULL) header_row_style_->::TSP::Reference::Clear();
-    }
-    if (has_header_column_style()) {
-      if (header_column_style_ != NULL) header_column_style_->::TSP::Reference::Clear();
-    }
-    if (has_footer_row_style()) {
-      if (footer_row_style_ != NULL) footer_row_style_->::TSP::Reference::Clear();
-    }
-    if (has_table_name_style()) {
-      if (table_name_style_ != NULL) table_name_style_->::TSP::Reference::Clear();
-    }
-    if (has_table_name_shape_style()) {
-      if (table_name_shape_style_ != NULL) table_name_shape_style_->::TSP::Reference::Clear();
-    }
-    if (has_data_store()) {
-      if (data_store_ != NULL) data_store_->::TST::DataStore::Clear();
-    }
-    if (has_provider()) {
-      if (provider_ != NULL) provider_->::TSP::Reference::Clear();
-    }
-    number_of_rows_ = 0u;
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    number_of_columns_ = 0u;
-    if (has_table_name()) {
-      if (table_name_ != &::google::protobuf::internal::kEmptyString) {
-        table_name_->clear();
-      }
-    }
-    table_name_enabled_ = false;
-    table_name_height_ = 0;
-    table_name_border_enabled_ = false;
-    number_of_header_rows_ = 0u;
-    number_of_header_columns_ = 0u;
-    number_of_footer_rows_ = 0u;
-  }
-  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
-    header_rows_frozen_ = false;
-    header_columns_frozen_ = false;
-    number_of_hidden_rows_ = 0u;
-    number_of_hidden_columns_ = 0u;
-    number_of_user_hidden_rows_ = 0u;
-    number_of_user_hidden_columns_ = 0u;
-    number_of_filtered_rows_ = 0u;
-    default_row_height_ = 0;
-  }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
-    default_column_width_ = 0;
-    if (has_origin_offset()) {
-      if (origin_offset_ != NULL) origin_offset_->::TST::CellID::Clear();
-    }
-    preset_index_ = 0u;
-    repeating_header_rows_enabled_ = false;
-    repeating_header_columns_enabled_ = false;
-    style_apply_clears_all_ = false;
-    if (has_hidden_state_formula_owner_for_columns()) {
-      if (hidden_state_formula_owner_for_columns_ != NULL) hidden_state_formula_owner_for_columns_->::TSP::Reference::Clear();
-    }
-    if (has_hidden_state_formula_owner_for_rows()) {
-      if (hidden_state_formula_owner_for_rows_ != NULL) hidden_state_formula_owner_for_rows_->::TSP::Reference::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSD::DrawableArchive::Clear();
     }
-  }
-  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
-    if (has_filter_set()) {
-      if (filter_set_ != NULL) filter_set_->::TSP::Reference::Clear();
+    if (has_tablemodel()) {
+      if (tablemodel_ != NULL) tablemodel_->::TSP::Reference::Clear();
     }
-    if (has_conditional_style_formula_owner_id()) {
-      if (conditional_style_formula_owner_id_ != NULL) conditional_style_formula_owner_id_->::TSCE::CFUUIDArchive::Clear();
+    if (has_editingstate()) {
+      if (editingstate_ != NULL) editingstate_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableModelArchive::MergePartialFromCodedStream(
+bool TableInfoArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required string table_id = 1;
+      // required .TSD.DrawableArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_table_id()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->table_id().data(), this->table_id().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_table_style;
-        break;
-      }
-
-      // required .TSP.Reference table_style = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_style()));
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_data_store;
+        if (input->ExpectTag(18)) goto parse_tableModel;
         break;
       }
 
-      // required .TST.DataStore data_store = 4;
-      case 4: {
+      // required .TSP.Reference tableModel = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_data_store:
+         parse_tableModel:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_data_store()));
+               input, mutable_tablemodel()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_provider;
+        if (input->ExpectTag(26)) goto parse_editingState;
         break;
       }
 
-      // optional .TSP.Reference provider = 5;
-      case 5: {
+      // optional .TSP.Reference editingState = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_provider:
+         parse_editingState:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_provider()));
+               input, mutable_editingstate()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(48)) goto parse_number_of_rows;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // required uint32 number_of_rows = 6;
-      case 6: {
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_rows_)));
-          set_has_number_of_rows();
-        } else {
-          goto handle_uninterpreted;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
         }
-        if (input->ExpectTag(56)) goto parse_number_of_columns;
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
 
-      // required uint32 number_of_columns = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_columns:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_columns_)));
-          set_has_number_of_columns();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_table_name;
-        break;
-      }
+void TableInfoArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSD.DrawableArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
 
-      // required string table_name = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_name:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_table_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->table_name().data(), this->table_name().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(72)) goto parse_number_of_header_rows;
-        break;
-      }
+  // required .TSP.Reference tableModel = 2;
+  if (has_tablemodel()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->tablemodel(), output);
+  }
 
-      // optional uint32 number_of_header_rows = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_header_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_header_rows_)));
-          set_has_number_of_header_rows();
+  // optional .TSP.Reference editingState = 3;
+  if (has_editingstate()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->editingstate(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* TableInfoArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSD.DrawableArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSP.Reference tableModel = 2;
+  if (has_tablemodel()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->tablemodel(), target);
+  }
+
+  // optional .TSP.Reference editingState = 3;
+  if (has_editingstate()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->editingstate(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int TableInfoArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSD.DrawableArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference tableModel = 2;
+    if (has_tablemodel()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tablemodel());
+    }
+
+    // optional .TSP.Reference editingState = 3;
+    if (has_editingstate()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->editingstate());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableInfoArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TableInfoArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableInfoArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TableInfoArchive::MergeFrom(const TableInfoArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSD::DrawableArchive::MergeFrom(from.super());
+    }
+    if (from.has_tablemodel()) {
+      mutable_tablemodel()->::TSP::Reference::MergeFrom(from.tablemodel());
+    }
+    if (from.has_editingstate()) {
+      mutable_editingstate()->::TSP::Reference::MergeFrom(from.editingstate());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TableInfoArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TableInfoArchive::CopyFrom(const TableInfoArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TableInfoArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_tablemodel()) {
+    if (!this->tablemodel().IsInitialized()) return false;
+  }
+  if (has_editingstate()) {
+    if (!this->editingstate().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void TableInfoArchive::Swap(TableInfoArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(tablemodel_, other->tablemodel_);
+    std::swap(editingstate_, other->editingstate_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TableInfoArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TableInfoArchive_descriptor_;
+  metadata.reflection = TableInfoArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int EditingStateArchive::kEditingStorageFieldNumber;
+const int EditingStateArchive::kEditingCellFieldNumber;
+const int EditingStateArchive::kSelectionFieldNumber;
+const int EditingStateArchive::kLasteditingcellidFieldNumber;
+const int EditingStateArchive::kEditingcellidFieldNumber;
+const int EditingStateArchive::kDeprecatedSetupTextUndoRedoTransactionFieldNumber;
+const int EditingStateArchive::kCellWasEditedInCurrentSessionFieldNumber;
+#endif  // !_MSC_VER
+
+EditingStateArchive::EditingStateArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void EditingStateArchive::InitAsDefaultInstance() {
+  editingstorage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  editingcell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  lasteditingcellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
+  editingcellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
+  deprecated_setup_textundoredotransaction_ = const_cast< ::TSWP::UndoTransaction*>(&::TSWP::UndoTransaction::default_instance());
+}
+
+EditingStateArchive::EditingStateArchive(const EditingStateArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void EditingStateArchive::SharedCtor() {
+  _cached_size_ = 0;
+  editingstorage_ = NULL;
+  editingcell_ = NULL;
+  selection_ = NULL;
+  lasteditingcellid_ = NULL;
+  editingcellid_ = NULL;
+  deprecated_setup_textundoredotransaction_ = NULL;
+  cell_was_edited_in_current_session_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+EditingStateArchive::~EditingStateArchive() {
+  SharedDtor();
+}
+
+void EditingStateArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete editingstorage_;
+    delete editingcell_;
+    delete selection_;
+    delete lasteditingcellid_;
+    delete editingcellid_;
+    delete deprecated_setup_textundoredotransaction_;
+  }
+}
+
+void EditingStateArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* EditingStateArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return EditingStateArchive_descriptor_;
+}
+
+const EditingStateArchive& EditingStateArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+EditingStateArchive* EditingStateArchive::default_instance_ = NULL;
+
+EditingStateArchive* EditingStateArchive::New() const {
+  return new EditingStateArchive;
+}
+
+void EditingStateArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_editingstorage()) {
+      if (editingstorage_ != NULL) editingstorage_->::TSP::Reference::Clear();
+    }
+    if (has_editingcell()) {
+      if (editingcell_ != NULL) editingcell_->::TST::Cell::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    if (has_lasteditingcellid()) {
+      if (lasteditingcellid_ != NULL) lasteditingcellid_->::TST::CellID::Clear();
+    }
+    if (has_editingcellid()) {
+      if (editingcellid_ != NULL) editingcellid_->::TST::CellID::Clear();
+    }
+    if (has_deprecated_setup_textundoredotransaction()) {
+      if (deprecated_setup_textundoredotransaction_ != NULL) deprecated_setup_textundoredotransaction_->::TSWP::UndoTransaction::Clear();
+    }
+    cell_was_edited_in_current_session_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool EditingStateArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .TSP.Reference editingStorage = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_editingstorage()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_editingCell;
+        break;
+      }
+
+      // required .TST.Cell editingCell = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_editingCell:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_editingcell()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_selection;
+        break;
+      }
+
+      // optional .TST.SelectionArchive selection = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_lasteditingcellid;
+        break;
+      }
+
+      // optional .TST.CellID lasteditingcellid = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_lasteditingcellid:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_lasteditingcellid()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_editingcellid;
+        break;
+      }
+
+      // optional .TST.CellID editingcellid = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_editingcellid:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_editingcellid()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_deprecated_setup_textUndoRedoTransaction;
+        break;
+      }
+
+      // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_deprecated_setup_textUndoRedoTransaction:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_deprecated_setup_textundoredotransaction()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_cell_was_edited_in_current_session;
+        break;
+      }
+
+      // optional bool cell_was_edited_in_current_session = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_cell_was_edited_in_current_session:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &cell_was_edited_in_current_session_)));
+          set_has_cell_was_edited_in_current_session();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void EditingStateArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .TSP.Reference editingStorage = 1;
+  if (has_editingstorage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->editingstorage(), output);
+  }
+
+  // required .TST.Cell editingCell = 2;
+  if (has_editingcell()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->editingcell(), output);
+  }
+
+  // optional .TST.SelectionArchive selection = 3;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->selection(), output);
+  }
+
+  // optional .TST.CellID lasteditingcellid = 4;
+  if (has_lasteditingcellid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->lasteditingcellid(), output);
+  }
+
+  // optional .TST.CellID editingcellid = 5;
+  if (has_editingcellid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->editingcellid(), output);
+  }
+
+  // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
+  if (has_deprecated_setup_textundoredotransaction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->deprecated_setup_textundoredotransaction(), output);
+  }
+
+  // optional bool cell_was_edited_in_current_session = 7;
+  if (has_cell_was_edited_in_current_session()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->cell_was_edited_in_current_session(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* EditingStateArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .TSP.Reference editingStorage = 1;
+  if (has_editingstorage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->editingstorage(), target);
+  }
+
+  // required .TST.Cell editingCell = 2;
+  if (has_editingcell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->editingcell(), target);
+  }
+
+  // optional .TST.SelectionArchive selection = 3;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->selection(), target);
+  }
+
+  // optional .TST.CellID lasteditingcellid = 4;
+  if (has_lasteditingcellid()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->lasteditingcellid(), target);
+  }
+
+  // optional .TST.CellID editingcellid = 5;
+  if (has_editingcellid()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->editingcellid(), target);
+  }
+
+  // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
+  if (has_deprecated_setup_textundoredotransaction()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->deprecated_setup_textundoredotransaction(), target);
+  }
+
+  // optional bool cell_was_edited_in_current_session = 7;
+  if (has_cell_was_edited_in_current_session()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->cell_was_edited_in_current_session(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int EditingStateArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .TSP.Reference editingStorage = 1;
+    if (has_editingstorage()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->editingstorage());
+    }
+
+    // required .TST.Cell editingCell = 2;
+    if (has_editingcell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->editingcell());
+    }
+
+    // optional .TST.SelectionArchive selection = 3;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // optional .TST.CellID lasteditingcellid = 4;
+    if (has_lasteditingcellid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->lasteditingcellid());
+    }
+
+    // optional .TST.CellID editingcellid = 5;
+    if (has_editingcellid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->editingcellid());
+    }
+
+    // optional .TSWP.UndoTransaction deprecated_setup_textUndoRedoTransaction = 6;
+    if (has_deprecated_setup_textundoredotransaction()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->deprecated_setup_textundoredotransaction());
+    }
+
+    // optional bool cell_was_edited_in_current_session = 7;
+    if (has_cell_was_edited_in_current_session()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void EditingStateArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const EditingStateArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const EditingStateArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void EditingStateArchive::MergeFrom(const EditingStateArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_editingstorage()) {
+      mutable_editingstorage()->::TSP::Reference::MergeFrom(from.editingstorage());
+    }
+    if (from.has_editingcell()) {
+      mutable_editingcell()->::TST::Cell::MergeFrom(from.editingcell());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_lasteditingcellid()) {
+      mutable_lasteditingcellid()->::TST::CellID::MergeFrom(from.lasteditingcellid());
+    }
+    if (from.has_editingcellid()) {
+      mutable_editingcellid()->::TST::CellID::MergeFrom(from.editingcellid());
+    }
+    if (from.has_deprecated_setup_textundoredotransaction()) {
+      mutable_deprecated_setup_textundoredotransaction()->::TSWP::UndoTransaction::MergeFrom(from.deprecated_setup_textundoredotransaction());
+    }
+    if (from.has_cell_was_edited_in_current_session()) {
+      set_cell_was_edited_in_current_session(from.cell_was_edited_in_current_session());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void EditingStateArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void EditingStateArchive::CopyFrom(const EditingStateArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool EditingStateArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000002) != 0x00000002) return false;
+
+  if (has_editingstorage()) {
+    if (!this->editingstorage().IsInitialized()) return false;
+  }
+  if (has_editingcell()) {
+    if (!this->editingcell().IsInitialized()) return false;
+  }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_lasteditingcellid()) {
+    if (!this->lasteditingcellid().IsInitialized()) return false;
+  }
+  if (has_editingcellid()) {
+    if (!this->editingcellid().IsInitialized()) return false;
+  }
+  if (has_deprecated_setup_textundoredotransaction()) {
+    if (!this->deprecated_setup_textundoredotransaction().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void EditingStateArchive::Swap(EditingStateArchive* other) {
+  if (other != this) {
+    std::swap(editingstorage_, other->editingstorage_);
+    std::swap(editingcell_, other->editingcell_);
+    std::swap(selection_, other->selection_);
+    std::swap(lasteditingcellid_, other->lasteditingcellid_);
+    std::swap(editingcellid_, other->editingcellid_);
+    std::swap(deprecated_setup_textundoredotransaction_, other->deprecated_setup_textundoredotransaction_);
+    std::swap(cell_was_edited_in_current_session_, other->cell_was_edited_in_current_session_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata EditingStateArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = EditingStateArchive_descriptor_;
+  metadata.reflection = EditingStateArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int WPTableInfoArchive::kSuperFieldNumber;
+const int WPTableInfoArchive::kStorageFieldNumber;
+#endif  // !_MSC_VER
+
+WPTableInfoArchive::WPTableInfoArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void WPTableInfoArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableInfoArchive*>(&::TST::TableInfoArchive::default_instance());
+  storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+WPTableInfoArchive::WPTableInfoArchive(const WPTableInfoArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void WPTableInfoArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  storage_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+WPTableInfoArchive::~WPTableInfoArchive() {
+  SharedDtor();
+}
+
+void WPTableInfoArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete storage_;
+  }
+}
+
+void WPTableInfoArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* WPTableInfoArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return WPTableInfoArchive_descriptor_;
+}
+
+const WPTableInfoArchive& WPTableInfoArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+WPTableInfoArchive* WPTableInfoArchive::default_instance_ = NULL;
+
+WPTableInfoArchive* WPTableInfoArchive::New() const {
+  return new WPTableInfoArchive;
+}
+
+void WPTableInfoArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableInfoArchive::Clear();
+    }
+    if (has_storage()) {
+      if (storage_ != NULL) storage_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool WPTableInfoArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableInfoArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_storage;
+        break;
+      }
+
+      // optional .TSP.Reference storage = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_storage:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_storage()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void WPTableInfoArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableInfoArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSP.Reference storage = 2;
+  if (has_storage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->storage(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* WPTableInfoArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableInfoArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSP.Reference storage = 2;
+  if (has_storage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->storage(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int WPTableInfoArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableInfoArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSP.Reference storage = 2;
+    if (has_storage()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->storage());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void WPTableInfoArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const WPTableInfoArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const WPTableInfoArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void WPTableInfoArchive::MergeFrom(const WPTableInfoArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableInfoArchive::MergeFrom(from.super());
+    }
+    if (from.has_storage()) {
+      mutable_storage()->::TSP::Reference::MergeFrom(from.storage());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void WPTableInfoArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void WPTableInfoArchive::CopyFrom(const WPTableInfoArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool WPTableInfoArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_storage()) {
+    if (!this->storage().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void WPTableInfoArchive::Swap(WPTableInfoArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(storage_, other->storage_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata WPTableInfoArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = WPTableInfoArchive_descriptor_;
+  metadata.reflection = WPTableInfoArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int TableStyleNetworkArchive::kTableStyleFieldNumber;
+const int TableStyleNetworkArchive::kBodyTextStyleFieldNumber;
+const int TableStyleNetworkArchive::kHeaderRowTextStyleFieldNumber;
+const int TableStyleNetworkArchive::kHeaderColumnTextStyleFieldNumber;
+const int TableStyleNetworkArchive::kFooterRowTextStyleFieldNumber;
+const int TableStyleNetworkArchive::kBodyCellStyleFieldNumber;
+const int TableStyleNetworkArchive::kHeaderRowStyleFieldNumber;
+const int TableStyleNetworkArchive::kHeaderColumnStyleFieldNumber;
+const int TableStyleNetworkArchive::kFooterRowStyleFieldNumber;
+const int TableStyleNetworkArchive::kTableNameStyleFieldNumber;
+const int TableStyleNetworkArchive::kTableNameShapeStyleFieldNumber;
+const int TableStyleNetworkArchive::kPresetIndexFieldNumber;
+#endif  // !_MSC_VER
+
+TableStyleNetworkArchive::TableStyleNetworkArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void TableStyleNetworkArchive::InitAsDefaultInstance() {
+  table_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  body_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_column_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  footer_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  body_cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_column_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  footer_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  table_name_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  table_name_shape_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+TableStyleNetworkArchive::TableStyleNetworkArchive(const TableStyleNetworkArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void TableStyleNetworkArchive::SharedCtor() {
+  _cached_size_ = 0;
+  table_style_ = NULL;
+  body_text_style_ = NULL;
+  header_row_text_style_ = NULL;
+  header_column_text_style_ = NULL;
+  footer_row_text_style_ = NULL;
+  body_cell_style_ = NULL;
+  header_row_style_ = NULL;
+  header_column_style_ = NULL;
+  footer_row_style_ = NULL;
+  table_name_style_ = NULL;
+  table_name_shape_style_ = NULL;
+  preset_index_ = 0u;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+TableStyleNetworkArchive::~TableStyleNetworkArchive() {
+  SharedDtor();
+}
+
+void TableStyleNetworkArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete table_style_;
+    delete body_text_style_;
+    delete header_row_text_style_;
+    delete header_column_text_style_;
+    delete footer_row_text_style_;
+    delete body_cell_style_;
+    delete header_row_style_;
+    delete header_column_style_;
+    delete footer_row_style_;
+    delete table_name_style_;
+    delete table_name_shape_style_;
+  }
+}
+
+void TableStyleNetworkArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* TableStyleNetworkArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableStyleNetworkArchive_descriptor_;
+}
+
+const TableStyleNetworkArchive& TableStyleNetworkArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+TableStyleNetworkArchive* TableStyleNetworkArchive::default_instance_ = NULL;
+
+TableStyleNetworkArchive* TableStyleNetworkArchive::New() const {
+  return new TableStyleNetworkArchive;
+}
+
+void TableStyleNetworkArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_table_style()) {
+      if (table_style_ != NULL) table_style_->::TSP::Reference::Clear();
+    }
+    if (has_body_text_style()) {
+      if (body_text_style_ != NULL) body_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_row_text_style()) {
+      if (header_row_text_style_ != NULL) header_row_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_column_text_style()) {
+      if (header_column_text_style_ != NULL) header_column_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_footer_row_text_style()) {
+      if (footer_row_text_style_ != NULL) footer_row_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_body_cell_style()) {
+      if (body_cell_style_ != NULL) body_cell_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_row_style()) {
+      if (header_row_style_ != NULL) header_row_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_column_style()) {
+      if (header_column_style_ != NULL) header_column_style_->::TSP::Reference::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_footer_row_style()) {
+      if (footer_row_style_ != NULL) footer_row_style_->::TSP::Reference::Clear();
+    }
+    if (has_table_name_style()) {
+      if (table_name_style_ != NULL) table_name_style_->::TSP::Reference::Clear();
+    }
+    if (has_table_name_shape_style()) {
+      if (table_name_shape_style_ != NULL) table_name_shape_style_->::TSP::Reference::Clear();
+    }
+    preset_index_ = 0u;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool TableStyleNetworkArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSP.Reference body_text_style = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_body_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_header_row_text_style;
+        break;
+      }
+
+      // required .TSP.Reference header_row_text_style = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_row_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_row_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_header_column_text_style;
+        break;
+      }
+
+      // required .TSP.Reference header_column_text_style = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_column_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_column_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_footer_row_text_style;
+        break;
+      }
+
+      // required .TSP.Reference footer_row_text_style = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_footer_row_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_footer_row_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_body_cell_style;
+        break;
+      }
+
+      // required .TSP.Reference body_cell_style = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_body_cell_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_body_cell_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_header_row_style;
+        break;
+      }
+
+      // required .TSP.Reference header_row_style = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_row_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_row_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_header_column_style;
+        break;
+      }
+
+      // required .TSP.Reference header_column_style = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_column_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_column_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_footer_row_style;
+        break;
+      }
+
+      // required .TSP.Reference footer_row_style = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_footer_row_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_footer_row_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_table_style;
+        break;
+      }
+
+      // required .TSP.Reference table_style = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(82)) goto parse_table_name_style;
+        break;
+      }
+
+      // optional .TSP.Reference table_name_style = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_name_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_name_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(90)) goto parse_table_name_shape_style;
+        break;
+      }
+
+      // optional .TSP.Reference table_name_shape_style = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_name_shape_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_name_shape_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(96)) goto parse_preset_index;
+        break;
+      }
+
+      // optional uint32 preset_index = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_preset_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &preset_index_)));
+          set_has_preset_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void TableStyleNetworkArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSP.Reference body_text_style = 1;
+  if (has_body_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->body_text_style(), output);
+  }
+
+  // required .TSP.Reference header_row_text_style = 2;
+  if (has_header_row_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->header_row_text_style(), output);
+  }
+
+  // required .TSP.Reference header_column_text_style = 3;
+  if (has_header_column_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->header_column_text_style(), output);
+  }
+
+  // required .TSP.Reference footer_row_text_style = 4;
+  if (has_footer_row_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->footer_row_text_style(), output);
+  }
+
+  // required .TSP.Reference body_cell_style = 5;
+  if (has_body_cell_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->body_cell_style(), output);
+  }
+
+  // required .TSP.Reference header_row_style = 6;
+  if (has_header_row_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->header_row_style(), output);
+  }
+
+  // required .TSP.Reference header_column_style = 7;
+  if (has_header_column_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->header_column_style(), output);
+  }
+
+  // required .TSP.Reference footer_row_style = 8;
+  if (has_footer_row_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->footer_row_style(), output);
+  }
+
+  // required .TSP.Reference table_style = 9;
+  if (has_table_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->table_style(), output);
+  }
+
+  // optional .TSP.Reference table_name_style = 10;
+  if (has_table_name_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      10, this->table_name_style(), output);
+  }
+
+  // optional .TSP.Reference table_name_shape_style = 11;
+  if (has_table_name_shape_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      11, this->table_name_shape_style(), output);
+  }
+
+  // optional uint32 preset_index = 12;
+  if (has_preset_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(12, this->preset_index(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* TableStyleNetworkArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSP.Reference body_text_style = 1;
+  if (has_body_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->body_text_style(), target);
+  }
+
+  // required .TSP.Reference header_row_text_style = 2;
+  if (has_header_row_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->header_row_text_style(), target);
+  }
+
+  // required .TSP.Reference header_column_text_style = 3;
+  if (has_header_column_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->header_column_text_style(), target);
+  }
+
+  // required .TSP.Reference footer_row_text_style = 4;
+  if (has_footer_row_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->footer_row_text_style(), target);
+  }
+
+  // required .TSP.Reference body_cell_style = 5;
+  if (has_body_cell_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->body_cell_style(), target);
+  }
+
+  // required .TSP.Reference header_row_style = 6;
+  if (has_header_row_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->header_row_style(), target);
+  }
+
+  // required .TSP.Reference header_column_style = 7;
+  if (has_header_column_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->header_column_style(), target);
+  }
+
+  // required .TSP.Reference footer_row_style = 8;
+  if (has_footer_row_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->footer_row_style(), target);
+  }
+
+  // required .TSP.Reference table_style = 9;
+  if (has_table_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->table_style(), target);
+  }
+
+  // optional .TSP.Reference table_name_style = 10;
+  if (has_table_name_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        10, this->table_name_style(), target);
+  }
+
+  // optional .TSP.Reference table_name_shape_style = 11;
+  if (has_table_name_shape_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        11, this->table_name_shape_style(), target);
+  }
+
+  // optional uint32 preset_index = 12;
+  if (has_preset_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(12, this->preset_index(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int TableStyleNetworkArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSP.Reference table_style = 9;
+    if (has_table_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_style());
+    }
+
+    // required .TSP.Reference body_text_style = 1;
+    if (has_body_text_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->body_text_style());
+    }
+
+    // required .TSP.Reference header_row_text_style = 2;
+    if (has_header_row_text_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_row_text_style());
+    }
+
+    // required .TSP.Reference header_column_text_style = 3;
+    if (has_header_column_text_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_column_text_style());
+    }
+
+    // required .TSP.Reference footer_row_text_style = 4;
+    if (has_footer_row_text_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->footer_row_text_style());
+    }
+
+    // required .TSP.Reference body_cell_style = 5;
+    if (has_body_cell_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->body_cell_style());
+    }
+
+    // required .TSP.Reference header_row_style = 6;
+    if (has_header_row_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_row_style());
+    }
+
+    // required .TSP.Reference header_column_style = 7;
+    if (has_header_column_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_column_style());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // required .TSP.Reference footer_row_style = 8;
+    if (has_footer_row_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->footer_row_style());
+    }
+
+    // optional .TSP.Reference table_name_style = 10;
+    if (has_table_name_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_name_style());
+    }
+
+    // optional .TSP.Reference table_name_shape_style = 11;
+    if (has_table_name_shape_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_name_shape_style());
+    }
+
+    // optional uint32 preset_index = 12;
+    if (has_preset_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->preset_index());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableStyleNetworkArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TableStyleNetworkArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableStyleNetworkArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TableStyleNetworkArchive::MergeFrom(const TableStyleNetworkArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_table_style()) {
+      mutable_table_style()->::TSP::Reference::MergeFrom(from.table_style());
+    }
+    if (from.has_body_text_style()) {
+      mutable_body_text_style()->::TSP::Reference::MergeFrom(from.body_text_style());
+    }
+    if (from.has_header_row_text_style()) {
+      mutable_header_row_text_style()->::TSP::Reference::MergeFrom(from.header_row_text_style());
+    }
+    if (from.has_header_column_text_style()) {
+      mutable_header_column_text_style()->::TSP::Reference::MergeFrom(from.header_column_text_style());
+    }
+    if (from.has_footer_row_text_style()) {
+      mutable_footer_row_text_style()->::TSP::Reference::MergeFrom(from.footer_row_text_style());
+    }
+    if (from.has_body_cell_style()) {
+      mutable_body_cell_style()->::TSP::Reference::MergeFrom(from.body_cell_style());
+    }
+    if (from.has_header_row_style()) {
+      mutable_header_row_style()->::TSP::Reference::MergeFrom(from.header_row_style());
+    }
+    if (from.has_header_column_style()) {
+      mutable_header_column_style()->::TSP::Reference::MergeFrom(from.header_column_style());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_footer_row_style()) {
+      mutable_footer_row_style()->::TSP::Reference::MergeFrom(from.footer_row_style());
+    }
+    if (from.has_table_name_style()) {
+      mutable_table_name_style()->::TSP::Reference::MergeFrom(from.table_name_style());
+    }
+    if (from.has_table_name_shape_style()) {
+      mutable_table_name_shape_style()->::TSP::Reference::MergeFrom(from.table_name_shape_style());
+    }
+    if (from.has_preset_index()) {
+      set_preset_index(from.preset_index());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TableStyleNetworkArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TableStyleNetworkArchive::CopyFrom(const TableStyleNetworkArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TableStyleNetworkArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x000001ff) != 0x000001ff) return false;
+
+  if (has_table_style()) {
+    if (!this->table_style().IsInitialized()) return false;
+  }
+  if (has_body_text_style()) {
+    if (!this->body_text_style().IsInitialized()) return false;
+  }
+  if (has_header_row_text_style()) {
+    if (!this->header_row_text_style().IsInitialized()) return false;
+  }
+  if (has_header_column_text_style()) {
+    if (!this->header_column_text_style().IsInitialized()) return false;
+  }
+  if (has_footer_row_text_style()) {
+    if (!this->footer_row_text_style().IsInitialized()) return false;
+  }
+  if (has_body_cell_style()) {
+    if (!this->body_cell_style().IsInitialized()) return false;
+  }
+  if (has_header_row_style()) {
+    if (!this->header_row_style().IsInitialized()) return false;
+  }
+  if (has_header_column_style()) {
+    if (!this->header_column_style().IsInitialized()) return false;
+  }
+  if (has_footer_row_style()) {
+    if (!this->footer_row_style().IsInitialized()) return false;
+  }
+  if (has_table_name_style()) {
+    if (!this->table_name_style().IsInitialized()) return false;
+  }
+  if (has_table_name_shape_style()) {
+    if (!this->table_name_shape_style().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void TableStyleNetworkArchive::Swap(TableStyleNetworkArchive* other) {
+  if (other != this) {
+    std::swap(table_style_, other->table_style_);
+    std::swap(body_text_style_, other->body_text_style_);
+    std::swap(header_row_text_style_, other->header_row_text_style_);
+    std::swap(header_column_text_style_, other->header_column_text_style_);
+    std::swap(footer_row_text_style_, other->footer_row_text_style_);
+    std::swap(body_cell_style_, other->body_cell_style_);
+    std::swap(header_row_style_, other->header_row_style_);
+    std::swap(header_column_style_, other->header_column_style_);
+    std::swap(footer_row_style_, other->footer_row_style_);
+    std::swap(table_name_style_, other->table_name_style_);
+    std::swap(table_name_shape_style_, other->table_name_shape_style_);
+    std::swap(preset_index_, other->preset_index_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TableStyleNetworkArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TableStyleNetworkArchive_descriptor_;
+  metadata.reflection = TableStyleNetworkArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+const ::google::protobuf::EnumDescriptor* TableSortOrderArchive_SortType_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableSortOrderArchive_SortType_descriptor_;
+}
+bool TableSortOrderArchive_SortType_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#ifndef _MSC_VER
+const TableSortOrderArchive_SortType TableSortOrderArchive::entire_table;
+const TableSortOrderArchive_SortType TableSortOrderArchive::row_range;
+const TableSortOrderArchive_SortType TableSortOrderArchive::SortType_MIN;
+const TableSortOrderArchive_SortType TableSortOrderArchive::SortType_MAX;
+const int TableSortOrderArchive::SortType_ARRAYSIZE;
+#endif  // _MSC_VER
+const ::google::protobuf::EnumDescriptor* TableSortOrderArchive_SortRuleArchive_Direction_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableSortOrderArchive_SortRuleArchive_Direction_descriptor_;
+}
+bool TableSortOrderArchive_SortRuleArchive_Direction_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#ifndef _MSC_VER
+const TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive::ascending;
+const TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive::descending;
+const TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive::Direction_MIN;
+const TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive::Direction_MAX;
+const int TableSortOrderArchive_SortRuleArchive::Direction_ARRAYSIZE;
+#endif  // _MSC_VER
+#ifndef _MSC_VER
+const int TableSortOrderArchive_SortRuleArchive::kColumnFieldNumber;
+const int TableSortOrderArchive_SortRuleArchive::kDirectionFieldNumber;
+#endif  // !_MSC_VER
+
+TableSortOrderArchive_SortRuleArchive::TableSortOrderArchive_SortRuleArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void TableSortOrderArchive_SortRuleArchive::InitAsDefaultInstance() {
+}
+
+TableSortOrderArchive_SortRuleArchive::TableSortOrderArchive_SortRuleArchive(const TableSortOrderArchive_SortRuleArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void TableSortOrderArchive_SortRuleArchive::SharedCtor() {
+  _cached_size_ = 0;
+  column_ = 0u;
+  direction_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+TableSortOrderArchive_SortRuleArchive::~TableSortOrderArchive_SortRuleArchive() {
+  SharedDtor();
+}
+
+void TableSortOrderArchive_SortRuleArchive::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void TableSortOrderArchive_SortRuleArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* TableSortOrderArchive_SortRuleArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableSortOrderArchive_SortRuleArchive_descriptor_;
+}
+
+const TableSortOrderArchive_SortRuleArchive& TableSortOrderArchive_SortRuleArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+TableSortOrderArchive_SortRuleArchive* TableSortOrderArchive_SortRuleArchive::default_instance_ = NULL;
+
+TableSortOrderArchive_SortRuleArchive* TableSortOrderArchive_SortRuleArchive::New() const {
+  return new TableSortOrderArchive_SortRuleArchive;
+}
+
+void TableSortOrderArchive_SortRuleArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    column_ = 0u;
+    direction_ = 0;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool TableSortOrderArchive_SortRuleArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required uint32 column = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &column_)));
+          set_has_column();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_direction;
+        break;
+      }
+
+      // required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_direction:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::TableSortOrderArchive_SortRuleArchive_Direction_IsValid(value)) {
+            set_direction(static_cast< ::TST::TableSortOrderArchive_SortRuleArchive_Direction >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void TableSortOrderArchive_SortRuleArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required uint32 column = 1;
+  if (has_column()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->column(), output);
+  }
+
+  // required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+  if (has_direction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->direction(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* TableSortOrderArchive_SortRuleArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required uint32 column = 1;
+  if (has_column()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->column(), target);
+  }
+
+  // required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+  if (has_direction()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->direction(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int TableSortOrderArchive_SortRuleArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required uint32 column = 1;
+    if (has_column()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->column());
+    }
+
+    // required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+    if (has_direction()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->direction());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableSortOrderArchive_SortRuleArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TableSortOrderArchive_SortRuleArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableSortOrderArchive_SortRuleArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TableSortOrderArchive_SortRuleArchive::MergeFrom(const TableSortOrderArchive_SortRuleArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_column()) {
+      set_column(from.column());
+    }
+    if (from.has_direction()) {
+      set_direction(from.direction());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TableSortOrderArchive_SortRuleArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TableSortOrderArchive_SortRuleArchive::CopyFrom(const TableSortOrderArchive_SortRuleArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TableSortOrderArchive_SortRuleArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  return true;
+}
+
+void TableSortOrderArchive_SortRuleArchive::Swap(TableSortOrderArchive_SortRuleArchive* other) {
+  if (other != this) {
+    std::swap(column_, other->column_);
+    std::swap(direction_, other->direction_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TableSortOrderArchive_SortRuleArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TableSortOrderArchive_SortRuleArchive_descriptor_;
+  metadata.reflection = TableSortOrderArchive_SortRuleArchive_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int TableSortOrderArchive::kTypeFieldNumber;
+const int TableSortOrderArchive::kRulesFieldNumber;
+#endif  // !_MSC_VER
+
+TableSortOrderArchive::TableSortOrderArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void TableSortOrderArchive::InitAsDefaultInstance() {
+}
+
+TableSortOrderArchive::TableSortOrderArchive(const TableSortOrderArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void TableSortOrderArchive::SharedCtor() {
+  _cached_size_ = 0;
+  type_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+TableSortOrderArchive::~TableSortOrderArchive() {
+  SharedDtor();
+}
+
+void TableSortOrderArchive::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void TableSortOrderArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* TableSortOrderArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableSortOrderArchive_descriptor_;
+}
+
+const TableSortOrderArchive& TableSortOrderArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+TableSortOrderArchive* TableSortOrderArchive::default_instance_ = NULL;
+
+TableSortOrderArchive* TableSortOrderArchive::New() const {
+  return new TableSortOrderArchive;
+}
+
+void TableSortOrderArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    type_ = 0;
+  }
+  rules_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool TableSortOrderArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableSortOrderArchive.SortType type = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::TableSortOrderArchive_SortType_IsValid(value)) {
+            set_type(static_cast< ::TST::TableSortOrderArchive_SortType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_rules;
+        break;
+      }
+
+      // repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_rules:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_rules()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_rules;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void TableSortOrderArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableSortOrderArchive.SortType type = 1;
+  if (has_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->type(), output);
+  }
+
+  // repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+  for (int i = 0; i < this->rules_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->rules(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* TableSortOrderArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableSortOrderArchive.SortType type = 1;
+  if (has_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->type(), target);
+  }
+
+  // repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+  for (int i = 0; i < this->rules_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->rules(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int TableSortOrderArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableSortOrderArchive.SortType type = 1;
+    if (has_type()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
+    }
+
+  }
+  // repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+  total_size += 1 * this->rules_size();
+  for (int i = 0; i < this->rules_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->rules(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableSortOrderArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TableSortOrderArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableSortOrderArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TableSortOrderArchive::MergeFrom(const TableSortOrderArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  rules_.MergeFrom(from.rules_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_type()) {
+      set_type(from.type());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TableSortOrderArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TableSortOrderArchive::CopyFrom(const TableSortOrderArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TableSortOrderArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  for (int i = 0; i < rules_size(); i++) {
+    if (!this->rules(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void TableSortOrderArchive::Swap(TableSortOrderArchive* other) {
+  if (other != this) {
+    std::swap(type_, other->type_);
+    rules_.Swap(&other->rules_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TableSortOrderArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TableSortOrderArchive_descriptor_;
+  metadata.reflection = TableSortOrderArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int SortRuleReferenceTrackerArchive::kReferenceTrackerFieldNumber;
+#endif  // !_MSC_VER
+
+SortRuleReferenceTrackerArchive::SortRuleReferenceTrackerArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void SortRuleReferenceTrackerArchive::InitAsDefaultInstance() {
+  reference_tracker_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+SortRuleReferenceTrackerArchive::SortRuleReferenceTrackerArchive(const SortRuleReferenceTrackerArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void SortRuleReferenceTrackerArchive::SharedCtor() {
+  _cached_size_ = 0;
+  reference_tracker_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+SortRuleReferenceTrackerArchive::~SortRuleReferenceTrackerArchive() {
+  SharedDtor();
+}
+
+void SortRuleReferenceTrackerArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete reference_tracker_;
+  }
+}
+
+void SortRuleReferenceTrackerArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* SortRuleReferenceTrackerArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return SortRuleReferenceTrackerArchive_descriptor_;
+}
+
+const SortRuleReferenceTrackerArchive& SortRuleReferenceTrackerArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+SortRuleReferenceTrackerArchive* SortRuleReferenceTrackerArchive::default_instance_ = NULL;
+
+SortRuleReferenceTrackerArchive* SortRuleReferenceTrackerArchive::New() const {
+  return new SortRuleReferenceTrackerArchive;
+}
+
+void SortRuleReferenceTrackerArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_reference_tracker()) {
+      if (reference_tracker_ != NULL) reference_tracker_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool SortRuleReferenceTrackerArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSP.Reference reference_tracker = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_reference_tracker()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void SortRuleReferenceTrackerArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSP.Reference reference_tracker = 1;
+  if (has_reference_tracker()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->reference_tracker(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* SortRuleReferenceTrackerArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSP.Reference reference_tracker = 1;
+  if (has_reference_tracker()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->reference_tracker(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int SortRuleReferenceTrackerArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSP.Reference reference_tracker = 1;
+    if (has_reference_tracker()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->reference_tracker());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void SortRuleReferenceTrackerArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const SortRuleReferenceTrackerArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const SortRuleReferenceTrackerArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void SortRuleReferenceTrackerArchive::MergeFrom(const SortRuleReferenceTrackerArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_reference_tracker()) {
+      mutable_reference_tracker()->::TSP::Reference::MergeFrom(from.reference_tracker());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void SortRuleReferenceTrackerArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void SortRuleReferenceTrackerArchive::CopyFrom(const SortRuleReferenceTrackerArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool SortRuleReferenceTrackerArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_reference_tracker()) {
+    if (!this->reference_tracker().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void SortRuleReferenceTrackerArchive::Swap(SortRuleReferenceTrackerArchive* other) {
+  if (other != this) {
+    std::swap(reference_tracker_, other->reference_tracker_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata SortRuleReferenceTrackerArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = SortRuleReferenceTrackerArchive_descriptor_;
+  metadata.reflection = SortRuleReferenceTrackerArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int TableModelArchive::kTableIdFieldNumber;
+const int TableModelArchive::kFromTableIdFieldNumber;
+const int TableModelArchive::kTableStyleFieldNumber;
+const int TableModelArchive::kBodyTextStyleFieldNumber;
+const int TableModelArchive::kHeaderRowTextStyleFieldNumber;
+const int TableModelArchive::kHeaderColumnTextStyleFieldNumber;
+const int TableModelArchive::kFooterRowTextStyleFieldNumber;
+const int TableModelArchive::kBodyCellStyleFieldNumber;
+const int TableModelArchive::kHeaderRowStyleFieldNumber;
+const int TableModelArchive::kHeaderColumnStyleFieldNumber;
+const int TableModelArchive::kFooterRowStyleFieldNumber;
+const int TableModelArchive::kTableNameStyleFieldNumber;
+const int TableModelArchive::kTableNameShapeStyleFieldNumber;
+const int TableModelArchive::kDataStoreFieldNumber;
+const int TableModelArchive::kProviderFieldNumber;
+const int TableModelArchive::kNumberOfRowsFieldNumber;
+const int TableModelArchive::kNumberOfColumnsFieldNumber;
+const int TableModelArchive::kTableNameFieldNumber;
+const int TableModelArchive::kTableNameEnabledFieldNumber;
+const int TableModelArchive::kTableNameHeightFieldNumber;
+const int TableModelArchive::kTableNameBorderEnabledFieldNumber;
+const int TableModelArchive::kNumberOfHeaderRowsFieldNumber;
+const int TableModelArchive::kNumberOfHeaderColumnsFieldNumber;
+const int TableModelArchive::kNumberOfFooterRowsFieldNumber;
+const int TableModelArchive::kHeaderRowsFrozenFieldNumber;
+const int TableModelArchive::kHeaderColumnsFrozenFieldNumber;
+const int TableModelArchive::kNumberOfHiddenRowsFieldNumber;
+const int TableModelArchive::kNumberOfHiddenColumnsFieldNumber;
+const int TableModelArchive::kNumberOfUserHiddenRowsFieldNumber;
+const int TableModelArchive::kNumberOfUserHiddenColumnsFieldNumber;
+const int TableModelArchive::kNumberOfFilteredRowsFieldNumber;
+const int TableModelArchive::kDefaultRowHeightFieldNumber;
+const int TableModelArchive::kDefaultColumnWidthFieldNumber;
+const int TableModelArchive::kOriginOffsetFieldNumber;
+const int TableModelArchive::kPresetIndexFieldNumber;
+const int TableModelArchive::kRepeatingHeaderRowsEnabledFieldNumber;
+const int TableModelArchive::kRepeatingHeaderColumnsEnabledFieldNumber;
+const int TableModelArchive::kStyleApplyClearsAllFieldNumber;
+const int TableModelArchive::kHiddenStateFormulaOwnerForColumnsFieldNumber;
+const int TableModelArchive::kHiddenStateFormulaOwnerForRowsFieldNumber;
+const int TableModelArchive::kFilterSetFieldNumber;
+const int TableModelArchive::kSortOrderFieldNumber;
+const int TableModelArchive::kConditionalStyleFormulaOwnerIdFieldNumber;
+const int TableModelArchive::kSortRuleReferenceTrackerFieldNumber;
+#endif  // !_MSC_VER
+
+TableModelArchive::TableModelArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void TableModelArchive::InitAsDefaultInstance() {
+  table_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  body_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_column_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  footer_row_text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  body_cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  header_column_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  footer_row_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  table_name_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  table_name_shape_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  data_store_ = const_cast< ::TST::DataStore*>(&::TST::DataStore::default_instance());
+  provider_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  origin_offset_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
+  hidden_state_formula_owner_for_columns_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  hidden_state_formula_owner_for_rows_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  filter_set_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
+  conditional_style_formula_owner_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
+  sort_rule_reference_tracker_ = const_cast< ::TST::SortRuleReferenceTrackerArchive*>(&::TST::SortRuleReferenceTrackerArchive::default_instance());
+}
+
+TableModelArchive::TableModelArchive(const TableModelArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void TableModelArchive::SharedCtor() {
+  _cached_size_ = 0;
+  table_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  from_table_id_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  table_style_ = NULL;
+  body_text_style_ = NULL;
+  header_row_text_style_ = NULL;
+  header_column_text_style_ = NULL;
+  footer_row_text_style_ = NULL;
+  body_cell_style_ = NULL;
+  header_row_style_ = NULL;
+  header_column_style_ = NULL;
+  footer_row_style_ = NULL;
+  table_name_style_ = NULL;
+  table_name_shape_style_ = NULL;
+  data_store_ = NULL;
+  provider_ = NULL;
+  number_of_rows_ = 0u;
+  number_of_columns_ = 0u;
+  table_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  table_name_enabled_ = false;
+  table_name_height_ = 0;
+  table_name_border_enabled_ = false;
+  number_of_header_rows_ = 0u;
+  number_of_header_columns_ = 0u;
+  number_of_footer_rows_ = 0u;
+  header_rows_frozen_ = false;
+  header_columns_frozen_ = false;
+  number_of_hidden_rows_ = 0u;
+  number_of_hidden_columns_ = 0u;
+  number_of_user_hidden_rows_ = 0u;
+  number_of_user_hidden_columns_ = 0u;
+  number_of_filtered_rows_ = 0u;
+  default_row_height_ = 0;
+  default_column_width_ = 0;
+  origin_offset_ = NULL;
+  preset_index_ = 0u;
+  repeating_header_rows_enabled_ = false;
+  repeating_header_columns_enabled_ = false;
+  style_apply_clears_all_ = false;
+  hidden_state_formula_owner_for_columns_ = NULL;
+  hidden_state_formula_owner_for_rows_ = NULL;
+  filter_set_ = NULL;
+  sort_order_ = NULL;
+  conditional_style_formula_owner_id_ = NULL;
+  sort_rule_reference_tracker_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+TableModelArchive::~TableModelArchive() {
+  SharedDtor();
+}
+
+void TableModelArchive::SharedDtor() {
+  if (table_id_ != &::google::protobuf::internal::kEmptyString) {
+    delete table_id_;
+  }
+  if (from_table_id_ != &::google::protobuf::internal::kEmptyString) {
+    delete from_table_id_;
+  }
+  if (table_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete table_name_;
+  }
+  if (this != default_instance_) {
+    delete table_style_;
+    delete body_text_style_;
+    delete header_row_text_style_;
+    delete header_column_text_style_;
+    delete footer_row_text_style_;
+    delete body_cell_style_;
+    delete header_row_style_;
+    delete header_column_style_;
+    delete footer_row_style_;
+    delete table_name_style_;
+    delete table_name_shape_style_;
+    delete data_store_;
+    delete provider_;
+    delete origin_offset_;
+    delete hidden_state_formula_owner_for_columns_;
+    delete hidden_state_formula_owner_for_rows_;
+    delete filter_set_;
+    delete sort_order_;
+    delete conditional_style_formula_owner_id_;
+    delete sort_rule_reference_tracker_;
+  }
+}
+
+void TableModelArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* TableModelArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TableModelArchive_descriptor_;
+}
+
+const TableModelArchive& TableModelArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+TableModelArchive* TableModelArchive::default_instance_ = NULL;
+
+TableModelArchive* TableModelArchive::New() const {
+  return new TableModelArchive;
+}
+
+void TableModelArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_table_id()) {
+      if (table_id_ != &::google::protobuf::internal::kEmptyString) {
+        table_id_->clear();
+      }
+    }
+    if (has_from_table_id()) {
+      if (from_table_id_ != &::google::protobuf::internal::kEmptyString) {
+        from_table_id_->clear();
+      }
+    }
+    if (has_table_style()) {
+      if (table_style_ != NULL) table_style_->::TSP::Reference::Clear();
+    }
+    if (has_body_text_style()) {
+      if (body_text_style_ != NULL) body_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_row_text_style()) {
+      if (header_row_text_style_ != NULL) header_row_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_column_text_style()) {
+      if (header_column_text_style_ != NULL) header_column_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_footer_row_text_style()) {
+      if (footer_row_text_style_ != NULL) footer_row_text_style_->::TSP::Reference::Clear();
+    }
+    if (has_body_cell_style()) {
+      if (body_cell_style_ != NULL) body_cell_style_->::TSP::Reference::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_header_row_style()) {
+      if (header_row_style_ != NULL) header_row_style_->::TSP::Reference::Clear();
+    }
+    if (has_header_column_style()) {
+      if (header_column_style_ != NULL) header_column_style_->::TSP::Reference::Clear();
+    }
+    if (has_footer_row_style()) {
+      if (footer_row_style_ != NULL) footer_row_style_->::TSP::Reference::Clear();
+    }
+    if (has_table_name_style()) {
+      if (table_name_style_ != NULL) table_name_style_->::TSP::Reference::Clear();
+    }
+    if (has_table_name_shape_style()) {
+      if (table_name_shape_style_ != NULL) table_name_shape_style_->::TSP::Reference::Clear();
+    }
+    if (has_data_store()) {
+      if (data_store_ != NULL) data_store_->::TST::DataStore::Clear();
+    }
+    if (has_provider()) {
+      if (provider_ != NULL) provider_->::TSP::Reference::Clear();
+    }
+    number_of_rows_ = 0u;
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    number_of_columns_ = 0u;
+    if (has_table_name()) {
+      if (table_name_ != &::google::protobuf::internal::kEmptyString) {
+        table_name_->clear();
+      }
+    }
+    table_name_enabled_ = false;
+    table_name_height_ = 0;
+    table_name_border_enabled_ = false;
+    number_of_header_rows_ = 0u;
+    number_of_header_columns_ = 0u;
+    number_of_footer_rows_ = 0u;
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    header_rows_frozen_ = false;
+    header_columns_frozen_ = false;
+    number_of_hidden_rows_ = 0u;
+    number_of_hidden_columns_ = 0u;
+    number_of_user_hidden_rows_ = 0u;
+    number_of_user_hidden_columns_ = 0u;
+    number_of_filtered_rows_ = 0u;
+    default_row_height_ = 0;
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    default_column_width_ = 0;
+    if (has_origin_offset()) {
+      if (origin_offset_ != NULL) origin_offset_->::TST::CellID::Clear();
+    }
+    preset_index_ = 0u;
+    repeating_header_rows_enabled_ = false;
+    repeating_header_columns_enabled_ = false;
+    style_apply_clears_all_ = false;
+    if (has_hidden_state_formula_owner_for_columns()) {
+      if (hidden_state_formula_owner_for_columns_ != NULL) hidden_state_formula_owner_for_columns_->::TSP::Reference::Clear();
+    }
+    if (has_hidden_state_formula_owner_for_rows()) {
+      if (hidden_state_formula_owner_for_rows_ != NULL) hidden_state_formula_owner_for_rows_->::TSP::Reference::Clear();
+    }
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
+    if (has_filter_set()) {
+      if (filter_set_ != NULL) filter_set_->::TSP::Reference::Clear();
+    }
+    if (has_sort_order()) {
+      if (sort_order_ != NULL) sort_order_->::TST::TableSortOrderArchive::Clear();
+    }
+    if (has_conditional_style_formula_owner_id()) {
+      if (conditional_style_formula_owner_id_ != NULL) conditional_style_formula_owner_id_->::TSCE::CFUUIDArchive::Clear();
+    }
+    if (has_sort_rule_reference_tracker()) {
+      if (sort_rule_reference_tracker_ != NULL) sort_rule_reference_tracker_->::TST::SortRuleReferenceTrackerArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool TableModelArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required string table_id = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_table_id()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->table_id().data(), this->table_id().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_table_style;
+        break;
+      }
+
+      // required .TSP.Reference table_style = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_data_store;
+        break;
+      }
+
+      // required .TST.DataStore data_store = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_data_store:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_data_store()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_provider;
+        break;
+      }
+
+      // optional .TSP.Reference provider = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_provider:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_provider()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_number_of_rows;
+        break;
+      }
+
+      // required uint32 number_of_rows = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_rows_)));
+          set_has_number_of_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_number_of_columns;
+        break;
+      }
+
+      // required uint32 number_of_columns = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_columns:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_columns_)));
+          set_has_number_of_columns();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_table_name;
+        break;
+      }
+
+      // required string table_name = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_table_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->table_name().data(), this->table_name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_number_of_header_rows;
+        break;
+      }
+
+      // optional uint32 number_of_header_rows = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_header_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_header_rows_)));
+          set_has_number_of_header_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_number_of_header_columns;
+        break;
+      }
+
+      // optional uint32 number_of_header_columns = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_header_columns:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_header_columns_)));
+          set_has_number_of_header_columns();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_number_of_footer_rows;
+        break;
+      }
+
+      // optional uint32 number_of_footer_rows = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_footer_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_footer_rows_)));
+          set_has_number_of_footer_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(96)) goto parse_header_rows_frozen;
+        break;
+      }
+
+      // optional bool header_rows_frozen = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_header_rows_frozen:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &header_rows_frozen_)));
+          set_has_header_rows_frozen();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(104)) goto parse_header_columns_frozen;
+        break;
+      }
+
+      // optional bool header_columns_frozen = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_header_columns_frozen:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &header_columns_frozen_)));
+          set_has_header_columns_frozen();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(112)) goto parse_number_of_hidden_rows;
+        break;
+      }
+
+      // optional uint32 number_of_hidden_rows = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_hidden_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_hidden_rows_)));
+          set_has_number_of_hidden_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(120)) goto parse_number_of_hidden_columns;
+        break;
+      }
+
+      // optional uint32 number_of_hidden_columns = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_hidden_columns:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_hidden_columns_)));
+          set_has_number_of_hidden_columns();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(129)) goto parse_default_row_height;
+        break;
+      }
+
+      // required double default_row_height = 16;
+      case 16: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_default_row_height:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &default_row_height_)));
+          set_has_default_row_height();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(137)) goto parse_default_column_width;
+        break;
+      }
+
+      // required double default_column_width = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_default_column_width:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &default_column_width_)));
+          set_has_default_column_width();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(146)) goto parse_body_cell_style;
+        break;
+      }
+
+      // required .TSP.Reference body_cell_style = 18;
+      case 18: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_body_cell_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_body_cell_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(154)) goto parse_header_row_style;
+        break;
+      }
+
+      // required .TSP.Reference header_row_style = 19;
+      case 19: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_row_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_row_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(162)) goto parse_header_column_style;
+        break;
+      }
+
+      // required .TSP.Reference header_column_style = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_column_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_column_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(170)) goto parse_footer_row_style;
+        break;
+      }
+
+      // required .TSP.Reference footer_row_style = 21;
+      case 21: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_footer_row_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_footer_row_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(176)) goto parse_table_name_enabled;
+        break;
+      }
+
+      // optional bool table_name_enabled = 22;
+      case 22: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_table_name_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &table_name_enabled_)));
+          set_has_table_name_enabled();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(186)) goto parse_origin_offset;
+        break;
+      }
+
+      // optional .TST.CellID origin_offset = 23 [deprecated = true];
+      case 23: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_origin_offset:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_origin_offset()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(194)) goto parse_body_text_style;
+        break;
+      }
+
+      // required .TSP.Reference body_text_style = 24;
+      case 24: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_body_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_body_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(202)) goto parse_header_row_text_style;
+        break;
+      }
+
+      // required .TSP.Reference header_row_text_style = 25;
+      case 25: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_row_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_row_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(210)) goto parse_header_column_text_style;
+        break;
+      }
+
+      // required .TSP.Reference header_column_text_style = 26;
+      case 26: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_header_column_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_header_column_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(218)) goto parse_footer_row_text_style;
+        break;
+      }
+
+      // required .TSP.Reference footer_row_text_style = 27;
+      case 27: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_footer_row_text_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_footer_row_text_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(224)) goto parse_preset_index;
+        break;
+      }
+
+      // required uint32 preset_index = 28;
+      case 28: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_preset_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &preset_index_)));
+          set_has_preset_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(232)) goto parse_repeating_header_rows_enabled;
+        break;
+      }
+
+      // optional bool repeating_header_rows_enabled = 29;
+      case 29: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_repeating_header_rows_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &repeating_header_rows_enabled_)));
+          set_has_repeating_header_rows_enabled();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(242)) goto parse_table_name_style;
+        break;
+      }
+
+      // optional .TSP.Reference table_name_style = 30;
+      case 30: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_name_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_name_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(248)) goto parse_style_apply_clears_all;
+        break;
+      }
+
+      // optional bool style_apply_clears_all = 31;
+      case 31: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_style_apply_clears_all:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &style_apply_clears_all_)));
+          set_has_style_apply_clears_all();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(256)) goto parse_repeating_header_columns_enabled;
+        break;
+      }
+
+      // optional bool repeating_header_columns_enabled = 32;
+      case 32: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_repeating_header_columns_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &repeating_header_columns_enabled_)));
+          set_has_repeating_header_columns_enabled();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(265)) goto parse_table_name_height;
+        break;
+      }
+
+      // optional double table_name_height = 33;
+      case 33: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_table_name_height:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &table_name_height_)));
+          set_has_table_name_height();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(274)) goto parse_hidden_state_formula_owner_for_columns;
+        break;
+      }
+
+      // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
+      case 34: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_hidden_state_formula_owner_for_columns:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_hidden_state_formula_owner_for_columns()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(282)) goto parse_hidden_state_formula_owner_for_rows;
+        break;
+      }
+
+      // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
+      case 35: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_hidden_state_formula_owner_for_rows:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_hidden_state_formula_owner_for_rows()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(290)) goto parse_table_name_shape_style;
+        break;
+      }
+
+      // optional .TSP.Reference table_name_shape_style = 36;
+      case 36: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_name_shape_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_name_shape_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(80)) goto parse_number_of_header_columns;
+        if (input->ExpectTag(296)) goto parse_table_name_border_enabled;
+        break;
+      }
+
+      // optional bool table_name_border_enabled = 37;
+      case 37: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_table_name_border_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &table_name_border_enabled_)));
+          set_has_table_name_border_enabled();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(306)) goto parse_filter_set;
+        break;
+      }
+
+      // optional .TSP.Reference filter_set = 38;
+      case 38: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_filter_set:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_filter_set()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(314)) goto parse_conditional_style_formula_owner_id;
+        break;
+      }
+
+      // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
+      case 39: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_conditional_style_formula_owner_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_conditional_style_formula_owner_id()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(320)) goto parse_number_of_filtered_rows;
+        break;
+      }
+
+      // optional uint32 number_of_filtered_rows = 40;
+      case 40: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_filtered_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_filtered_rows_)));
+          set_has_number_of_filtered_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(328)) goto parse_number_of_user_hidden_rows;
+        break;
+      }
+
+      // optional uint32 number_of_user_hidden_rows = 41;
+      case 41: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_user_hidden_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_user_hidden_rows_)));
+          set_has_number_of_user_hidden_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(336)) goto parse_number_of_user_hidden_columns;
+        break;
+      }
+
+      // optional uint32 number_of_user_hidden_columns = 42;
+      case 42: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_user_hidden_columns:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_user_hidden_columns_)));
+          set_has_number_of_user_hidden_columns();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(346)) goto parse_from_table_id;
+        break;
+      }
+
+      // optional string from_table_id = 43;
+      case 43: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_from_table_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_from_table_id()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->from_table_id().data(), this->from_table_id().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(354)) goto parse_sort_order;
+        break;
+      }
+
+      // optional .TST.TableSortOrderArchive sort_order = 44;
+      case 44: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sort_order:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sort_order()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(362)) goto parse_sort_rule_reference_tracker;
+        break;
+      }
+
+      // optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
+      case 45: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sort_rule_reference_tracker:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sort_rule_reference_tracker()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void TableModelArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required string table_id = 1;
+  if (has_table_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->table_id().data(), this->table_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->table_id(), output);
+  }
+
+  // required .TSP.Reference table_style = 3;
+  if (has_table_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->table_style(), output);
+  }
+
+  // required .TST.DataStore data_store = 4;
+  if (has_data_store()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->data_store(), output);
+  }
+
+  // optional .TSP.Reference provider = 5;
+  if (has_provider()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->provider(), output);
+  }
+
+  // required uint32 number_of_rows = 6;
+  if (has_number_of_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->number_of_rows(), output);
+  }
+
+  // required uint32 number_of_columns = 7;
+  if (has_number_of_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->number_of_columns(), output);
+  }
+
+  // required string table_name = 8;
+  if (has_table_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->table_name().data(), this->table_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      8, this->table_name(), output);
+  }
+
+  // optional uint32 number_of_header_rows = 9;
+  if (has_number_of_header_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(9, this->number_of_header_rows(), output);
+  }
+
+  // optional uint32 number_of_header_columns = 10;
+  if (has_number_of_header_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(10, this->number_of_header_columns(), output);
+  }
+
+  // optional uint32 number_of_footer_rows = 11;
+  if (has_number_of_footer_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(11, this->number_of_footer_rows(), output);
+  }
+
+  // optional bool header_rows_frozen = 12;
+  if (has_header_rows_frozen()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(12, this->header_rows_frozen(), output);
+  }
+
+  // optional bool header_columns_frozen = 13;
+  if (has_header_columns_frozen()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(13, this->header_columns_frozen(), output);
+  }
+
+  // optional uint32 number_of_hidden_rows = 14;
+  if (has_number_of_hidden_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(14, this->number_of_hidden_rows(), output);
+  }
+
+  // optional uint32 number_of_hidden_columns = 15;
+  if (has_number_of_hidden_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(15, this->number_of_hidden_columns(), output);
+  }
+
+  // required double default_row_height = 16;
+  if (has_default_row_height()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(16, this->default_row_height(), output);
+  }
+
+  // required double default_column_width = 17;
+  if (has_default_column_width()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(17, this->default_column_width(), output);
+  }
+
+  // required .TSP.Reference body_cell_style = 18;
+  if (has_body_cell_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      18, this->body_cell_style(), output);
+  }
+
+  // required .TSP.Reference header_row_style = 19;
+  if (has_header_row_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      19, this->header_row_style(), output);
+  }
+
+  // required .TSP.Reference header_column_style = 20;
+  if (has_header_column_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      20, this->header_column_style(), output);
+  }
+
+  // required .TSP.Reference footer_row_style = 21;
+  if (has_footer_row_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      21, this->footer_row_style(), output);
+  }
+
+  // optional bool table_name_enabled = 22;
+  if (has_table_name_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(22, this->table_name_enabled(), output);
+  }
+
+  // optional .TST.CellID origin_offset = 23 [deprecated = true];
+  if (has_origin_offset()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      23, this->origin_offset(), output);
+  }
+
+  // required .TSP.Reference body_text_style = 24;
+  if (has_body_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      24, this->body_text_style(), output);
+  }
+
+  // required .TSP.Reference header_row_text_style = 25;
+  if (has_header_row_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      25, this->header_row_text_style(), output);
+  }
+
+  // required .TSP.Reference header_column_text_style = 26;
+  if (has_header_column_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      26, this->header_column_text_style(), output);
+  }
+
+  // required .TSP.Reference footer_row_text_style = 27;
+  if (has_footer_row_text_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      27, this->footer_row_text_style(), output);
+  }
+
+  // required uint32 preset_index = 28;
+  if (has_preset_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(28, this->preset_index(), output);
+  }
+
+  // optional bool repeating_header_rows_enabled = 29;
+  if (has_repeating_header_rows_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(29, this->repeating_header_rows_enabled(), output);
+  }
+
+  // optional .TSP.Reference table_name_style = 30;
+  if (has_table_name_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      30, this->table_name_style(), output);
+  }
+
+  // optional bool style_apply_clears_all = 31;
+  if (has_style_apply_clears_all()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(31, this->style_apply_clears_all(), output);
+  }
+
+  // optional bool repeating_header_columns_enabled = 32;
+  if (has_repeating_header_columns_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(32, this->repeating_header_columns_enabled(), output);
+  }
+
+  // optional double table_name_height = 33;
+  if (has_table_name_height()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(33, this->table_name_height(), output);
+  }
+
+  // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
+  if (has_hidden_state_formula_owner_for_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      34, this->hidden_state_formula_owner_for_columns(), output);
+  }
+
+  // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
+  if (has_hidden_state_formula_owner_for_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      35, this->hidden_state_formula_owner_for_rows(), output);
+  }
+
+  // optional .TSP.Reference table_name_shape_style = 36;
+  if (has_table_name_shape_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      36, this->table_name_shape_style(), output);
+  }
+
+  // optional bool table_name_border_enabled = 37;
+  if (has_table_name_border_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(37, this->table_name_border_enabled(), output);
+  }
+
+  // optional .TSP.Reference filter_set = 38;
+  if (has_filter_set()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      38, this->filter_set(), output);
+  }
+
+  // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
+  if (has_conditional_style_formula_owner_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      39, this->conditional_style_formula_owner_id(), output);
+  }
+
+  // optional uint32 number_of_filtered_rows = 40;
+  if (has_number_of_filtered_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(40, this->number_of_filtered_rows(), output);
+  }
+
+  // optional uint32 number_of_user_hidden_rows = 41;
+  if (has_number_of_user_hidden_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(41, this->number_of_user_hidden_rows(), output);
+  }
+
+  // optional uint32 number_of_user_hidden_columns = 42;
+  if (has_number_of_user_hidden_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(42, this->number_of_user_hidden_columns(), output);
+  }
+
+  // optional string from_table_id = 43;
+  if (has_from_table_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->from_table_id().data(), this->from_table_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      43, this->from_table_id(), output);
+  }
+
+  // optional .TST.TableSortOrderArchive sort_order = 44;
+  if (has_sort_order()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      44, this->sort_order(), output);
+  }
+
+  // optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
+  if (has_sort_rule_reference_tracker()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      45, this->sort_rule_reference_tracker(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* TableModelArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required string table_id = 1;
+  if (has_table_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->table_id().data(), this->table_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->table_id(), target);
+  }
+
+  // required .TSP.Reference table_style = 3;
+  if (has_table_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->table_style(), target);
+  }
+
+  // required .TST.DataStore data_store = 4;
+  if (has_data_store()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->data_store(), target);
+  }
+
+  // optional .TSP.Reference provider = 5;
+  if (has_provider()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->provider(), target);
+  }
+
+  // required uint32 number_of_rows = 6;
+  if (has_number_of_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(6, this->number_of_rows(), target);
+  }
+
+  // required uint32 number_of_columns = 7;
+  if (has_number_of_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->number_of_columns(), target);
+  }
+
+  // required string table_name = 8;
+  if (has_table_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->table_name().data(), this->table_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        8, this->table_name(), target);
+  }
+
+  // optional uint32 number_of_header_rows = 9;
+  if (has_number_of_header_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(9, this->number_of_header_rows(), target);
+  }
+
+  // optional uint32 number_of_header_columns = 10;
+  if (has_number_of_header_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(10, this->number_of_header_columns(), target);
+  }
+
+  // optional uint32 number_of_footer_rows = 11;
+  if (has_number_of_footer_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(11, this->number_of_footer_rows(), target);
+  }
+
+  // optional bool header_rows_frozen = 12;
+  if (has_header_rows_frozen()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(12, this->header_rows_frozen(), target);
+  }
+
+  // optional bool header_columns_frozen = 13;
+  if (has_header_columns_frozen()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(13, this->header_columns_frozen(), target);
+  }
+
+  // optional uint32 number_of_hidden_rows = 14;
+  if (has_number_of_hidden_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(14, this->number_of_hidden_rows(), target);
+  }
+
+  // optional uint32 number_of_hidden_columns = 15;
+  if (has_number_of_hidden_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(15, this->number_of_hidden_columns(), target);
+  }
+
+  // required double default_row_height = 16;
+  if (has_default_row_height()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(16, this->default_row_height(), target);
+  }
+
+  // required double default_column_width = 17;
+  if (has_default_column_width()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(17, this->default_column_width(), target);
+  }
+
+  // required .TSP.Reference body_cell_style = 18;
+  if (has_body_cell_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        18, this->body_cell_style(), target);
+  }
+
+  // required .TSP.Reference header_row_style = 19;
+  if (has_header_row_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        19, this->header_row_style(), target);
+  }
+
+  // required .TSP.Reference header_column_style = 20;
+  if (has_header_column_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        20, this->header_column_style(), target);
+  }
+
+  // required .TSP.Reference footer_row_style = 21;
+  if (has_footer_row_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        21, this->footer_row_style(), target);
+  }
+
+  // optional bool table_name_enabled = 22;
+  if (has_table_name_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(22, this->table_name_enabled(), target);
+  }
+
+  // optional .TST.CellID origin_offset = 23 [deprecated = true];
+  if (has_origin_offset()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        23, this->origin_offset(), target);
+  }
+
+  // required .TSP.Reference body_text_style = 24;
+  if (has_body_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        24, this->body_text_style(), target);
+  }
+
+  // required .TSP.Reference header_row_text_style = 25;
+  if (has_header_row_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        25, this->header_row_text_style(), target);
+  }
+
+  // required .TSP.Reference header_column_text_style = 26;
+  if (has_header_column_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        26, this->header_column_text_style(), target);
+  }
+
+  // required .TSP.Reference footer_row_text_style = 27;
+  if (has_footer_row_text_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        27, this->footer_row_text_style(), target);
+  }
+
+  // required uint32 preset_index = 28;
+  if (has_preset_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(28, this->preset_index(), target);
+  }
+
+  // optional bool repeating_header_rows_enabled = 29;
+  if (has_repeating_header_rows_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(29, this->repeating_header_rows_enabled(), target);
+  }
+
+  // optional .TSP.Reference table_name_style = 30;
+  if (has_table_name_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        30, this->table_name_style(), target);
+  }
+
+  // optional bool style_apply_clears_all = 31;
+  if (has_style_apply_clears_all()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(31, this->style_apply_clears_all(), target);
+  }
+
+  // optional bool repeating_header_columns_enabled = 32;
+  if (has_repeating_header_columns_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(32, this->repeating_header_columns_enabled(), target);
+  }
+
+  // optional double table_name_height = 33;
+  if (has_table_name_height()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(33, this->table_name_height(), target);
+  }
+
+  // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
+  if (has_hidden_state_formula_owner_for_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        34, this->hidden_state_formula_owner_for_columns(), target);
+  }
+
+  // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
+  if (has_hidden_state_formula_owner_for_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        35, this->hidden_state_formula_owner_for_rows(), target);
+  }
+
+  // optional .TSP.Reference table_name_shape_style = 36;
+  if (has_table_name_shape_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        36, this->table_name_shape_style(), target);
+  }
+
+  // optional bool table_name_border_enabled = 37;
+  if (has_table_name_border_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(37, this->table_name_border_enabled(), target);
+  }
+
+  // optional .TSP.Reference filter_set = 38;
+  if (has_filter_set()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        38, this->filter_set(), target);
+  }
+
+  // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
+  if (has_conditional_style_formula_owner_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        39, this->conditional_style_formula_owner_id(), target);
+  }
+
+  // optional uint32 number_of_filtered_rows = 40;
+  if (has_number_of_filtered_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(40, this->number_of_filtered_rows(), target);
+  }
+
+  // optional uint32 number_of_user_hidden_rows = 41;
+  if (has_number_of_user_hidden_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(41, this->number_of_user_hidden_rows(), target);
+  }
+
+  // optional uint32 number_of_user_hidden_columns = 42;
+  if (has_number_of_user_hidden_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(42, this->number_of_user_hidden_columns(), target);
+  }
+
+  // optional string from_table_id = 43;
+  if (has_from_table_id()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->from_table_id().data(), this->from_table_id().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        43, this->from_table_id(), target);
+  }
+
+  // optional .TST.TableSortOrderArchive sort_order = 44;
+  if (has_sort_order()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        44, this->sort_order(), target);
+  }
+
+  // optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
+  if (has_sort_rule_reference_tracker()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        45, this->sort_rule_reference_tracker(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int TableModelArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required string table_id = 1;
+    if (has_table_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->table_id());
+    }
+
+    // optional string from_table_id = 43;
+    if (has_from_table_id()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->from_table_id());
+    }
+
+    // required .TSP.Reference table_style = 3;
+    if (has_table_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_style());
+    }
+
+    // required .TSP.Reference body_text_style = 24;
+    if (has_body_text_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->body_text_style());
+    }
+
+    // required .TSP.Reference header_row_text_style = 25;
+    if (has_header_row_text_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_row_text_style());
+    }
+
+    // required .TSP.Reference header_column_text_style = 26;
+    if (has_header_column_text_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_column_text_style());
+    }
+
+    // required .TSP.Reference footer_row_text_style = 27;
+    if (has_footer_row_text_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->footer_row_text_style());
+    }
+
+    // required .TSP.Reference body_cell_style = 18;
+    if (has_body_cell_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->body_cell_style());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // required .TSP.Reference header_row_style = 19;
+    if (has_header_row_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_row_style());
+    }
+
+    // required .TSP.Reference header_column_style = 20;
+    if (has_header_column_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->header_column_style());
+    }
+
+    // required .TSP.Reference footer_row_style = 21;
+    if (has_footer_row_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->footer_row_style());
+    }
+
+    // optional .TSP.Reference table_name_style = 30;
+    if (has_table_name_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_name_style());
+    }
+
+    // optional .TSP.Reference table_name_shape_style = 36;
+    if (has_table_name_shape_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_name_shape_style());
+    }
+
+    // required .TST.DataStore data_store = 4;
+    if (has_data_store()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->data_store());
+    }
+
+    // optional .TSP.Reference provider = 5;
+    if (has_provider()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->provider());
+    }
+
+    // required uint32 number_of_rows = 6;
+    if (has_number_of_rows()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_rows());
+    }
+
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // required uint32 number_of_columns = 7;
+    if (has_number_of_columns()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_columns());
+    }
+
+    // required string table_name = 8;
+    if (has_table_name()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->table_name());
+    }
+
+    // optional bool table_name_enabled = 22;
+    if (has_table_name_enabled()) {
+      total_size += 2 + 1;
+    }
+
+    // optional double table_name_height = 33;
+    if (has_table_name_height()) {
+      total_size += 2 + 8;
+    }
+
+    // optional bool table_name_border_enabled = 37;
+    if (has_table_name_border_enabled()) {
+      total_size += 2 + 1;
+    }
+
+    // optional uint32 number_of_header_rows = 9;
+    if (has_number_of_header_rows()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_header_rows());
+    }
+
+    // optional uint32 number_of_header_columns = 10;
+    if (has_number_of_header_columns()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_header_columns());
+    }
+
+    // optional uint32 number_of_footer_rows = 11;
+    if (has_number_of_footer_rows()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_footer_rows());
+    }
+
+  }
+  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    // optional bool header_rows_frozen = 12;
+    if (has_header_rows_frozen()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool header_columns_frozen = 13;
+    if (has_header_columns_frozen()) {
+      total_size += 1 + 1;
+    }
+
+    // optional uint32 number_of_hidden_rows = 14;
+    if (has_number_of_hidden_rows()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_hidden_rows());
+    }
+
+    // optional uint32 number_of_hidden_columns = 15;
+    if (has_number_of_hidden_columns()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_hidden_columns());
+    }
+
+    // optional uint32 number_of_user_hidden_rows = 41;
+    if (has_number_of_user_hidden_rows()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_user_hidden_rows());
+    }
+
+    // optional uint32 number_of_user_hidden_columns = 42;
+    if (has_number_of_user_hidden_columns()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_user_hidden_columns());
+    }
+
+    // optional uint32 number_of_filtered_rows = 40;
+    if (has_number_of_filtered_rows()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_filtered_rows());
+    }
+
+    // required double default_row_height = 16;
+    if (has_default_row_height()) {
+      total_size += 2 + 8;
+    }
+
+  }
+  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    // required double default_column_width = 17;
+    if (has_default_column_width()) {
+      total_size += 2 + 8;
+    }
+
+    // optional .TST.CellID origin_offset = 23 [deprecated = true];
+    if (has_origin_offset()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->origin_offset());
+    }
+
+    // required uint32 preset_index = 28;
+    if (has_preset_index()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->preset_index());
+    }
+
+    // optional bool repeating_header_rows_enabled = 29;
+    if (has_repeating_header_rows_enabled()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool repeating_header_columns_enabled = 32;
+    if (has_repeating_header_columns_enabled()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool style_apply_clears_all = 31;
+    if (has_style_apply_clears_all()) {
+      total_size += 2 + 1;
+    }
+
+    // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
+    if (has_hidden_state_formula_owner_for_columns()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->hidden_state_formula_owner_for_columns());
+    }
+
+    // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
+    if (has_hidden_state_formula_owner_for_rows()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->hidden_state_formula_owner_for_rows());
+    }
+
+  }
+  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
+    // optional .TSP.Reference filter_set = 38;
+    if (has_filter_set()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->filter_set());
+    }
+
+    // optional .TST.TableSortOrderArchive sort_order = 44;
+    if (has_sort_order()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sort_order());
+    }
+
+    // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
+    if (has_conditional_style_formula_owner_id()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->conditional_style_formula_owner_id());
+    }
+
+    // optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
+    if (has_sort_rule_reference_tracker()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sort_rule_reference_tracker());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void TableModelArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const TableModelArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableModelArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void TableModelArchive::MergeFrom(const TableModelArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_table_id()) {
+      set_table_id(from.table_id());
+    }
+    if (from.has_from_table_id()) {
+      set_from_table_id(from.from_table_id());
+    }
+    if (from.has_table_style()) {
+      mutable_table_style()->::TSP::Reference::MergeFrom(from.table_style());
+    }
+    if (from.has_body_text_style()) {
+      mutable_body_text_style()->::TSP::Reference::MergeFrom(from.body_text_style());
+    }
+    if (from.has_header_row_text_style()) {
+      mutable_header_row_text_style()->::TSP::Reference::MergeFrom(from.header_row_text_style());
+    }
+    if (from.has_header_column_text_style()) {
+      mutable_header_column_text_style()->::TSP::Reference::MergeFrom(from.header_column_text_style());
+    }
+    if (from.has_footer_row_text_style()) {
+      mutable_footer_row_text_style()->::TSP::Reference::MergeFrom(from.footer_row_text_style());
+    }
+    if (from.has_body_cell_style()) {
+      mutable_body_cell_style()->::TSP::Reference::MergeFrom(from.body_cell_style());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_header_row_style()) {
+      mutable_header_row_style()->::TSP::Reference::MergeFrom(from.header_row_style());
+    }
+    if (from.has_header_column_style()) {
+      mutable_header_column_style()->::TSP::Reference::MergeFrom(from.header_column_style());
+    }
+    if (from.has_footer_row_style()) {
+      mutable_footer_row_style()->::TSP::Reference::MergeFrom(from.footer_row_style());
+    }
+    if (from.has_table_name_style()) {
+      mutable_table_name_style()->::TSP::Reference::MergeFrom(from.table_name_style());
+    }
+    if (from.has_table_name_shape_style()) {
+      mutable_table_name_shape_style()->::TSP::Reference::MergeFrom(from.table_name_shape_style());
+    }
+    if (from.has_data_store()) {
+      mutable_data_store()->::TST::DataStore::MergeFrom(from.data_store());
+    }
+    if (from.has_provider()) {
+      mutable_provider()->::TSP::Reference::MergeFrom(from.provider());
+    }
+    if (from.has_number_of_rows()) {
+      set_number_of_rows(from.number_of_rows());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_number_of_columns()) {
+      set_number_of_columns(from.number_of_columns());
+    }
+    if (from.has_table_name()) {
+      set_table_name(from.table_name());
+    }
+    if (from.has_table_name_enabled()) {
+      set_table_name_enabled(from.table_name_enabled());
+    }
+    if (from.has_table_name_height()) {
+      set_table_name_height(from.table_name_height());
+    }
+    if (from.has_table_name_border_enabled()) {
+      set_table_name_border_enabled(from.table_name_border_enabled());
+    }
+    if (from.has_number_of_header_rows()) {
+      set_number_of_header_rows(from.number_of_header_rows());
+    }
+    if (from.has_number_of_header_columns()) {
+      set_number_of_header_columns(from.number_of_header_columns());
+    }
+    if (from.has_number_of_footer_rows()) {
+      set_number_of_footer_rows(from.number_of_footer_rows());
+    }
+  }
+  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
+    if (from.has_header_rows_frozen()) {
+      set_header_rows_frozen(from.header_rows_frozen());
+    }
+    if (from.has_header_columns_frozen()) {
+      set_header_columns_frozen(from.header_columns_frozen());
+    }
+    if (from.has_number_of_hidden_rows()) {
+      set_number_of_hidden_rows(from.number_of_hidden_rows());
+    }
+    if (from.has_number_of_hidden_columns()) {
+      set_number_of_hidden_columns(from.number_of_hidden_columns());
+    }
+    if (from.has_number_of_user_hidden_rows()) {
+      set_number_of_user_hidden_rows(from.number_of_user_hidden_rows());
+    }
+    if (from.has_number_of_user_hidden_columns()) {
+      set_number_of_user_hidden_columns(from.number_of_user_hidden_columns());
+    }
+    if (from.has_number_of_filtered_rows()) {
+      set_number_of_filtered_rows(from.number_of_filtered_rows());
+    }
+    if (from.has_default_row_height()) {
+      set_default_row_height(from.default_row_height());
+    }
+  }
+  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
+    if (from.has_default_column_width()) {
+      set_default_column_width(from.default_column_width());
+    }
+    if (from.has_origin_offset()) {
+      mutable_origin_offset()->::TST::CellID::MergeFrom(from.origin_offset());
+    }
+    if (from.has_preset_index()) {
+      set_preset_index(from.preset_index());
+    }
+    if (from.has_repeating_header_rows_enabled()) {
+      set_repeating_header_rows_enabled(from.repeating_header_rows_enabled());
+    }
+    if (from.has_repeating_header_columns_enabled()) {
+      set_repeating_header_columns_enabled(from.repeating_header_columns_enabled());
+    }
+    if (from.has_style_apply_clears_all()) {
+      set_style_apply_clears_all(from.style_apply_clears_all());
+    }
+    if (from.has_hidden_state_formula_owner_for_columns()) {
+      mutable_hidden_state_formula_owner_for_columns()->::TSP::Reference::MergeFrom(from.hidden_state_formula_owner_for_columns());
+    }
+    if (from.has_hidden_state_formula_owner_for_rows()) {
+      mutable_hidden_state_formula_owner_for_rows()->::TSP::Reference::MergeFrom(from.hidden_state_formula_owner_for_rows());
+    }
+  }
+  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
+    if (from.has_filter_set()) {
+      mutable_filter_set()->::TSP::Reference::MergeFrom(from.filter_set());
+    }
+    if (from.has_sort_order()) {
+      mutable_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.sort_order());
+    }
+    if (from.has_conditional_style_formula_owner_id()) {
+      mutable_conditional_style_formula_owner_id()->::TSCE::CFUUIDArchive::MergeFrom(from.conditional_style_formula_owner_id());
+    }
+    if (from.has_sort_rule_reference_tracker()) {
+      mutable_sort_rule_reference_tracker()->::TST::SortRuleReferenceTrackerArchive::MergeFrom(from.sort_rule_reference_tracker());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void TableModelArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void TableModelArchive::CopyFrom(const TableModelArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool TableModelArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x8003a7fd) != 0x8003a7fd) return false;
+  if ((_has_bits_[1] & 0x00000005) != 0x00000005) return false;
+
+  if (has_table_style()) {
+    if (!this->table_style().IsInitialized()) return false;
+  }
+  if (has_body_text_style()) {
+    if (!this->body_text_style().IsInitialized()) return false;
+  }
+  if (has_header_row_text_style()) {
+    if (!this->header_row_text_style().IsInitialized()) return false;
+  }
+  if (has_header_column_text_style()) {
+    if (!this->header_column_text_style().IsInitialized()) return false;
+  }
+  if (has_footer_row_text_style()) {
+    if (!this->footer_row_text_style().IsInitialized()) return false;
+  }
+  if (has_body_cell_style()) {
+    if (!this->body_cell_style().IsInitialized()) return false;
+  }
+  if (has_header_row_style()) {
+    if (!this->header_row_style().IsInitialized()) return false;
+  }
+  if (has_header_column_style()) {
+    if (!this->header_column_style().IsInitialized()) return false;
+  }
+  if (has_footer_row_style()) {
+    if (!this->footer_row_style().IsInitialized()) return false;
+  }
+  if (has_table_name_style()) {
+    if (!this->table_name_style().IsInitialized()) return false;
+  }
+  if (has_table_name_shape_style()) {
+    if (!this->table_name_shape_style().IsInitialized()) return false;
+  }
+  if (has_data_store()) {
+    if (!this->data_store().IsInitialized()) return false;
+  }
+  if (has_provider()) {
+    if (!this->provider().IsInitialized()) return false;
+  }
+  if (has_origin_offset()) {
+    if (!this->origin_offset().IsInitialized()) return false;
+  }
+  if (has_hidden_state_formula_owner_for_columns()) {
+    if (!this->hidden_state_formula_owner_for_columns().IsInitialized()) return false;
+  }
+  if (has_hidden_state_formula_owner_for_rows()) {
+    if (!this->hidden_state_formula_owner_for_rows().IsInitialized()) return false;
+  }
+  if (has_filter_set()) {
+    if (!this->filter_set().IsInitialized()) return false;
+  }
+  if (has_sort_order()) {
+    if (!this->sort_order().IsInitialized()) return false;
+  }
+  if (has_sort_rule_reference_tracker()) {
+    if (!this->sort_rule_reference_tracker().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void TableModelArchive::Swap(TableModelArchive* other) {
+  if (other != this) {
+    std::swap(table_id_, other->table_id_);
+    std::swap(from_table_id_, other->from_table_id_);
+    std::swap(table_style_, other->table_style_);
+    std::swap(body_text_style_, other->body_text_style_);
+    std::swap(header_row_text_style_, other->header_row_text_style_);
+    std::swap(header_column_text_style_, other->header_column_text_style_);
+    std::swap(footer_row_text_style_, other->footer_row_text_style_);
+    std::swap(body_cell_style_, other->body_cell_style_);
+    std::swap(header_row_style_, other->header_row_style_);
+    std::swap(header_column_style_, other->header_column_style_);
+    std::swap(footer_row_style_, other->footer_row_style_);
+    std::swap(table_name_style_, other->table_name_style_);
+    std::swap(table_name_shape_style_, other->table_name_shape_style_);
+    std::swap(data_store_, other->data_store_);
+    std::swap(provider_, other->provider_);
+    std::swap(number_of_rows_, other->number_of_rows_);
+    std::swap(number_of_columns_, other->number_of_columns_);
+    std::swap(table_name_, other->table_name_);
+    std::swap(table_name_enabled_, other->table_name_enabled_);
+    std::swap(table_name_height_, other->table_name_height_);
+    std::swap(table_name_border_enabled_, other->table_name_border_enabled_);
+    std::swap(number_of_header_rows_, other->number_of_header_rows_);
+    std::swap(number_of_header_columns_, other->number_of_header_columns_);
+    std::swap(number_of_footer_rows_, other->number_of_footer_rows_);
+    std::swap(header_rows_frozen_, other->header_rows_frozen_);
+    std::swap(header_columns_frozen_, other->header_columns_frozen_);
+    std::swap(number_of_hidden_rows_, other->number_of_hidden_rows_);
+    std::swap(number_of_hidden_columns_, other->number_of_hidden_columns_);
+    std::swap(number_of_user_hidden_rows_, other->number_of_user_hidden_rows_);
+    std::swap(number_of_user_hidden_columns_, other->number_of_user_hidden_columns_);
+    std::swap(number_of_filtered_rows_, other->number_of_filtered_rows_);
+    std::swap(default_row_height_, other->default_row_height_);
+    std::swap(default_column_width_, other->default_column_width_);
+    std::swap(origin_offset_, other->origin_offset_);
+    std::swap(preset_index_, other->preset_index_);
+    std::swap(repeating_header_rows_enabled_, other->repeating_header_rows_enabled_);
+    std::swap(repeating_header_columns_enabled_, other->repeating_header_columns_enabled_);
+    std::swap(style_apply_clears_all_, other->style_apply_clears_all_);
+    std::swap(hidden_state_formula_owner_for_columns_, other->hidden_state_formula_owner_for_columns_);
+    std::swap(hidden_state_formula_owner_for_rows_, other->hidden_state_formula_owner_for_rows_);
+    std::swap(filter_set_, other->filter_set_);
+    std::swap(sort_order_, other->sort_order_);
+    std::swap(conditional_style_formula_owner_id_, other->conditional_style_formula_owner_id_);
+    std::swap(sort_rule_reference_tracker_, other->sort_rule_reference_tracker_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    std::swap(_has_bits_[1], other->_has_bits_[1]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata TableModelArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = TableModelArchive_descriptor_;
+  metadata.reflection = TableModelArchive_reflection_;
+  return metadata;
+}
 
-      // optional uint32 number_of_header_columns = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_header_columns:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_header_columns_)));
-          set_has_number_of_header_columns();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(88)) goto parse_number_of_footer_rows;
-        break;
-      }
 
-      // optional uint32 number_of_footer_rows = 11;
-      case 11: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_footer_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_footer_rows_)));
-          set_has_number_of_footer_rows();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(96)) goto parse_header_rows_frozen;
-        break;
-      }
+// ===================================================================
+
+#ifndef _MSC_VER
+#endif  // !_MSC_VER
+
+DurationWrapperArchive::DurationWrapperArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void DurationWrapperArchive::InitAsDefaultInstance() {
+}
+
+DurationWrapperArchive::DurationWrapperArchive(const DurationWrapperArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void DurationWrapperArchive::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+DurationWrapperArchive::~DurationWrapperArchive() {
+  SharedDtor();
+}
+
+void DurationWrapperArchive::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void DurationWrapperArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* DurationWrapperArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return DurationWrapperArchive_descriptor_;
+}
+
+const DurationWrapperArchive& DurationWrapperArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+DurationWrapperArchive* DurationWrapperArchive::default_instance_ = NULL;
+
+DurationWrapperArchive* DurationWrapperArchive::New() const {
+  return new DurationWrapperArchive;
+}
+
+void DurationWrapperArchive::Clear() {
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool DurationWrapperArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+        ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+      return true;
+    }
+    DO_(::google::protobuf::internal::WireFormat::SkipField(
+          input, tag, mutable_unknown_fields()));
+  }
+  return true;
+#undef DO_
+}
+
+void DurationWrapperArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* DurationWrapperArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int DurationWrapperArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void DurationWrapperArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const DurationWrapperArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const DurationWrapperArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void DurationWrapperArchive::MergeFrom(const DurationWrapperArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void DurationWrapperArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void DurationWrapperArchive::CopyFrom(const DurationWrapperArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool DurationWrapperArchive::IsInitialized() const {
+
+  return true;
+}
+
+void DurationWrapperArchive::Swap(DurationWrapperArchive* other) {
+  if (other != this) {
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata DurationWrapperArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = DurationWrapperArchive_descriptor_;
+  metadata.reflection = DurationWrapperArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int Cell::kValueTypeFieldNumber;
+const int Cell::kNumberValueFieldNumber;
+const int Cell::kStringValueFieldNumber;
+const int Cell::kBoolValueFieldNumber;
+const int Cell::kCellStyleFieldNumber;
+const int Cell::kTextStyleFieldNumber;
+const int Cell::kFormulaFieldNumber;
+const int Cell::kFormulaErrorFieldNumber;
+const int Cell::kCurrentFormatFieldNumber;
+const int Cell::kNumberFormatFieldNumber;
+const int Cell::kCurrencyFormatFieldNumber;
+const int Cell::kDurationFormatFieldNumber;
+const int Cell::kDateFormatFieldNumber;
+const int Cell::kControlFormatFieldNumber;
+const int Cell::kCustomFormatFieldNumber;
+const int Cell::kBaseFormatFieldNumber;
+const int Cell::kMultipleChoiceListFormatFieldNumber;
+const int Cell::kExplicitFormatFlagsFieldNumber;
+const int Cell::kRichTextPayloadFieldNumber;
+const int Cell::kConditionalStyleFieldNumber;
+const int Cell::kMultipleChoiceListFieldNumber;
+const int Cell::kCommentStorageFieldNumber;
+const int Cell::kConditionalStyleAppliedRuleFieldNumber;
+const int Cell::kImportWarningSetFieldNumber;
+#endif  // !_MSC_VER
+
+Cell::Cell()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void Cell::InitAsDefaultInstance() {
+  cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formula_ = const_cast< ::TSCE::FormulaArchive*>(&::TSCE::FormulaArchive::default_instance());
+  formulaerror_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  current_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  number_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  currency_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  duration_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  date_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  control_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  custom_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  base_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  multiple_choice_list_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  richtextpayload_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  conditional_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  multiple_choice_list_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  import_warning_set_ = const_cast< ::TST::ImportWarningSetArchive*>(&::TST::ImportWarningSetArchive::default_instance());
+}
+
+Cell::Cell(const Cell& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void Cell::SharedCtor() {
+  _cached_size_ = 0;
+  valuetype_ = 0;
+  numbervalue_ = 0;
+  stringvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  boolvalue_ = false;
+  cell_style_ = NULL;
+  text_style_ = NULL;
+  formula_ = NULL;
+  formulaerror_ = NULL;
+  current_format_ = NULL;
+  number_format_ = NULL;
+  currency_format_ = NULL;
+  duration_format_ = NULL;
+  date_format_ = NULL;
+  control_format_ = NULL;
+  custom_format_ = NULL;
+  base_format_ = NULL;
+  multiple_choice_list_format_ = NULL;
+  explicit_format_flags_ = 0u;
+  richtextpayload_ = NULL;
+  conditional_style_ = NULL;
+  multiple_choice_list_ = NULL;
+  comment_storage_ = NULL;
+  conditional_style_applied_rule_ = 0u;
+  import_warning_set_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
 
-      // optional bool header_rows_frozen = 12;
-      case 12: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_header_rows_frozen:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &header_rows_frozen_)));
-          set_has_header_rows_frozen();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(104)) goto parse_header_columns_frozen;
-        break;
-      }
+Cell::~Cell() {
+  SharedDtor();
+}
 
-      // optional bool header_columns_frozen = 13;
-      case 13: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_header_columns_frozen:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &header_columns_frozen_)));
-          set_has_header_columns_frozen();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(112)) goto parse_number_of_hidden_rows;
-        break;
-      }
+void Cell::SharedDtor() {
+  if (stringvalue_ != &::google::protobuf::internal::kEmptyString) {
+    delete stringvalue_;
+  }
+  if (this != default_instance_) {
+    delete cell_style_;
+    delete text_style_;
+    delete formula_;
+    delete formulaerror_;
+    delete current_format_;
+    delete number_format_;
+    delete currency_format_;
+    delete duration_format_;
+    delete date_format_;
+    delete control_format_;
+    delete custom_format_;
+    delete base_format_;
+    delete multiple_choice_list_format_;
+    delete richtextpayload_;
+    delete conditional_style_;
+    delete multiple_choice_list_;
+    delete comment_storage_;
+    delete import_warning_set_;
+  }
+}
 
-      // optional uint32 number_of_hidden_rows = 14;
-      case 14: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_hidden_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_hidden_rows_)));
-          set_has_number_of_hidden_rows();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(120)) goto parse_number_of_hidden_columns;
-        break;
-      }
+void Cell::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* Cell::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return Cell_descriptor_;
+}
 
-      // optional uint32 number_of_hidden_columns = 15;
-      case 15: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_hidden_columns:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_hidden_columns_)));
-          set_has_number_of_hidden_columns();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(129)) goto parse_default_row_height;
-        break;
-      }
+const Cell& Cell::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
 
-      // required double default_row_height = 16;
-      case 16: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_default_row_height:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &default_row_height_)));
-          set_has_default_row_height();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(137)) goto parse_default_column_width;
-        break;
-      }
+Cell* Cell::default_instance_ = NULL;
 
-      // required double default_column_width = 17;
-      case 17: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_default_column_width:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &default_column_width_)));
-          set_has_default_column_width();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(146)) goto parse_body_cell_style;
-        break;
-      }
+Cell* Cell::New() const {
+  return new Cell;
+}
 
-      // required .TSP.Reference body_cell_style = 18;
-      case 18: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_body_cell_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_body_cell_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(154)) goto parse_header_row_style;
-        break;
+void Cell::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    valuetype_ = 0;
+    numbervalue_ = 0;
+    if (has_stringvalue()) {
+      if (stringvalue_ != &::google::protobuf::internal::kEmptyString) {
+        stringvalue_->clear();
       }
+    }
+    boolvalue_ = false;
+    if (has_cell_style()) {
+      if (cell_style_ != NULL) cell_style_->::TSP::Reference::Clear();
+    }
+    if (has_text_style()) {
+      if (text_style_ != NULL) text_style_->::TSP::Reference::Clear();
+    }
+    if (has_formula()) {
+      if (formula_ != NULL) formula_->::TSCE::FormulaArchive::Clear();
+    }
+    if (has_formulaerror()) {
+      if (formulaerror_ != NULL) formulaerror_->::TSP::Reference::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_current_format()) {
+      if (current_format_ != NULL) current_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_number_format()) {
+      if (number_format_ != NULL) number_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_currency_format()) {
+      if (currency_format_ != NULL) currency_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_duration_format()) {
+      if (duration_format_ != NULL) duration_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_date_format()) {
+      if (date_format_ != NULL) date_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_control_format()) {
+      if (control_format_ != NULL) control_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_custom_format()) {
+      if (custom_format_ != NULL) custom_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_base_format()) {
+      if (base_format_ != NULL) base_format_->::TSK::FormatStructArchive::Clear();
+    }
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (has_multiple_choice_list_format()) {
+      if (multiple_choice_list_format_ != NULL) multiple_choice_list_format_->::TSK::FormatStructArchive::Clear();
+    }
+    explicit_format_flags_ = 0u;
+    if (has_richtextpayload()) {
+      if (richtextpayload_ != NULL) richtextpayload_->::TSP::Reference::Clear();
+    }
+    if (has_conditional_style()) {
+      if (conditional_style_ != NULL) conditional_style_->::TSP::Reference::Clear();
+    }
+    if (has_multiple_choice_list()) {
+      if (multiple_choice_list_ != NULL) multiple_choice_list_->::TSP::Reference::Clear();
+    }
+    if (has_comment_storage()) {
+      if (comment_storage_ != NULL) comment_storage_->::TSP::Reference::Clear();
+    }
+    conditional_style_applied_rule_ = 0u;
+    if (has_import_warning_set()) {
+      if (import_warning_set_ != NULL) import_warning_set_->::TST::ImportWarningSetArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
 
-      // required .TSP.Reference header_row_style = 19;
-      case 19: {
+bool Cell::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.CellValueType valueType = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_row_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_row_style()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::CellValueType_IsValid(value)) {
+            set_valuetype(static_cast< ::TST::CellValueType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(162)) goto parse_header_column_style;
+        if (input->ExpectTag(26)) goto parse_cell_style;
         break;
       }
 
-      // required .TSP.Reference header_column_style = 20;
-      case 20: {
+      // optional .TSP.Reference cell_style = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_column_style:
+         parse_cell_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_column_style()));
+               input, mutable_cell_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(170)) goto parse_footer_row_style;
+        if (input->ExpectTag(34)) goto parse_text_style;
         break;
       }
 
-      // required .TSP.Reference footer_row_style = 21;
-      case 21: {
+      // optional .TSP.Reference text_style = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_footer_row_style:
+         parse_text_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_footer_row_style()));
+               input, mutable_text_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(176)) goto parse_table_name_enabled;
+        if (input->ExpectTag(41)) goto parse_numberValue;
         break;
       }
 
-      // optional bool table_name_enabled = 22;
-      case 22: {
+      // optional double numberValue = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_table_name_enabled:
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_numberValue:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &table_name_enabled_)));
-          set_has_table_name_enabled();
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &numbervalue_)));
+          set_has_numbervalue();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(186)) goto parse_origin_offset;
+        if (input->ExpectTag(50)) goto parse_stringValue;
         break;
       }
 
-      // optional .TST.CellID origin_offset = 23 [deprecated = true];
-      case 23: {
+      // optional string stringValue = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_origin_offset:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_origin_offset()));
+         parse_stringValue:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_stringvalue()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->stringvalue().data(), this->stringvalue().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(194)) goto parse_body_text_style;
+        if (input->ExpectTag(56)) goto parse_boolValue;
         break;
       }
 
-      // required .TSP.Reference body_text_style = 24;
-      case 24: {
+      // optional bool boolValue = 7;
+      case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_body_text_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_body_text_style()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_boolValue:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &boolvalue_)));
+          set_has_boolvalue();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(202)) goto parse_header_row_text_style;
+        if (input->ExpectTag(66)) goto parse_formula;
         break;
       }
 
-      // required .TSP.Reference header_row_text_style = 25;
-      case 25: {
+      // optional .TSCE.FormulaArchive formula = 8;
+      case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_row_text_style:
+         parse_formula:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_row_text_style()));
+               input, mutable_formula()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(210)) goto parse_header_column_text_style;
+        if (input->ExpectTag(74)) goto parse_current_format;
         break;
       }
 
-      // required .TSP.Reference header_column_text_style = 26;
-      case 26: {
+      // optional .TSK.FormatStructArchive current_format = 9;
+      case 9: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_header_column_text_style:
+         parse_current_format:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_header_column_text_style()));
+               input, mutable_current_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(218)) goto parse_footer_row_text_style;
+        if (input->ExpectTag(82)) goto parse_formulaError;
         break;
       }
 
-      // required .TSP.Reference footer_row_text_style = 27;
-      case 27: {
+      // optional .TSP.Reference formulaError = 10;
+      case 10: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_footer_row_text_style:
+         parse_formulaError:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_footer_row_text_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(224)) goto parse_preset_index;
-        break;
-      }
-
-      // required uint32 preset_index = 28;
-      case 28: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_preset_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &preset_index_)));
-          set_has_preset_index();
+               input, mutable_formulaerror()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(232)) goto parse_repeating_header_rows_enabled;
+        if (input->ExpectTag(90)) goto parse_number_format;
         break;
       }
 
-      // optional bool repeating_header_rows_enabled = 29;
-      case 29: {
+      // optional .TSK.FormatStructArchive number_format = 11;
+      case 11: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_repeating_header_rows_enabled:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &repeating_header_rows_enabled_)));
-          set_has_repeating_header_rows_enabled();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_number_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_number_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(242)) goto parse_table_name_style;
+        if (input->ExpectTag(98)) goto parse_currency_format;
         break;
       }
 
-      // optional .TSP.Reference table_name_style = 30;
-      case 30: {
+      // optional .TSK.FormatStructArchive currency_format = 12;
+      case 12: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_name_style:
+         parse_currency_format:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_name_style()));
+               input, mutable_currency_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(248)) goto parse_style_apply_clears_all;
+        if (input->ExpectTag(106)) goto parse_duration_format;
         break;
       }
 
-      // optional bool style_apply_clears_all = 31;
-      case 31: {
+      // optional .TSK.FormatStructArchive duration_format = 13;
+      case 13: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_style_apply_clears_all:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &style_apply_clears_all_)));
-          set_has_style_apply_clears_all();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_duration_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_duration_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(256)) goto parse_repeating_header_columns_enabled;
+        if (input->ExpectTag(114)) goto parse_date_format;
         break;
       }
 
-      // optional bool repeating_header_columns_enabled = 32;
-      case 32: {
+      // optional .TSK.FormatStructArchive date_format = 14;
+      case 14: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_repeating_header_columns_enabled:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &repeating_header_columns_enabled_)));
-          set_has_repeating_header_columns_enabled();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_date_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_date_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(265)) goto parse_table_name_height;
+        if (input->ExpectTag(122)) goto parse_control_format;
         break;
       }
 
-      // optional double table_name_height = 33;
-      case 33: {
+      // optional .TSK.FormatStructArchive control_format = 15;
+      case 15: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_table_name_height:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &table_name_height_)));
-          set_has_table_name_height();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_control_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_control_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(274)) goto parse_hidden_state_formula_owner_for_columns;
+        if (input->ExpectTag(130)) goto parse_custom_format;
         break;
       }
 
-      // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
-      case 34: {
+      // optional .TSK.FormatStructArchive custom_format = 16;
+      case 16: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_hidden_state_formula_owner_for_columns:
+         parse_custom_format:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_hidden_state_formula_owner_for_columns()));
+               input, mutable_custom_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(282)) goto parse_hidden_state_formula_owner_for_rows;
+        if (input->ExpectTag(138)) goto parse_base_format;
         break;
       }
 
-      // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
-      case 35: {
+      // optional .TSK.FormatStructArchive base_format = 17;
+      case 17: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_hidden_state_formula_owner_for_rows:
+         parse_base_format:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_hidden_state_formula_owner_for_rows()));
+               input, mutable_base_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(290)) goto parse_table_name_shape_style;
+        if (input->ExpectTag(146)) goto parse_multiple_choice_list_format;
         break;
       }
 
-      // optional .TSP.Reference table_name_shape_style = 36;
-      case 36: {
+      // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
+      case 18: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_name_shape_style:
+         parse_multiple_choice_list_format:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_name_shape_style()));
+               input, mutable_multiple_choice_list_format()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(296)) goto parse_table_name_border_enabled;
+        if (input->ExpectTag(152)) goto parse_explicit_format_flags;
         break;
       }
 
-      // optional bool table_name_border_enabled = 37;
-      case 37: {
+      // optional uint32 explicit_format_flags = 19;
+      case 19: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_table_name_border_enabled:
+         parse_explicit_format_flags:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &table_name_border_enabled_)));
-          set_has_table_name_border_enabled();
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &explicit_format_flags_)));
+          set_has_explicit_format_flags();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(306)) goto parse_filter_set;
+        if (input->ExpectTag(162)) goto parse_richTextPayload;
         break;
       }
 
-      // optional .TSP.Reference filter_set = 38;
-      case 38: {
+      // optional .TSP.Reference richTextPayload = 20;
+      case 20: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_filter_set:
+         parse_richTextPayload:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_filter_set()));
+               input, mutable_richtextpayload()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(314)) goto parse_conditional_style_formula_owner_id;
+        if (input->ExpectTag(170)) goto parse_conditional_style;
         break;
       }
 
-      // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
-      case 39: {
+      // optional .TSP.Reference conditional_style = 21;
+      case 21: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditional_style_formula_owner_id:
+         parse_conditional_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditional_style_formula_owner_id()));
+               input, mutable_conditional_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(320)) goto parse_number_of_filtered_rows;
+        if (input->ExpectTag(178)) goto parse_multiple_choice_list;
         break;
       }
 
-      // optional uint32 number_of_filtered_rows = 40;
-      case 40: {
+      // optional .TSP.Reference multiple_choice_list = 22;
+      case 22: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_filtered_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_filtered_rows_)));
-          set_has_number_of_filtered_rows();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_multiple_choice_list:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_multiple_choice_list()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(328)) goto parse_number_of_user_hidden_rows;
+        if (input->ExpectTag(186)) goto parse_comment_storage;
         break;
       }
 
-      // optional uint32 number_of_user_hidden_rows = 41;
-      case 41: {
+      // optional .TSP.Reference comment_storage = 23;
+      case 23: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_user_hidden_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_user_hidden_rows_)));
-          set_has_number_of_user_hidden_rows();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_comment_storage:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_comment_storage()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(336)) goto parse_number_of_user_hidden_columns;
+        if (input->ExpectTag(192)) goto parse_conditional_style_applied_rule;
         break;
       }
 
-      // optional uint32 number_of_user_hidden_columns = 42;
-      case 42: {
+      // optional uint32 conditional_style_applied_rule = 24;
+      case 24: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_user_hidden_columns:
+         parse_conditional_style_applied_rule:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_user_hidden_columns_)));
-          set_has_number_of_user_hidden_columns();
+                 input, &conditional_style_applied_rule_)));
+          set_has_conditional_style_applied_rule();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(346)) goto parse_from_table_id;
+        if (input->ExpectTag(202)) goto parse_import_warning_set;
         break;
       }
 
-      // optional string from_table_id = 43;
-      case 43: {
+      // optional .TST.ImportWarningSetArchive import_warning_set = 25;
+      case 25: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_from_table_id:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_from_table_id()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->from_table_id().data(), this->from_table_id().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+         parse_import_warning_set:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_import_warning_set()));
         } else {
           goto handle_uninterpreted;
         }
@@ -11498,246 +15894,149 @@ bool TableModelArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void TableModelArchive::SerializeWithCachedSizes(
+void Cell::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required string table_id = 1;
-  if (has_table_id()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->table_id().data(), this->table_id().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      1, this->table_id(), output);
-  }
-
-  // required .TSP.Reference table_style = 3;
-  if (has_table_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->table_style(), output);
+  // required .TST.CellValueType valueType = 2;
+  if (has_valuetype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->valuetype(), output);
   }
 
-  // required .TST.DataStore data_store = 4;
-  if (has_data_store()) {
+  // optional .TSP.Reference cell_style = 3;
+  if (has_cell_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->data_store(), output);
+      3, this->cell_style(), output);
   }
 
-  // optional .TSP.Reference provider = 5;
-  if (has_provider()) {
+  // optional .TSP.Reference text_style = 4;
+  if (has_text_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->provider(), output);
-  }
-
-  // required uint32 number_of_rows = 6;
-  if (has_number_of_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(6, this->number_of_rows(), output);
+      4, this->text_style(), output);
   }
 
-  // required uint32 number_of_columns = 7;
-  if (has_number_of_columns()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->number_of_columns(), output);
+  // optional double numberValue = 5;
+  if (has_numbervalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->numbervalue(), output);
   }
 
-  // required string table_name = 8;
-  if (has_table_name()) {
+  // optional string stringValue = 6;
+  if (has_stringvalue()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->table_name().data(), this->table_name().length(),
+      this->stringvalue().data(), this->stringvalue().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
     ::google::protobuf::internal::WireFormatLite::WriteString(
-      8, this->table_name(), output);
-  }
-
-  // optional uint32 number_of_header_rows = 9;
-  if (has_number_of_header_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(9, this->number_of_header_rows(), output);
-  }
-
-  // optional uint32 number_of_header_columns = 10;
-  if (has_number_of_header_columns()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(10, this->number_of_header_columns(), output);
-  }
-
-  // optional uint32 number_of_footer_rows = 11;
-  if (has_number_of_footer_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(11, this->number_of_footer_rows(), output);
-  }
-
-  // optional bool header_rows_frozen = 12;
-  if (has_header_rows_frozen()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(12, this->header_rows_frozen(), output);
-  }
-
-  // optional bool header_columns_frozen = 13;
-  if (has_header_columns_frozen()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(13, this->header_columns_frozen(), output);
-  }
-
-  // optional uint32 number_of_hidden_rows = 14;
-  if (has_number_of_hidden_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(14, this->number_of_hidden_rows(), output);
-  }
-
-  // optional uint32 number_of_hidden_columns = 15;
-  if (has_number_of_hidden_columns()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(15, this->number_of_hidden_columns(), output);
-  }
-
-  // required double default_row_height = 16;
-  if (has_default_row_height()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(16, this->default_row_height(), output);
-  }
-
-  // required double default_column_width = 17;
-  if (has_default_column_width()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(17, this->default_column_width(), output);
-  }
-
-  // required .TSP.Reference body_cell_style = 18;
-  if (has_body_cell_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      18, this->body_cell_style(), output);
+      6, this->stringvalue(), output);
   }
 
-  // required .TSP.Reference header_row_style = 19;
-  if (has_header_row_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      19, this->header_row_style(), output);
+  // optional bool boolValue = 7;
+  if (has_boolvalue()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->boolvalue(), output);
   }
 
-  // required .TSP.Reference header_column_style = 20;
-  if (has_header_column_style()) {
+  // optional .TSCE.FormulaArchive formula = 8;
+  if (has_formula()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, this->header_column_style(), output);
+      8, this->formula(), output);
   }
 
-  // required .TSP.Reference footer_row_style = 21;
-  if (has_footer_row_style()) {
+  // optional .TSK.FormatStructArchive current_format = 9;
+  if (has_current_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      21, this->footer_row_style(), output);
-  }
-
-  // optional bool table_name_enabled = 22;
-  if (has_table_name_enabled()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(22, this->table_name_enabled(), output);
+      9, this->current_format(), output);
   }
 
-  // optional .TST.CellID origin_offset = 23 [deprecated = true];
-  if (has_origin_offset()) {
+  // optional .TSP.Reference formulaError = 10;
+  if (has_formulaerror()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      23, this->origin_offset(), output);
+      10, this->formulaerror(), output);
   }
 
-  // required .TSP.Reference body_text_style = 24;
-  if (has_body_text_style()) {
+  // optional .TSK.FormatStructArchive number_format = 11;
+  if (has_number_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      24, this->body_text_style(), output);
+      11, this->number_format(), output);
   }
 
-  // required .TSP.Reference header_row_text_style = 25;
-  if (has_header_row_text_style()) {
+  // optional .TSK.FormatStructArchive currency_format = 12;
+  if (has_currency_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      25, this->header_row_text_style(), output);
+      12, this->currency_format(), output);
   }
 
-  // required .TSP.Reference header_column_text_style = 26;
-  if (has_header_column_text_style()) {
+  // optional .TSK.FormatStructArchive duration_format = 13;
+  if (has_duration_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      26, this->header_column_text_style(), output);
+      13, this->duration_format(), output);
   }
 
-  // required .TSP.Reference footer_row_text_style = 27;
-  if (has_footer_row_text_style()) {
+  // optional .TSK.FormatStructArchive date_format = 14;
+  if (has_date_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      27, this->footer_row_text_style(), output);
-  }
-
-  // required uint32 preset_index = 28;
-  if (has_preset_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(28, this->preset_index(), output);
-  }
-
-  // optional bool repeating_header_rows_enabled = 29;
-  if (has_repeating_header_rows_enabled()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(29, this->repeating_header_rows_enabled(), output);
+      14, this->date_format(), output);
   }
 
-  // optional .TSP.Reference table_name_style = 30;
-  if (has_table_name_style()) {
+  // optional .TSK.FormatStructArchive control_format = 15;
+  if (has_control_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      30, this->table_name_style(), output);
-  }
-
-  // optional bool style_apply_clears_all = 31;
-  if (has_style_apply_clears_all()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(31, this->style_apply_clears_all(), output);
-  }
-
-  // optional bool repeating_header_columns_enabled = 32;
-  if (has_repeating_header_columns_enabled()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(32, this->repeating_header_columns_enabled(), output);
-  }
-
-  // optional double table_name_height = 33;
-  if (has_table_name_height()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(33, this->table_name_height(), output);
+      15, this->control_format(), output);
   }
 
-  // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
-  if (has_hidden_state_formula_owner_for_columns()) {
+  // optional .TSK.FormatStructArchive custom_format = 16;
+  if (has_custom_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      34, this->hidden_state_formula_owner_for_columns(), output);
+      16, this->custom_format(), output);
   }
 
-  // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
-  if (has_hidden_state_formula_owner_for_rows()) {
+  // optional .TSK.FormatStructArchive base_format = 17;
+  if (has_base_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      35, this->hidden_state_formula_owner_for_rows(), output);
+      17, this->base_format(), output);
   }
 
-  // optional .TSP.Reference table_name_shape_style = 36;
-  if (has_table_name_shape_style()) {
+  // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
+  if (has_multiple_choice_list_format()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      36, this->table_name_shape_style(), output);
+      18, this->multiple_choice_list_format(), output);
   }
 
-  // optional bool table_name_border_enabled = 37;
-  if (has_table_name_border_enabled()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(37, this->table_name_border_enabled(), output);
+  // optional uint32 explicit_format_flags = 19;
+  if (has_explicit_format_flags()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(19, this->explicit_format_flags(), output);
   }
 
-  // optional .TSP.Reference filter_set = 38;
-  if (has_filter_set()) {
+  // optional .TSP.Reference richTextPayload = 20;
+  if (has_richtextpayload()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      38, this->filter_set(), output);
+      20, this->richtextpayload(), output);
   }
 
-  // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
-  if (has_conditional_style_formula_owner_id()) {
+  // optional .TSP.Reference conditional_style = 21;
+  if (has_conditional_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      39, this->conditional_style_formula_owner_id(), output);
+      21, this->conditional_style(), output);
   }
 
-  // optional uint32 number_of_filtered_rows = 40;
-  if (has_number_of_filtered_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(40, this->number_of_filtered_rows(), output);
+  // optional .TSP.Reference multiple_choice_list = 22;
+  if (has_multiple_choice_list()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      22, this->multiple_choice_list(), output);
   }
 
-  // optional uint32 number_of_user_hidden_rows = 41;
-  if (has_number_of_user_hidden_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(41, this->number_of_user_hidden_rows(), output);
+  // optional .TSP.Reference comment_storage = 23;
+  if (has_comment_storage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      23, this->comment_storage(), output);
   }
 
-  // optional uint32 number_of_user_hidden_columns = 42;
-  if (has_number_of_user_hidden_columns()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(42, this->number_of_user_hidden_columns(), output);
+  // optional uint32 conditional_style_applied_rule = 24;
+  if (has_conditional_style_applied_rule()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(24, this->conditional_style_applied_rule(), output);
   }
 
-  // optional string from_table_id = 43;
-  if (has_from_table_id()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->from_table_id().data(), this->from_table_id().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      43, this->from_table_id(), output);
+  // optional .TST.ImportWarningSetArchive import_warning_set = 25;
+  if (has_import_warning_set()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      25, this->import_warning_set(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -11746,267 +16045,168 @@ void TableModelArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* TableModelArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* Cell::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required string table_id = 1;
-  if (has_table_id()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->table_id().data(), this->table_id().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->table_id(), target);
-  }
-
-  // required .TSP.Reference table_style = 3;
-  if (has_table_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->table_style(), target);
+  // required .TST.CellValueType valueType = 2;
+  if (has_valuetype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->valuetype(), target);
   }
 
-  // required .TST.DataStore data_store = 4;
-  if (has_data_store()) {
+  // optional .TSP.Reference cell_style = 3;
+  if (has_cell_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->data_store(), target);
+        3, this->cell_style(), target);
   }
 
-  // optional .TSP.Reference provider = 5;
-  if (has_provider()) {
+  // optional .TSP.Reference text_style = 4;
+  if (has_text_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->provider(), target);
-  }
-
-  // required uint32 number_of_rows = 6;
-  if (has_number_of_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(6, this->number_of_rows(), target);
+        4, this->text_style(), target);
   }
 
-  // required uint32 number_of_columns = 7;
-  if (has_number_of_columns()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->number_of_columns(), target);
+  // optional double numberValue = 5;
+  if (has_numbervalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->numbervalue(), target);
   }
 
-  // required string table_name = 8;
-  if (has_table_name()) {
+  // optional string stringValue = 6;
+  if (has_stringvalue()) {
     ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->table_name().data(), this->table_name().length(),
+      this->stringvalue().data(), this->stringvalue().length(),
       ::google::protobuf::internal::WireFormat::SERIALIZE);
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        8, this->table_name(), target);
-  }
-
-  // optional uint32 number_of_header_rows = 9;
-  if (has_number_of_header_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(9, this->number_of_header_rows(), target);
-  }
-
-  // optional uint32 number_of_header_columns = 10;
-  if (has_number_of_header_columns()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(10, this->number_of_header_columns(), target);
-  }
-
-  // optional uint32 number_of_footer_rows = 11;
-  if (has_number_of_footer_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(11, this->number_of_footer_rows(), target);
-  }
-
-  // optional bool header_rows_frozen = 12;
-  if (has_header_rows_frozen()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(12, this->header_rows_frozen(), target);
-  }
-
-  // optional bool header_columns_frozen = 13;
-  if (has_header_columns_frozen()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(13, this->header_columns_frozen(), target);
-  }
-
-  // optional uint32 number_of_hidden_rows = 14;
-  if (has_number_of_hidden_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(14, this->number_of_hidden_rows(), target);
-  }
-
-  // optional uint32 number_of_hidden_columns = 15;
-  if (has_number_of_hidden_columns()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(15, this->number_of_hidden_columns(), target);
-  }
-
-  // required double default_row_height = 16;
-  if (has_default_row_height()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(16, this->default_row_height(), target);
-  }
-
-  // required double default_column_width = 17;
-  if (has_default_column_width()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(17, this->default_column_width(), target);
-  }
-
-  // required .TSP.Reference body_cell_style = 18;
-  if (has_body_cell_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        18, this->body_cell_style(), target);
+        6, this->stringvalue(), target);
   }
 
-  // required .TSP.Reference header_row_style = 19;
-  if (has_header_row_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        19, this->header_row_style(), target);
+  // optional bool boolValue = 7;
+  if (has_boolvalue()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->boolvalue(), target);
   }
 
-  // required .TSP.Reference header_column_style = 20;
-  if (has_header_column_style()) {
+  // optional .TSCE.FormulaArchive formula = 8;
+  if (has_formula()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        20, this->header_column_style(), target);
+        8, this->formula(), target);
   }
 
-  // required .TSP.Reference footer_row_style = 21;
-  if (has_footer_row_style()) {
+  // optional .TSK.FormatStructArchive current_format = 9;
+  if (has_current_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        21, this->footer_row_style(), target);
-  }
-
-  // optional bool table_name_enabled = 22;
-  if (has_table_name_enabled()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(22, this->table_name_enabled(), target);
+        9, this->current_format(), target);
   }
 
-  // optional .TST.CellID origin_offset = 23 [deprecated = true];
-  if (has_origin_offset()) {
+  // optional .TSP.Reference formulaError = 10;
+  if (has_formulaerror()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        23, this->origin_offset(), target);
+        10, this->formulaerror(), target);
   }
 
-  // required .TSP.Reference body_text_style = 24;
-  if (has_body_text_style()) {
+  // optional .TSK.FormatStructArchive number_format = 11;
+  if (has_number_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        24, this->body_text_style(), target);
+        11, this->number_format(), target);
   }
 
-  // required .TSP.Reference header_row_text_style = 25;
-  if (has_header_row_text_style()) {
+  // optional .TSK.FormatStructArchive currency_format = 12;
+  if (has_currency_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        25, this->header_row_text_style(), target);
+        12, this->currency_format(), target);
   }
 
-  // required .TSP.Reference header_column_text_style = 26;
-  if (has_header_column_text_style()) {
+  // optional .TSK.FormatStructArchive duration_format = 13;
+  if (has_duration_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        26, this->header_column_text_style(), target);
+        13, this->duration_format(), target);
   }
 
-  // required .TSP.Reference footer_row_text_style = 27;
-  if (has_footer_row_text_style()) {
+  // optional .TSK.FormatStructArchive date_format = 14;
+  if (has_date_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        27, this->footer_row_text_style(), target);
-  }
-
-  // required uint32 preset_index = 28;
-  if (has_preset_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(28, this->preset_index(), target);
-  }
-
-  // optional bool repeating_header_rows_enabled = 29;
-  if (has_repeating_header_rows_enabled()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(29, this->repeating_header_rows_enabled(), target);
+        14, this->date_format(), target);
   }
 
-  // optional .TSP.Reference table_name_style = 30;
-  if (has_table_name_style()) {
+  // optional .TSK.FormatStructArchive control_format = 15;
+  if (has_control_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        30, this->table_name_style(), target);
-  }
-
-  // optional bool style_apply_clears_all = 31;
-  if (has_style_apply_clears_all()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(31, this->style_apply_clears_all(), target);
-  }
-
-  // optional bool repeating_header_columns_enabled = 32;
-  if (has_repeating_header_columns_enabled()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(32, this->repeating_header_columns_enabled(), target);
-  }
-
-  // optional double table_name_height = 33;
-  if (has_table_name_height()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(33, this->table_name_height(), target);
+        15, this->control_format(), target);
   }
 
-  // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
-  if (has_hidden_state_formula_owner_for_columns()) {
+  // optional .TSK.FormatStructArchive custom_format = 16;
+  if (has_custom_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        34, this->hidden_state_formula_owner_for_columns(), target);
+        16, this->custom_format(), target);
   }
 
-  // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
-  if (has_hidden_state_formula_owner_for_rows()) {
+  // optional .TSK.FormatStructArchive base_format = 17;
+  if (has_base_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        35, this->hidden_state_formula_owner_for_rows(), target);
+        17, this->base_format(), target);
   }
 
-  // optional .TSP.Reference table_name_shape_style = 36;
-  if (has_table_name_shape_style()) {
+  // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
+  if (has_multiple_choice_list_format()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        36, this->table_name_shape_style(), target);
+        18, this->multiple_choice_list_format(), target);
   }
 
-  // optional bool table_name_border_enabled = 37;
-  if (has_table_name_border_enabled()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(37, this->table_name_border_enabled(), target);
+  // optional uint32 explicit_format_flags = 19;
+  if (has_explicit_format_flags()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(19, this->explicit_format_flags(), target);
   }
 
-  // optional .TSP.Reference filter_set = 38;
-  if (has_filter_set()) {
+  // optional .TSP.Reference richTextPayload = 20;
+  if (has_richtextpayload()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        38, this->filter_set(), target);
+        20, this->richtextpayload(), target);
   }
 
-  // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
-  if (has_conditional_style_formula_owner_id()) {
+  // optional .TSP.Reference conditional_style = 21;
+  if (has_conditional_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        39, this->conditional_style_formula_owner_id(), target);
+        21, this->conditional_style(), target);
   }
 
-  // optional uint32 number_of_filtered_rows = 40;
-  if (has_number_of_filtered_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(40, this->number_of_filtered_rows(), target);
+  // optional .TSP.Reference multiple_choice_list = 22;
+  if (has_multiple_choice_list()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        22, this->multiple_choice_list(), target);
   }
 
-  // optional uint32 number_of_user_hidden_rows = 41;
-  if (has_number_of_user_hidden_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(41, this->number_of_user_hidden_rows(), target);
+  // optional .TSP.Reference comment_storage = 23;
+  if (has_comment_storage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        23, this->comment_storage(), target);
   }
 
-  // optional uint32 number_of_user_hidden_columns = 42;
-  if (has_number_of_user_hidden_columns()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(42, this->number_of_user_hidden_columns(), target);
+  // optional uint32 conditional_style_applied_rule = 24;
+  if (has_conditional_style_applied_rule()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(24, this->conditional_style_applied_rule(), target);
   }
 
-  // optional string from_table_id = 43;
-  if (has_from_table_id()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->from_table_id().data(), this->from_table_id().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        43, this->from_table_id(), target);
+  // optional .TST.ImportWarningSetArchive import_warning_set = 25;
+  if (has_import_warning_set()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        25, this->import_warning_set(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -12016,292 +16216,175 @@ ::google::protobuf::uint8* TableModelArchive::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int TableModelArchive::ByteSize() const {
+int Cell::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required string table_id = 1;
-    if (has_table_id()) {
+    // required .TST.CellValueType valueType = 2;
+    if (has_valuetype()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->table_id());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->valuetype());
     }
 
-    // optional string from_table_id = 43;
-    if (has_from_table_id()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->from_table_id());
+    // optional double numberValue = 5;
+    if (has_numbervalue()) {
+      total_size += 1 + 8;
     }
 
-    // required .TSP.Reference table_style = 3;
-    if (has_table_style()) {
+    // optional string stringValue = 6;
+    if (has_stringvalue()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_style());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->stringvalue());
     }
 
-    // required .TSP.Reference body_text_style = 24;
-    if (has_body_text_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->body_text_style());
+    // optional bool boolValue = 7;
+    if (has_boolvalue()) {
+      total_size += 1 + 1;
     }
 
-    // required .TSP.Reference header_row_text_style = 25;
-    if (has_header_row_text_style()) {
-      total_size += 2 +
+    // optional .TSP.Reference cell_style = 3;
+    if (has_cell_style()) {
+      total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_row_text_style());
+          this->cell_style());
     }
 
-    // required .TSP.Reference header_column_text_style = 26;
-    if (has_header_column_text_style()) {
-      total_size += 2 +
+    // optional .TSP.Reference text_style = 4;
+    if (has_text_style()) {
+      total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_column_text_style());
+          this->text_style());
     }
 
-    // required .TSP.Reference footer_row_text_style = 27;
-    if (has_footer_row_text_style()) {
-      total_size += 2 +
+    // optional .TSCE.FormulaArchive formula = 8;
+    if (has_formula()) {
+      total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->footer_row_text_style());
+          this->formula());
     }
 
-    // required .TSP.Reference body_cell_style = 18;
-    if (has_body_cell_style()) {
-      total_size += 2 +
+    // optional .TSP.Reference formulaError = 10;
+    if (has_formulaerror()) {
+      total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->body_cell_style());
+          this->formulaerror());
     }
 
   }
   if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // required .TSP.Reference header_row_style = 19;
-    if (has_header_row_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_row_style());
-    }
-
-    // required .TSP.Reference header_column_style = 20;
-    if (has_header_column_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->header_column_style());
-    }
-
-    // required .TSP.Reference footer_row_style = 21;
-    if (has_footer_row_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->footer_row_style());
-    }
-
-    // optional .TSP.Reference table_name_style = 30;
-    if (has_table_name_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_name_style());
-    }
-
-    // optional .TSP.Reference table_name_shape_style = 36;
-    if (has_table_name_shape_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_name_shape_style());
-    }
-
-    // required .TST.DataStore data_store = 4;
-    if (has_data_store()) {
+    // optional .TSK.FormatStructArchive current_format = 9;
+    if (has_current_format()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->data_store());
+          this->current_format());
     }
 
-    // optional .TSP.Reference provider = 5;
-    if (has_provider()) {
+    // optional .TSK.FormatStructArchive number_format = 11;
+    if (has_number_format()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->provider());
-    }
-
-    // required uint32 number_of_rows = 6;
-    if (has_number_of_rows()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_rows());
-    }
-
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    // required uint32 number_of_columns = 7;
-    if (has_number_of_columns()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_columns());
-    }
-
-    // required string table_name = 8;
-    if (has_table_name()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->table_name());
-    }
-
-    // optional bool table_name_enabled = 22;
-    if (has_table_name_enabled()) {
-      total_size += 2 + 1;
-    }
-
-    // optional double table_name_height = 33;
-    if (has_table_name_height()) {
-      total_size += 2 + 8;
-    }
-
-    // optional bool table_name_border_enabled = 37;
-    if (has_table_name_border_enabled()) {
-      total_size += 2 + 1;
-    }
-
-    // optional uint32 number_of_header_rows = 9;
-    if (has_number_of_header_rows()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_header_rows());
-    }
-
-    // optional uint32 number_of_header_columns = 10;
-    if (has_number_of_header_columns()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_header_columns());
+          this->number_format());
     }
 
-    // optional uint32 number_of_footer_rows = 11;
-    if (has_number_of_footer_rows()) {
+    // optional .TSK.FormatStructArchive currency_format = 12;
+    if (has_currency_format()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_footer_rows());
-    }
-
-  }
-  if (_has_bits_[24 / 32] & (0xffu << (24 % 32))) {
-    // optional bool header_rows_frozen = 12;
-    if (has_header_rows_frozen()) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool header_columns_frozen = 13;
-    if (has_header_columns_frozen()) {
-      total_size += 1 + 1;
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->currency_format());
     }
 
-    // optional uint32 number_of_hidden_rows = 14;
-    if (has_number_of_hidden_rows()) {
+    // optional .TSK.FormatStructArchive duration_format = 13;
+    if (has_duration_format()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_hidden_rows());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->duration_format());
     }
 
-    // optional uint32 number_of_hidden_columns = 15;
-    if (has_number_of_hidden_columns()) {
+    // optional .TSK.FormatStructArchive date_format = 14;
+    if (has_date_format()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_hidden_columns());
-    }
-
-    // optional uint32 number_of_user_hidden_rows = 41;
-    if (has_number_of_user_hidden_rows()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_user_hidden_rows());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->date_format());
     }
 
-    // optional uint32 number_of_user_hidden_columns = 42;
-    if (has_number_of_user_hidden_columns()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_user_hidden_columns());
+    // optional .TSK.FormatStructArchive control_format = 15;
+    if (has_control_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->control_format());
     }
 
-    // optional uint32 number_of_filtered_rows = 40;
-    if (has_number_of_filtered_rows()) {
+    // optional .TSK.FormatStructArchive custom_format = 16;
+    if (has_custom_format()) {
       total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_filtered_rows());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->custom_format());
     }
 
-    // required double default_row_height = 16;
-    if (has_default_row_height()) {
-      total_size += 2 + 8;
+    // optional .TSK.FormatStructArchive base_format = 17;
+    if (has_base_format()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->base_format());
     }
 
   }
-  if (_has_bits_[32 / 32] & (0xffu << (32 % 32))) {
-    // required double default_column_width = 17;
-    if (has_default_column_width()) {
-      total_size += 2 + 8;
-    }
-
-    // optional .TST.CellID origin_offset = 23 [deprecated = true];
-    if (has_origin_offset()) {
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
+    if (has_multiple_choice_list_format()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->origin_offset());
+          this->multiple_choice_list_format());
     }
 
-    // required uint32 preset_index = 28;
-    if (has_preset_index()) {
+    // optional uint32 explicit_format_flags = 19;
+    if (has_explicit_format_flags()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->preset_index());
-    }
-
-    // optional bool repeating_header_rows_enabled = 29;
-    if (has_repeating_header_rows_enabled()) {
-      total_size += 2 + 1;
+          this->explicit_format_flags());
     }
 
-    // optional bool repeating_header_columns_enabled = 32;
-    if (has_repeating_header_columns_enabled()) {
-      total_size += 2 + 1;
+    // optional .TSP.Reference richTextPayload = 20;
+    if (has_richtextpayload()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->richtextpayload());
     }
 
-    // optional bool style_apply_clears_all = 31;
-    if (has_style_apply_clears_all()) {
-      total_size += 2 + 1;
+    // optional .TSP.Reference conditional_style = 21;
+    if (has_conditional_style()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->conditional_style());
     }
 
-    // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
-    if (has_hidden_state_formula_owner_for_columns()) {
+    // optional .TSP.Reference multiple_choice_list = 22;
+    if (has_multiple_choice_list()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->hidden_state_formula_owner_for_columns());
+          this->multiple_choice_list());
     }
 
-    // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
-    if (has_hidden_state_formula_owner_for_rows()) {
+    // optional .TSP.Reference comment_storage = 23;
+    if (has_comment_storage()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->hidden_state_formula_owner_for_rows());
+          this->comment_storage());
     }
 
-  }
-  if (_has_bits_[40 / 32] & (0xffu << (40 % 32))) {
-    // optional .TSP.Reference filter_set = 38;
-    if (has_filter_set()) {
+    // optional uint32 conditional_style_applied_rule = 24;
+    if (has_conditional_style_applied_rule()) {
       total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->filter_set());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->conditional_style_applied_rule());
     }
 
-    // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
-    if (has_conditional_style_formula_owner_id()) {
+    // optional .TST.ImportWarningSetArchive import_warning_set = 25;
+    if (has_import_warning_set()) {
       total_size += 2 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditional_style_formula_owner_id());
+          this->import_warning_set());
     }
 
   }
@@ -12316,10 +16399,10 @@ int TableModelArchive::ByteSize() const {
   return total_size;
 }
 
-void TableModelArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void Cell::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const TableModelArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableModelArchive*>(
+  const Cell* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const Cell*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -12328,275 +16411,404 @@ void TableModelArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void TableModelArchive::MergeFrom(const TableModelArchive& from) {
+void Cell::MergeFrom(const Cell& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_table_id()) {
-      set_table_id(from.table_id());
+    if (from.has_valuetype()) {
+      set_valuetype(from.valuetype());
     }
-    if (from.has_from_table_id()) {
-      set_from_table_id(from.from_table_id());
+    if (from.has_numbervalue()) {
+      set_numbervalue(from.numbervalue());
     }
-    if (from.has_table_style()) {
-      mutable_table_style()->::TSP::Reference::MergeFrom(from.table_style());
+    if (from.has_stringvalue()) {
+      set_stringvalue(from.stringvalue());
     }
-    if (from.has_body_text_style()) {
-      mutable_body_text_style()->::TSP::Reference::MergeFrom(from.body_text_style());
+    if (from.has_boolvalue()) {
+      set_boolvalue(from.boolvalue());
     }
-    if (from.has_header_row_text_style()) {
-      mutable_header_row_text_style()->::TSP::Reference::MergeFrom(from.header_row_text_style());
+    if (from.has_cell_style()) {
+      mutable_cell_style()->::TSP::Reference::MergeFrom(from.cell_style());
     }
-    if (from.has_header_column_text_style()) {
-      mutable_header_column_text_style()->::TSP::Reference::MergeFrom(from.header_column_text_style());
+    if (from.has_text_style()) {
+      mutable_text_style()->::TSP::Reference::MergeFrom(from.text_style());
     }
-    if (from.has_footer_row_text_style()) {
-      mutable_footer_row_text_style()->::TSP::Reference::MergeFrom(from.footer_row_text_style());
+    if (from.has_formula()) {
+      mutable_formula()->::TSCE::FormulaArchive::MergeFrom(from.formula());
     }
-    if (from.has_body_cell_style()) {
-      mutable_body_cell_style()->::TSP::Reference::MergeFrom(from.body_cell_style());
+    if (from.has_formulaerror()) {
+      mutable_formulaerror()->::TSP::Reference::MergeFrom(from.formulaerror());
     }
   }
   if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_header_row_style()) {
-      mutable_header_row_style()->::TSP::Reference::MergeFrom(from.header_row_style());
+    if (from.has_current_format()) {
+      mutable_current_format()->::TSK::FormatStructArchive::MergeFrom(from.current_format());
     }
-    if (from.has_header_column_style()) {
-      mutable_header_column_style()->::TSP::Reference::MergeFrom(from.header_column_style());
+    if (from.has_number_format()) {
+      mutable_number_format()->::TSK::FormatStructArchive::MergeFrom(from.number_format());
     }
-    if (from.has_footer_row_style()) {
-      mutable_footer_row_style()->::TSP::Reference::MergeFrom(from.footer_row_style());
+    if (from.has_currency_format()) {
+      mutable_currency_format()->::TSK::FormatStructArchive::MergeFrom(from.currency_format());
     }
-    if (from.has_table_name_style()) {
-      mutable_table_name_style()->::TSP::Reference::MergeFrom(from.table_name_style());
+    if (from.has_duration_format()) {
+      mutable_duration_format()->::TSK::FormatStructArchive::MergeFrom(from.duration_format());
     }
-    if (from.has_table_name_shape_style()) {
-      mutable_table_name_shape_style()->::TSP::Reference::MergeFrom(from.table_name_shape_style());
+    if (from.has_date_format()) {
+      mutable_date_format()->::TSK::FormatStructArchive::MergeFrom(from.date_format());
     }
-    if (from.has_data_store()) {
-      mutable_data_store()->::TST::DataStore::MergeFrom(from.data_store());
+    if (from.has_control_format()) {
+      mutable_control_format()->::TSK::FormatStructArchive::MergeFrom(from.control_format());
     }
-    if (from.has_provider()) {
-      mutable_provider()->::TSP::Reference::MergeFrom(from.provider());
+    if (from.has_custom_format()) {
+      mutable_custom_format()->::TSK::FormatStructArchive::MergeFrom(from.custom_format());
     }
-    if (from.has_number_of_rows()) {
-      set_number_of_rows(from.number_of_rows());
+    if (from.has_base_format()) {
+      mutable_base_format()->::TSK::FormatStructArchive::MergeFrom(from.base_format());
     }
   }
   if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    if (from.has_number_of_columns()) {
-      set_number_of_columns(from.number_of_columns());
-    }
-    if (from.has_table_name()) {
-      set_table_name(from.table_name());
-    }
-    if (from.has_table_name_enabled()) {
-      set_table_name_enabled(from.table_name_enabled());
-    }
-    if (from.has_table_name_height()) {
-      set_table_name_height(from.table_name_height());
-    }
-    if (from.has_table_name_border_enabled()) {
-      set_table_name_border_enabled(from.table_name_border_enabled());
-    }
-    if (from.has_number_of_header_rows()) {
-      set_number_of_header_rows(from.number_of_header_rows());
-    }
-    if (from.has_number_of_header_columns()) {
-      set_number_of_header_columns(from.number_of_header_columns());
-    }
-    if (from.has_number_of_footer_rows()) {
-      set_number_of_footer_rows(from.number_of_footer_rows());
-    }
-  }
-  if (from._has_bits_[24 / 32] & (0xffu << (24 % 32))) {
-    if (from.has_header_rows_frozen()) {
-      set_header_rows_frozen(from.header_rows_frozen());
-    }
-    if (from.has_header_columns_frozen()) {
-      set_header_columns_frozen(from.header_columns_frozen());
-    }
-    if (from.has_number_of_hidden_rows()) {
-      set_number_of_hidden_rows(from.number_of_hidden_rows());
-    }
-    if (from.has_number_of_hidden_columns()) {
-      set_number_of_hidden_columns(from.number_of_hidden_columns());
-    }
-    if (from.has_number_of_user_hidden_rows()) {
-      set_number_of_user_hidden_rows(from.number_of_user_hidden_rows());
-    }
-    if (from.has_number_of_user_hidden_columns()) {
-      set_number_of_user_hidden_columns(from.number_of_user_hidden_columns());
-    }
-    if (from.has_number_of_filtered_rows()) {
-      set_number_of_filtered_rows(from.number_of_filtered_rows());
-    }
-    if (from.has_default_row_height()) {
-      set_default_row_height(from.default_row_height());
-    }
-  }
-  if (from._has_bits_[32 / 32] & (0xffu << (32 % 32))) {
-    if (from.has_default_column_width()) {
-      set_default_column_width(from.default_column_width());
-    }
-    if (from.has_origin_offset()) {
-      mutable_origin_offset()->::TST::CellID::MergeFrom(from.origin_offset());
-    }
-    if (from.has_preset_index()) {
-      set_preset_index(from.preset_index());
+    if (from.has_multiple_choice_list_format()) {
+      mutable_multiple_choice_list_format()->::TSK::FormatStructArchive::MergeFrom(from.multiple_choice_list_format());
     }
-    if (from.has_repeating_header_rows_enabled()) {
-      set_repeating_header_rows_enabled(from.repeating_header_rows_enabled());
+    if (from.has_explicit_format_flags()) {
+      set_explicit_format_flags(from.explicit_format_flags());
     }
-    if (from.has_repeating_header_columns_enabled()) {
-      set_repeating_header_columns_enabled(from.repeating_header_columns_enabled());
+    if (from.has_richtextpayload()) {
+      mutable_richtextpayload()->::TSP::Reference::MergeFrom(from.richtextpayload());
     }
-    if (from.has_style_apply_clears_all()) {
-      set_style_apply_clears_all(from.style_apply_clears_all());
+    if (from.has_conditional_style()) {
+      mutable_conditional_style()->::TSP::Reference::MergeFrom(from.conditional_style());
     }
-    if (from.has_hidden_state_formula_owner_for_columns()) {
-      mutable_hidden_state_formula_owner_for_columns()->::TSP::Reference::MergeFrom(from.hidden_state_formula_owner_for_columns());
+    if (from.has_multiple_choice_list()) {
+      mutable_multiple_choice_list()->::TSP::Reference::MergeFrom(from.multiple_choice_list());
     }
-    if (from.has_hidden_state_formula_owner_for_rows()) {
-      mutable_hidden_state_formula_owner_for_rows()->::TSP::Reference::MergeFrom(from.hidden_state_formula_owner_for_rows());
+    if (from.has_comment_storage()) {
+      mutable_comment_storage()->::TSP::Reference::MergeFrom(from.comment_storage());
     }
-  }
-  if (from._has_bits_[40 / 32] & (0xffu << (40 % 32))) {
-    if (from.has_filter_set()) {
-      mutable_filter_set()->::TSP::Reference::MergeFrom(from.filter_set());
+    if (from.has_conditional_style_applied_rule()) {
+      set_conditional_style_applied_rule(from.conditional_style_applied_rule());
     }
-    if (from.has_conditional_style_formula_owner_id()) {
-      mutable_conditional_style_formula_owner_id()->::TSCE::CFUUIDArchive::MergeFrom(from.conditional_style_formula_owner_id());
+    if (from.has_import_warning_set()) {
+      mutable_import_warning_set()->::TST::ImportWarningSetArchive::MergeFrom(from.import_warning_set());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void TableModelArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void Cell::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableModelArchive::CopyFrom(const TableModelArchive& from) {
+void Cell::CopyFrom(const Cell& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableModelArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x8003a7fd) != 0x8003a7fd) return false;
-  if ((_has_bits_[1] & 0x00000005) != 0x00000005) return false;
+bool Cell::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  if (has_table_style()) {
-    if (!this->table_style().IsInitialized()) return false;
+  if (has_cell_style()) {
+    if (!this->cell_style().IsInitialized()) return false;
   }
-  if (has_body_text_style()) {
-    if (!this->body_text_style().IsInitialized()) return false;
+  if (has_text_style()) {
+    if (!this->text_style().IsInitialized()) return false;
   }
-  if (has_header_row_text_style()) {
-    if (!this->header_row_text_style().IsInitialized()) return false;
+  if (has_formula()) {
+    if (!this->formula().IsInitialized()) return false;
   }
-  if (has_header_column_text_style()) {
-    if (!this->header_column_text_style().IsInitialized()) return false;
+  if (has_formulaerror()) {
+    if (!this->formulaerror().IsInitialized()) return false;
   }
-  if (has_footer_row_text_style()) {
-    if (!this->footer_row_text_style().IsInitialized()) return false;
+  if (has_current_format()) {
+    if (!this->current_format().IsInitialized()) return false;
   }
-  if (has_body_cell_style()) {
-    if (!this->body_cell_style().IsInitialized()) return false;
+  if (has_number_format()) {
+    if (!this->number_format().IsInitialized()) return false;
   }
-  if (has_header_row_style()) {
-    if (!this->header_row_style().IsInitialized()) return false;
+  if (has_currency_format()) {
+    if (!this->currency_format().IsInitialized()) return false;
   }
-  if (has_header_column_style()) {
-    if (!this->header_column_style().IsInitialized()) return false;
+  if (has_duration_format()) {
+    if (!this->duration_format().IsInitialized()) return false;
   }
-  if (has_footer_row_style()) {
-    if (!this->footer_row_style().IsInitialized()) return false;
+  if (has_date_format()) {
+    if (!this->date_format().IsInitialized()) return false;
   }
-  if (has_table_name_style()) {
-    if (!this->table_name_style().IsInitialized()) return false;
+  if (has_control_format()) {
+    if (!this->control_format().IsInitialized()) return false;
   }
-  if (has_table_name_shape_style()) {
-    if (!this->table_name_shape_style().IsInitialized()) return false;
+  if (has_custom_format()) {
+    if (!this->custom_format().IsInitialized()) return false;
   }
-  if (has_data_store()) {
-    if (!this->data_store().IsInitialized()) return false;
+  if (has_base_format()) {
+    if (!this->base_format().IsInitialized()) return false;
   }
-  if (has_provider()) {
-    if (!this->provider().IsInitialized()) return false;
+  if (has_multiple_choice_list_format()) {
+    if (!this->multiple_choice_list_format().IsInitialized()) return false;
   }
-  if (has_origin_offset()) {
-    if (!this->origin_offset().IsInitialized()) return false;
+  if (has_richtextpayload()) {
+    if (!this->richtextpayload().IsInitialized()) return false;
   }
-  if (has_hidden_state_formula_owner_for_columns()) {
-    if (!this->hidden_state_formula_owner_for_columns().IsInitialized()) return false;
+  if (has_conditional_style()) {
+    if (!this->conditional_style().IsInitialized()) return false;
+  }
+  if (has_multiple_choice_list()) {
+    if (!this->multiple_choice_list().IsInitialized()) return false;
+  }
+  if (has_comment_storage()) {
+    if (!this->comment_storage().IsInitialized()) return false;
+  }
+  if (has_import_warning_set()) {
+    if (!this->import_warning_set().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void Cell::Swap(Cell* other) {
+  if (other != this) {
+    std::swap(valuetype_, other->valuetype_);
+    std::swap(numbervalue_, other->numbervalue_);
+    std::swap(stringvalue_, other->stringvalue_);
+    std::swap(boolvalue_, other->boolvalue_);
+    std::swap(cell_style_, other->cell_style_);
+    std::swap(text_style_, other->text_style_);
+    std::swap(formula_, other->formula_);
+    std::swap(formulaerror_, other->formulaerror_);
+    std::swap(current_format_, other->current_format_);
+    std::swap(number_format_, other->number_format_);
+    std::swap(currency_format_, other->currency_format_);
+    std::swap(duration_format_, other->duration_format_);
+    std::swap(date_format_, other->date_format_);
+    std::swap(control_format_, other->control_format_);
+    std::swap(custom_format_, other->custom_format_);
+    std::swap(base_format_, other->base_format_);
+    std::swap(multiple_choice_list_format_, other->multiple_choice_list_format_);
+    std::swap(explicit_format_flags_, other->explicit_format_flags_);
+    std::swap(richtextpayload_, other->richtextpayload_);
+    std::swap(conditional_style_, other->conditional_style_);
+    std::swap(multiple_choice_list_, other->multiple_choice_list_);
+    std::swap(comment_storage_, other->comment_storage_);
+    std::swap(conditional_style_applied_rule_, other->conditional_style_applied_rule_);
+    std::swap(import_warning_set_, other->import_warning_set_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata Cell::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = Cell_descriptor_;
+  metadata.reflection = Cell_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int MergeRegionMapArchive::kCellRangeFieldNumber;
+#endif  // !_MSC_VER
+
+MergeRegionMapArchive::MergeRegionMapArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void MergeRegionMapArchive::InitAsDefaultInstance() {
+}
+
+MergeRegionMapArchive::MergeRegionMapArchive(const MergeRegionMapArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void MergeRegionMapArchive::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+MergeRegionMapArchive::~MergeRegionMapArchive() {
+  SharedDtor();
+}
+
+void MergeRegionMapArchive::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void MergeRegionMapArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* MergeRegionMapArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return MergeRegionMapArchive_descriptor_;
+}
+
+const MergeRegionMapArchive& MergeRegionMapArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+MergeRegionMapArchive* MergeRegionMapArchive::default_instance_ = NULL;
+
+MergeRegionMapArchive* MergeRegionMapArchive::New() const {
+  return new MergeRegionMapArchive;
+}
+
+void MergeRegionMapArchive::Clear() {
+  cell_range_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool MergeRegionMapArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TST.CellRange cell_range = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_range:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_cell_range()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_cell_range;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void MergeRegionMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TST.CellRange cell_range = 1;
+  for (int i = 0; i < this->cell_range_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->cell_range(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* MergeRegionMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TST.CellRange cell_range = 1;
+  for (int i = 0; i < this->cell_range_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->cell_range(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int MergeRegionMapArchive::ByteSize() const {
+  int total_size = 0;
+
+  // repeated .TST.CellRange cell_range = 1;
+  total_size += 1 * this->cell_range_size();
+  for (int i = 0; i < this->cell_range_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->cell_range(i));
   }
-  if (has_hidden_state_formula_owner_for_rows()) {
-    if (!this->hidden_state_formula_owner_for_rows().IsInitialized()) return false;
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
   }
-  if (has_filter_set()) {
-    if (!this->filter_set().IsInitialized()) return false;
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void MergeRegionMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const MergeRegionMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const MergeRegionMapArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void MergeRegionMapArchive::MergeFrom(const MergeRegionMapArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  cell_range_.MergeFrom(from.cell_range_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void MergeRegionMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void MergeRegionMapArchive::CopyFrom(const MergeRegionMapArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool MergeRegionMapArchive::IsInitialized() const {
+
+  for (int i = 0; i < cell_range_size(); i++) {
+    if (!this->cell_range(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void TableModelArchive::Swap(TableModelArchive* other) {
+void MergeRegionMapArchive::Swap(MergeRegionMapArchive* other) {
   if (other != this) {
-    std::swap(table_id_, other->table_id_);
-    std::swap(from_table_id_, other->from_table_id_);
-    std::swap(table_style_, other->table_style_);
-    std::swap(body_text_style_, other->body_text_style_);
-    std::swap(header_row_text_style_, other->header_row_text_style_);
-    std::swap(header_column_text_style_, other->header_column_text_style_);
-    std::swap(footer_row_text_style_, other->footer_row_text_style_);
-    std::swap(body_cell_style_, other->body_cell_style_);
-    std::swap(header_row_style_, other->header_row_style_);
-    std::swap(header_column_style_, other->header_column_style_);
-    std::swap(footer_row_style_, other->footer_row_style_);
-    std::swap(table_name_style_, other->table_name_style_);
-    std::swap(table_name_shape_style_, other->table_name_shape_style_);
-    std::swap(data_store_, other->data_store_);
-    std::swap(provider_, other->provider_);
-    std::swap(number_of_rows_, other->number_of_rows_);
-    std::swap(number_of_columns_, other->number_of_columns_);
-    std::swap(table_name_, other->table_name_);
-    std::swap(table_name_enabled_, other->table_name_enabled_);
-    std::swap(table_name_height_, other->table_name_height_);
-    std::swap(table_name_border_enabled_, other->table_name_border_enabled_);
-    std::swap(number_of_header_rows_, other->number_of_header_rows_);
-    std::swap(number_of_header_columns_, other->number_of_header_columns_);
-    std::swap(number_of_footer_rows_, other->number_of_footer_rows_);
-    std::swap(header_rows_frozen_, other->header_rows_frozen_);
-    std::swap(header_columns_frozen_, other->header_columns_frozen_);
-    std::swap(number_of_hidden_rows_, other->number_of_hidden_rows_);
-    std::swap(number_of_hidden_columns_, other->number_of_hidden_columns_);
-    std::swap(number_of_user_hidden_rows_, other->number_of_user_hidden_rows_);
-    std::swap(number_of_user_hidden_columns_, other->number_of_user_hidden_columns_);
-    std::swap(number_of_filtered_rows_, other->number_of_filtered_rows_);
-    std::swap(default_row_height_, other->default_row_height_);
-    std::swap(default_column_width_, other->default_column_width_);
-    std::swap(origin_offset_, other->origin_offset_);
-    std::swap(preset_index_, other->preset_index_);
-    std::swap(repeating_header_rows_enabled_, other->repeating_header_rows_enabled_);
-    std::swap(repeating_header_columns_enabled_, other->repeating_header_columns_enabled_);
-    std::swap(style_apply_clears_all_, other->style_apply_clears_all_);
-    std::swap(hidden_state_formula_owner_for_columns_, other->hidden_state_formula_owner_for_columns_);
-    std::swap(hidden_state_formula_owner_for_rows_, other->hidden_state_formula_owner_for_rows_);
-    std::swap(filter_set_, other->filter_set_);
-    std::swap(conditional_style_formula_owner_id_, other->conditional_style_formula_owner_id_);
+    cell_range_.Swap(&other->cell_range_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
-    std::swap(_has_bits_[1], other->_has_bits_[1]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableModelArchive::GetMetadata() const {
+::google::protobuf::Metadata MergeRegionMapArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableModelArchive_descriptor_;
-  metadata.reflection = TableModelArchive_reflection_;
+  metadata.descriptor = MergeRegionMapArchive_descriptor_;
+  metadata.reflection = MergeRegionMapArchive_reflection_;
   return metadata;
 }
 
@@ -12604,88 +16816,163 @@ ::google::protobuf::Metadata TableModelArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int CellMapArchive_CellMapEntry::kCellIDFieldNumber;
+const int CellMapArchive_CellMapEntry::kCellFieldNumber;
 #endif  // !_MSC_VER
 
-DurationWrapperArchive::DurationWrapperArchive()
+CellMapArchive_CellMapEntry::CellMapArchive_CellMapEntry()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void DurationWrapperArchive::InitAsDefaultInstance() {
+void CellMapArchive_CellMapEntry::InitAsDefaultInstance() {
+  cellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
+  cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
 }
 
-DurationWrapperArchive::DurationWrapperArchive(const DurationWrapperArchive& from)
+CellMapArchive_CellMapEntry::CellMapArchive_CellMapEntry(const CellMapArchive_CellMapEntry& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void DurationWrapperArchive::SharedCtor() {
+void CellMapArchive_CellMapEntry::SharedCtor() {
   _cached_size_ = 0;
+  cellid_ = NULL;
+  cell_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-DurationWrapperArchive::~DurationWrapperArchive() {
+CellMapArchive_CellMapEntry::~CellMapArchive_CellMapEntry() {
   SharedDtor();
 }
 
-void DurationWrapperArchive::SharedDtor() {
+void CellMapArchive_CellMapEntry::SharedDtor() {
   if (this != default_instance_) {
+    delete cellid_;
+    delete cell_;
   }
 }
 
-void DurationWrapperArchive::SetCachedSize(int size) const {
+void CellMapArchive_CellMapEntry::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* DurationWrapperArchive::descriptor() {
+const ::google::protobuf::Descriptor* CellMapArchive_CellMapEntry::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return DurationWrapperArchive_descriptor_;
+  return CellMapArchive_CellMapEntry_descriptor_;
 }
 
-const DurationWrapperArchive& DurationWrapperArchive::default_instance() {
+const CellMapArchive_CellMapEntry& CellMapArchive_CellMapEntry::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-DurationWrapperArchive* DurationWrapperArchive::default_instance_ = NULL;
+CellMapArchive_CellMapEntry* CellMapArchive_CellMapEntry::default_instance_ = NULL;
 
-DurationWrapperArchive* DurationWrapperArchive::New() const {
-  return new DurationWrapperArchive;
+CellMapArchive_CellMapEntry* CellMapArchive_CellMapEntry::New() const {
+  return new CellMapArchive_CellMapEntry;
 }
 
-void DurationWrapperArchive::Clear() {
+void CellMapArchive_CellMapEntry::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_cellid()) {
+      if (cellid_ != NULL) cellid_->::TST::CellID::Clear();
+    }
+    if (has_cell()) {
+      if (cell_ != NULL) cell_->::TST::Cell::Clear();
+    }
+  }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool DurationWrapperArchive::MergePartialFromCodedStream(
+bool CellMapArchive_CellMapEntry::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
-    if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-        ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-      return true;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.CellID cellID = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cellid()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_cell;
+        break;
+      }
+
+      // optional .TST.Cell cell = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cell()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
     }
-    DO_(::google::protobuf::internal::WireFormat::SkipField(
-          input, tag, mutable_unknown_fields()));
   }
   return true;
 #undef DO_
 }
 
-void DurationWrapperArchive::SerializeWithCachedSizes(
+void CellMapArchive_CellMapEntry::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.CellID cellID = 1;
+  if (has_cellid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->cellid(), output);
+  }
+
+  // optional .TST.Cell cell = 2;
+  if (has_cell()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->cell(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* DurationWrapperArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CellMapArchive_CellMapEntry::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
+  // required .TST.CellID cellID = 1;
+  if (has_cellid()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->cellid(), target);
+  }
+
+  // optional .TST.Cell cell = 2;
+  if (has_cell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->cell(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -12693,9 +16980,25 @@ ::google::protobuf::uint8* DurationWrapperArchive::SerializeWithCachedSizesToArr
   return target;
 }
 
-int DurationWrapperArchive::ByteSize() const {
+int CellMapArchive_CellMapEntry::ByteSize() const {
   int total_size = 0;
 
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.CellID cellID = 1;
+    if (has_cellid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cellid());
+    }
+
+    // optional .TST.Cell cell = 2;
+    if (has_cell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell());
+    }
+
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -12707,10 +17010,10 @@ int DurationWrapperArchive::ByteSize() const {
   return total_size;
 }
 
-void DurationWrapperArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CellMapArchive_CellMapEntry::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const DurationWrapperArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const DurationWrapperArchive*>(
+  const CellMapArchive_CellMapEntry* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellMapArchive_CellMapEntry*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -12719,591 +17022,569 @@ void DurationWrapperArchive::MergeFrom(const ::google::protobuf::Message& from)
   }
 }
 
-void DurationWrapperArchive::MergeFrom(const DurationWrapperArchive& from) {
+void CellMapArchive_CellMapEntry::MergeFrom(const CellMapArchive_CellMapEntry& from) {
   GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_cellid()) {
+      mutable_cellid()->::TST::CellID::MergeFrom(from.cellid());
+    }
+    if (from.has_cell()) {
+      mutable_cell()->::TST::Cell::MergeFrom(from.cell());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void DurationWrapperArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CellMapArchive_CellMapEntry::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void DurationWrapperArchive::CopyFrom(const DurationWrapperArchive& from) {
+void CellMapArchive_CellMapEntry::CopyFrom(const CellMapArchive_CellMapEntry& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool DurationWrapperArchive::IsInitialized() const {
+bool CellMapArchive_CellMapEntry::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
+  if (has_cellid()) {
+    if (!this->cellid().IsInitialized()) return false;
+  }
+  if (has_cell()) {
+    if (!this->cell().IsInitialized()) return false;
+  }
   return true;
 }
 
-void DurationWrapperArchive::Swap(DurationWrapperArchive* other) {
+void CellMapArchive_CellMapEntry::Swap(CellMapArchive_CellMapEntry* other) {
   if (other != this) {
+    std::swap(cellid_, other->cellid_);
+    std::swap(cell_, other->cell_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata DurationWrapperArchive::GetMetadata() const {
+::google::protobuf::Metadata CellMapArchive_CellMapEntry::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = DurationWrapperArchive_descriptor_;
-  metadata.reflection = DurationWrapperArchive_reflection_;
+  metadata.descriptor = CellMapArchive_CellMapEntry_descriptor_;
+  metadata.reflection = CellMapArchive_CellMapEntry_reflection_;
   return metadata;
 }
 
 
-// ===================================================================
+// -------------------------------------------------------------------
 
 #ifndef _MSC_VER
-const int Cell::kValueTypeFieldNumber;
-const int Cell::kNumberValueFieldNumber;
-const int Cell::kStringValueFieldNumber;
-const int Cell::kBoolValueFieldNumber;
-const int Cell::kCellStyleFieldNumber;
-const int Cell::kTextStyleFieldNumber;
-const int Cell::kFormulaFieldNumber;
-const int Cell::kFormulaErrorFieldNumber;
-const int Cell::kCurrentFormatFieldNumber;
-const int Cell::kNumberFormatFieldNumber;
-const int Cell::kCurrencyFormatFieldNumber;
-const int Cell::kDurationFormatFieldNumber;
-const int Cell::kDateFormatFieldNumber;
-const int Cell::kControlFormatFieldNumber;
-const int Cell::kCustomFormatFieldNumber;
-const int Cell::kBaseFormatFieldNumber;
-const int Cell::kMultipleChoiceListFormatFieldNumber;
-const int Cell::kExplicitFormatFlagsFieldNumber;
-const int Cell::kRichTextPayloadFieldNumber;
-const int Cell::kConditionalStyleFieldNumber;
-const int Cell::kMultipleChoiceListFieldNumber;
-const int Cell::kCommentStorageFieldNumber;
-const int Cell::kConditionalStyleAppliedRuleFieldNumber;
+const int CellMapArchive::kCapacityFieldNumber;
+const int CellMapArchive::kCountFieldNumber;
+const int CellMapArchive::kCellMapEntryFieldNumber;
+const int CellMapArchive::kMayModifyFormulasInCellsFieldNumber;
+const int CellMapArchive::kMayModifyValuesReferencedByFormulasFieldNumber;
+const int CellMapArchive::kAppliesToHiddenFieldNumber;
 #endif  // !_MSC_VER
 
-Cell::Cell()
+CellMapArchive::CellMapArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void Cell::InitAsDefaultInstance() {
-  cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  formula_ = const_cast< ::TSCE::FormulaArchive*>(&::TSCE::FormulaArchive::default_instance());
-  formulaerror_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  current_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  number_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  currency_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  duration_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  date_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  control_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  custom_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  base_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  multiple_choice_list_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  richtextpayload_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  conditional_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  multiple_choice_list_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CellMapArchive::InitAsDefaultInstance() {
 }
 
-Cell::Cell(const Cell& from)
+CellMapArchive::CellMapArchive(const CellMapArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void Cell::SharedCtor() {
+void CellMapArchive::SharedCtor() {
   _cached_size_ = 0;
-  valuetype_ = 0;
-  numbervalue_ = 0;
-  stringvalue_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  boolvalue_ = false;
-  cell_style_ = NULL;
-  text_style_ = NULL;
-  formula_ = NULL;
-  formulaerror_ = NULL;
-  current_format_ = NULL;
-  number_format_ = NULL;
-  currency_format_ = NULL;
-  duration_format_ = NULL;
-  date_format_ = NULL;
-  control_format_ = NULL;
-  custom_format_ = NULL;
-  base_format_ = NULL;
-  multiple_choice_list_format_ = NULL;
-  explicit_format_flags_ = 0u;
-  richtextpayload_ = NULL;
-  conditional_style_ = NULL;
-  multiple_choice_list_ = NULL;
-  comment_storage_ = NULL;
-  conditional_style_applied_rule_ = 0u;
+  capacity_ = 0u;
+  count_ = 0u;
+  may_modify_formulas_in_cells_ = true;
+  may_modify_values_referenced_by_formulas_ = true;
+  applies_to_hidden_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-Cell::~Cell() {
+CellMapArchive::~CellMapArchive() {
   SharedDtor();
 }
 
-void Cell::SharedDtor() {
-  if (stringvalue_ != &::google::protobuf::internal::kEmptyString) {
-    delete stringvalue_;
-  }
+void CellMapArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete cell_style_;
-    delete text_style_;
-    delete formula_;
-    delete formulaerror_;
-    delete current_format_;
-    delete number_format_;
-    delete currency_format_;
-    delete duration_format_;
-    delete date_format_;
-    delete control_format_;
-    delete custom_format_;
-    delete base_format_;
-    delete multiple_choice_list_format_;
-    delete richtextpayload_;
-    delete conditional_style_;
-    delete multiple_choice_list_;
-    delete comment_storage_;
   }
 }
 
-void Cell::SetCachedSize(int size) const {
+void CellMapArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* Cell::descriptor() {
+const ::google::protobuf::Descriptor* CellMapArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return Cell_descriptor_;
+  return CellMapArchive_descriptor_;
 }
 
-const Cell& Cell::default_instance() {
+const CellMapArchive& CellMapArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-Cell* Cell::default_instance_ = NULL;
+CellMapArchive* CellMapArchive::default_instance_ = NULL;
 
-Cell* Cell::New() const {
-  return new Cell;
+CellMapArchive* CellMapArchive::New() const {
+  return new CellMapArchive;
 }
 
-void Cell::Clear() {
+void CellMapArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    valuetype_ = 0;
-    numbervalue_ = 0;
-    if (has_stringvalue()) {
-      if (stringvalue_ != &::google::protobuf::internal::kEmptyString) {
-        stringvalue_->clear();
-      }
-    }
-    boolvalue_ = false;
-    if (has_cell_style()) {
-      if (cell_style_ != NULL) cell_style_->::TSP::Reference::Clear();
-    }
-    if (has_text_style()) {
-      if (text_style_ != NULL) text_style_->::TSP::Reference::Clear();
-    }
-    if (has_formula()) {
-      if (formula_ != NULL) formula_->::TSCE::FormulaArchive::Clear();
-    }
-    if (has_formulaerror()) {
-      if (formulaerror_ != NULL) formulaerror_->::TSP::Reference::Clear();
-    }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_current_format()) {
-      if (current_format_ != NULL) current_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_number_format()) {
-      if (number_format_ != NULL) number_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_currency_format()) {
-      if (currency_format_ != NULL) currency_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_duration_format()) {
-      if (duration_format_ != NULL) duration_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_date_format()) {
-      if (date_format_ != NULL) date_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_control_format()) {
-      if (control_format_ != NULL) control_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_custom_format()) {
-      if (custom_format_ != NULL) custom_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_base_format()) {
-      if (base_format_ != NULL) base_format_->::TSK::FormatStructArchive::Clear();
-    }
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    if (has_multiple_choice_list_format()) {
-      if (multiple_choice_list_format_ != NULL) multiple_choice_list_format_->::TSK::FormatStructArchive::Clear();
-    }
-    explicit_format_flags_ = 0u;
-    if (has_richtextpayload()) {
-      if (richtextpayload_ != NULL) richtextpayload_->::TSP::Reference::Clear();
-    }
-    if (has_conditional_style()) {
-      if (conditional_style_ != NULL) conditional_style_->::TSP::Reference::Clear();
-    }
-    if (has_multiple_choice_list()) {
-      if (multiple_choice_list_ != NULL) multiple_choice_list_->::TSP::Reference::Clear();
-    }
-    if (has_comment_storage()) {
-      if (comment_storage_ != NULL) comment_storage_->::TSP::Reference::Clear();
-    }
-    conditional_style_applied_rule_ = 0u;
+    capacity_ = 0u;
+    count_ = 0u;
+    may_modify_formulas_in_cells_ = true;
+    may_modify_values_referenced_by_formulas_ = true;
+    applies_to_hidden_ = false;
   }
+  cellmapentry_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool Cell::MergePartialFromCodedStream(
+bool CellMapArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CellValueType valueType = 2;
+      // required uint32 capacity = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &capacity_)));
+          set_has_capacity();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_count;
+        break;
+      }
+
+      // required uint32 count = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
+         parse_count:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::CellValueType_IsValid(value)) {
-            set_valuetype(static_cast< ::TST::CellValueType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &count_)));
+          set_has_count();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_cell_style;
+        if (input->ExpectTag(26)) goto parse_cellMapEntry;
         break;
       }
 
-      // optional .TSP.Reference cell_style = 3;
+      // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_style:
+         parse_cellMapEntry:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cell_style()));
+                input, add_cellmapentry()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_text_style;
+        if (input->ExpectTag(26)) goto parse_cellMapEntry;
+        if (input->ExpectTag(32)) goto parse_may_modify_formulas_in_cells;
         break;
       }
 
-      // optional .TSP.Reference text_style = 4;
+      // optional bool may_modify_formulas_in_cells = 4 [default = true];
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_text_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_text_style()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_may_modify_formulas_in_cells:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &may_modify_formulas_in_cells_)));
+          set_has_may_modify_formulas_in_cells();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(41)) goto parse_numberValue;
+        if (input->ExpectTag(40)) goto parse_may_modify_values_referenced_by_formulas;
         break;
       }
 
-      // optional double numberValue = 5;
+      // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_numberValue:
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_may_modify_values_referenced_by_formulas:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &numbervalue_)));
-          set_has_numbervalue();
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &may_modify_values_referenced_by_formulas_)));
+          set_has_may_modify_values_referenced_by_formulas();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_stringValue;
+        if (input->ExpectTag(48)) goto parse_applies_to_hidden;
         break;
       }
 
-      // optional string stringValue = 6;
+      // optional bool applies_to_hidden = 6 [default = false];
       case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_stringValue:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_stringvalue()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->stringvalue().data(), this->stringvalue().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_applies_to_hidden:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &applies_to_hidden_)));
+          set_has_applies_to_hidden();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(56)) goto parse_boolValue;
+        if (input->ExpectAtEnd()) return true;
         break;
       }
 
-      // optional bool boolValue = 7;
-      case 7: {
+      default: {
+      handle_uninterpreted:
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_boolValue:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &boolvalue_)));
-          set_has_boolvalue();
-        } else {
-          goto handle_uninterpreted;
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
         }
-        if (input->ExpectTag(66)) goto parse_formula;
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
         break;
       }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CellMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required uint32 capacity = 1;
+  if (has_capacity()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->capacity(), output);
+  }
+
+  // required uint32 count = 2;
+  if (has_count()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->count(), output);
+  }
+
+  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
+  for (int i = 0; i < this->cellmapentry_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->cellmapentry(i), output);
+  }
+
+  // optional bool may_modify_formulas_in_cells = 4 [default = true];
+  if (has_may_modify_formulas_in_cells()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->may_modify_formulas_in_cells(), output);
+  }
+
+  // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
+  if (has_may_modify_values_referenced_by_formulas()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->may_modify_values_referenced_by_formulas(), output);
+  }
+
+  // optional bool applies_to_hidden = 6 [default = false];
+  if (has_applies_to_hidden()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->applies_to_hidden(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CellMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required uint32 capacity = 1;
+  if (has_capacity()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->capacity(), target);
+  }
+
+  // required uint32 count = 2;
+  if (has_count()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->count(), target);
+  }
+
+  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
+  for (int i = 0; i < this->cellmapentry_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->cellmapentry(i), target);
+  }
+
+  // optional bool may_modify_formulas_in_cells = 4 [default = true];
+  if (has_may_modify_formulas_in_cells()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->may_modify_formulas_in_cells(), target);
+  }
+
+  // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
+  if (has_may_modify_values_referenced_by_formulas()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->may_modify_values_referenced_by_formulas(), target);
+  }
+
+  // optional bool applies_to_hidden = 6 [default = false];
+  if (has_applies_to_hidden()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->applies_to_hidden(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CellMapArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required uint32 capacity = 1;
+    if (has_capacity()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->capacity());
+    }
+
+    // required uint32 count = 2;
+    if (has_count()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->count());
+    }
+
+    // optional bool may_modify_formulas_in_cells = 4 [default = true];
+    if (has_may_modify_formulas_in_cells()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
+    if (has_may_modify_values_referenced_by_formulas()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool applies_to_hidden = 6 [default = false];
+    if (has_applies_to_hidden()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
+  total_size += 1 * this->cellmapentry_size();
+  for (int i = 0; i < this->cellmapentry_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->cellmapentry(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CellMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CellMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellMapArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CellMapArchive::MergeFrom(const CellMapArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  cellmapentry_.MergeFrom(from.cellmapentry_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_capacity()) {
+      set_capacity(from.capacity());
+    }
+    if (from.has_count()) {
+      set_count(from.count());
+    }
+    if (from.has_may_modify_formulas_in_cells()) {
+      set_may_modify_formulas_in_cells(from.may_modify_formulas_in_cells());
+    }
+    if (from.has_may_modify_values_referenced_by_formulas()) {
+      set_may_modify_values_referenced_by_formulas(from.may_modify_values_referenced_by_formulas());
+    }
+    if (from.has_applies_to_hidden()) {
+      set_applies_to_hidden(from.applies_to_hidden());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CellMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CellMapArchive::CopyFrom(const CellMapArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CellMapArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  for (int i = 0; i < cellmapentry_size(); i++) {
+    if (!this->cellmapentry(i).IsInitialized()) return false;
+  }
+  return true;
+}
 
-      // optional .TSCE.FormulaArchive formula = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(74)) goto parse_current_format;
-        break;
-      }
+void CellMapArchive::Swap(CellMapArchive* other) {
+  if (other != this) {
+    std::swap(capacity_, other->capacity_);
+    std::swap(count_, other->count_);
+    cellmapentry_.Swap(&other->cellmapentry_);
+    std::swap(may_modify_formulas_in_cells_, other->may_modify_formulas_in_cells_);
+    std::swap(may_modify_values_referenced_by_formulas_, other->may_modify_values_referenced_by_formulas_);
+    std::swap(applies_to_hidden_, other->applies_to_hidden_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
 
-      // optional .TSK.FormatStructArchive current_format = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_current_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_current_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(82)) goto parse_formulaError;
-        break;
-      }
+::google::protobuf::Metadata CellMapArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CellMapArchive_descriptor_;
+  metadata.reflection = CellMapArchive_reflection_;
+  return metadata;
+}
 
-      // optional .TSP.Reference formulaError = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formulaError:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formulaerror()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(90)) goto parse_number_format;
-        break;
-      }
 
-      // optional .TSK.FormatStructArchive number_format = 11;
-      case 11: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_number_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_number_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(98)) goto parse_currency_format;
-        break;
-      }
+// ===================================================================
 
-      // optional .TSK.FormatStructArchive currency_format = 12;
-      case 12: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_currency_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_currency_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(106)) goto parse_duration_format;
-        break;
-      }
+#ifndef _MSC_VER
+const int CellMapTileArchive_CellMapEntry::kCellIDFieldNumber;
+const int CellMapTileArchive_CellMapEntry::kCellFieldNumber;
+#endif  // !_MSC_VER
 
-      // optional .TSK.FormatStructArchive duration_format = 13;
-      case 13: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_duration_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_duration_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(114)) goto parse_date_format;
-        break;
-      }
+CellMapTileArchive_CellMapEntry::CellMapTileArchive_CellMapEntry()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
 
-      // optional .TSK.FormatStructArchive date_format = 14;
-      case 14: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_date_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_date_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(122)) goto parse_control_format;
-        break;
-      }
+void CellMapTileArchive_CellMapEntry::InitAsDefaultInstance() {
+  cellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
+  cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+}
 
-      // optional .TSK.FormatStructArchive control_format = 15;
-      case 15: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_control_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_control_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(130)) goto parse_custom_format;
-        break;
-      }
+CellMapTileArchive_CellMapEntry::CellMapTileArchive_CellMapEntry(const CellMapTileArchive_CellMapEntry& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
 
-      // optional .TSK.FormatStructArchive custom_format = 16;
-      case 16: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_custom_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_custom_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(138)) goto parse_base_format;
-        break;
-      }
+void CellMapTileArchive_CellMapEntry::SharedCtor() {
+  _cached_size_ = 0;
+  cellid_ = NULL;
+  cell_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
 
-      // optional .TSK.FormatStructArchive base_format = 17;
-      case 17: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_base_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_base_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(146)) goto parse_multiple_choice_list_format;
-        break;
-      }
+CellMapTileArchive_CellMapEntry::~CellMapTileArchive_CellMapEntry() {
+  SharedDtor();
+}
 
-      // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
-      case 18: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_multiple_choice_list_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_multiple_choice_list_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(152)) goto parse_explicit_format_flags;
-        break;
-      }
+void CellMapTileArchive_CellMapEntry::SharedDtor() {
+  if (this != default_instance_) {
+    delete cellid_;
+    delete cell_;
+  }
+}
 
-      // optional uint32 explicit_format_flags = 19;
-      case 19: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_explicit_format_flags:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &explicit_format_flags_)));
-          set_has_explicit_format_flags();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(162)) goto parse_richTextPayload;
-        break;
-      }
+void CellMapTileArchive_CellMapEntry::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CellMapTileArchive_CellMapEntry::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CellMapTileArchive_CellMapEntry_descriptor_;
+}
 
-      // optional .TSP.Reference richTextPayload = 20;
-      case 20: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_richTextPayload:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_richtextpayload()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(170)) goto parse_conditional_style;
-        break;
-      }
+const CellMapTileArchive_CellMapEntry& CellMapTileArchive_CellMapEntry::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
 
-      // optional .TSP.Reference conditional_style = 21;
-      case 21: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditional_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditional_style()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(178)) goto parse_multiple_choice_list;
-        break;
-      }
+CellMapTileArchive_CellMapEntry* CellMapTileArchive_CellMapEntry::default_instance_ = NULL;
 
-      // optional .TSP.Reference multiple_choice_list = 22;
-      case 22: {
+CellMapTileArchive_CellMapEntry* CellMapTileArchive_CellMapEntry::New() const {
+  return new CellMapTileArchive_CellMapEntry;
+}
+
+void CellMapTileArchive_CellMapEntry::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_cellid()) {
+      if (cellid_ != NULL) cellid_->::TST::CellID::Clear();
+    }
+    if (has_cell()) {
+      if (cell_ != NULL) cell_->::TST::Cell::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CellMapTileArchive_CellMapEntry::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.CellID cellID = 1;
+      case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_multiple_choice_list:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_multiple_choice_list()));
+               input, mutable_cellid()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(186)) goto parse_comment_storage;
+        if (input->ExpectTag(18)) goto parse_cell;
         break;
       }
 
-      // optional .TSP.Reference comment_storage = 23;
-      case 23: {
+      // optional .TST.Cell cell = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_comment_storage:
+         parse_cell:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_comment_storage()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(192)) goto parse_conditional_style_applied_rule;
-        break;
-      }
-
-      // optional uint32 conditional_style_applied_rule = 24;
-      case 24: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_conditional_style_applied_rule:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &conditional_style_applied_rule_)));
-          set_has_conditional_style_applied_rule();
+               input, mutable_cell()));
         } else {
           goto handle_uninterpreted;
         }
@@ -13327,306 +17608,561 @@ bool Cell::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void Cell::SerializeWithCachedSizes(
+void CellMapTileArchive_CellMapEntry::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CellValueType valueType = 2;
-  if (has_valuetype()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->valuetype(), output);
+  // required .TST.CellID cellID = 1;
+  if (has_cellid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->cellid(), output);
   }
 
-  // optional .TSP.Reference cell_style = 3;
-  if (has_cell_style()) {
+  // optional .TST.Cell cell = 2;
+  if (has_cell()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->cell_style(), output);
+      2, this->cell(), output);
   }
 
-  // optional .TSP.Reference text_style = 4;
-  if (has_text_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->text_style(), output);
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
   }
+}
 
-  // optional double numberValue = 5;
-  if (has_numbervalue()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->numbervalue(), output);
+::google::protobuf::uint8* CellMapTileArchive_CellMapEntry::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.CellID cellID = 1;
+  if (has_cellid()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->cellid(), target);
   }
 
-  // optional string stringValue = 6;
-  if (has_stringvalue()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->stringvalue().data(), this->stringvalue().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      6, this->stringvalue(), output);
+  // optional .TST.Cell cell = 2;
+  if (has_cell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->cell(), target);
   }
 
-  // optional bool boolValue = 7;
-  if (has_boolvalue()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->boolvalue(), output);
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
   }
+  return target;
+}
 
-  // optional .TSCE.FormulaArchive formula = 8;
-  if (has_formula()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->formula(), output);
+int CellMapTileArchive_CellMapEntry::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.CellID cellID = 1;
+    if (has_cellid()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cellid());
+    }
+
+    // optional .TST.Cell cell = 2;
+    if (has_cell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
   }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
 
-  // optional .TSK.FormatStructArchive current_format = 9;
-  if (has_current_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->current_format(), output);
+void CellMapTileArchive_CellMapEntry::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CellMapTileArchive_CellMapEntry* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellMapTileArchive_CellMapEntry*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
   }
+}
 
-  // optional .TSP.Reference formulaError = 10;
-  if (has_formulaerror()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->formulaerror(), output);
+void CellMapTileArchive_CellMapEntry::MergeFrom(const CellMapTileArchive_CellMapEntry& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_cellid()) {
+      mutable_cellid()->::TST::CellID::MergeFrom(from.cellid());
+    }
+    if (from.has_cell()) {
+      mutable_cell()->::TST::Cell::MergeFrom(from.cell());
+    }
   }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
 
-  // optional .TSK.FormatStructArchive number_format = 11;
-  if (has_number_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      11, this->number_format(), output);
+void CellMapTileArchive_CellMapEntry::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CellMapTileArchive_CellMapEntry::CopyFrom(const CellMapTileArchive_CellMapEntry& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CellMapTileArchive_CellMapEntry::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_cellid()) {
+    if (!this->cellid().IsInitialized()) return false;
+  }
+  if (has_cell()) {
+    if (!this->cell().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CellMapTileArchive_CellMapEntry::Swap(CellMapTileArchive_CellMapEntry* other) {
+  if (other != this) {
+    std::swap(cellid_, other->cellid_);
+    std::swap(cell_, other->cell_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CellMapTileArchive_CellMapEntry::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CellMapTileArchive_CellMapEntry_descriptor_;
+  metadata.reflection = CellMapTileArchive_CellMapEntry_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int CellMapTileArchive::kCellmapEntryFieldNumber;
+#endif  // !_MSC_VER
+
+CellMapTileArchive::CellMapTileArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CellMapTileArchive::InitAsDefaultInstance() {
+}
+
+CellMapTileArchive::CellMapTileArchive(const CellMapTileArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CellMapTileArchive::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CellMapTileArchive::~CellMapTileArchive() {
+  SharedDtor();
+}
+
+void CellMapTileArchive::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void CellMapTileArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CellMapTileArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CellMapTileArchive_descriptor_;
+}
+
+const CellMapTileArchive& CellMapTileArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+CellMapTileArchive* CellMapTileArchive::default_instance_ = NULL;
+
+CellMapTileArchive* CellMapTileArchive::New() const {
+  return new CellMapTileArchive;
+}
+
+void CellMapTileArchive::Clear() {
+  cellmap_entry_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CellMapTileArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cellmap_entry:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_cellmap_entry()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_cellmap_entry;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
   }
+  return true;
+#undef DO_
+}
 
-  // optional .TSK.FormatStructArchive currency_format = 12;
-  if (has_currency_format()) {
+void CellMapTileArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+  for (int i = 0; i < this->cellmap_entry_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      12, this->currency_format(), output);
+      2, this->cellmap_entry(i), output);
   }
 
-  // optional .TSK.FormatStructArchive duration_format = 13;
-  if (has_duration_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      13, this->duration_format(), output);
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
   }
+}
 
-  // optional .TSK.FormatStructArchive date_format = 14;
-  if (has_date_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      14, this->date_format(), output);
+::google::protobuf::uint8* CellMapTileArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+  for (int i = 0; i < this->cellmap_entry_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->cellmap_entry(i), target);
   }
 
-  // optional .TSK.FormatStructArchive control_format = 15;
-  if (has_control_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      15, this->control_format(), output);
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
   }
+  return target;
+}
 
-  // optional .TSK.FormatStructArchive custom_format = 16;
-  if (has_custom_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      16, this->custom_format(), output);
-  }
+int CellMapTileArchive::ByteSize() const {
+  int total_size = 0;
 
-  // optional .TSK.FormatStructArchive base_format = 17;
-  if (has_base_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      17, this->base_format(), output);
+  // repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+  total_size += 1 * this->cellmap_entry_size();
+  for (int i = 0; i < this->cellmap_entry_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->cellmap_entry(i));
   }
 
-  // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
-  if (has_multiple_choice_list_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      18, this->multiple_choice_list_format(), output);
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
   }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
 
-  // optional uint32 explicit_format_flags = 19;
-  if (has_explicit_format_flags()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(19, this->explicit_format_flags(), output);
+void CellMapTileArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CellMapTileArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellMapTileArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
   }
+}
 
-  // optional .TSP.Reference richTextPayload = 20;
-  if (has_richtextpayload()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, this->richtextpayload(), output);
-  }
+void CellMapTileArchive::MergeFrom(const CellMapTileArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  cellmap_entry_.MergeFrom(from.cellmap_entry_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
 
-  // optional .TSP.Reference conditional_style = 21;
-  if (has_conditional_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      21, this->conditional_style(), output);
-  }
+void CellMapTileArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
 
-  // optional .TSP.Reference multiple_choice_list = 22;
-  if (has_multiple_choice_list()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      22, this->multiple_choice_list(), output);
-  }
+void CellMapTileArchive::CopyFrom(const CellMapTileArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
 
-  // optional .TSP.Reference comment_storage = 23;
-  if (has_comment_storage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      23, this->comment_storage(), output);
-  }
+bool CellMapTileArchive::IsInitialized() const {
 
-  // optional uint32 conditional_style_applied_rule = 24;
-  if (has_conditional_style_applied_rule()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(24, this->conditional_style_applied_rule(), output);
+  for (int i = 0; i < cellmap_entry_size(); i++) {
+    if (!this->cellmap_entry(i).IsInitialized()) return false;
   }
+  return true;
+}
 
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
+void CellMapTileArchive::Swap(CellMapTileArchive* other) {
+  if (other != this) {
+    cellmap_entry_.Swap(&other->cellmap_entry_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::uint8* Cell::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .TST.CellValueType valueType = 2;
-  if (has_valuetype()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->valuetype(), target);
-  }
+::google::protobuf::Metadata CellMapTileArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CellMapTileArchive_descriptor_;
+  metadata.reflection = CellMapTileArchive_reflection_;
+  return metadata;
+}
 
-  // optional .TSP.Reference cell_style = 3;
-  if (has_cell_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->cell_style(), target);
-  }
 
-  // optional .TSP.Reference text_style = 4;
-  if (has_text_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->text_style(), target);
-  }
+// ===================================================================
 
-  // optional double numberValue = 5;
-  if (has_numbervalue()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->numbervalue(), target);
-  }
+#ifndef _MSC_VER
+const int TiledCellMapArchive::kCellmapTileFieldNumber;
+const int TiledCellMapArchive::kMayModifyFormulasInCellsFieldNumber;
+const int TiledCellMapArchive::kMayModifyValuesReferencedByFormulasFieldNumber;
+const int TiledCellMapArchive::kAppliesToHiddenFieldNumber;
+#endif  // !_MSC_VER
 
-  // optional string stringValue = 6;
-  if (has_stringvalue()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->stringvalue().data(), this->stringvalue().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        6, this->stringvalue(), target);
-  }
+TiledCellMapArchive::TiledCellMapArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
 
-  // optional bool boolValue = 7;
-  if (has_boolvalue()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->boolvalue(), target);
-  }
+void TiledCellMapArchive::InitAsDefaultInstance() {
+}
 
-  // optional .TSCE.FormulaArchive formula = 8;
-  if (has_formula()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->formula(), target);
-  }
+TiledCellMapArchive::TiledCellMapArchive(const TiledCellMapArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
 
-  // optional .TSK.FormatStructArchive current_format = 9;
-  if (has_current_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        9, this->current_format(), target);
-  }
+void TiledCellMapArchive::SharedCtor() {
+  _cached_size_ = 0;
+  may_modify_formulas_in_cells_ = true;
+  may_modify_values_referenced_by_formulas_ = true;
+  applies_to_hidden_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
 
-  // optional .TSP.Reference formulaError = 10;
-  if (has_formulaerror()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        10, this->formulaerror(), target);
-  }
+TiledCellMapArchive::~TiledCellMapArchive() {
+  SharedDtor();
+}
 
-  // optional .TSK.FormatStructArchive number_format = 11;
-  if (has_number_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        11, this->number_format(), target);
+void TiledCellMapArchive::SharedDtor() {
+  if (this != default_instance_) {
   }
+}
 
-  // optional .TSK.FormatStructArchive currency_format = 12;
-  if (has_currency_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        12, this->currency_format(), target);
-  }
+void TiledCellMapArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* TiledCellMapArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return TiledCellMapArchive_descriptor_;
+}
 
-  // optional .TSK.FormatStructArchive duration_format = 13;
-  if (has_duration_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        13, this->duration_format(), target);
+const TiledCellMapArchive& TiledCellMapArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+TiledCellMapArchive* TiledCellMapArchive::default_instance_ = NULL;
+
+TiledCellMapArchive* TiledCellMapArchive::New() const {
+  return new TiledCellMapArchive;
+}
+
+void TiledCellMapArchive::Clear() {
+  if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
+    may_modify_formulas_in_cells_ = true;
+    may_modify_values_referenced_by_formulas_ = true;
+    applies_to_hidden_ = false;
   }
+  cellmap_tile_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool TiledCellMapArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TSP.Reference cellmap_tile = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cellmap_tile:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_cellmap_tile()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_cellmap_tile;
+        if (input->ExpectTag(16)) goto parse_may_modify_formulas_in_cells;
+        break;
+      }
+
+      // optional bool may_modify_formulas_in_cells = 2 [default = true];
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_may_modify_formulas_in_cells:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &may_modify_formulas_in_cells_)));
+          set_has_may_modify_formulas_in_cells();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_may_modify_values_referenced_by_formulas;
+        break;
+      }
+
+      // optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_may_modify_values_referenced_by_formulas:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &may_modify_values_referenced_by_formulas_)));
+          set_has_may_modify_values_referenced_by_formulas();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_applies_to_hidden;
+        break;
+      }
 
-  // optional .TSK.FormatStructArchive date_format = 14;
-  if (has_date_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        14, this->date_format(), target);
-  }
+      // optional bool applies_to_hidden = 4 [default = false];
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_applies_to_hidden:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &applies_to_hidden_)));
+          set_has_applies_to_hidden();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
 
-  // optional .TSK.FormatStructArchive control_format = 15;
-  if (has_control_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        15, this->control_format(), target);
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
   }
+  return true;
+#undef DO_
+}
 
-  // optional .TSK.FormatStructArchive custom_format = 16;
-  if (has_custom_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        16, this->custom_format(), target);
+void TiledCellMapArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TSP.Reference cellmap_tile = 1;
+  for (int i = 0; i < this->cellmap_tile_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->cellmap_tile(i), output);
   }
 
-  // optional .TSK.FormatStructArchive base_format = 17;
-  if (has_base_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        17, this->base_format(), target);
+  // optional bool may_modify_formulas_in_cells = 2 [default = true];
+  if (has_may_modify_formulas_in_cells()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->may_modify_formulas_in_cells(), output);
   }
 
-  // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
-  if (has_multiple_choice_list_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        18, this->multiple_choice_list_format(), target);
+  // optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+  if (has_may_modify_values_referenced_by_formulas()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->may_modify_values_referenced_by_formulas(), output);
   }
 
-  // optional uint32 explicit_format_flags = 19;
-  if (has_explicit_format_flags()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(19, this->explicit_format_flags(), target);
+  // optional bool applies_to_hidden = 4 [default = false];
+  if (has_applies_to_hidden()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->applies_to_hidden(), output);
   }
 
-  // optional .TSP.Reference richTextPayload = 20;
-  if (has_richtextpayload()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        20, this->richtextpayload(), target);
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
   }
+}
 
-  // optional .TSP.Reference conditional_style = 21;
-  if (has_conditional_style()) {
+::google::protobuf::uint8* TiledCellMapArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TSP.Reference cellmap_tile = 1;
+  for (int i = 0; i < this->cellmap_tile_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        21, this->conditional_style(), target);
+        1, this->cellmap_tile(i), target);
   }
 
-  // optional .TSP.Reference multiple_choice_list = 22;
-  if (has_multiple_choice_list()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        22, this->multiple_choice_list(), target);
+  // optional bool may_modify_formulas_in_cells = 2 [default = true];
+  if (has_may_modify_formulas_in_cells()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->may_modify_formulas_in_cells(), target);
   }
 
-  // optional .TSP.Reference comment_storage = 23;
-  if (has_comment_storage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        23, this->comment_storage(), target);
+  // optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+  if (has_may_modify_values_referenced_by_formulas()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->may_modify_values_referenced_by_formulas(), target);
   }
 
-  // optional uint32 conditional_style_applied_rule = 24;
-  if (has_conditional_style_applied_rule()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(24, this->conditional_style_applied_rule(), target);
+  // optional bool applies_to_hidden = 4 [default = false];
+  if (has_applies_to_hidden()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->applies_to_hidden(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -13636,171 +18172,34 @@ ::google::protobuf::uint8* Cell::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int Cell::ByteSize() const {
+int TiledCellMapArchive::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CellValueType valueType = 2;
-    if (has_valuetype()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->valuetype());
-    }
-
-    // optional double numberValue = 5;
-    if (has_numbervalue()) {
-      total_size += 1 + 8;
-    }
-
-    // optional string stringValue = 6;
-    if (has_stringvalue()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->stringvalue());
-    }
-
-    // optional bool boolValue = 7;
-    if (has_boolvalue()) {
+  if (_has_bits_[1 / 32] & (0xffu << (1 % 32))) {
+    // optional bool may_modify_formulas_in_cells = 2 [default = true];
+    if (has_may_modify_formulas_in_cells()) {
       total_size += 1 + 1;
     }
-
-    // optional .TSP.Reference cell_style = 3;
-    if (has_cell_style()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cell_style());
-    }
-
-    // optional .TSP.Reference text_style = 4;
-    if (has_text_style()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->text_style());
-    }
-
-    // optional .TSCE.FormulaArchive formula = 8;
-    if (has_formula()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula());
-    }
-
-    // optional .TSP.Reference formulaError = 10;
-    if (has_formulaerror()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formulaerror());
-    }
-
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional .TSK.FormatStructArchive current_format = 9;
-    if (has_current_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->current_format());
-    }
-
-    // optional .TSK.FormatStructArchive number_format = 11;
-    if (has_number_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->number_format());
-    }
-
-    // optional .TSK.FormatStructArchive currency_format = 12;
-    if (has_currency_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->currency_format());
-    }
-
-    // optional .TSK.FormatStructArchive duration_format = 13;
-    if (has_duration_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->duration_format());
-    }
-
-    // optional .TSK.FormatStructArchive date_format = 14;
-    if (has_date_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->date_format());
-    }
-
-    // optional .TSK.FormatStructArchive control_format = 15;
-    if (has_control_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->control_format());
-    }
-
-    // optional .TSK.FormatStructArchive custom_format = 16;
-    if (has_custom_format()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->custom_format());
-    }
-
-    // optional .TSK.FormatStructArchive base_format = 17;
-    if (has_base_format()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->base_format());
-    }
-
-  }
-  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
-    if (has_multiple_choice_list_format()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->multiple_choice_list_format());
-    }
-
-    // optional uint32 explicit_format_flags = 19;
-    if (has_explicit_format_flags()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->explicit_format_flags());
-    }
-
-    // optional .TSP.Reference richTextPayload = 20;
-    if (has_richtextpayload()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->richtextpayload());
-    }
-
-    // optional .TSP.Reference conditional_style = 21;
-    if (has_conditional_style()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditional_style());
-    }
-
-    // optional .TSP.Reference multiple_choice_list = 22;
-    if (has_multiple_choice_list()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->multiple_choice_list());
-    }
-
-    // optional .TSP.Reference comment_storage = 23;
-    if (has_comment_storage()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->comment_storage());
+
+    // optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+    if (has_may_modify_values_referenced_by_formulas()) {
+      total_size += 1 + 1;
     }
 
-    // optional uint32 conditional_style_applied_rule = 24;
-    if (has_conditional_style_applied_rule()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->conditional_style_applied_rule());
+    // optional bool applies_to_hidden = 4 [default = false];
+    if (has_applies_to_hidden()) {
+      total_size += 1 + 1;
     }
 
   }
+  // repeated .TSP.Reference cellmap_tile = 1;
+  total_size += 1 * this->cellmap_tile_size();
+  for (int i = 0; i < this->cellmap_tile_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->cellmap_tile(i));
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -13812,10 +18211,10 @@ int Cell::ByteSize() const {
   return total_size;
 }
 
-void Cell::MergeFrom(const ::google::protobuf::Message& from) {
+void TiledCellMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const Cell* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const Cell*>(
+  const TiledCellMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TiledCellMapArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -13824,191 +18223,60 @@ void Cell::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void Cell::MergeFrom(const Cell& from) {
+void TiledCellMapArchive::MergeFrom(const TiledCellMapArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_valuetype()) {
-      set_valuetype(from.valuetype());
-    }
-    if (from.has_numbervalue()) {
-      set_numbervalue(from.numbervalue());
-    }
-    if (from.has_stringvalue()) {
-      set_stringvalue(from.stringvalue());
-    }
-    if (from.has_boolvalue()) {
-      set_boolvalue(from.boolvalue());
-    }
-    if (from.has_cell_style()) {
-      mutable_cell_style()->::TSP::Reference::MergeFrom(from.cell_style());
-    }
-    if (from.has_text_style()) {
-      mutable_text_style()->::TSP::Reference::MergeFrom(from.text_style());
-    }
-    if (from.has_formula()) {
-      mutable_formula()->::TSCE::FormulaArchive::MergeFrom(from.formula());
-    }
-    if (from.has_formulaerror()) {
-      mutable_formulaerror()->::TSP::Reference::MergeFrom(from.formulaerror());
-    }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_current_format()) {
-      mutable_current_format()->::TSK::FormatStructArchive::MergeFrom(from.current_format());
-    }
-    if (from.has_number_format()) {
-      mutable_number_format()->::TSK::FormatStructArchive::MergeFrom(from.number_format());
-    }
-    if (from.has_currency_format()) {
-      mutable_currency_format()->::TSK::FormatStructArchive::MergeFrom(from.currency_format());
-    }
-    if (from.has_duration_format()) {
-      mutable_duration_format()->::TSK::FormatStructArchive::MergeFrom(from.duration_format());
-    }
-    if (from.has_date_format()) {
-      mutable_date_format()->::TSK::FormatStructArchive::MergeFrom(from.date_format());
-    }
-    if (from.has_control_format()) {
-      mutable_control_format()->::TSK::FormatStructArchive::MergeFrom(from.control_format());
-    }
-    if (from.has_custom_format()) {
-      mutable_custom_format()->::TSK::FormatStructArchive::MergeFrom(from.custom_format());
-    }
-    if (from.has_base_format()) {
-      mutable_base_format()->::TSK::FormatStructArchive::MergeFrom(from.base_format());
-    }
-  }
-  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
-    if (from.has_multiple_choice_list_format()) {
-      mutable_multiple_choice_list_format()->::TSK::FormatStructArchive::MergeFrom(from.multiple_choice_list_format());
-    }
-    if (from.has_explicit_format_flags()) {
-      set_explicit_format_flags(from.explicit_format_flags());
-    }
-    if (from.has_richtextpayload()) {
-      mutable_richtextpayload()->::TSP::Reference::MergeFrom(from.richtextpayload());
-    }
-    if (from.has_conditional_style()) {
-      mutable_conditional_style()->::TSP::Reference::MergeFrom(from.conditional_style());
-    }
-    if (from.has_multiple_choice_list()) {
-      mutable_multiple_choice_list()->::TSP::Reference::MergeFrom(from.multiple_choice_list());
+  cellmap_tile_.MergeFrom(from.cellmap_tile_);
+  if (from._has_bits_[1 / 32] & (0xffu << (1 % 32))) {
+    if (from.has_may_modify_formulas_in_cells()) {
+      set_may_modify_formulas_in_cells(from.may_modify_formulas_in_cells());
     }
-    if (from.has_comment_storage()) {
-      mutable_comment_storage()->::TSP::Reference::MergeFrom(from.comment_storage());
+    if (from.has_may_modify_values_referenced_by_formulas()) {
+      set_may_modify_values_referenced_by_formulas(from.may_modify_values_referenced_by_formulas());
     }
-    if (from.has_conditional_style_applied_rule()) {
-      set_conditional_style_applied_rule(from.conditional_style_applied_rule());
+    if (from.has_applies_to_hidden()) {
+      set_applies_to_hidden(from.applies_to_hidden());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void Cell::CopyFrom(const ::google::protobuf::Message& from) {
+void TiledCellMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void Cell::CopyFrom(const Cell& from) {
+void TiledCellMapArchive::CopyFrom(const TiledCellMapArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool Cell::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool TiledCellMapArchive::IsInitialized() const {
 
-  if (has_cell_style()) {
-    if (!this->cell_style().IsInitialized()) return false;
-  }
-  if (has_text_style()) {
-    if (!this->text_style().IsInitialized()) return false;
-  }
-  if (has_formula()) {
-    if (!this->formula().IsInitialized()) return false;
-  }
-  if (has_formulaerror()) {
-    if (!this->formulaerror().IsInitialized()) return false;
-  }
-  if (has_current_format()) {
-    if (!this->current_format().IsInitialized()) return false;
-  }
-  if (has_number_format()) {
-    if (!this->number_format().IsInitialized()) return false;
-  }
-  if (has_currency_format()) {
-    if (!this->currency_format().IsInitialized()) return false;
-  }
-  if (has_duration_format()) {
-    if (!this->duration_format().IsInitialized()) return false;
-  }
-  if (has_date_format()) {
-    if (!this->date_format().IsInitialized()) return false;
-  }
-  if (has_control_format()) {
-    if (!this->control_format().IsInitialized()) return false;
-  }
-  if (has_custom_format()) {
-    if (!this->custom_format().IsInitialized()) return false;
-  }
-  if (has_base_format()) {
-    if (!this->base_format().IsInitialized()) return false;
-  }
-  if (has_multiple_choice_list_format()) {
-    if (!this->multiple_choice_list_format().IsInitialized()) return false;
-  }
-  if (has_richtextpayload()) {
-    if (!this->richtextpayload().IsInitialized()) return false;
-  }
-  if (has_conditional_style()) {
-    if (!this->conditional_style().IsInitialized()) return false;
-  }
-  if (has_multiple_choice_list()) {
-    if (!this->multiple_choice_list().IsInitialized()) return false;
-  }
-  if (has_comment_storage()) {
-    if (!this->comment_storage().IsInitialized()) return false;
+  for (int i = 0; i < cellmap_tile_size(); i++) {
+    if (!this->cellmap_tile(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void Cell::Swap(Cell* other) {
+void TiledCellMapArchive::Swap(TiledCellMapArchive* other) {
   if (other != this) {
-    std::swap(valuetype_, other->valuetype_);
-    std::swap(numbervalue_, other->numbervalue_);
-    std::swap(stringvalue_, other->stringvalue_);
-    std::swap(boolvalue_, other->boolvalue_);
-    std::swap(cell_style_, other->cell_style_);
-    std::swap(text_style_, other->text_style_);
-    std::swap(formula_, other->formula_);
-    std::swap(formulaerror_, other->formulaerror_);
-    std::swap(current_format_, other->current_format_);
-    std::swap(number_format_, other->number_format_);
-    std::swap(currency_format_, other->currency_format_);
-    std::swap(duration_format_, other->duration_format_);
-    std::swap(date_format_, other->date_format_);
-    std::swap(control_format_, other->control_format_);
-    std::swap(custom_format_, other->custom_format_);
-    std::swap(base_format_, other->base_format_);
-    std::swap(multiple_choice_list_format_, other->multiple_choice_list_format_);
-    std::swap(explicit_format_flags_, other->explicit_format_flags_);
-    std::swap(richtextpayload_, other->richtextpayload_);
-    std::swap(conditional_style_, other->conditional_style_);
-    std::swap(multiple_choice_list_, other->multiple_choice_list_);
-    std::swap(comment_storage_, other->comment_storage_);
-    std::swap(conditional_style_applied_rule_, other->conditional_style_applied_rule_);
+    cellmap_tile_.Swap(&other->cellmap_tile_);
+    std::swap(may_modify_formulas_in_cells_, other->may_modify_formulas_in_cells_);
+    std::swap(may_modify_values_referenced_by_formulas_, other->may_modify_values_referenced_by_formulas_);
+    std::swap(applies_to_hidden_, other->applies_to_hidden_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata Cell::GetMetadata() const {
+::google::protobuf::Metadata TiledCellMapArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = Cell_descriptor_;
-  metadata.reflection = Cell_reflection_;
+  metadata.descriptor = TiledCellMapArchive_descriptor_;
+  metadata.reflection = TiledCellMapArchive_reflection_;
   return metadata;
 }
 
@@ -14016,81 +18284,249 @@ ::google::protobuf::Metadata Cell::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int MergeRegionMapArchive::kCellRangeFieldNumber;
+const int PropertyMapEntryArchive::kPropertyFieldNumber;
+const int PropertyMapEntryArchive::kValueTypeFieldNumber;
+const int PropertyMapEntryArchive::kIntValueFieldNumber;
+const int PropertyMapEntryArchive::kFloatValueFieldNumber;
+const int PropertyMapEntryArchive::kDoubleValueFieldNumber;
+const int PropertyMapEntryArchive::kIsNsnullFieldNumber;
+const int PropertyMapEntryArchive::kTspReferenceFieldNumber;
+const int PropertyMapEntryArchive::kFillFieldNumber;
+const int PropertyMapEntryArchive::kImportWarningSetFieldNumber;
 #endif  // !_MSC_VER
 
-MergeRegionMapArchive::MergeRegionMapArchive()
+PropertyMapEntryArchive::PropertyMapEntryArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void MergeRegionMapArchive::InitAsDefaultInstance() {
+void PropertyMapEntryArchive::InitAsDefaultInstance() {
+  tsp_reference_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  fill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  import_warning_set_ = const_cast< ::TST::ImportWarningSetArchive*>(&::TST::ImportWarningSetArchive::default_instance());
 }
 
-MergeRegionMapArchive::MergeRegionMapArchive(const MergeRegionMapArchive& from)
+PropertyMapEntryArchive::PropertyMapEntryArchive(const PropertyMapEntryArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void MergeRegionMapArchive::SharedCtor() {
+void PropertyMapEntryArchive::SharedCtor() {
   _cached_size_ = 0;
+  property_ = 0u;
+  valuetype_ = 0;
+  int_value_ = 0;
+  float_value_ = 0;
+  double_value_ = 0;
+  is_nsnull_ = false;
+  tsp_reference_ = NULL;
+  fill_ = NULL;
+  import_warning_set_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-MergeRegionMapArchive::~MergeRegionMapArchive() {
+PropertyMapEntryArchive::~PropertyMapEntryArchive() {
   SharedDtor();
 }
 
-void MergeRegionMapArchive::SharedDtor() {
+void PropertyMapEntryArchive::SharedDtor() {
   if (this != default_instance_) {
+    delete tsp_reference_;
+    delete fill_;
+    delete import_warning_set_;
+  }
+}
+
+void PropertyMapEntryArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* PropertyMapEntryArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return PropertyMapEntryArchive_descriptor_;
+}
+
+const PropertyMapEntryArchive& PropertyMapEntryArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+PropertyMapEntryArchive* PropertyMapEntryArchive::default_instance_ = NULL;
+
+PropertyMapEntryArchive* PropertyMapEntryArchive::New() const {
+  return new PropertyMapEntryArchive;
+}
+
+void PropertyMapEntryArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    property_ = 0u;
+    valuetype_ = 0;
+    int_value_ = 0;
+    float_value_ = 0;
+    double_value_ = 0;
+    is_nsnull_ = false;
+    if (has_tsp_reference()) {
+      if (tsp_reference_ != NULL) tsp_reference_->::TSP::Reference::Clear();
+    }
+    if (has_fill()) {
+      if (fill_ != NULL) fill_->::TSD::FillArchive::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_import_warning_set()) {
+      if (import_warning_set_ != NULL) import_warning_set_->::TST::ImportWarningSetArchive::Clear();
+    }
   }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
 }
 
-void MergeRegionMapArchive::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* MergeRegionMapArchive::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return MergeRegionMapArchive_descriptor_;
-}
+bool PropertyMapEntryArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required uint32 property = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &property_)));
+          set_has_property();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_valueType;
+        break;
+      }
+
+      // required .TSS.ValueType valueType = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_valueType:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TSS::ValueType_IsValid(value)) {
+            set_valuetype(static_cast< ::TSS::ValueType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_int_value;
+        break;
+      }
+
+      // optional int32 int_value = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_int_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &int_value_)));
+          set_has_int_value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(37)) goto parse_float_value;
+        break;
+      }
+
+      // optional float float_value = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED32) {
+         parse_float_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
+                 input, &float_value_)));
+          set_has_float_value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(41)) goto parse_double_value;
+        break;
+      }
 
-const MergeRegionMapArchive& MergeRegionMapArchive::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
-  return *default_instance_;
-}
+      // optional double double_value = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_double_value:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &double_value_)));
+          set_has_double_value();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_is_nsnull;
+        break;
+      }
 
-MergeRegionMapArchive* MergeRegionMapArchive::default_instance_ = NULL;
+      // optional bool is_nsnull = 6 [default = false];
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_is_nsnull:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &is_nsnull_)));
+          set_has_is_nsnull();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_tsp_reference;
+        break;
+      }
 
-MergeRegionMapArchive* MergeRegionMapArchive::New() const {
-  return new MergeRegionMapArchive;
-}
+      // optional .TSP.Reference tsp_reference = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_tsp_reference:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_tsp_reference()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_fill;
+        break;
+      }
 
-void MergeRegionMapArchive::Clear() {
-  cell_range_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
+      // optional .TSD.FillArchive fill = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_fill:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_fill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_import_warning_set;
+        break;
+      }
 
-bool MergeRegionMapArchive::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .TST.CellRange cell_range = 1;
-      case 1: {
+      // optional .TST.ImportWarningSetArchive import_warning_set = 9;
+      case 9: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_range:
+         parse_import_warning_set:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_cell_range()));
+               input, mutable_import_warning_set()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(10)) goto parse_cell_range;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -14111,12 +18547,55 @@ bool MergeRegionMapArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void MergeRegionMapArchive::SerializeWithCachedSizes(
+void PropertyMapEntryArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated .TST.CellRange cell_range = 1;
-  for (int i = 0; i < this->cell_range_size(); i++) {
+  // required uint32 property = 1;
+  if (has_property()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->property(), output);
+  }
+
+  // required .TSS.ValueType valueType = 2;
+  if (has_valuetype()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->valuetype(), output);
+  }
+
+  // optional int32 int_value = 3;
+  if (has_int_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->int_value(), output);
+  }
+
+  // optional float float_value = 4;
+  if (has_float_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteFloat(4, this->float_value(), output);
+  }
+
+  // optional double double_value = 5;
+  if (has_double_value()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(5, this->double_value(), output);
+  }
+
+  // optional bool is_nsnull = 6 [default = false];
+  if (has_is_nsnull()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->is_nsnull(), output);
+  }
+
+  // optional .TSP.Reference tsp_reference = 7;
+  if (has_tsp_reference()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->cell_range(i), output);
+      7, this->tsp_reference(), output);
+  }
+
+  // optional .TSD.FillArchive fill = 8;
+  if (has_fill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->fill(), output);
+  }
+
+  // optional .TST.ImportWarningSetArchive import_warning_set = 9;
+  if (has_import_warning_set()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->import_warning_set(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -14125,13 +18604,58 @@ void MergeRegionMapArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* MergeRegionMapArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* PropertyMapEntryArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // repeated .TST.CellRange cell_range = 1;
-  for (int i = 0; i < this->cell_range_size(); i++) {
+  // required uint32 property = 1;
+  if (has_property()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->property(), target);
+  }
+
+  // required .TSS.ValueType valueType = 2;
+  if (has_valuetype()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->valuetype(), target);
+  }
+
+  // optional int32 int_value = 3;
+  if (has_int_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->int_value(), target);
+  }
+
+  // optional float float_value = 4;
+  if (has_float_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteFloatToArray(4, this->float_value(), target);
+  }
+
+  // optional double double_value = 5;
+  if (has_double_value()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(5, this->double_value(), target);
+  }
+
+  // optional bool is_nsnull = 6 [default = false];
+  if (has_is_nsnull()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->is_nsnull(), target);
+  }
+
+  // optional .TSP.Reference tsp_reference = 7;
+  if (has_tsp_reference()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->cell_range(i), target);
+        7, this->tsp_reference(), target);
+  }
+
+  // optional .TSD.FillArchive fill = 8;
+  if (has_fill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->fill(), target);
+  }
+
+  // optional .TST.ImportWarningSetArchive import_warning_set = 9;
+  if (has_import_warning_set()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->import_warning_set(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -14141,17 +18665,69 @@ ::google::protobuf::uint8* MergeRegionMapArchive::SerializeWithCachedSizesToArra
   return target;
 }
 
-int MergeRegionMapArchive::ByteSize() const {
+int PropertyMapEntryArchive::ByteSize() const {
   int total_size = 0;
 
-  // repeated .TST.CellRange cell_range = 1;
-  total_size += 1 * this->cell_range_size();
-  for (int i = 0; i < this->cell_range_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->cell_range(i));
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required uint32 property = 1;
+    if (has_property()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->property());
+    }
+
+    // required .TSS.ValueType valueType = 2;
+    if (has_valuetype()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->valuetype());
+    }
+
+    // optional int32 int_value = 3;
+    if (has_int_value()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->int_value());
+    }
+
+    // optional float float_value = 4;
+    if (has_float_value()) {
+      total_size += 1 + 4;
+    }
+
+    // optional double double_value = 5;
+    if (has_double_value()) {
+      total_size += 1 + 8;
+    }
+
+    // optional bool is_nsnull = 6 [default = false];
+    if (has_is_nsnull()) {
+      total_size += 1 + 1;
+    }
+
+    // optional .TSP.Reference tsp_reference = 7;
+    if (has_tsp_reference()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->tsp_reference());
+    }
+
+    // optional .TSD.FillArchive fill = 8;
+    if (has_fill()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->fill());
+    }
+
   }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional .TST.ImportWarningSetArchive import_warning_set = 9;
+    if (has_import_warning_set()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->import_warning_set());
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -14163,10 +18739,10 @@ int MergeRegionMapArchive::ByteSize() const {
   return total_size;
 }
 
-void MergeRegionMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void PropertyMapEntryArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const MergeRegionMapArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const MergeRegionMapArchive*>(
+  const PropertyMapEntryArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const PropertyMapEntryArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -14175,46 +18751,91 @@ void MergeRegionMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void MergeRegionMapArchive::MergeFrom(const MergeRegionMapArchive& from) {
+void PropertyMapEntryArchive::MergeFrom(const PropertyMapEntryArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  cell_range_.MergeFrom(from.cell_range_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_property()) {
+      set_property(from.property());
+    }
+    if (from.has_valuetype()) {
+      set_valuetype(from.valuetype());
+    }
+    if (from.has_int_value()) {
+      set_int_value(from.int_value());
+    }
+    if (from.has_float_value()) {
+      set_float_value(from.float_value());
+    }
+    if (from.has_double_value()) {
+      set_double_value(from.double_value());
+    }
+    if (from.has_is_nsnull()) {
+      set_is_nsnull(from.is_nsnull());
+    }
+    if (from.has_tsp_reference()) {
+      mutable_tsp_reference()->::TSP::Reference::MergeFrom(from.tsp_reference());
+    }
+    if (from.has_fill()) {
+      mutable_fill()->::TSD::FillArchive::MergeFrom(from.fill());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_import_warning_set()) {
+      mutable_import_warning_set()->::TST::ImportWarningSetArchive::MergeFrom(from.import_warning_set());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void MergeRegionMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void PropertyMapEntryArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void MergeRegionMapArchive::CopyFrom(const MergeRegionMapArchive& from) {
+void PropertyMapEntryArchive::CopyFrom(const PropertyMapEntryArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool MergeRegionMapArchive::IsInitialized() const {
+bool PropertyMapEntryArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  for (int i = 0; i < cell_range_size(); i++) {
-    if (!this->cell_range(i).IsInitialized()) return false;
+  if (has_tsp_reference()) {
+    if (!this->tsp_reference().IsInitialized()) return false;
+  }
+  if (has_fill()) {
+    if (!this->fill().IsInitialized()) return false;
+  }
+  if (has_import_warning_set()) {
+    if (!this->import_warning_set().IsInitialized()) return false;
   }
   return true;
 }
 
-void MergeRegionMapArchive::Swap(MergeRegionMapArchive* other) {
+void PropertyMapEntryArchive::Swap(PropertyMapEntryArchive* other) {
   if (other != this) {
-    cell_range_.Swap(&other->cell_range_);
+    std::swap(property_, other->property_);
+    std::swap(valuetype_, other->valuetype_);
+    std::swap(int_value_, other->int_value_);
+    std::swap(float_value_, other->float_value_);
+    std::swap(double_value_, other->double_value_);
+    std::swap(is_nsnull_, other->is_nsnull_);
+    std::swap(tsp_reference_, other->tsp_reference_);
+    std::swap(fill_, other->fill_);
+    std::swap(import_warning_set_, other->import_warning_set_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata MergeRegionMapArchive::GetMetadata() const {
+::google::protobuf::Metadata PropertyMapEntryArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = MergeRegionMapArchive_descriptor_;
-  metadata.reflection = MergeRegionMapArchive_reflection_;
+  metadata.descriptor = PropertyMapEntryArchive_descriptor_;
+  metadata.reflection = PropertyMapEntryArchive_reflection_;
   return metadata;
 }
 
@@ -14222,107 +18843,98 @@ ::google::protobuf::Metadata MergeRegionMapArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CellMapArchive_CellMapEntry::kCellIDFieldNumber;
-const int CellMapArchive_CellMapEntry::kCellFieldNumber;
+const int CellDiffArchive::kPropertyMapToSetFieldNumber;
+const int CellDiffArchive::kPropertyMapToResetFieldNumber;
 #endif  // !_MSC_VER
 
-CellMapArchive_CellMapEntry::CellMapArchive_CellMapEntry()
+CellDiffArchive::CellDiffArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CellMapArchive_CellMapEntry::InitAsDefaultInstance() {
-  cellid_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
-  cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+void CellDiffArchive::InitAsDefaultInstance() {
 }
 
-CellMapArchive_CellMapEntry::CellMapArchive_CellMapEntry(const CellMapArchive_CellMapEntry& from)
+CellDiffArchive::CellDiffArchive(const CellDiffArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CellMapArchive_CellMapEntry::SharedCtor() {
+void CellDiffArchive::SharedCtor() {
   _cached_size_ = 0;
-  cellid_ = NULL;
-  cell_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CellMapArchive_CellMapEntry::~CellMapArchive_CellMapEntry() {
+CellDiffArchive::~CellDiffArchive() {
   SharedDtor();
 }
 
-void CellMapArchive_CellMapEntry::SharedDtor() {
+void CellDiffArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete cellid_;
-    delete cell_;
   }
 }
 
-void CellMapArchive_CellMapEntry::SetCachedSize(int size) const {
+void CellDiffArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CellMapArchive_CellMapEntry::descriptor() {
+const ::google::protobuf::Descriptor* CellDiffArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CellMapArchive_CellMapEntry_descriptor_;
+  return CellDiffArchive_descriptor_;
 }
 
-const CellMapArchive_CellMapEntry& CellMapArchive_CellMapEntry::default_instance() {
+const CellDiffArchive& CellDiffArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-CellMapArchive_CellMapEntry* CellMapArchive_CellMapEntry::default_instance_ = NULL;
+CellDiffArchive* CellDiffArchive::default_instance_ = NULL;
 
-CellMapArchive_CellMapEntry* CellMapArchive_CellMapEntry::New() const {
-  return new CellMapArchive_CellMapEntry;
+CellDiffArchive* CellDiffArchive::New() const {
+  return new CellDiffArchive;
 }
 
-void CellMapArchive_CellMapEntry::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_cellid()) {
-      if (cellid_ != NULL) cellid_->::TST::CellID::Clear();
-    }
-    if (has_cell()) {
-      if (cell_ != NULL) cell_->::TST::Cell::Clear();
-    }
-  }
+void CellDiffArchive::Clear() {
+  property_map_to_set_.Clear();
+  property_map_to_reset_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CellMapArchive_CellMapEntry::MergePartialFromCodedStream(
+bool CellDiffArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CellID cellID = 1;
+      // repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_property_map_to_set:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cellid()));
+                input, add_property_map_to_set()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_cell;
+        if (input->ExpectTag(10)) goto parse_property_map_to_set;
+        if (input->ExpectTag(18)) goto parse_property_map_to_reset;
         break;
       }
 
-      // optional .TST.Cell cell = 2;
+      // repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell:
+         parse_property_map_to_reset:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cell()));
+                input, add_property_map_to_reset()));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_property_map_to_reset;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -14343,18 +18955,18 @@ bool CellMapArchive_CellMapEntry::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CellMapArchive_CellMapEntry::SerializeWithCachedSizes(
+void CellDiffArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CellID cellID = 1;
-  if (has_cellid()) {
+  // repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
+  for (int i = 0; i < this->property_map_to_set_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->cellid(), output);
+      1, this->property_map_to_set(i), output);
   }
 
-  // optional .TST.Cell cell = 2;
-  if (has_cell()) {
+  // repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
+  for (int i = 0; i < this->property_map_to_reset_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->cell(), output);
+      2, this->property_map_to_reset(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -14363,20 +18975,20 @@ void CellMapArchive_CellMapEntry::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CellMapArchive_CellMapEntry::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CellDiffArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.CellID cellID = 1;
-  if (has_cellid()) {
+  // repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
+  for (int i = 0; i < this->property_map_to_set_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->cellid(), target);
+        1, this->property_map_to_set(i), target);
   }
 
-  // optional .TST.Cell cell = 2;
-  if (has_cell()) {
+  // repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
+  for (int i = 0; i < this->property_map_to_reset_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->cell(), target);
+        2, this->property_map_to_reset(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -14386,25 +18998,25 @@ ::google::protobuf::uint8* CellMapArchive_CellMapEntry::SerializeWithCachedSizes
   return target;
 }
 
-int CellMapArchive_CellMapEntry::ByteSize() const {
+int CellDiffArchive::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CellID cellID = 1;
-    if (has_cellid()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cellid());
-    }
-
-    // optional .TST.Cell cell = 2;
-    if (has_cell()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cell());
-    }
+  // repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
+  total_size += 1 * this->property_map_to_set_size();
+  for (int i = 0; i < this->property_map_to_set_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->property_map_to_set(i));
+  }
 
+  // repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
+  total_size += 1 * this->property_map_to_reset_size();
+  for (int i = 0; i < this->property_map_to_reset_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->property_map_to_reset(i));
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -14416,10 +19028,10 @@ int CellMapArchive_CellMapEntry::ByteSize() const {
   return total_size;
 }
 
-void CellMapArchive_CellMapEntry::MergeFrom(const ::google::protobuf::Message& from) {
+void CellDiffArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CellMapArchive_CellMapEntry* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CellMapArchive_CellMapEntry*>(
+  const CellDiffArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellDiffArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -14428,236 +19040,150 @@ void CellMapArchive_CellMapEntry::MergeFrom(const ::google::protobuf::Message& f
   }
 }
 
-void CellMapArchive_CellMapEntry::MergeFrom(const CellMapArchive_CellMapEntry& from) {
+void CellDiffArchive::MergeFrom(const CellDiffArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_cellid()) {
-      mutable_cellid()->::TST::CellID::MergeFrom(from.cellid());
-    }
-    if (from.has_cell()) {
-      mutable_cell()->::TST::Cell::MergeFrom(from.cell());
-    }
-  }
+  property_map_to_set_.MergeFrom(from.property_map_to_set_);
+  property_map_to_reset_.MergeFrom(from.property_map_to_reset_);
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CellMapArchive_CellMapEntry::CopyFrom(const ::google::protobuf::Message& from) {
+void CellDiffArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CellMapArchive_CellMapEntry::CopyFrom(const CellMapArchive_CellMapEntry& from) {
+void CellDiffArchive::CopyFrom(const CellDiffArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CellMapArchive_CellMapEntry::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CellDiffArchive::IsInitialized() const {
 
-  if (has_cellid()) {
-    if (!this->cellid().IsInitialized()) return false;
+  for (int i = 0; i < property_map_to_set_size(); i++) {
+    if (!this->property_map_to_set(i).IsInitialized()) return false;
   }
-  if (has_cell()) {
-    if (!this->cell().IsInitialized()) return false;
+  for (int i = 0; i < property_map_to_reset_size(); i++) {
+    if (!this->property_map_to_reset(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void CellMapArchive_CellMapEntry::Swap(CellMapArchive_CellMapEntry* other) {
+void CellDiffArchive::Swap(CellDiffArchive* other) {
   if (other != this) {
-    std::swap(cellid_, other->cellid_);
-    std::swap(cell_, other->cell_);
+    property_map_to_set_.Swap(&other->property_map_to_set_);
+    property_map_to_reset_.Swap(&other->property_map_to_reset_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CellMapArchive_CellMapEntry::GetMetadata() const {
+::google::protobuf::Metadata CellDiffArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CellMapArchive_CellMapEntry_descriptor_;
-  metadata.reflection = CellMapArchive_CellMapEntry_reflection_;
+  metadata.descriptor = CellDiffArchive_descriptor_;
+  metadata.reflection = CellDiffArchive_reflection_;
   return metadata;
 }
 
 
-// -------------------------------------------------------------------
+// ===================================================================
 
 #ifndef _MSC_VER
-const int CellMapArchive::kCapacityFieldNumber;
-const int CellMapArchive::kCountFieldNumber;
-const int CellMapArchive::kCellMapEntryFieldNumber;
-const int CellMapArchive::kMayModifyFormulasInCellsFieldNumber;
-const int CellMapArchive::kMayModifyValuesReferencedByFormulasFieldNumber;
-const int CellMapArchive::kAppliesToHiddenFieldNumber;
+const int CellDiffMapArchive::kCellIdsFieldNumber;
+const int CellDiffMapArchive::kCellDiffsFieldNumber;
 #endif  // !_MSC_VER
 
-CellMapArchive::CellMapArchive()
+CellDiffMapArchive::CellDiffMapArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CellMapArchive::InitAsDefaultInstance() {
+void CellDiffMapArchive::InitAsDefaultInstance() {
 }
 
-CellMapArchive::CellMapArchive(const CellMapArchive& from)
+CellDiffMapArchive::CellDiffMapArchive(const CellDiffMapArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CellMapArchive::SharedCtor() {
+void CellDiffMapArchive::SharedCtor() {
   _cached_size_ = 0;
-  capacity_ = 0u;
-  count_ = 0u;
-  may_modify_formulas_in_cells_ = true;
-  may_modify_values_referenced_by_formulas_ = true;
-  applies_to_hidden_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CellMapArchive::~CellMapArchive() {
+CellDiffMapArchive::~CellDiffMapArchive() {
   SharedDtor();
 }
 
-void CellMapArchive::SharedDtor() {
+void CellDiffMapArchive::SharedDtor() {
   if (this != default_instance_) {
   }
 }
 
-void CellMapArchive::SetCachedSize(int size) const {
+void CellDiffMapArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CellMapArchive::descriptor() {
+const ::google::protobuf::Descriptor* CellDiffMapArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CellMapArchive_descriptor_;
+  return CellDiffMapArchive_descriptor_;
 }
 
-const CellMapArchive& CellMapArchive::default_instance() {
+const CellDiffMapArchive& CellDiffMapArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-CellMapArchive* CellMapArchive::default_instance_ = NULL;
+CellDiffMapArchive* CellDiffMapArchive::default_instance_ = NULL;
 
-CellMapArchive* CellMapArchive::New() const {
-  return new CellMapArchive;
+CellDiffMapArchive* CellDiffMapArchive::New() const {
+  return new CellDiffMapArchive;
 }
 
-void CellMapArchive::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    capacity_ = 0u;
-    count_ = 0u;
-    may_modify_formulas_in_cells_ = true;
-    may_modify_values_referenced_by_formulas_ = true;
-    applies_to_hidden_ = false;
-  }
-  cellmapentry_.Clear();
+void CellDiffMapArchive::Clear() {
+  cell_ids_.Clear();
+  cell_diffs_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CellMapArchive::MergePartialFromCodedStream(
+bool CellDiffMapArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint32 capacity = 1;
+      // repeated .TST.CellID cell_ids = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &capacity_)));
-          set_has_capacity();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_ids:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_cell_ids()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_count;
+        if (input->ExpectTag(10)) goto parse_cell_ids;
+        if (input->ExpectTag(18)) goto parse_cell_diffs;
         break;
       }
 
-      // required uint32 count = 2;
+      // repeated .TSP.Reference cell_diffs = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_count:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &count_)));
-          set_has_count();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_cellMapEntry;
-        break;
-      }
-
-      // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
-      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cellMapEntry:
+         parse_cell_diffs:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_cellmapentry()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_cellMapEntry;
-        if (input->ExpectTag(32)) goto parse_may_modify_formulas_in_cells;
-        break;
-      }
-
-      // optional bool may_modify_formulas_in_cells = 4 [default = true];
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_may_modify_formulas_in_cells:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &may_modify_formulas_in_cells_)));
-          set_has_may_modify_formulas_in_cells();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_may_modify_values_referenced_by_formulas;
-        break;
-      }
-
-      // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_may_modify_values_referenced_by_formulas:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &may_modify_values_referenced_by_formulas_)));
-          set_has_may_modify_values_referenced_by_formulas();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(48)) goto parse_applies_to_hidden;
-        break;
-      }
-
-      // optional bool applies_to_hidden = 6 [default = false];
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_applies_to_hidden:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &applies_to_hidden_)));
-          set_has_applies_to_hidden();
+                input, add_cell_diffs()));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_cell_diffs;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -14678,37 +19204,18 @@ bool CellMapArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CellMapArchive::SerializeWithCachedSizes(
+void CellDiffMapArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 capacity = 1;
-  if (has_capacity()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->capacity(), output);
-  }
-
-  // required uint32 count = 2;
-  if (has_count()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->count(), output);
-  }
-
-  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
-  for (int i = 0; i < this->cellmapentry_size(); i++) {
+  // repeated .TST.CellID cell_ids = 1;
+  for (int i = 0; i < this->cell_ids_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->cellmapentry(i), output);
-  }
-
-  // optional bool may_modify_formulas_in_cells = 4 [default = true];
-  if (has_may_modify_formulas_in_cells()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->may_modify_formulas_in_cells(), output);
-  }
-
-  // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
-  if (has_may_modify_values_referenced_by_formulas()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->may_modify_values_referenced_by_formulas(), output);
+      1, this->cell_ids(i), output);
   }
 
-  // optional bool applies_to_hidden = 6 [default = false];
-  if (has_applies_to_hidden()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->applies_to_hidden(), output);
+  // repeated .TSP.Reference cell_diffs = 2;
+  for (int i = 0; i < this->cell_diffs_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->cell_diffs(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -14717,38 +19224,20 @@ void CellMapArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CellMapArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CellDiffMapArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required uint32 capacity = 1;
-  if (has_capacity()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->capacity(), target);
-  }
-
-  // required uint32 count = 2;
-  if (has_count()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->count(), target);
-  }
-
-  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
-  for (int i = 0; i < this->cellmapentry_size(); i++) {
+  // repeated .TST.CellID cell_ids = 1;
+  for (int i = 0; i < this->cell_ids_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->cellmapentry(i), target);
-  }
-
-  // optional bool may_modify_formulas_in_cells = 4 [default = true];
-  if (has_may_modify_formulas_in_cells()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->may_modify_formulas_in_cells(), target);
-  }
-
-  // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
-  if (has_may_modify_values_referenced_by_formulas()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->may_modify_values_referenced_by_formulas(), target);
+        1, this->cell_ids(i), target);
   }
 
-  // optional bool applies_to_hidden = 6 [default = false];
-  if (has_applies_to_hidden()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->applies_to_hidden(), target);
+  // repeated .TSP.Reference cell_diffs = 2;
+  for (int i = 0; i < this->cell_diffs_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->cell_diffs(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -14758,46 +19247,23 @@ ::google::protobuf::uint8* CellMapArchive::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int CellMapArchive::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 capacity = 1;
-    if (has_capacity()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->capacity());
-    }
-
-    // required uint32 count = 2;
-    if (has_count()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->count());
-    }
-
-    // optional bool may_modify_formulas_in_cells = 4 [default = true];
-    if (has_may_modify_formulas_in_cells()) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
-    if (has_may_modify_values_referenced_by_formulas()) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool applies_to_hidden = 6 [default = false];
-    if (has_applies_to_hidden()) {
-      total_size += 1 + 1;
-    }
+int CellDiffMapArchive::ByteSize() const {
+  int total_size = 0;
 
+  // repeated .TST.CellID cell_ids = 1;
+  total_size += 1 * this->cell_ids_size();
+  for (int i = 0; i < this->cell_ids_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->cell_ids(i));
   }
-  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
-  total_size += 1 * this->cellmapentry_size();
-  for (int i = 0; i < this->cellmapentry_size(); i++) {
+
+  // repeated .TSP.Reference cell_diffs = 2;
+  total_size += 1 * this->cell_diffs_size();
+  for (int i = 0; i < this->cell_diffs_size(); i++) {
     total_size +=
       ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->cellmapentry(i));
+        this->cell_diffs(i));
   }
 
   if (!unknown_fields().empty()) {
@@ -14811,10 +19277,10 @@ int CellMapArchive::ByteSize() const {
   return total_size;
 }
 
-void CellMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CellDiffMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CellMapArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CellMapArchive*>(
+  const CellDiffMapArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellDiffMapArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -14823,69 +19289,51 @@ void CellMapArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void CellMapArchive::MergeFrom(const CellMapArchive& from) {
+void CellDiffMapArchive::MergeFrom(const CellDiffMapArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  cellmapentry_.MergeFrom(from.cellmapentry_);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_capacity()) {
-      set_capacity(from.capacity());
-    }
-    if (from.has_count()) {
-      set_count(from.count());
-    }
-    if (from.has_may_modify_formulas_in_cells()) {
-      set_may_modify_formulas_in_cells(from.may_modify_formulas_in_cells());
-    }
-    if (from.has_may_modify_values_referenced_by_formulas()) {
-      set_may_modify_values_referenced_by_formulas(from.may_modify_values_referenced_by_formulas());
-    }
-    if (from.has_applies_to_hidden()) {
-      set_applies_to_hidden(from.applies_to_hidden());
-    }
-  }
+  cell_ids_.MergeFrom(from.cell_ids_);
+  cell_diffs_.MergeFrom(from.cell_diffs_);
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CellMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CellDiffMapArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CellMapArchive::CopyFrom(const CellMapArchive& from) {
+void CellDiffMapArchive::CopyFrom(const CellDiffMapArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CellMapArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CellDiffMapArchive::IsInitialized() const {
 
-  for (int i = 0; i < cellmapentry_size(); i++) {
-    if (!this->cellmapentry(i).IsInitialized()) return false;
+  for (int i = 0; i < cell_ids_size(); i++) {
+    if (!this->cell_ids(i).IsInitialized()) return false;
+  }
+  for (int i = 0; i < cell_diffs_size(); i++) {
+    if (!this->cell_diffs(i).IsInitialized()) return false;
   }
   return true;
 }
 
-void CellMapArchive::Swap(CellMapArchive* other) {
+void CellDiffMapArchive::Swap(CellDiffMapArchive* other) {
   if (other != this) {
-    std::swap(capacity_, other->capacity_);
-    std::swap(count_, other->count_);
-    cellmapentry_.Swap(&other->cellmapentry_);
-    std::swap(may_modify_formulas_in_cells_, other->may_modify_formulas_in_cells_);
-    std::swap(may_modify_values_referenced_by_formulas_, other->may_modify_values_referenced_by_formulas_);
-    std::swap(applies_to_hidden_, other->applies_to_hidden_);
+    cell_ids_.Swap(&other->cell_ids_);
+    cell_diffs_.Swap(&other->cell_diffs_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CellMapArchive::GetMetadata() const {
+::google::protobuf::Metadata CellDiffMapArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CellMapArchive_descriptor_;
-  metadata.reflection = CellMapArchive_reflection_;
+  metadata.descriptor = CellDiffMapArchive_descriptor_;
+  metadata.reflection = CellDiffMapArchive_reflection_;
   return metadata;
 }
 
@@ -25878,7 +30326,216 @@ ::google::protobuf::uint8* FormulaEqualsTokenAttachmentArchive::SerializeWithCac
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+        1, this->super(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int FormulaEqualsTokenAttachmentArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSWP.UIGraphicalAttachment super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void FormulaEqualsTokenAttachmentArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const FormulaEqualsTokenAttachmentArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const FormulaEqualsTokenAttachmentArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void FormulaEqualsTokenAttachmentArchive::MergeFrom(const FormulaEqualsTokenAttachmentArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSWP::UIGraphicalAttachment::MergeFrom(from.super());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void FormulaEqualsTokenAttachmentArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void FormulaEqualsTokenAttachmentArchive::CopyFrom(const FormulaEqualsTokenAttachmentArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool FormulaEqualsTokenAttachmentArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  return true;
+}
+
+void FormulaEqualsTokenAttachmentArchive::Swap(FormulaEqualsTokenAttachmentArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata FormulaEqualsTokenAttachmentArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = FormulaEqualsTokenAttachmentArchive_descriptor_;
+  metadata.reflection = FormulaEqualsTokenAttachmentArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CellRegion::kCellRangesFieldNumber;
+#endif  // !_MSC_VER
+
+CellRegion::CellRegion()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CellRegion::InitAsDefaultInstance() {
+}
+
+CellRegion::CellRegion(const CellRegion& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CellRegion::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CellRegion::~CellRegion() {
+  SharedDtor();
+}
+
+void CellRegion::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void CellRegion::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CellRegion::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CellRegion_descriptor_;
+}
+
+const CellRegion& CellRegion::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
+  return *default_instance_;
+}
+
+CellRegion* CellRegion::default_instance_ = NULL;
+
+CellRegion* CellRegion::New() const {
+  return new CellRegion;
+}
+
+void CellRegion::Clear() {
+  cell_ranges_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CellRegion::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // repeated .TST.CellRange cell_ranges = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_ranges:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_cell_ranges()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_cell_ranges;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CellRegion::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .TST.CellRange cell_ranges = 1;
+  for (int i = 0; i < this->cell_ranges_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->cell_ranges(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CellRegion::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .TST.CellRange cell_ranges = 1;
+  for (int i = 0; i < this->cell_ranges_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->cell_ranges(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -25888,18 +30545,17 @@ ::google::protobuf::uint8* FormulaEqualsTokenAttachmentArchive::SerializeWithCac
   return target;
 }
 
-int FormulaEqualsTokenAttachmentArchive::ByteSize() const {
+int CellRegion::ByteSize() const {
   int total_size = 0;
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSWP.UIGraphicalAttachment super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
+  // repeated .TST.CellRange cell_ranges = 1;
+  total_size += 1 * this->cell_ranges_size();
+  for (int i = 0; i < this->cell_ranges_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->cell_ranges(i));
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -25911,10 +30567,10 @@ int FormulaEqualsTokenAttachmentArchive::ByteSize() const {
   return total_size;
 }
 
-void FormulaEqualsTokenAttachmentArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CellRegion::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const FormulaEqualsTokenAttachmentArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const FormulaEqualsTokenAttachmentArchive*>(
+  const CellRegion* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellRegion*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -25923,48 +30579,46 @@ void FormulaEqualsTokenAttachmentArchive::MergeFrom(const ::google::protobuf::Me
   }
 }
 
-void FormulaEqualsTokenAttachmentArchive::MergeFrom(const FormulaEqualsTokenAttachmentArchive& from) {
+void CellRegion::MergeFrom(const CellRegion& from) {
   GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSWP::UIGraphicalAttachment::MergeFrom(from.super());
-    }
-  }
+  cell_ranges_.MergeFrom(from.cell_ranges_);
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void FormulaEqualsTokenAttachmentArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CellRegion::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void FormulaEqualsTokenAttachmentArchive::CopyFrom(const FormulaEqualsTokenAttachmentArchive& from) {
+void CellRegion::CopyFrom(const CellRegion& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool FormulaEqualsTokenAttachmentArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CellRegion::IsInitialized() const {
 
+  for (int i = 0; i < cell_ranges_size(); i++) {
+    if (!this->cell_ranges(i).IsInitialized()) return false;
+  }
   return true;
 }
 
-void FormulaEqualsTokenAttachmentArchive::Swap(FormulaEqualsTokenAttachmentArchive* other) {
+void CellRegion::Swap(CellRegion* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
+    cell_ranges_.Swap(&other->cell_ranges_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata FormulaEqualsTokenAttachmentArchive::GetMetadata() const {
+::google::protobuf::Metadata CellRegion::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = FormulaEqualsTokenAttachmentArchive_descriptor_;
-  metadata.reflection = FormulaEqualsTokenAttachmentArchive_reflection_;
+  metadata.descriptor = CellRegion_descriptor_;
+  metadata.reflection = CellRegion_reflection_;
   return metadata;
 }
 
@@ -25972,81 +30626,451 @@ ::google::protobuf::Metadata FormulaEqualsTokenAttachmentArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CellRegion::kCellRangesFieldNumber;
+const int CellFillStandIn::kFillFieldNumber;
+const int CellFillStandIn::kTypeIsMixedFieldNumber;
+const int CellFillStandIn::kColorHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kColorIsMixedFieldNumber;
+const int CellFillStandIn::kFirstColorHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kFirstColorIsMixedFieldNumber;
+const int CellFillStandIn::kLastColorHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kLastColorIsMixedFieldNumber;
+const int CellFillStandIn::kGradientTypeHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kGradientTypeIsMixedFieldNumber;
+const int CellFillStandIn::kGradientAngleHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kGradientAngleIsMixedFieldNumber;
+const int CellFillStandIn::kImageDataHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kImageDataIsMixedFieldNumber;
+const int CellFillStandIn::kTintColorHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kTintColorIsMixedFieldNumber;
+const int CellFillStandIn::kScaleHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kScaleIsMixedFieldNumber;
+const int CellFillStandIn::kTechniqueHasBeenModifiedFieldNumber;
+const int CellFillStandIn::kTechniqueIsMixedFieldNumber;
 #endif  // !_MSC_VER
 
-CellRegion::CellRegion()
+CellFillStandIn::CellFillStandIn()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CellRegion::InitAsDefaultInstance() {
+void CellFillStandIn::InitAsDefaultInstance() {
+  fill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
 }
 
-CellRegion::CellRegion(const CellRegion& from)
+CellFillStandIn::CellFillStandIn(const CellFillStandIn& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CellRegion::SharedCtor() {
+void CellFillStandIn::SharedCtor() {
   _cached_size_ = 0;
+  fill_ = NULL;
+  type_is_mixed_ = false;
+  color_has_been_modified_ = false;
+  color_is_mixed_ = false;
+  first_color_has_been_modified_ = false;
+  first_color_is_mixed_ = false;
+  last_color_has_been_modified_ = false;
+  last_color_is_mixed_ = false;
+  gradient_type_has_been_modified_ = false;
+  gradient_type_is_mixed_ = false;
+  gradient_angle_has_been_modified_ = false;
+  gradient_angle_is_mixed_ = false;
+  image_data_has_been_modified_ = false;
+  image_data_is_mixed_ = false;
+  tint_color_has_been_modified_ = false;
+  tint_color_is_mixed_ = false;
+  scale_has_been_modified_ = false;
+  scale_is_mixed_ = false;
+  technique_has_been_modified_ = false;
+  technique_is_mixed_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CellRegion::~CellRegion() {
+CellFillStandIn::~CellFillStandIn() {
   SharedDtor();
 }
 
-void CellRegion::SharedDtor() {
+void CellFillStandIn::SharedDtor() {
   if (this != default_instance_) {
+    delete fill_;
   }
 }
 
-void CellRegion::SetCachedSize(int size) const {
+void CellFillStandIn::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CellRegion::descriptor() {
+const ::google::protobuf::Descriptor* CellFillStandIn::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CellRegion_descriptor_;
+  return CellFillStandIn_descriptor_;
 }
 
-const CellRegion& CellRegion::default_instance() {
+const CellFillStandIn& CellFillStandIn::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTArchives_2eproto();
   return *default_instance_;
 }
 
-CellRegion* CellRegion::default_instance_ = NULL;
+CellFillStandIn* CellFillStandIn::default_instance_ = NULL;
+
+CellFillStandIn* CellFillStandIn::New() const {
+  return new CellFillStandIn;
+}
+
+void CellFillStandIn::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_fill()) {
+      if (fill_ != NULL) fill_->::TSD::FillArchive::Clear();
+    }
+    type_is_mixed_ = false;
+    color_has_been_modified_ = false;
+    color_is_mixed_ = false;
+    first_color_has_been_modified_ = false;
+    first_color_is_mixed_ = false;
+    last_color_has_been_modified_ = false;
+    last_color_is_mixed_ = false;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    gradient_type_has_been_modified_ = false;
+    gradient_type_is_mixed_ = false;
+    gradient_angle_has_been_modified_ = false;
+    gradient_angle_is_mixed_ = false;
+    image_data_has_been_modified_ = false;
+    image_data_is_mixed_ = false;
+    tint_color_has_been_modified_ = false;
+    tint_color_is_mixed_ = false;
+  }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    scale_has_been_modified_ = false;
+    scale_is_mixed_ = false;
+    technique_has_been_modified_ = false;
+    technique_is_mixed_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CellFillStandIn::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSD.FillArchive fill = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_fill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_type_is_mixed;
+        break;
+      }
+
+      // optional bool type_is_mixed = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_type_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &type_is_mixed_)));
+          set_has_type_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_color_has_been_modified;
+        break;
+      }
+
+      // optional bool color_has_been_modified = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_color_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &color_has_been_modified_)));
+          set_has_color_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_color_is_mixed;
+        break;
+      }
+
+      // optional bool color_is_mixed = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_color_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &color_is_mixed_)));
+          set_has_color_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_first_color_has_been_modified;
+        break;
+      }
+
+      // optional bool first_color_has_been_modified = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_first_color_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &first_color_has_been_modified_)));
+          set_has_first_color_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_first_color_is_mixed;
+        break;
+      }
+
+      // optional bool first_color_is_mixed = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_first_color_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &first_color_is_mixed_)));
+          set_has_first_color_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_last_color_has_been_modified;
+        break;
+      }
+
+      // optional bool last_color_has_been_modified = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_last_color_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &last_color_has_been_modified_)));
+          set_has_last_color_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_last_color_is_mixed;
+        break;
+      }
+
+      // optional bool last_color_is_mixed = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_last_color_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &last_color_is_mixed_)));
+          set_has_last_color_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_gradient_type_has_been_modified;
+        break;
+      }
+
+      // optional bool gradient_type_has_been_modified = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_gradient_type_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &gradient_type_has_been_modified_)));
+          set_has_gradient_type_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_gradient_type_is_mixed;
+        break;
+      }
+
+      // optional bool gradient_type_is_mixed = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_gradient_type_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &gradient_type_is_mixed_)));
+          set_has_gradient_type_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_gradient_angle_has_been_modified;
+        break;
+      }
+
+      // optional bool gradient_angle_has_been_modified = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_gradient_angle_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &gradient_angle_has_been_modified_)));
+          set_has_gradient_angle_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(96)) goto parse_gradient_angle_is_mixed;
+        break;
+      }
+
+      // optional bool gradient_angle_is_mixed = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_gradient_angle_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &gradient_angle_is_mixed_)));
+          set_has_gradient_angle_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(104)) goto parse_image_data_has_been_modified;
+        break;
+      }
+
+      // optional bool image_data_has_been_modified = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_image_data_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &image_data_has_been_modified_)));
+          set_has_image_data_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(112)) goto parse_image_data_is_mixed;
+        break;
+      }
+
+      // optional bool image_data_is_mixed = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_image_data_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &image_data_is_mixed_)));
+          set_has_image_data_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(120)) goto parse_tint_color_has_been_modified;
+        break;
+      }
+
+      // optional bool tint_color_has_been_modified = 15;
+      case 15: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tint_color_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tint_color_has_been_modified_)));
+          set_has_tint_color_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(128)) goto parse_tint_color_is_mixed;
+        break;
+      }
+
+      // optional bool tint_color_is_mixed = 16;
+      case 16: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_tint_color_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tint_color_is_mixed_)));
+          set_has_tint_color_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(136)) goto parse_scale_has_been_modified;
+        break;
+      }
+
+      // optional bool scale_has_been_modified = 17;
+      case 17: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_scale_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &scale_has_been_modified_)));
+          set_has_scale_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(144)) goto parse_scale_is_mixed;
+        break;
+      }
 
-CellRegion* CellRegion::New() const {
-  return new CellRegion;
-}
+      // optional bool scale_is_mixed = 18;
+      case 18: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_scale_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &scale_is_mixed_)));
+          set_has_scale_is_mixed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(152)) goto parse_technique_has_been_modified;
+        break;
+      }
 
-void CellRegion::Clear() {
-  cell_ranges_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
+      // optional bool technique_has_been_modified = 19;
+      case 19: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_technique_has_been_modified:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &technique_has_been_modified_)));
+          set_has_technique_has_been_modified();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(160)) goto parse_technique_is_mixed;
+        break;
+      }
 
-bool CellRegion::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // repeated .TST.CellRange cell_ranges = 1;
-      case 1: {
+      // optional bool technique_is_mixed = 20;
+      case 20: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_ranges:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_cell_ranges()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_technique_is_mixed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &technique_is_mixed_)));
+          set_has_technique_is_mixed();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(10)) goto parse_cell_ranges;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -26067,12 +31091,107 @@ bool CellRegion::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CellRegion::SerializeWithCachedSizes(
+void CellFillStandIn::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // repeated .TST.CellRange cell_ranges = 1;
-  for (int i = 0; i < this->cell_ranges_size(); i++) {
+  // required .TSD.FillArchive fill = 1;
+  if (has_fill()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->cell_ranges(i), output);
+      1, this->fill(), output);
+  }
+
+  // optional bool type_is_mixed = 2;
+  if (has_type_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->type_is_mixed(), output);
+  }
+
+  // optional bool color_has_been_modified = 3;
+  if (has_color_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->color_has_been_modified(), output);
+  }
+
+  // optional bool color_is_mixed = 4;
+  if (has_color_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->color_is_mixed(), output);
+  }
+
+  // optional bool first_color_has_been_modified = 5;
+  if (has_first_color_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->first_color_has_been_modified(), output);
+  }
+
+  // optional bool first_color_is_mixed = 6;
+  if (has_first_color_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->first_color_is_mixed(), output);
+  }
+
+  // optional bool last_color_has_been_modified = 7;
+  if (has_last_color_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->last_color_has_been_modified(), output);
+  }
+
+  // optional bool last_color_is_mixed = 8;
+  if (has_last_color_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->last_color_is_mixed(), output);
+  }
+
+  // optional bool gradient_type_has_been_modified = 9;
+  if (has_gradient_type_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(9, this->gradient_type_has_been_modified(), output);
+  }
+
+  // optional bool gradient_type_is_mixed = 10;
+  if (has_gradient_type_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->gradient_type_is_mixed(), output);
+  }
+
+  // optional bool gradient_angle_has_been_modified = 11;
+  if (has_gradient_angle_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->gradient_angle_has_been_modified(), output);
+  }
+
+  // optional bool gradient_angle_is_mixed = 12;
+  if (has_gradient_angle_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(12, this->gradient_angle_is_mixed(), output);
+  }
+
+  // optional bool image_data_has_been_modified = 13;
+  if (has_image_data_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(13, this->image_data_has_been_modified(), output);
+  }
+
+  // optional bool image_data_is_mixed = 14;
+  if (has_image_data_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(14, this->image_data_is_mixed(), output);
+  }
+
+  // optional bool tint_color_has_been_modified = 15;
+  if (has_tint_color_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(15, this->tint_color_has_been_modified(), output);
+  }
+
+  // optional bool tint_color_is_mixed = 16;
+  if (has_tint_color_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(16, this->tint_color_is_mixed(), output);
+  }
+
+  // optional bool scale_has_been_modified = 17;
+  if (has_scale_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(17, this->scale_has_been_modified(), output);
+  }
+
+  // optional bool scale_is_mixed = 18;
+  if (has_scale_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(18, this->scale_is_mixed(), output);
+  }
+
+  // optional bool technique_has_been_modified = 19;
+  if (has_technique_has_been_modified()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(19, this->technique_has_been_modified(), output);
+  }
+
+  // optional bool technique_is_mixed = 20;
+  if (has_technique_is_mixed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(20, this->technique_is_mixed(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -26081,13 +31200,108 @@ void CellRegion::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CellRegion::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CellFillStandIn::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // repeated .TST.CellRange cell_ranges = 1;
-  for (int i = 0; i < this->cell_ranges_size(); i++) {
+  // required .TSD.FillArchive fill = 1;
+  if (has_fill()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->cell_ranges(i), target);
+        1, this->fill(), target);
+  }
+
+  // optional bool type_is_mixed = 2;
+  if (has_type_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->type_is_mixed(), target);
+  }
+
+  // optional bool color_has_been_modified = 3;
+  if (has_color_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->color_has_been_modified(), target);
+  }
+
+  // optional bool color_is_mixed = 4;
+  if (has_color_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->color_is_mixed(), target);
+  }
+
+  // optional bool first_color_has_been_modified = 5;
+  if (has_first_color_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->first_color_has_been_modified(), target);
+  }
+
+  // optional bool first_color_is_mixed = 6;
+  if (has_first_color_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->first_color_is_mixed(), target);
+  }
+
+  // optional bool last_color_has_been_modified = 7;
+  if (has_last_color_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->last_color_has_been_modified(), target);
+  }
+
+  // optional bool last_color_is_mixed = 8;
+  if (has_last_color_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->last_color_is_mixed(), target);
+  }
+
+  // optional bool gradient_type_has_been_modified = 9;
+  if (has_gradient_type_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(9, this->gradient_type_has_been_modified(), target);
+  }
+
+  // optional bool gradient_type_is_mixed = 10;
+  if (has_gradient_type_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->gradient_type_is_mixed(), target);
+  }
+
+  // optional bool gradient_angle_has_been_modified = 11;
+  if (has_gradient_angle_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->gradient_angle_has_been_modified(), target);
+  }
+
+  // optional bool gradient_angle_is_mixed = 12;
+  if (has_gradient_angle_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(12, this->gradient_angle_is_mixed(), target);
+  }
+
+  // optional bool image_data_has_been_modified = 13;
+  if (has_image_data_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(13, this->image_data_has_been_modified(), target);
+  }
+
+  // optional bool image_data_is_mixed = 14;
+  if (has_image_data_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(14, this->image_data_is_mixed(), target);
+  }
+
+  // optional bool tint_color_has_been_modified = 15;
+  if (has_tint_color_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(15, this->tint_color_has_been_modified(), target);
+  }
+
+  // optional bool tint_color_is_mixed = 16;
+  if (has_tint_color_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(16, this->tint_color_is_mixed(), target);
+  }
+
+  // optional bool scale_has_been_modified = 17;
+  if (has_scale_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(17, this->scale_has_been_modified(), target);
+  }
+
+  // optional bool scale_is_mixed = 18;
+  if (has_scale_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(18, this->scale_is_mixed(), target);
+  }
+
+  // optional bool technique_has_been_modified = 19;
+  if (has_technique_has_been_modified()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(19, this->technique_has_been_modified(), target);
+  }
+
+  // optional bool technique_is_mixed = 20;
+  if (has_technique_is_mixed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(20, this->technique_is_mixed(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -26097,17 +31311,117 @@ ::google::protobuf::uint8* CellRegion::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int CellRegion::ByteSize() const {
+int CellFillStandIn::ByteSize() const {
   int total_size = 0;
 
-  // repeated .TST.CellRange cell_ranges = 1;
-  total_size += 1 * this->cell_ranges_size();
-  for (int i = 0; i < this->cell_ranges_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->cell_ranges(i));
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSD.FillArchive fill = 1;
+    if (has_fill()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->fill());
+    }
+
+    // optional bool type_is_mixed = 2;
+    if (has_type_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool color_has_been_modified = 3;
+    if (has_color_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool color_is_mixed = 4;
+    if (has_color_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool first_color_has_been_modified = 5;
+    if (has_first_color_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool first_color_is_mixed = 6;
+    if (has_first_color_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool last_color_has_been_modified = 7;
+    if (has_last_color_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool last_color_is_mixed = 8;
+    if (has_last_color_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional bool gradient_type_has_been_modified = 9;
+    if (has_gradient_type_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool gradient_type_is_mixed = 10;
+    if (has_gradient_type_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool gradient_angle_has_been_modified = 11;
+    if (has_gradient_angle_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool gradient_angle_is_mixed = 12;
+    if (has_gradient_angle_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool image_data_has_been_modified = 13;
+    if (has_image_data_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool image_data_is_mixed = 14;
+    if (has_image_data_is_mixed()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool tint_color_has_been_modified = 15;
+    if (has_tint_color_has_been_modified()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool tint_color_is_mixed = 16;
+    if (has_tint_color_is_mixed()) {
+      total_size += 2 + 1;
+    }
+
   }
+  if (_has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    // optional bool scale_has_been_modified = 17;
+    if (has_scale_has_been_modified()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool scale_is_mixed = 18;
+    if (has_scale_is_mixed()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool technique_has_been_modified = 19;
+    if (has_technique_has_been_modified()) {
+      total_size += 2 + 1;
+    }
+
+    // optional bool technique_is_mixed = 20;
+    if (has_technique_is_mixed()) {
+      total_size += 2 + 1;
+    }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -26119,10 +31433,10 @@ int CellRegion::ByteSize() const {
   return total_size;
 }
 
-void CellRegion::MergeFrom(const ::google::protobuf::Message& from) {
+void CellFillStandIn::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CellRegion* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CellRegion*>(
+  const CellFillStandIn* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CellFillStandIn*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -26131,46 +31445,131 @@ void CellRegion::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void CellRegion::MergeFrom(const CellRegion& from) {
+void CellFillStandIn::MergeFrom(const CellFillStandIn& from) {
   GOOGLE_CHECK_NE(&from, this);
-  cell_ranges_.MergeFrom(from.cell_ranges_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_fill()) {
+      mutable_fill()->::TSD::FillArchive::MergeFrom(from.fill());
+    }
+    if (from.has_type_is_mixed()) {
+      set_type_is_mixed(from.type_is_mixed());
+    }
+    if (from.has_color_has_been_modified()) {
+      set_color_has_been_modified(from.color_has_been_modified());
+    }
+    if (from.has_color_is_mixed()) {
+      set_color_is_mixed(from.color_is_mixed());
+    }
+    if (from.has_first_color_has_been_modified()) {
+      set_first_color_has_been_modified(from.first_color_has_been_modified());
+    }
+    if (from.has_first_color_is_mixed()) {
+      set_first_color_is_mixed(from.first_color_is_mixed());
+    }
+    if (from.has_last_color_has_been_modified()) {
+      set_last_color_has_been_modified(from.last_color_has_been_modified());
+    }
+    if (from.has_last_color_is_mixed()) {
+      set_last_color_is_mixed(from.last_color_is_mixed());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_gradient_type_has_been_modified()) {
+      set_gradient_type_has_been_modified(from.gradient_type_has_been_modified());
+    }
+    if (from.has_gradient_type_is_mixed()) {
+      set_gradient_type_is_mixed(from.gradient_type_is_mixed());
+    }
+    if (from.has_gradient_angle_has_been_modified()) {
+      set_gradient_angle_has_been_modified(from.gradient_angle_has_been_modified());
+    }
+    if (from.has_gradient_angle_is_mixed()) {
+      set_gradient_angle_is_mixed(from.gradient_angle_is_mixed());
+    }
+    if (from.has_image_data_has_been_modified()) {
+      set_image_data_has_been_modified(from.image_data_has_been_modified());
+    }
+    if (from.has_image_data_is_mixed()) {
+      set_image_data_is_mixed(from.image_data_is_mixed());
+    }
+    if (from.has_tint_color_has_been_modified()) {
+      set_tint_color_has_been_modified(from.tint_color_has_been_modified());
+    }
+    if (from.has_tint_color_is_mixed()) {
+      set_tint_color_is_mixed(from.tint_color_is_mixed());
+    }
+  }
+  if (from._has_bits_[16 / 32] & (0xffu << (16 % 32))) {
+    if (from.has_scale_has_been_modified()) {
+      set_scale_has_been_modified(from.scale_has_been_modified());
+    }
+    if (from.has_scale_is_mixed()) {
+      set_scale_is_mixed(from.scale_is_mixed());
+    }
+    if (from.has_technique_has_been_modified()) {
+      set_technique_has_been_modified(from.technique_has_been_modified());
+    }
+    if (from.has_technique_is_mixed()) {
+      set_technique_is_mixed(from.technique_is_mixed());
+    }
+  }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CellRegion::CopyFrom(const ::google::protobuf::Message& from) {
+void CellFillStandIn::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CellRegion::CopyFrom(const CellRegion& from) {
+void CellFillStandIn::CopyFrom(const CellFillStandIn& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CellRegion::IsInitialized() const {
+bool CellFillStandIn::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
-  for (int i = 0; i < cell_ranges_size(); i++) {
-    if (!this->cell_ranges(i).IsInitialized()) return false;
+  if (has_fill()) {
+    if (!this->fill().IsInitialized()) return false;
   }
   return true;
 }
 
-void CellRegion::Swap(CellRegion* other) {
+void CellFillStandIn::Swap(CellFillStandIn* other) {
   if (other != this) {
-    cell_ranges_.Swap(&other->cell_ranges_);
+    std::swap(fill_, other->fill_);
+    std::swap(type_is_mixed_, other->type_is_mixed_);
+    std::swap(color_has_been_modified_, other->color_has_been_modified_);
+    std::swap(color_is_mixed_, other->color_is_mixed_);
+    std::swap(first_color_has_been_modified_, other->first_color_has_been_modified_);
+    std::swap(first_color_is_mixed_, other->first_color_is_mixed_);
+    std::swap(last_color_has_been_modified_, other->last_color_has_been_modified_);
+    std::swap(last_color_is_mixed_, other->last_color_is_mixed_);
+    std::swap(gradient_type_has_been_modified_, other->gradient_type_has_been_modified_);
+    std::swap(gradient_type_is_mixed_, other->gradient_type_is_mixed_);
+    std::swap(gradient_angle_has_been_modified_, other->gradient_angle_has_been_modified_);
+    std::swap(gradient_angle_is_mixed_, other->gradient_angle_is_mixed_);
+    std::swap(image_data_has_been_modified_, other->image_data_has_been_modified_);
+    std::swap(image_data_is_mixed_, other->image_data_is_mixed_);
+    std::swap(tint_color_has_been_modified_, other->tint_color_has_been_modified_);
+    std::swap(tint_color_is_mixed_, other->tint_color_is_mixed_);
+    std::swap(scale_has_been_modified_, other->scale_has_been_modified_);
+    std::swap(scale_is_mixed_, other->scale_is_mixed_);
+    std::swap(technique_has_been_modified_, other->technique_has_been_modified_);
+    std::swap(technique_is_mixed_, other->technique_is_mixed_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CellRegion::GetMetadata() const {
+::google::protobuf::Metadata CellFillStandIn::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CellRegion_descriptor_;
-  metadata.reflection = CellRegion_reflection_;
+  metadata.descriptor = CellFillStandIn_descriptor_;
+  metadata.reflection = CellFillStandIn_reflection_;
   return metadata;
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.h
index 170bd10..0bfd5d1 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSTArchives.pb.h
@@ -51,6 +51,8 @@ class TileStorage;
 class TileStorage_Tile;
 class PopUpMenuModel;
 class PopUpMenuModel_CellValue;
+class ImportWarningSetArchive;
+class ImportWarningSetArchive_FormulaImportWarning;
 class TableDataList;
 class TableDataList_ListEntry;
 class TableRBTree;
@@ -63,12 +65,21 @@ class TableInfoArchive;
 class EditingStateArchive;
 class WPTableInfoArchive;
 class TableStyleNetworkArchive;
+class TableSortOrderArchive;
+class TableSortOrderArchive_SortRuleArchive;
+class SortRuleReferenceTrackerArchive;
 class TableModelArchive;
 class DurationWrapperArchive;
 class Cell;
 class MergeRegionMapArchive;
 class CellMapArchive;
 class CellMapArchive_CellMapEntry;
+class CellMapTileArchive;
+class CellMapTileArchive_CellMapEntry;
+class TiledCellMapArchive;
+class PropertyMapEntryArchive;
+class CellDiffArchive;
+class CellDiffMapArchive;
 class DoubleStyleMapArchive;
 class DoubleStyleMapArchive_DoubleStyleMapEntryArchive;
 class StyleTableMapArchive;
@@ -106,6 +117,7 @@ class HiddenStateFormulaOwnerArchive;
 class RichTextPayloadArchive;
 class FormulaEqualsTokenAttachmentArchive;
 class CellRegion;
+class CellFillStandIn;
 
 enum PopUpMenuModel_CellValueType {
   PopUpMenuModel_CellValueType_NIL_TYPE = 1,
@@ -129,6 +141,35 @@ inline bool PopUpMenuModel_CellValueType_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<PopUpMenuModel_CellValueType>(
     PopUpMenuModel_CellValueType_descriptor(), name, value);
 }
+enum ImportWarningSetArchive_FormulaWarningType {
+  ImportWarningSetArchive_FormulaWarningType_THREE_D_REFERENCE = 1,
+  ImportWarningSetArchive_FormulaWarningType_ARRAYED_FORMULA = 2,
+  ImportWarningSetArchive_FormulaWarningType_DIFFERENT_BEHAVIOR_FOR_FUNCTION = 3,
+  ImportWarningSetArchive_FormulaWarningType_ERROR_TOKEN = 4,
+  ImportWarningSetArchive_FormulaWarningType_EXTERNAL_REFERENCE = 5,
+  ImportWarningSetArchive_FormulaWarningType_NATURAL_LANGUAGE_FORMULA = 6,
+  ImportWarningSetArchive_FormulaWarningType_REFERENCE_OUT_OF_BOUNDS = 7,
+  ImportWarningSetArchive_FormulaWarningType_SHARED_FORMULA_BASE_NOT_FOUND = 8,
+  ImportWarningSetArchive_FormulaWarningType_UNKNOWN_NAME = 9,
+  ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_FORMULA = 10,
+  ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_FUNCTION = 11,
+  ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_NAME = 12
+};
+bool ImportWarningSetArchive_FormulaWarningType_IsValid(int value);
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_MIN = ImportWarningSetArchive_FormulaWarningType_THREE_D_REFERENCE;
+const ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_MAX = ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_NAME;
+const int ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_ARRAYSIZE = ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* ImportWarningSetArchive_FormulaWarningType_descriptor();
+inline const ::std::string& ImportWarningSetArchive_FormulaWarningType_Name(ImportWarningSetArchive_FormulaWarningType value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    ImportWarningSetArchive_FormulaWarningType_descriptor(), value);
+}
+inline bool ImportWarningSetArchive_FormulaWarningType_Parse(
+    const ::std::string& name, ImportWarningSetArchive_FormulaWarningType* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<ImportWarningSetArchive_FormulaWarningType>(
+    ImportWarningSetArchive_FormulaWarningType_descriptor(), name, value);
+}
 enum TableDataList_ListType {
   TableDataList_ListType_STRING = 1,
   TableDataList_ListType_FORMAT = 2,
@@ -139,11 +180,12 @@ enum TableDataList_ListType {
   TableDataList_ListType_MULTIPLE_CHOICE_LIST_FORMAT = 7,
   TableDataList_ListType_RICH_TEXT_PAYLOAD = 8,
   TableDataList_ListType_CONDITIONAL_STYLE = 9,
-  TableDataList_ListType_COMMENT_STORAGE = 10
+  TableDataList_ListType_COMMENT_STORAGE = 10,
+  TableDataList_ListType_IMPORT_WARNING = 11
 };
 bool TableDataList_ListType_IsValid(int value);
 const TableDataList_ListType TableDataList_ListType_ListType_MIN = TableDataList_ListType_STRING;
-const TableDataList_ListType TableDataList_ListType_ListType_MAX = TableDataList_ListType_COMMENT_STORAGE;
+const TableDataList_ListType TableDataList_ListType_ListType_MAX = TableDataList_ListType_IMPORT_WARNING;
 const int TableDataList_ListType_ListType_ARRAYSIZE = TableDataList_ListType_ListType_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* TableDataList_ListType_descriptor();
@@ -156,6 +198,44 @@ inline bool TableDataList_ListType_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<TableDataList_ListType>(
     TableDataList_ListType_descriptor(), name, value);
 }
+enum TableSortOrderArchive_SortRuleArchive_Direction {
+  TableSortOrderArchive_SortRuleArchive_Direction_ascending = 0,
+  TableSortOrderArchive_SortRuleArchive_Direction_descending = 1
+};
+bool TableSortOrderArchive_SortRuleArchive_Direction_IsValid(int value);
+const TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive_Direction_Direction_MIN = TableSortOrderArchive_SortRuleArchive_Direction_ascending;
+const TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive_Direction_Direction_MAX = TableSortOrderArchive_SortRuleArchive_Direction_descending;
+const int TableSortOrderArchive_SortRuleArchive_Direction_Direction_ARRAYSIZE = TableSortOrderArchive_SortRuleArchive_Direction_Direction_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* TableSortOrderArchive_SortRuleArchive_Direction_descriptor();
+inline const ::std::string& TableSortOrderArchive_SortRuleArchive_Direction_Name(TableSortOrderArchive_SortRuleArchive_Direction value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    TableSortOrderArchive_SortRuleArchive_Direction_descriptor(), value);
+}
+inline bool TableSortOrderArchive_SortRuleArchive_Direction_Parse(
+    const ::std::string& name, TableSortOrderArchive_SortRuleArchive_Direction* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<TableSortOrderArchive_SortRuleArchive_Direction>(
+    TableSortOrderArchive_SortRuleArchive_Direction_descriptor(), name, value);
+}
+enum TableSortOrderArchive_SortType {
+  TableSortOrderArchive_SortType_entire_table = 0,
+  TableSortOrderArchive_SortType_row_range = 1
+};
+bool TableSortOrderArchive_SortType_IsValid(int value);
+const TableSortOrderArchive_SortType TableSortOrderArchive_SortType_SortType_MIN = TableSortOrderArchive_SortType_entire_table;
+const TableSortOrderArchive_SortType TableSortOrderArchive_SortType_SortType_MAX = TableSortOrderArchive_SortType_row_range;
+const int TableSortOrderArchive_SortType_SortType_ARRAYSIZE = TableSortOrderArchive_SortType_SortType_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* TableSortOrderArchive_SortType_descriptor();
+inline const ::std::string& TableSortOrderArchive_SortType_Name(TableSortOrderArchive_SortType value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    TableSortOrderArchive_SortType_descriptor(), value);
+}
+inline bool TableSortOrderArchive_SortType_Parse(
+    const ::std::string& name, TableSortOrderArchive_SortType* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<TableSortOrderArchive_SortType>(
+    TableSortOrderArchive_SortType_descriptor(), name, value);
+}
 enum FormulaPredicateArchive_FormulaPredicateType {
   FormulaPredicateArchive_FormulaPredicateType_PredNone = 0,
   FormulaPredicateArchive_FormulaPredicateType_TextStartsWith = 1,
@@ -1487,6 +1567,383 @@ class PopUpMenuModel : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class ImportWarningSetArchive_FormulaImportWarning : public ::google::protobuf::Message {
+ public:
+  ImportWarningSetArchive_FormulaImportWarning();
+  virtual ~ImportWarningSetArchive_FormulaImportWarning();
+
+  ImportWarningSetArchive_FormulaImportWarning(const ImportWarningSetArchive_FormulaImportWarning& from);
+
+  inline ImportWarningSetArchive_FormulaImportWarning& operator=(const ImportWarningSetArchive_FormulaImportWarning& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ImportWarningSetArchive_FormulaImportWarning& default_instance();
+
+  void Swap(ImportWarningSetArchive_FormulaImportWarning* other);
+
+  // implements Message ----------------------------------------------
+
+  ImportWarningSetArchive_FormulaImportWarning* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ImportWarningSetArchive_FormulaImportWarning& from);
+  void MergeFrom(const ImportWarningSetArchive_FormulaImportWarning& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
+  inline bool has_formula_warning_type() const;
+  inline void clear_formula_warning_type();
+  static const int kFormulaWarningTypeFieldNumber = 1;
+  inline ::TST::ImportWarningSetArchive_FormulaWarningType formula_warning_type() const;
+  inline void set_formula_warning_type(::TST::ImportWarningSetArchive_FormulaWarningType value);
+
+  // optional string original_formula = 2;
+  inline bool has_original_formula() const;
+  inline void clear_original_formula();
+  static const int kOriginalFormulaFieldNumber = 2;
+  inline const ::std::string& original_formula() const;
+  inline void set_original_formula(const ::std::string& value);
+  inline void set_original_formula(const char* value);
+  inline void set_original_formula(const char* value, size_t size);
+  inline ::std::string* mutable_original_formula();
+  inline ::std::string* release_original_formula();
+  inline void set_allocated_original_formula(::std::string* original_formula);
+
+  // optional string supplementary_text = 3;
+  inline bool has_supplementary_text() const;
+  inline void clear_supplementary_text();
+  static const int kSupplementaryTextFieldNumber = 3;
+  inline const ::std::string& supplementary_text() const;
+  inline void set_supplementary_text(const ::std::string& value);
+  inline void set_supplementary_text(const char* value);
+  inline void set_supplementary_text(const char* value, size_t size);
+  inline ::std::string* mutable_supplementary_text();
+  inline ::std::string* release_supplementary_text();
+  inline void set_allocated_supplementary_text(::std::string* supplementary_text);
+
+  // @@protoc_insertion_point(class_scope:TST.ImportWarningSetArchive.FormulaImportWarning)
+ private:
+  inline void set_has_formula_warning_type();
+  inline void clear_has_formula_warning_type();
+  inline void set_has_original_formula();
+  inline void clear_has_original_formula();
+  inline void set_has_supplementary_text();
+  inline void clear_has_supplementary_text();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::std::string* original_formula_;
+  ::std::string* supplementary_text_;
+  int formula_warning_type_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ImportWarningSetArchive_FormulaImportWarning* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ImportWarningSetArchive : public ::google::protobuf::Message {
+ public:
+  ImportWarningSetArchive();
+  virtual ~ImportWarningSetArchive();
+
+  ImportWarningSetArchive(const ImportWarningSetArchive& from);
+
+  inline ImportWarningSetArchive& operator=(const ImportWarningSetArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ImportWarningSetArchive& default_instance();
+
+  void Swap(ImportWarningSetArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ImportWarningSetArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ImportWarningSetArchive& from);
+  void MergeFrom(const ImportWarningSetArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef ImportWarningSetArchive_FormulaImportWarning FormulaImportWarning;
+
+  typedef ImportWarningSetArchive_FormulaWarningType FormulaWarningType;
+  static const FormulaWarningType THREE_D_REFERENCE = ImportWarningSetArchive_FormulaWarningType_THREE_D_REFERENCE;
+  static const FormulaWarningType ARRAYED_FORMULA = ImportWarningSetArchive_FormulaWarningType_ARRAYED_FORMULA;
+  static const FormulaWarningType DIFFERENT_BEHAVIOR_FOR_FUNCTION = ImportWarningSetArchive_FormulaWarningType_DIFFERENT_BEHAVIOR_FOR_FUNCTION;
+  static const FormulaWarningType ERROR_TOKEN = ImportWarningSetArchive_FormulaWarningType_ERROR_TOKEN;
+  static const FormulaWarningType EXTERNAL_REFERENCE = ImportWarningSetArchive_FormulaWarningType_EXTERNAL_REFERENCE;
+  static const FormulaWarningType NATURAL_LANGUAGE_FORMULA = ImportWarningSetArchive_FormulaWarningType_NATURAL_LANGUAGE_FORMULA;
+  static const FormulaWarningType REFERENCE_OUT_OF_BOUNDS = ImportWarningSetArchive_FormulaWarningType_REFERENCE_OUT_OF_BOUNDS;
+  static const FormulaWarningType SHARED_FORMULA_BASE_NOT_FOUND = ImportWarningSetArchive_FormulaWarningType_SHARED_FORMULA_BASE_NOT_FOUND;
+  static const FormulaWarningType UNKNOWN_NAME = ImportWarningSetArchive_FormulaWarningType_UNKNOWN_NAME;
+  static const FormulaWarningType UNSUPPORTED_FORMULA = ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_FORMULA;
+  static const FormulaWarningType UNSUPPORTED_FUNCTION = ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_FUNCTION;
+  static const FormulaWarningType UNSUPPORTED_NAME = ImportWarningSetArchive_FormulaWarningType_UNSUPPORTED_NAME;
+  static inline bool FormulaWarningType_IsValid(int value) {
+    return ImportWarningSetArchive_FormulaWarningType_IsValid(value);
+  }
+  static const FormulaWarningType FormulaWarningType_MIN =
+    ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_MIN;
+  static const FormulaWarningType FormulaWarningType_MAX =
+    ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_MAX;
+  static const int FormulaWarningType_ARRAYSIZE =
+    ImportWarningSetArchive_FormulaWarningType_FormulaWarningType_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  FormulaWarningType_descriptor() {
+    return ImportWarningSetArchive_FormulaWarningType_descriptor();
+  }
+  static inline const ::std::string& FormulaWarningType_Name(FormulaWarningType value) {
+    return ImportWarningSetArchive_FormulaWarningType_Name(value);
+  }
+  static inline bool FormulaWarningType_Parse(const ::std::string& name,
+      FormulaWarningType* value) {
+    return ImportWarningSetArchive_FormulaWarningType_Parse(name, value);
+  }
+
+  // accessors -------------------------------------------------------
+
+  // optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
+  inline bool has_formula_import_warning() const;
+  inline void clear_formula_import_warning();
+  static const int kFormulaImportWarningFieldNumber = 1;
+  inline const ::TST::ImportWarningSetArchive_FormulaImportWarning& formula_import_warning() const;
+  inline ::TST::ImportWarningSetArchive_FormulaImportWarning* mutable_formula_import_warning();
+  inline ::TST::ImportWarningSetArchive_FormulaImportWarning* release_formula_import_warning();
+  inline void set_allocated_formula_import_warning(::TST::ImportWarningSetArchive_FormulaImportWarning* formula_import_warning);
+
+  // optional bool cond_format_above_avg_equal_avg = 2 [default = false];
+  inline bool has_cond_format_above_avg_equal_avg() const;
+  inline void clear_cond_format_above_avg_equal_avg();
+  static const int kCondFormatAboveAvgEqualAvgFieldNumber = 2;
+  inline bool cond_format_above_avg_equal_avg() const;
+  inline void set_cond_format_above_avg_equal_avg(bool value);
+
+  // optional bool cond_format_above_avg_std_dev = 3 [default = false];
+  inline bool has_cond_format_above_avg_std_dev() const;
+  inline void clear_cond_format_above_avg_std_dev();
+  static const int kCondFormatAboveAvgStdDevFieldNumber = 3;
+  inline bool cond_format_above_avg_std_dev() const;
+  inline void set_cond_format_above_avg_std_dev(bool value);
+
+  // optional bool cond_format_complex_formula = 4 [default = false];
+  inline bool has_cond_format_complex_formula() const;
+  inline void clear_cond_format_complex_formula();
+  static const int kCondFormatComplexFormulaFieldNumber = 4;
+  inline bool cond_format_complex_formula() const;
+  inline void set_cond_format_complex_formula(bool value);
+
+  // optional bool cond_format_contains_errors = 5 [default = false];
+  inline bool has_cond_format_contains_errors() const;
+  inline void clear_cond_format_contains_errors();
+  static const int kCondFormatContainsErrorsFieldNumber = 5;
+  inline bool cond_format_contains_errors() const;
+  inline void set_cond_format_contains_errors(bool value);
+
+  // optional bool cond_format_expr = 6 [default = false];
+  inline bool has_cond_format_expr() const;
+  inline void clear_cond_format_expr();
+  static const int kCondFormatExprFieldNumber = 6;
+  inline bool cond_format_expr() const;
+  inline void set_cond_format_expr(bool value);
+
+  // optional bool cond_format_not_contains_errors = 7 [default = false];
+  inline bool has_cond_format_not_contains_errors() const;
+  inline void clear_cond_format_not_contains_errors();
+  static const int kCondFormatNotContainsErrorsFieldNumber = 7;
+  inline bool cond_format_not_contains_errors() const;
+  inline void set_cond_format_not_contains_errors(bool value);
+
+  // optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+  inline bool has_cond_format_parameters_not_all_same_type() const;
+  inline void clear_cond_format_parameters_not_all_same_type();
+  static const int kCondFormatParametersNotAllSameTypeFieldNumber = 8;
+  inline bool cond_format_parameters_not_all_same_type() const;
+  inline void set_cond_format_parameters_not_all_same_type(bool value);
+
+  // optional bool cond_format_stop_if_true = 9 [default = false];
+  inline bool has_cond_format_stop_if_true() const;
+  inline void clear_cond_format_stop_if_true();
+  static const int kCondFormatStopIfTrueFieldNumber = 9;
+  inline bool cond_format_stop_if_true() const;
+  inline void set_cond_format_stop_if_true(bool value);
+
+  // optional bool cond_format_unsupported_operator = 10 [default = false];
+  inline bool has_cond_format_unsupported_operator() const;
+  inline void clear_cond_format_unsupported_operator();
+  static const int kCondFormatUnsupportedOperatorFieldNumber = 10;
+  inline bool cond_format_unsupported_operator() const;
+  inline void set_cond_format_unsupported_operator(bool value);
+
+  // optional bool cond_format_unsupported_styling = 11 [default = false];
+  inline bool has_cond_format_unsupported_styling() const;
+  inline void clear_cond_format_unsupported_styling();
+  static const int kCondFormatUnsupportedStylingFieldNumber = 11;
+  inline bool cond_format_unsupported_styling() const;
+  inline void set_cond_format_unsupported_styling(bool value);
+
+  // optional bool cond_format_unsupported_time_period = 12 [default = false];
+  inline bool has_cond_format_unsupported_time_period() const;
+  inline void clear_cond_format_unsupported_time_period();
+  static const int kCondFormatUnsupportedTimePeriodFieldNumber = 12;
+  inline bool cond_format_unsupported_time_period() const;
+  inline void set_cond_format_unsupported_time_period(bool value);
+
+  // optional bool error_cell_with_no_formula = 13 [default = false];
+  inline bool has_error_cell_with_no_formula() const;
+  inline void clear_error_cell_with_no_formula();
+  static const int kErrorCellWithNoFormulaFieldNumber = 13;
+  inline bool error_cell_with_no_formula() const;
+  inline void set_error_cell_with_no_formula(bool value);
+
+  // optional bool unsupported_cond_format = 14 [default = false];
+  inline bool has_unsupported_cond_format() const;
+  inline void clear_unsupported_cond_format();
+  static const int kUnsupportedCondFormatFieldNumber = 14;
+  inline bool unsupported_cond_format() const;
+  inline void set_unsupported_cond_format(bool value);
+
+  // optional string original_data_format = 15;
+  inline bool has_original_data_format() const;
+  inline void clear_original_data_format();
+  static const int kOriginalDataFormatFieldNumber = 15;
+  inline const ::std::string& original_data_format() const;
+  inline void set_original_data_format(const ::std::string& value);
+  inline void set_original_data_format(const char* value);
+  inline void set_original_data_format(const char* value, size_t size);
+  inline ::std::string* mutable_original_data_format();
+  inline ::std::string* release_original_data_format();
+  inline void set_allocated_original_data_format(::std::string* original_data_format);
+
+  // @@protoc_insertion_point(class_scope:TST.ImportWarningSetArchive)
+ private:
+  inline void set_has_formula_import_warning();
+  inline void clear_has_formula_import_warning();
+  inline void set_has_cond_format_above_avg_equal_avg();
+  inline void clear_has_cond_format_above_avg_equal_avg();
+  inline void set_has_cond_format_above_avg_std_dev();
+  inline void clear_has_cond_format_above_avg_std_dev();
+  inline void set_has_cond_format_complex_formula();
+  inline void clear_has_cond_format_complex_formula();
+  inline void set_has_cond_format_contains_errors();
+  inline void clear_has_cond_format_contains_errors();
+  inline void set_has_cond_format_expr();
+  inline void clear_has_cond_format_expr();
+  inline void set_has_cond_format_not_contains_errors();
+  inline void clear_has_cond_format_not_contains_errors();
+  inline void set_has_cond_format_parameters_not_all_same_type();
+  inline void clear_has_cond_format_parameters_not_all_same_type();
+  inline void set_has_cond_format_stop_if_true();
+  inline void clear_has_cond_format_stop_if_true();
+  inline void set_has_cond_format_unsupported_operator();
+  inline void clear_has_cond_format_unsupported_operator();
+  inline void set_has_cond_format_unsupported_styling();
+  inline void clear_has_cond_format_unsupported_styling();
+  inline void set_has_cond_format_unsupported_time_period();
+  inline void clear_has_cond_format_unsupported_time_period();
+  inline void set_has_error_cell_with_no_formula();
+  inline void clear_has_error_cell_with_no_formula();
+  inline void set_has_unsupported_cond_format();
+  inline void clear_has_unsupported_cond_format();
+  inline void set_has_original_data_format();
+  inline void clear_has_original_data_format();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::ImportWarningSetArchive_FormulaImportWarning* formula_import_warning_;
+  bool cond_format_above_avg_equal_avg_;
+  bool cond_format_above_avg_std_dev_;
+  bool cond_format_complex_formula_;
+  bool cond_format_contains_errors_;
+  bool cond_format_expr_;
+  bool cond_format_not_contains_errors_;
+  bool cond_format_parameters_not_all_same_type_;
+  bool cond_format_stop_if_true_;
+  bool cond_format_unsupported_operator_;
+  bool cond_format_unsupported_styling_;
+  bool cond_format_unsupported_time_period_;
+  bool error_cell_with_no_formula_;
+  bool unsupported_cond_format_;
+  ::std::string* original_data_format_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(15 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ImportWarningSetArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class TableDataList_ListEntry : public ::google::protobuf::Message {
  public:
   TableDataList_ListEntry();
@@ -1630,6 +2087,15 @@ class TableDataList_ListEntry : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_comment_storage();
   inline void set_allocated_comment_storage(::TSP::Reference* comment_storage);
 
+  // optional .TST.ImportWarningSetArchive import_warning_set = 11;
+  inline bool has_import_warning_set() const;
+  inline void clear_import_warning_set();
+  static const int kImportWarningSetFieldNumber = 11;
+  inline const ::TST::ImportWarningSetArchive& import_warning_set() const;
+  inline ::TST::ImportWarningSetArchive* mutable_import_warning_set();
+  inline ::TST::ImportWarningSetArchive* release_import_warning_set();
+  inline void set_allocated_import_warning_set(::TST::ImportWarningSetArchive* import_warning_set);
+
   // @@protoc_insertion_point(class_scope:TST.TableDataList.ListEntry)
  private:
   inline void set_has_key();
@@ -1652,6 +2118,8 @@ class TableDataList_ListEntry : public ::google::protobuf::Message {
   inline void clear_has_richtextpayload();
   inline void set_has_comment_storage();
   inline void clear_has_comment_storage();
+  inline void set_has_import_warning_set();
+  inline void clear_has_import_warning_set();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1665,9 +2133,10 @@ class TableDataList_ListEntry : public ::google::protobuf::Message {
   ::TSK::CustomFormatArchive* custom_format_;
   ::TSP::Reference* richtextpayload_;
   ::TSP::Reference* comment_storage_;
+  ::TST::ImportWarningSetArchive* import_warning_set_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(10 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
@@ -1743,6 +2212,7 @@ class TableDataList : public ::google::protobuf::Message {
   static const ListType RICH_TEXT_PAYLOAD = TableDataList_ListType_RICH_TEXT_PAYLOAD;
   static const ListType CONDITIONAL_STYLE = TableDataList_ListType_CONDITIONAL_STYLE;
   static const ListType COMMENT_STORAGE = TableDataList_ListType_COMMENT_STORAGE;
+  static const ListType IMPORT_WARNING = TableDataList_ListType_IMPORT_WARNING;
   static inline bool ListType_IsValid(int value) {
     return TableDataList_ListType_IsValid(value);
   }
@@ -2543,6 +3013,15 @@ class DataStore : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_commentstoragetable();
   inline void set_allocated_commentstoragetable(::TSP::Reference* commentstoragetable);
 
+  // optional .TSP.Reference importWarningSetTable = 20;
+  inline bool has_importwarningsettable() const;
+  inline void clear_importwarningsettable();
+  static const int kImportWarningSetTableFieldNumber = 20;
+  inline const ::TSP::Reference& importwarningsettable() const;
+  inline ::TSP::Reference* mutable_importwarningsettable();
+  inline ::TSP::Reference* release_importwarningsettable();
+  inline void set_allocated_importwarningsettable(::TSP::Reference* importwarningsettable);
+
   // @@protoc_insertion_point(class_scope:TST.DataStore)
  private:
   inline void set_has_rowheaders();
@@ -2583,6 +3062,8 @@ class DataStore : public ::google::protobuf::Message {
   inline void clear_has_conditionalstyletable();
   inline void set_has_commentstoragetable();
   inline void clear_has_commentstoragetable();
+  inline void set_has_importwarningsettable();
+  inline void clear_has_importwarningsettable();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -2604,10 +3085,11 @@ class DataStore : public ::google::protobuf::Message {
   ::TSP::Reference* richtextpayloadtable_;
   ::TSP::Reference* conditionalstyletable_;
   ::TSP::Reference* commentstoragetable_;
+  ::TSP::Reference* importwarningsettable_;
   ::google::protobuf::uint32 storage_version_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(19 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(20 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
@@ -3190,14 +3672,14 @@ class TableStyleNetworkArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class TableModelArchive : public ::google::protobuf::Message {
+class TableSortOrderArchive_SortRuleArchive : public ::google::protobuf::Message {
  public:
-  TableModelArchive();
-  virtual ~TableModelArchive();
+  TableSortOrderArchive_SortRuleArchive();
+  virtual ~TableSortOrderArchive_SortRuleArchive();
 
-  TableModelArchive(const TableModelArchive& from);
+  TableSortOrderArchive_SortRuleArchive(const TableSortOrderArchive_SortRuleArchive& from);
 
-  inline TableModelArchive& operator=(const TableModelArchive& from) {
+  inline TableSortOrderArchive_SortRuleArchive& operator=(const TableSortOrderArchive_SortRuleArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3211,17 +3693,17 @@ class TableModelArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const TableModelArchive& default_instance();
+  static const TableSortOrderArchive_SortRuleArchive& default_instance();
 
-  void Swap(TableModelArchive* other);
+  void Swap(TableSortOrderArchive_SortRuleArchive* other);
 
   // implements Message ----------------------------------------------
 
-  TableModelArchive* New() const;
+  TableSortOrderArchive_SortRuleArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const TableModelArchive& from);
-  void MergeFrom(const TableModelArchive& from);
+  void CopyFrom(const TableSortOrderArchive_SortRuleArchive& from);
+  void MergeFrom(const TableSortOrderArchive_SortRuleArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3242,531 +3724,225 @@ class TableModelArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef TableSortOrderArchive_SortRuleArchive_Direction Direction;
+  static const Direction ascending = TableSortOrderArchive_SortRuleArchive_Direction_ascending;
+  static const Direction descending = TableSortOrderArchive_SortRuleArchive_Direction_descending;
+  static inline bool Direction_IsValid(int value) {
+    return TableSortOrderArchive_SortRuleArchive_Direction_IsValid(value);
+  }
+  static const Direction Direction_MIN =
+    TableSortOrderArchive_SortRuleArchive_Direction_Direction_MIN;
+  static const Direction Direction_MAX =
+    TableSortOrderArchive_SortRuleArchive_Direction_Direction_MAX;
+  static const int Direction_ARRAYSIZE =
+    TableSortOrderArchive_SortRuleArchive_Direction_Direction_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  Direction_descriptor() {
+    return TableSortOrderArchive_SortRuleArchive_Direction_descriptor();
+  }
+  static inline const ::std::string& Direction_Name(Direction value) {
+    return TableSortOrderArchive_SortRuleArchive_Direction_Name(value);
+  }
+  static inline bool Direction_Parse(const ::std::string& name,
+      Direction* value) {
+    return TableSortOrderArchive_SortRuleArchive_Direction_Parse(name, value);
+  }
+
   // accessors -------------------------------------------------------
 
-  // required string table_id = 1;
-  inline bool has_table_id() const;
-  inline void clear_table_id();
-  static const int kTableIdFieldNumber = 1;
-  inline const ::std::string& table_id() const;
-  inline void set_table_id(const ::std::string& value);
-  inline void set_table_id(const char* value);
-  inline void set_table_id(const char* value, size_t size);
-  inline ::std::string* mutable_table_id();
-  inline ::std::string* release_table_id();
-  inline void set_allocated_table_id(::std::string* table_id);
+  // required uint32 column = 1;
+  inline bool has_column() const;
+  inline void clear_column();
+  static const int kColumnFieldNumber = 1;
+  inline ::google::protobuf::uint32 column() const;
+  inline void set_column(::google::protobuf::uint32 value);
+
+  // required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+  inline bool has_direction() const;
+  inline void clear_direction();
+  static const int kDirectionFieldNumber = 2;
+  inline ::TST::TableSortOrderArchive_SortRuleArchive_Direction direction() const;
+  inline void set_direction(::TST::TableSortOrderArchive_SortRuleArchive_Direction value);
+
+  // @@protoc_insertion_point(class_scope:TST.TableSortOrderArchive.SortRuleArchive)
+ private:
+  inline void set_has_column();
+  inline void clear_has_column();
+  inline void set_has_direction();
+  inline void clear_has_direction();
 
-  // optional string from_table_id = 43;
-  inline bool has_from_table_id() const;
-  inline void clear_from_table_id();
-  static const int kFromTableIdFieldNumber = 43;
-  inline const ::std::string& from_table_id() const;
-  inline void set_from_table_id(const ::std::string& value);
-  inline void set_from_table_id(const char* value);
-  inline void set_from_table_id(const char* value, size_t size);
-  inline ::std::string* mutable_from_table_id();
-  inline ::std::string* release_from_table_id();
-  inline void set_allocated_from_table_id(::std::string* from_table_id);
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  // required .TSP.Reference table_style = 3;
-  inline bool has_table_style() const;
-  inline void clear_table_style();
-  static const int kTableStyleFieldNumber = 3;
-  inline const ::TSP::Reference& table_style() const;
-  inline ::TSP::Reference* mutable_table_style();
-  inline ::TSP::Reference* release_table_style();
-  inline void set_allocated_table_style(::TSP::Reference* table_style);
+  ::google::protobuf::uint32 column_;
+  int direction_;
 
-  // required .TSP.Reference body_text_style = 24;
-  inline bool has_body_text_style() const;
-  inline void clear_body_text_style();
-  static const int kBodyTextStyleFieldNumber = 24;
-  inline const ::TSP::Reference& body_text_style() const;
-  inline ::TSP::Reference* mutable_body_text_style();
-  inline ::TSP::Reference* release_body_text_style();
-  inline void set_allocated_body_text_style(::TSP::Reference* body_text_style);
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
-  // required .TSP.Reference header_row_text_style = 25;
-  inline bool has_header_row_text_style() const;
-  inline void clear_header_row_text_style();
-  static const int kHeaderRowTextStyleFieldNumber = 25;
-  inline const ::TSP::Reference& header_row_text_style() const;
-  inline ::TSP::Reference* mutable_header_row_text_style();
-  inline ::TSP::Reference* release_header_row_text_style();
-  inline void set_allocated_header_row_text_style(::TSP::Reference* header_row_text_style);
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
-  // required .TSP.Reference header_column_text_style = 26;
-  inline bool has_header_column_text_style() const;
-  inline void clear_header_column_text_style();
-  static const int kHeaderColumnTextStyleFieldNumber = 26;
-  inline const ::TSP::Reference& header_column_text_style() const;
-  inline ::TSP::Reference* mutable_header_column_text_style();
-  inline ::TSP::Reference* release_header_column_text_style();
-  inline void set_allocated_header_column_text_style(::TSP::Reference* header_column_text_style);
+  void InitAsDefaultInstance();
+  static TableSortOrderArchive_SortRuleArchive* default_instance_;
+};
+// -------------------------------------------------------------------
 
-  // required .TSP.Reference footer_row_text_style = 27;
-  inline bool has_footer_row_text_style() const;
-  inline void clear_footer_row_text_style();
-  static const int kFooterRowTextStyleFieldNumber = 27;
-  inline const ::TSP::Reference& footer_row_text_style() const;
-  inline ::TSP::Reference* mutable_footer_row_text_style();
-  inline ::TSP::Reference* release_footer_row_text_style();
-  inline void set_allocated_footer_row_text_style(::TSP::Reference* footer_row_text_style);
+class TableSortOrderArchive : public ::google::protobuf::Message {
+ public:
+  TableSortOrderArchive();
+  virtual ~TableSortOrderArchive();
 
-  // required .TSP.Reference body_cell_style = 18;
-  inline bool has_body_cell_style() const;
-  inline void clear_body_cell_style();
-  static const int kBodyCellStyleFieldNumber = 18;
-  inline const ::TSP::Reference& body_cell_style() const;
-  inline ::TSP::Reference* mutable_body_cell_style();
-  inline ::TSP::Reference* release_body_cell_style();
-  inline void set_allocated_body_cell_style(::TSP::Reference* body_cell_style);
+  TableSortOrderArchive(const TableSortOrderArchive& from);
 
-  // required .TSP.Reference header_row_style = 19;
-  inline bool has_header_row_style() const;
-  inline void clear_header_row_style();
-  static const int kHeaderRowStyleFieldNumber = 19;
-  inline const ::TSP::Reference& header_row_style() const;
-  inline ::TSP::Reference* mutable_header_row_style();
-  inline ::TSP::Reference* release_header_row_style();
-  inline void set_allocated_header_row_style(::TSP::Reference* header_row_style);
+  inline TableSortOrderArchive& operator=(const TableSortOrderArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
 
-  // required .TSP.Reference header_column_style = 20;
-  inline bool has_header_column_style() const;
-  inline void clear_header_column_style();
-  static const int kHeaderColumnStyleFieldNumber = 20;
-  inline const ::TSP::Reference& header_column_style() const;
-  inline ::TSP::Reference* mutable_header_column_style();
-  inline ::TSP::Reference* release_header_column_style();
-  inline void set_allocated_header_column_style(::TSP::Reference* header_column_style);
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
 
-  // required .TSP.Reference footer_row_style = 21;
-  inline bool has_footer_row_style() const;
-  inline void clear_footer_row_style();
-  static const int kFooterRowStyleFieldNumber = 21;
-  inline const ::TSP::Reference& footer_row_style() const;
-  inline ::TSP::Reference* mutable_footer_row_style();
-  inline ::TSP::Reference* release_footer_row_style();
-  inline void set_allocated_footer_row_style(::TSP::Reference* footer_row_style);
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
 
-  // optional .TSP.Reference table_name_style = 30;
-  inline bool has_table_name_style() const;
-  inline void clear_table_name_style();
-  static const int kTableNameStyleFieldNumber = 30;
-  inline const ::TSP::Reference& table_name_style() const;
-  inline ::TSP::Reference* mutable_table_name_style();
-  inline ::TSP::Reference* release_table_name_style();
-  inline void set_allocated_table_name_style(::TSP::Reference* table_name_style);
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const TableSortOrderArchive& default_instance();
 
-  // optional .TSP.Reference table_name_shape_style = 36;
-  inline bool has_table_name_shape_style() const;
-  inline void clear_table_name_shape_style();
-  static const int kTableNameShapeStyleFieldNumber = 36;
-  inline const ::TSP::Reference& table_name_shape_style() const;
-  inline ::TSP::Reference* mutable_table_name_shape_style();
-  inline ::TSP::Reference* release_table_name_shape_style();
-  inline void set_allocated_table_name_shape_style(::TSP::Reference* table_name_shape_style);
+  void Swap(TableSortOrderArchive* other);
 
-  // required .TST.DataStore data_store = 4;
-  inline bool has_data_store() const;
-  inline void clear_data_store();
-  static const int kDataStoreFieldNumber = 4;
-  inline const ::TST::DataStore& data_store() const;
-  inline ::TST::DataStore* mutable_data_store();
-  inline ::TST::DataStore* release_data_store();
-  inline void set_allocated_data_store(::TST::DataStore* data_store);
+  // implements Message ----------------------------------------------
 
-  // optional .TSP.Reference provider = 5;
-  inline bool has_provider() const;
-  inline void clear_provider();
-  static const int kProviderFieldNumber = 5;
-  inline const ::TSP::Reference& provider() const;
-  inline ::TSP::Reference* mutable_provider();
-  inline ::TSP::Reference* release_provider();
-  inline void set_allocated_provider(::TSP::Reference* provider);
+  TableSortOrderArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const TableSortOrderArchive& from);
+  void MergeFrom(const TableSortOrderArchive& from);
+  void Clear();
+  bool IsInitialized() const;
 
-  // required uint32 number_of_rows = 6;
-  inline bool has_number_of_rows() const;
-  inline void clear_number_of_rows();
-  static const int kNumberOfRowsFieldNumber = 6;
-  inline ::google::protobuf::uint32 number_of_rows() const;
-  inline void set_number_of_rows(::google::protobuf::uint32 value);
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
 
-  // required uint32 number_of_columns = 7;
-  inline bool has_number_of_columns() const;
-  inline void clear_number_of_columns();
-  static const int kNumberOfColumnsFieldNumber = 7;
-  inline ::google::protobuf::uint32 number_of_columns() const;
-  inline void set_number_of_columns(::google::protobuf::uint32 value);
+  ::google::protobuf::Metadata GetMetadata() const;
 
-  // required string table_name = 8;
-  inline bool has_table_name() const;
-  inline void clear_table_name();
-  static const int kTableNameFieldNumber = 8;
-  inline const ::std::string& table_name() const;
-  inline void set_table_name(const ::std::string& value);
-  inline void set_table_name(const char* value);
-  inline void set_table_name(const char* value, size_t size);
-  inline ::std::string* mutable_table_name();
-  inline ::std::string* release_table_name();
-  inline void set_allocated_table_name(::std::string* table_name);
+  // nested types ----------------------------------------------------
 
-  // optional bool table_name_enabled = 22;
-  inline bool has_table_name_enabled() const;
-  inline void clear_table_name_enabled();
-  static const int kTableNameEnabledFieldNumber = 22;
-  inline bool table_name_enabled() const;
-  inline void set_table_name_enabled(bool value);
+  typedef TableSortOrderArchive_SortRuleArchive SortRuleArchive;
 
-  // optional double table_name_height = 33;
-  inline bool has_table_name_height() const;
-  inline void clear_table_name_height();
-  static const int kTableNameHeightFieldNumber = 33;
-  inline double table_name_height() const;
-  inline void set_table_name_height(double value);
+  typedef TableSortOrderArchive_SortType SortType;
+  static const SortType entire_table = TableSortOrderArchive_SortType_entire_table;
+  static const SortType row_range = TableSortOrderArchive_SortType_row_range;
+  static inline bool SortType_IsValid(int value) {
+    return TableSortOrderArchive_SortType_IsValid(value);
+  }
+  static const SortType SortType_MIN =
+    TableSortOrderArchive_SortType_SortType_MIN;
+  static const SortType SortType_MAX =
+    TableSortOrderArchive_SortType_SortType_MAX;
+  static const int SortType_ARRAYSIZE =
+    TableSortOrderArchive_SortType_SortType_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  SortType_descriptor() {
+    return TableSortOrderArchive_SortType_descriptor();
+  }
+  static inline const ::std::string& SortType_Name(SortType value) {
+    return TableSortOrderArchive_SortType_Name(value);
+  }
+  static inline bool SortType_Parse(const ::std::string& name,
+      SortType* value) {
+    return TableSortOrderArchive_SortType_Parse(name, value);
+  }
 
-  // optional bool table_name_border_enabled = 37;
-  inline bool has_table_name_border_enabled() const;
-  inline void clear_table_name_border_enabled();
-  static const int kTableNameBorderEnabledFieldNumber = 37;
-  inline bool table_name_border_enabled() const;
-  inline void set_table_name_border_enabled(bool value);
+  // accessors -------------------------------------------------------
 
-  // optional uint32 number_of_header_rows = 9;
-  inline bool has_number_of_header_rows() const;
-  inline void clear_number_of_header_rows();
-  static const int kNumberOfHeaderRowsFieldNumber = 9;
-  inline ::google::protobuf::uint32 number_of_header_rows() const;
-  inline void set_number_of_header_rows(::google::protobuf::uint32 value);
+  // required .TST.TableSortOrderArchive.SortType type = 1;
+  inline bool has_type() const;
+  inline void clear_type();
+  static const int kTypeFieldNumber = 1;
+  inline ::TST::TableSortOrderArchive_SortType type() const;
+  inline void set_type(::TST::TableSortOrderArchive_SortType value);
 
-  // optional uint32 number_of_header_columns = 10;
-  inline bool has_number_of_header_columns() const;
-  inline void clear_number_of_header_columns();
-  static const int kNumberOfHeaderColumnsFieldNumber = 10;
-  inline ::google::protobuf::uint32 number_of_header_columns() const;
-  inline void set_number_of_header_columns(::google::protobuf::uint32 value);
+  // repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+  inline int rules_size() const;
+  inline void clear_rules();
+  static const int kRulesFieldNumber = 2;
+  inline const ::TST::TableSortOrderArchive_SortRuleArchive& rules(int index) const;
+  inline ::TST::TableSortOrderArchive_SortRuleArchive* mutable_rules(int index);
+  inline ::TST::TableSortOrderArchive_SortRuleArchive* add_rules();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::TableSortOrderArchive_SortRuleArchive >&
+      rules() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::TableSortOrderArchive_SortRuleArchive >*
+      mutable_rules();
 
-  // optional uint32 number_of_footer_rows = 11;
-  inline bool has_number_of_footer_rows() const;
-  inline void clear_number_of_footer_rows();
-  static const int kNumberOfFooterRowsFieldNumber = 11;
-  inline ::google::protobuf::uint32 number_of_footer_rows() const;
-  inline void set_number_of_footer_rows(::google::protobuf::uint32 value);
+  // @@protoc_insertion_point(class_scope:TST.TableSortOrderArchive)
+ private:
+  inline void set_has_type();
+  inline void clear_has_type();
 
-  // optional bool header_rows_frozen = 12;
-  inline bool has_header_rows_frozen() const;
-  inline void clear_header_rows_frozen();
-  static const int kHeaderRowsFrozenFieldNumber = 12;
-  inline bool header_rows_frozen() const;
-  inline void set_header_rows_frozen(bool value);
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  // optional bool header_columns_frozen = 13;
-  inline bool has_header_columns_frozen() const;
-  inline void clear_header_columns_frozen();
-  static const int kHeaderColumnsFrozenFieldNumber = 13;
-  inline bool header_columns_frozen() const;
-  inline void set_header_columns_frozen(bool value);
+  ::google::protobuf::RepeatedPtrField< ::TST::TableSortOrderArchive_SortRuleArchive > rules_;
+  int type_;
 
-  // optional uint32 number_of_hidden_rows = 14;
-  inline bool has_number_of_hidden_rows() const;
-  inline void clear_number_of_hidden_rows();
-  static const int kNumberOfHiddenRowsFieldNumber = 14;
-  inline ::google::protobuf::uint32 number_of_hidden_rows() const;
-  inline void set_number_of_hidden_rows(::google::protobuf::uint32 value);
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
-  // optional uint32 number_of_hidden_columns = 15;
-  inline bool has_number_of_hidden_columns() const;
-  inline void clear_number_of_hidden_columns();
-  static const int kNumberOfHiddenColumnsFieldNumber = 15;
-  inline ::google::protobuf::uint32 number_of_hidden_columns() const;
-  inline void set_number_of_hidden_columns(::google::protobuf::uint32 value);
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
-  // optional uint32 number_of_user_hidden_rows = 41;
-  inline bool has_number_of_user_hidden_rows() const;
-  inline void clear_number_of_user_hidden_rows();
-  static const int kNumberOfUserHiddenRowsFieldNumber = 41;
-  inline ::google::protobuf::uint32 number_of_user_hidden_rows() const;
-  inline void set_number_of_user_hidden_rows(::google::protobuf::uint32 value);
+  void InitAsDefaultInstance();
+  static TableSortOrderArchive* default_instance_;
+};
+// -------------------------------------------------------------------
 
-  // optional uint32 number_of_user_hidden_columns = 42;
-  inline bool has_number_of_user_hidden_columns() const;
-  inline void clear_number_of_user_hidden_columns();
-  static const int kNumberOfUserHiddenColumnsFieldNumber = 42;
-  inline ::google::protobuf::uint32 number_of_user_hidden_columns() const;
-  inline void set_number_of_user_hidden_columns(::google::protobuf::uint32 value);
+class SortRuleReferenceTrackerArchive : public ::google::protobuf::Message {
+ public:
+  SortRuleReferenceTrackerArchive();
+  virtual ~SortRuleReferenceTrackerArchive();
 
-  // optional uint32 number_of_filtered_rows = 40;
-  inline bool has_number_of_filtered_rows() const;
-  inline void clear_number_of_filtered_rows();
-  static const int kNumberOfFilteredRowsFieldNumber = 40;
-  inline ::google::protobuf::uint32 number_of_filtered_rows() const;
-  inline void set_number_of_filtered_rows(::google::protobuf::uint32 value);
+  SortRuleReferenceTrackerArchive(const SortRuleReferenceTrackerArchive& from);
 
-  // required double default_row_height = 16;
-  inline bool has_default_row_height() const;
-  inline void clear_default_row_height();
-  static const int kDefaultRowHeightFieldNumber = 16;
-  inline double default_row_height() const;
-  inline void set_default_row_height(double value);
+  inline SortRuleReferenceTrackerArchive& operator=(const SortRuleReferenceTrackerArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
 
-  // required double default_column_width = 17;
-  inline bool has_default_column_width() const;
-  inline void clear_default_column_width();
-  static const int kDefaultColumnWidthFieldNumber = 17;
-  inline double default_column_width() const;
-  inline void set_default_column_width(double value);
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
 
-  // optional .TST.CellID origin_offset = 23 [deprecated = true];
-  inline bool has_origin_offset() const PROTOBUF_DEPRECATED;
-  inline void clear_origin_offset() PROTOBUF_DEPRECATED;
-  static const int kOriginOffsetFieldNumber = 23;
-  inline const ::TST::CellID& origin_offset() const PROTOBUF_DEPRECATED;
-  inline ::TST::CellID* mutable_origin_offset() PROTOBUF_DEPRECATED;
-  inline ::TST::CellID* release_origin_offset() PROTOBUF_DEPRECATED;
-  inline void set_allocated_origin_offset(::TST::CellID* origin_offset) PROTOBUF_DEPRECATED;
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
 
-  // required uint32 preset_index = 28;
-  inline bool has_preset_index() const;
-  inline void clear_preset_index();
-  static const int kPresetIndexFieldNumber = 28;
-  inline ::google::protobuf::uint32 preset_index() const;
-  inline void set_preset_index(::google::protobuf::uint32 value);
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const SortRuleReferenceTrackerArchive& default_instance();
 
-  // optional bool repeating_header_rows_enabled = 29;
-  inline bool has_repeating_header_rows_enabled() const;
-  inline void clear_repeating_header_rows_enabled();
-  static const int kRepeatingHeaderRowsEnabledFieldNumber = 29;
-  inline bool repeating_header_rows_enabled() const;
-  inline void set_repeating_header_rows_enabled(bool value);
+  void Swap(SortRuleReferenceTrackerArchive* other);
 
-  // optional bool repeating_header_columns_enabled = 32;
-  inline bool has_repeating_header_columns_enabled() const;
-  inline void clear_repeating_header_columns_enabled();
-  static const int kRepeatingHeaderColumnsEnabledFieldNumber = 32;
-  inline bool repeating_header_columns_enabled() const;
-  inline void set_repeating_header_columns_enabled(bool value);
+  // implements Message ----------------------------------------------
 
-  // optional bool style_apply_clears_all = 31;
-  inline bool has_style_apply_clears_all() const;
-  inline void clear_style_apply_clears_all();
-  static const int kStyleApplyClearsAllFieldNumber = 31;
-  inline bool style_apply_clears_all() const;
-  inline void set_style_apply_clears_all(bool value);
-
-  // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
-  inline bool has_hidden_state_formula_owner_for_columns() const;
-  inline void clear_hidden_state_formula_owner_for_columns();
-  static const int kHiddenStateFormulaOwnerForColumnsFieldNumber = 34;
-  inline const ::TSP::Reference& hidden_state_formula_owner_for_columns() const;
-  inline ::TSP::Reference* mutable_hidden_state_formula_owner_for_columns();
-  inline ::TSP::Reference* release_hidden_state_formula_owner_for_columns();
-  inline void set_allocated_hidden_state_formula_owner_for_columns(::TSP::Reference* hidden_state_formula_owner_for_columns);
-
-  // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
-  inline bool has_hidden_state_formula_owner_for_rows() const;
-  inline void clear_hidden_state_formula_owner_for_rows();
-  static const int kHiddenStateFormulaOwnerForRowsFieldNumber = 35;
-  inline const ::TSP::Reference& hidden_state_formula_owner_for_rows() const;
-  inline ::TSP::Reference* mutable_hidden_state_formula_owner_for_rows();
-  inline ::TSP::Reference* release_hidden_state_formula_owner_for_rows();
-  inline void set_allocated_hidden_state_formula_owner_for_rows(::TSP::Reference* hidden_state_formula_owner_for_rows);
-
-  // optional .TSP.Reference filter_set = 38;
-  inline bool has_filter_set() const;
-  inline void clear_filter_set();
-  static const int kFilterSetFieldNumber = 38;
-  inline const ::TSP::Reference& filter_set() const;
-  inline ::TSP::Reference* mutable_filter_set();
-  inline ::TSP::Reference* release_filter_set();
-  inline void set_allocated_filter_set(::TSP::Reference* filter_set);
-
-  // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
-  inline bool has_conditional_style_formula_owner_id() const;
-  inline void clear_conditional_style_formula_owner_id();
-  static const int kConditionalStyleFormulaOwnerIdFieldNumber = 39;
-  inline const ::TSCE::CFUUIDArchive& conditional_style_formula_owner_id() const;
-  inline ::TSCE::CFUUIDArchive* mutable_conditional_style_formula_owner_id();
-  inline ::TSCE::CFUUIDArchive* release_conditional_style_formula_owner_id();
-  inline void set_allocated_conditional_style_formula_owner_id(::TSCE::CFUUIDArchive* conditional_style_formula_owner_id);
-
-  // @@protoc_insertion_point(class_scope:TST.TableModelArchive)
- private:
-  inline void set_has_table_id();
-  inline void clear_has_table_id();
-  inline void set_has_from_table_id();
-  inline void clear_has_from_table_id();
-  inline void set_has_table_style();
-  inline void clear_has_table_style();
-  inline void set_has_body_text_style();
-  inline void clear_has_body_text_style();
-  inline void set_has_header_row_text_style();
-  inline void clear_has_header_row_text_style();
-  inline void set_has_header_column_text_style();
-  inline void clear_has_header_column_text_style();
-  inline void set_has_footer_row_text_style();
-  inline void clear_has_footer_row_text_style();
-  inline void set_has_body_cell_style();
-  inline void clear_has_body_cell_style();
-  inline void set_has_header_row_style();
-  inline void clear_has_header_row_style();
-  inline void set_has_header_column_style();
-  inline void clear_has_header_column_style();
-  inline void set_has_footer_row_style();
-  inline void clear_has_footer_row_style();
-  inline void set_has_table_name_style();
-  inline void clear_has_table_name_style();
-  inline void set_has_table_name_shape_style();
-  inline void clear_has_table_name_shape_style();
-  inline void set_has_data_store();
-  inline void clear_has_data_store();
-  inline void set_has_provider();
-  inline void clear_has_provider();
-  inline void set_has_number_of_rows();
-  inline void clear_has_number_of_rows();
-  inline void set_has_number_of_columns();
-  inline void clear_has_number_of_columns();
-  inline void set_has_table_name();
-  inline void clear_has_table_name();
-  inline void set_has_table_name_enabled();
-  inline void clear_has_table_name_enabled();
-  inline void set_has_table_name_height();
-  inline void clear_has_table_name_height();
-  inline void set_has_table_name_border_enabled();
-  inline void clear_has_table_name_border_enabled();
-  inline void set_has_number_of_header_rows();
-  inline void clear_has_number_of_header_rows();
-  inline void set_has_number_of_header_columns();
-  inline void clear_has_number_of_header_columns();
-  inline void set_has_number_of_footer_rows();
-  inline void clear_has_number_of_footer_rows();
-  inline void set_has_header_rows_frozen();
-  inline void clear_has_header_rows_frozen();
-  inline void set_has_header_columns_frozen();
-  inline void clear_has_header_columns_frozen();
-  inline void set_has_number_of_hidden_rows();
-  inline void clear_has_number_of_hidden_rows();
-  inline void set_has_number_of_hidden_columns();
-  inline void clear_has_number_of_hidden_columns();
-  inline void set_has_number_of_user_hidden_rows();
-  inline void clear_has_number_of_user_hidden_rows();
-  inline void set_has_number_of_user_hidden_columns();
-  inline void clear_has_number_of_user_hidden_columns();
-  inline void set_has_number_of_filtered_rows();
-  inline void clear_has_number_of_filtered_rows();
-  inline void set_has_default_row_height();
-  inline void clear_has_default_row_height();
-  inline void set_has_default_column_width();
-  inline void clear_has_default_column_width();
-  inline void set_has_origin_offset();
-  inline void clear_has_origin_offset();
-  inline void set_has_preset_index();
-  inline void clear_has_preset_index();
-  inline void set_has_repeating_header_rows_enabled();
-  inline void clear_has_repeating_header_rows_enabled();
-  inline void set_has_repeating_header_columns_enabled();
-  inline void clear_has_repeating_header_columns_enabled();
-  inline void set_has_style_apply_clears_all();
-  inline void clear_has_style_apply_clears_all();
-  inline void set_has_hidden_state_formula_owner_for_columns();
-  inline void clear_has_hidden_state_formula_owner_for_columns();
-  inline void set_has_hidden_state_formula_owner_for_rows();
-  inline void clear_has_hidden_state_formula_owner_for_rows();
-  inline void set_has_filter_set();
-  inline void clear_has_filter_set();
-  inline void set_has_conditional_style_formula_owner_id();
-  inline void clear_has_conditional_style_formula_owner_id();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::std::string* table_id_;
-  ::std::string* from_table_id_;
-  ::TSP::Reference* table_style_;
-  ::TSP::Reference* body_text_style_;
-  ::TSP::Reference* header_row_text_style_;
-  ::TSP::Reference* header_column_text_style_;
-  ::TSP::Reference* footer_row_text_style_;
-  ::TSP::Reference* body_cell_style_;
-  ::TSP::Reference* header_row_style_;
-  ::TSP::Reference* header_column_style_;
-  ::TSP::Reference* footer_row_style_;
-  ::TSP::Reference* table_name_style_;
-  ::TSP::Reference* table_name_shape_style_;
-  ::TST::DataStore* data_store_;
-  ::TSP::Reference* provider_;
-  ::google::protobuf::uint32 number_of_rows_;
-  ::google::protobuf::uint32 number_of_columns_;
-  ::std::string* table_name_;
-  double table_name_height_;
-  ::google::protobuf::uint32 number_of_header_rows_;
-  bool table_name_enabled_;
-  bool table_name_border_enabled_;
-  bool header_rows_frozen_;
-  bool header_columns_frozen_;
-  ::google::protobuf::uint32 number_of_header_columns_;
-  ::google::protobuf::uint32 number_of_footer_rows_;
-  ::google::protobuf::uint32 number_of_hidden_rows_;
-  ::google::protobuf::uint32 number_of_hidden_columns_;
-  ::google::protobuf::uint32 number_of_user_hidden_rows_;
-  ::google::protobuf::uint32 number_of_user_hidden_columns_;
-  double default_row_height_;
-  ::google::protobuf::uint32 number_of_filtered_rows_;
-  ::google::protobuf::uint32 preset_index_;
-  double default_column_width_;
-  ::TST::CellID* origin_offset_;
-  ::TSP::Reference* hidden_state_formula_owner_for_columns_;
-  ::TSP::Reference* hidden_state_formula_owner_for_rows_;
-  ::TSP::Reference* filter_set_;
-  ::TSCE::CFUUIDArchive* conditional_style_formula_owner_id_;
-  bool repeating_header_rows_enabled_;
-  bool repeating_header_columns_enabled_;
-  bool style_apply_clears_all_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(42 + 31) / 32];
-
-  friend void  protobuf_AddDesc_TSTArchives_2eproto();
-  friend void protobuf_AssignDesc_TSTArchives_2eproto();
-  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
-
-  void InitAsDefaultInstance();
-  static TableModelArchive* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class DurationWrapperArchive : public ::google::protobuf::Message {
- public:
-  DurationWrapperArchive();
-  virtual ~DurationWrapperArchive();
-
-  DurationWrapperArchive(const DurationWrapperArchive& from);
-
-  inline DurationWrapperArchive& operator=(const DurationWrapperArchive& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const DurationWrapperArchive& default_instance();
-
-  void Swap(DurationWrapperArchive* other);
-
-  // implements Message ----------------------------------------------
-
-  DurationWrapperArchive* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const DurationWrapperArchive& from);
-  void MergeFrom(const DurationWrapperArchive& from);
-  void Clear();
-  bool IsInitialized() const;
+  SortRuleReferenceTrackerArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const SortRuleReferenceTrackerArchive& from);
+  void MergeFrom(const SortRuleReferenceTrackerArchive& from);
+  void Clear();
+  bool IsInitialized() const;
 
   int ByteSize() const;
   bool MergePartialFromCodedStream(
@@ -3787,32 +3963,44 @@ class DurationWrapperArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // @@protoc_insertion_point(class_scope:TST.DurationWrapperArchive)
+  // required .TSP.Reference reference_tracker = 1;
+  inline bool has_reference_tracker() const;
+  inline void clear_reference_tracker();
+  static const int kReferenceTrackerFieldNumber = 1;
+  inline const ::TSP::Reference& reference_tracker() const;
+  inline ::TSP::Reference* mutable_reference_tracker();
+  inline ::TSP::Reference* release_reference_tracker();
+  inline void set_allocated_reference_tracker(::TSP::Reference* reference_tracker);
+
+  // @@protoc_insertion_point(class_scope:TST.SortRuleReferenceTrackerArchive)
  private:
+  inline void set_has_reference_tracker();
+  inline void clear_has_reference_tracker();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
+  ::TSP::Reference* reference_tracker_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[1];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static DurationWrapperArchive* default_instance_;
+  static SortRuleReferenceTrackerArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class Cell : public ::google::protobuf::Message {
+class TableModelArchive : public ::google::protobuf::Message {
  public:
-  Cell();
-  virtual ~Cell();
+  TableModelArchive();
+  virtual ~TableModelArchive();
 
-  Cell(const Cell& from);
+  TableModelArchive(const TableModelArchive& from);
 
-  inline Cell& operator=(const Cell& from) {
+  inline TableModelArchive& operator=(const TableModelArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -3826,17 +4014,17 @@ class Cell : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const Cell& default_instance();
+  static const TableModelArchive& default_instance();
 
-  void Swap(Cell* other);
+  void Swap(TableModelArchive* other);
 
   // implements Message ----------------------------------------------
 
-  Cell* New() const;
+  TableModelArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const Cell& from);
-  void MergeFrom(const Cell& from);
+  void CopyFrom(const TableModelArchive& from);
+  void MergeFrom(const TableModelArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -3859,386 +4047,527 @@ class Cell : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.CellValueType valueType = 2;
-  inline bool has_valuetype() const;
-  inline void clear_valuetype();
-  static const int kValueTypeFieldNumber = 2;
-  inline ::TST::CellValueType valuetype() const;
-  inline void set_valuetype(::TST::CellValueType value);
+  // required string table_id = 1;
+  inline bool has_table_id() const;
+  inline void clear_table_id();
+  static const int kTableIdFieldNumber = 1;
+  inline const ::std::string& table_id() const;
+  inline void set_table_id(const ::std::string& value);
+  inline void set_table_id(const char* value);
+  inline void set_table_id(const char* value, size_t size);
+  inline ::std::string* mutable_table_id();
+  inline ::std::string* release_table_id();
+  inline void set_allocated_table_id(::std::string* table_id);
 
-  // optional double numberValue = 5;
-  inline bool has_numbervalue() const;
-  inline void clear_numbervalue();
-  static const int kNumberValueFieldNumber = 5;
-  inline double numbervalue() const;
-  inline void set_numbervalue(double value);
+  // optional string from_table_id = 43;
+  inline bool has_from_table_id() const;
+  inline void clear_from_table_id();
+  static const int kFromTableIdFieldNumber = 43;
+  inline const ::std::string& from_table_id() const;
+  inline void set_from_table_id(const ::std::string& value);
+  inline void set_from_table_id(const char* value);
+  inline void set_from_table_id(const char* value, size_t size);
+  inline ::std::string* mutable_from_table_id();
+  inline ::std::string* release_from_table_id();
+  inline void set_allocated_from_table_id(::std::string* from_table_id);
 
-  // optional string stringValue = 6;
-  inline bool has_stringvalue() const;
-  inline void clear_stringvalue();
-  static const int kStringValueFieldNumber = 6;
-  inline const ::std::string& stringvalue() const;
-  inline void set_stringvalue(const ::std::string& value);
-  inline void set_stringvalue(const char* value);
-  inline void set_stringvalue(const char* value, size_t size);
-  inline ::std::string* mutable_stringvalue();
-  inline ::std::string* release_stringvalue();
-  inline void set_allocated_stringvalue(::std::string* stringvalue);
+  // required .TSP.Reference table_style = 3;
+  inline bool has_table_style() const;
+  inline void clear_table_style();
+  static const int kTableStyleFieldNumber = 3;
+  inline const ::TSP::Reference& table_style() const;
+  inline ::TSP::Reference* mutable_table_style();
+  inline ::TSP::Reference* release_table_style();
+  inline void set_allocated_table_style(::TSP::Reference* table_style);
 
-  // optional bool boolValue = 7;
-  inline bool has_boolvalue() const;
-  inline void clear_boolvalue();
-  static const int kBoolValueFieldNumber = 7;
-  inline bool boolvalue() const;
-  inline void set_boolvalue(bool value);
+  // required .TSP.Reference body_text_style = 24;
+  inline bool has_body_text_style() const;
+  inline void clear_body_text_style();
+  static const int kBodyTextStyleFieldNumber = 24;
+  inline const ::TSP::Reference& body_text_style() const;
+  inline ::TSP::Reference* mutable_body_text_style();
+  inline ::TSP::Reference* release_body_text_style();
+  inline void set_allocated_body_text_style(::TSP::Reference* body_text_style);
 
-  // optional .TSP.Reference cell_style = 3;
-  inline bool has_cell_style() const;
-  inline void clear_cell_style();
-  static const int kCellStyleFieldNumber = 3;
-  inline const ::TSP::Reference& cell_style() const;
-  inline ::TSP::Reference* mutable_cell_style();
-  inline ::TSP::Reference* release_cell_style();
-  inline void set_allocated_cell_style(::TSP::Reference* cell_style);
+  // required .TSP.Reference header_row_text_style = 25;
+  inline bool has_header_row_text_style() const;
+  inline void clear_header_row_text_style();
+  static const int kHeaderRowTextStyleFieldNumber = 25;
+  inline const ::TSP::Reference& header_row_text_style() const;
+  inline ::TSP::Reference* mutable_header_row_text_style();
+  inline ::TSP::Reference* release_header_row_text_style();
+  inline void set_allocated_header_row_text_style(::TSP::Reference* header_row_text_style);
 
-  // optional .TSP.Reference text_style = 4;
-  inline bool has_text_style() const;
-  inline void clear_text_style();
-  static const int kTextStyleFieldNumber = 4;
-  inline const ::TSP::Reference& text_style() const;
-  inline ::TSP::Reference* mutable_text_style();
-  inline ::TSP::Reference* release_text_style();
-  inline void set_allocated_text_style(::TSP::Reference* text_style);
+  // required .TSP.Reference header_column_text_style = 26;
+  inline bool has_header_column_text_style() const;
+  inline void clear_header_column_text_style();
+  static const int kHeaderColumnTextStyleFieldNumber = 26;
+  inline const ::TSP::Reference& header_column_text_style() const;
+  inline ::TSP::Reference* mutable_header_column_text_style();
+  inline ::TSP::Reference* release_header_column_text_style();
+  inline void set_allocated_header_column_text_style(::TSP::Reference* header_column_text_style);
 
-  // optional .TSCE.FormulaArchive formula = 8;
-  inline bool has_formula() const;
-  inline void clear_formula();
-  static const int kFormulaFieldNumber = 8;
-  inline const ::TSCE::FormulaArchive& formula() const;
-  inline ::TSCE::FormulaArchive* mutable_formula();
-  inline ::TSCE::FormulaArchive* release_formula();
-  inline void set_allocated_formula(::TSCE::FormulaArchive* formula);
+  // required .TSP.Reference footer_row_text_style = 27;
+  inline bool has_footer_row_text_style() const;
+  inline void clear_footer_row_text_style();
+  static const int kFooterRowTextStyleFieldNumber = 27;
+  inline const ::TSP::Reference& footer_row_text_style() const;
+  inline ::TSP::Reference* mutable_footer_row_text_style();
+  inline ::TSP::Reference* release_footer_row_text_style();
+  inline void set_allocated_footer_row_text_style(::TSP::Reference* footer_row_text_style);
 
-  // optional .TSP.Reference formulaError = 10;
-  inline bool has_formulaerror() const;
-  inline void clear_formulaerror();
-  static const int kFormulaErrorFieldNumber = 10;
-  inline const ::TSP::Reference& formulaerror() const;
-  inline ::TSP::Reference* mutable_formulaerror();
-  inline ::TSP::Reference* release_formulaerror();
-  inline void set_allocated_formulaerror(::TSP::Reference* formulaerror);
+  // required .TSP.Reference body_cell_style = 18;
+  inline bool has_body_cell_style() const;
+  inline void clear_body_cell_style();
+  static const int kBodyCellStyleFieldNumber = 18;
+  inline const ::TSP::Reference& body_cell_style() const;
+  inline ::TSP::Reference* mutable_body_cell_style();
+  inline ::TSP::Reference* release_body_cell_style();
+  inline void set_allocated_body_cell_style(::TSP::Reference* body_cell_style);
 
-  // optional .TSK.FormatStructArchive current_format = 9;
-  inline bool has_current_format() const;
-  inline void clear_current_format();
-  static const int kCurrentFormatFieldNumber = 9;
-  inline const ::TSK::FormatStructArchive& current_format() const;
-  inline ::TSK::FormatStructArchive* mutable_current_format();
-  inline ::TSK::FormatStructArchive* release_current_format();
-  inline void set_allocated_current_format(::TSK::FormatStructArchive* current_format);
+  // required .TSP.Reference header_row_style = 19;
+  inline bool has_header_row_style() const;
+  inline void clear_header_row_style();
+  static const int kHeaderRowStyleFieldNumber = 19;
+  inline const ::TSP::Reference& header_row_style() const;
+  inline ::TSP::Reference* mutable_header_row_style();
+  inline ::TSP::Reference* release_header_row_style();
+  inline void set_allocated_header_row_style(::TSP::Reference* header_row_style);
 
-  // optional .TSK.FormatStructArchive number_format = 11;
-  inline bool has_number_format() const;
-  inline void clear_number_format();
-  static const int kNumberFormatFieldNumber = 11;
-  inline const ::TSK::FormatStructArchive& number_format() const;
-  inline ::TSK::FormatStructArchive* mutable_number_format();
-  inline ::TSK::FormatStructArchive* release_number_format();
-  inline void set_allocated_number_format(::TSK::FormatStructArchive* number_format);
+  // required .TSP.Reference header_column_style = 20;
+  inline bool has_header_column_style() const;
+  inline void clear_header_column_style();
+  static const int kHeaderColumnStyleFieldNumber = 20;
+  inline const ::TSP::Reference& header_column_style() const;
+  inline ::TSP::Reference* mutable_header_column_style();
+  inline ::TSP::Reference* release_header_column_style();
+  inline void set_allocated_header_column_style(::TSP::Reference* header_column_style);
 
-  // optional .TSK.FormatStructArchive currency_format = 12;
-  inline bool has_currency_format() const;
-  inline void clear_currency_format();
-  static const int kCurrencyFormatFieldNumber = 12;
-  inline const ::TSK::FormatStructArchive& currency_format() const;
-  inline ::TSK::FormatStructArchive* mutable_currency_format();
-  inline ::TSK::FormatStructArchive* release_currency_format();
-  inline void set_allocated_currency_format(::TSK::FormatStructArchive* currency_format);
+  // required .TSP.Reference footer_row_style = 21;
+  inline bool has_footer_row_style() const;
+  inline void clear_footer_row_style();
+  static const int kFooterRowStyleFieldNumber = 21;
+  inline const ::TSP::Reference& footer_row_style() const;
+  inline ::TSP::Reference* mutable_footer_row_style();
+  inline ::TSP::Reference* release_footer_row_style();
+  inline void set_allocated_footer_row_style(::TSP::Reference* footer_row_style);
 
-  // optional .TSK.FormatStructArchive duration_format = 13;
-  inline bool has_duration_format() const;
-  inline void clear_duration_format();
-  static const int kDurationFormatFieldNumber = 13;
-  inline const ::TSK::FormatStructArchive& duration_format() const;
-  inline ::TSK::FormatStructArchive* mutable_duration_format();
-  inline ::TSK::FormatStructArchive* release_duration_format();
-  inline void set_allocated_duration_format(::TSK::FormatStructArchive* duration_format);
+  // optional .TSP.Reference table_name_style = 30;
+  inline bool has_table_name_style() const;
+  inline void clear_table_name_style();
+  static const int kTableNameStyleFieldNumber = 30;
+  inline const ::TSP::Reference& table_name_style() const;
+  inline ::TSP::Reference* mutable_table_name_style();
+  inline ::TSP::Reference* release_table_name_style();
+  inline void set_allocated_table_name_style(::TSP::Reference* table_name_style);
 
-  // optional .TSK.FormatStructArchive date_format = 14;
-  inline bool has_date_format() const;
-  inline void clear_date_format();
-  static const int kDateFormatFieldNumber = 14;
-  inline const ::TSK::FormatStructArchive& date_format() const;
-  inline ::TSK::FormatStructArchive* mutable_date_format();
-  inline ::TSK::FormatStructArchive* release_date_format();
-  inline void set_allocated_date_format(::TSK::FormatStructArchive* date_format);
+  // optional .TSP.Reference table_name_shape_style = 36;
+  inline bool has_table_name_shape_style() const;
+  inline void clear_table_name_shape_style();
+  static const int kTableNameShapeStyleFieldNumber = 36;
+  inline const ::TSP::Reference& table_name_shape_style() const;
+  inline ::TSP::Reference* mutable_table_name_shape_style();
+  inline ::TSP::Reference* release_table_name_shape_style();
+  inline void set_allocated_table_name_shape_style(::TSP::Reference* table_name_shape_style);
 
-  // optional .TSK.FormatStructArchive control_format = 15;
-  inline bool has_control_format() const;
-  inline void clear_control_format();
-  static const int kControlFormatFieldNumber = 15;
-  inline const ::TSK::FormatStructArchive& control_format() const;
-  inline ::TSK::FormatStructArchive* mutable_control_format();
-  inline ::TSK::FormatStructArchive* release_control_format();
-  inline void set_allocated_control_format(::TSK::FormatStructArchive* control_format);
+  // required .TST.DataStore data_store = 4;
+  inline bool has_data_store() const;
+  inline void clear_data_store();
+  static const int kDataStoreFieldNumber = 4;
+  inline const ::TST::DataStore& data_store() const;
+  inline ::TST::DataStore* mutable_data_store();
+  inline ::TST::DataStore* release_data_store();
+  inline void set_allocated_data_store(::TST::DataStore* data_store);
 
-  // optional .TSK.FormatStructArchive custom_format = 16;
-  inline bool has_custom_format() const;
-  inline void clear_custom_format();
-  static const int kCustomFormatFieldNumber = 16;
-  inline const ::TSK::FormatStructArchive& custom_format() const;
-  inline ::TSK::FormatStructArchive* mutable_custom_format();
-  inline ::TSK::FormatStructArchive* release_custom_format();
-  inline void set_allocated_custom_format(::TSK::FormatStructArchive* custom_format);
+  // optional .TSP.Reference provider = 5;
+  inline bool has_provider() const;
+  inline void clear_provider();
+  static const int kProviderFieldNumber = 5;
+  inline const ::TSP::Reference& provider() const;
+  inline ::TSP::Reference* mutable_provider();
+  inline ::TSP::Reference* release_provider();
+  inline void set_allocated_provider(::TSP::Reference* provider);
 
-  // optional .TSK.FormatStructArchive base_format = 17;
-  inline bool has_base_format() const;
-  inline void clear_base_format();
-  static const int kBaseFormatFieldNumber = 17;
-  inline const ::TSK::FormatStructArchive& base_format() const;
-  inline ::TSK::FormatStructArchive* mutable_base_format();
-  inline ::TSK::FormatStructArchive* release_base_format();
-  inline void set_allocated_base_format(::TSK::FormatStructArchive* base_format);
+  // required uint32 number_of_rows = 6;
+  inline bool has_number_of_rows() const;
+  inline void clear_number_of_rows();
+  static const int kNumberOfRowsFieldNumber = 6;
+  inline ::google::protobuf::uint32 number_of_rows() const;
+  inline void set_number_of_rows(::google::protobuf::uint32 value);
 
-  // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
-  inline bool has_multiple_choice_list_format() const;
-  inline void clear_multiple_choice_list_format();
-  static const int kMultipleChoiceListFormatFieldNumber = 18;
-  inline const ::TSK::FormatStructArchive& multiple_choice_list_format() const;
-  inline ::TSK::FormatStructArchive* mutable_multiple_choice_list_format();
-  inline ::TSK::FormatStructArchive* release_multiple_choice_list_format();
-  inline void set_allocated_multiple_choice_list_format(::TSK::FormatStructArchive* multiple_choice_list_format);
+  // required uint32 number_of_columns = 7;
+  inline bool has_number_of_columns() const;
+  inline void clear_number_of_columns();
+  static const int kNumberOfColumnsFieldNumber = 7;
+  inline ::google::protobuf::uint32 number_of_columns() const;
+  inline void set_number_of_columns(::google::protobuf::uint32 value);
 
-  // optional uint32 explicit_format_flags = 19;
-  inline bool has_explicit_format_flags() const;
-  inline void clear_explicit_format_flags();
-  static const int kExplicitFormatFlagsFieldNumber = 19;
-  inline ::google::protobuf::uint32 explicit_format_flags() const;
-  inline void set_explicit_format_flags(::google::protobuf::uint32 value);
-
-  // optional .TSP.Reference richTextPayload = 20;
-  inline bool has_richtextpayload() const;
-  inline void clear_richtextpayload();
-  static const int kRichTextPayloadFieldNumber = 20;
-  inline const ::TSP::Reference& richtextpayload() const;
-  inline ::TSP::Reference* mutable_richtextpayload();
-  inline ::TSP::Reference* release_richtextpayload();
-  inline void set_allocated_richtextpayload(::TSP::Reference* richtextpayload);
-
-  // optional .TSP.Reference conditional_style = 21;
-  inline bool has_conditional_style() const;
-  inline void clear_conditional_style();
-  static const int kConditionalStyleFieldNumber = 21;
-  inline const ::TSP::Reference& conditional_style() const;
-  inline ::TSP::Reference* mutable_conditional_style();
-  inline ::TSP::Reference* release_conditional_style();
-  inline void set_allocated_conditional_style(::TSP::Reference* conditional_style);
+  // required string table_name = 8;
+  inline bool has_table_name() const;
+  inline void clear_table_name();
+  static const int kTableNameFieldNumber = 8;
+  inline const ::std::string& table_name() const;
+  inline void set_table_name(const ::std::string& value);
+  inline void set_table_name(const char* value);
+  inline void set_table_name(const char* value, size_t size);
+  inline ::std::string* mutable_table_name();
+  inline ::std::string* release_table_name();
+  inline void set_allocated_table_name(::std::string* table_name);
 
-  // optional .TSP.Reference multiple_choice_list = 22;
-  inline bool has_multiple_choice_list() const;
-  inline void clear_multiple_choice_list();
-  static const int kMultipleChoiceListFieldNumber = 22;
-  inline const ::TSP::Reference& multiple_choice_list() const;
-  inline ::TSP::Reference* mutable_multiple_choice_list();
-  inline ::TSP::Reference* release_multiple_choice_list();
-  inline void set_allocated_multiple_choice_list(::TSP::Reference* multiple_choice_list);
+  // optional bool table_name_enabled = 22;
+  inline bool has_table_name_enabled() const;
+  inline void clear_table_name_enabled();
+  static const int kTableNameEnabledFieldNumber = 22;
+  inline bool table_name_enabled() const;
+  inline void set_table_name_enabled(bool value);
 
-  // optional .TSP.Reference comment_storage = 23;
-  inline bool has_comment_storage() const;
-  inline void clear_comment_storage();
-  static const int kCommentStorageFieldNumber = 23;
-  inline const ::TSP::Reference& comment_storage() const;
-  inline ::TSP::Reference* mutable_comment_storage();
-  inline ::TSP::Reference* release_comment_storage();
-  inline void set_allocated_comment_storage(::TSP::Reference* comment_storage);
+  // optional double table_name_height = 33;
+  inline bool has_table_name_height() const;
+  inline void clear_table_name_height();
+  static const int kTableNameHeightFieldNumber = 33;
+  inline double table_name_height() const;
+  inline void set_table_name_height(double value);
 
-  // optional uint32 conditional_style_applied_rule = 24;
-  inline bool has_conditional_style_applied_rule() const;
-  inline void clear_conditional_style_applied_rule();
-  static const int kConditionalStyleAppliedRuleFieldNumber = 24;
-  inline ::google::protobuf::uint32 conditional_style_applied_rule() const;
-  inline void set_conditional_style_applied_rule(::google::protobuf::uint32 value);
+  // optional bool table_name_border_enabled = 37;
+  inline bool has_table_name_border_enabled() const;
+  inline void clear_table_name_border_enabled();
+  static const int kTableNameBorderEnabledFieldNumber = 37;
+  inline bool table_name_border_enabled() const;
+  inline void set_table_name_border_enabled(bool value);
 
-  // @@protoc_insertion_point(class_scope:TST.Cell)
- private:
-  inline void set_has_valuetype();
-  inline void clear_has_valuetype();
-  inline void set_has_numbervalue();
-  inline void clear_has_numbervalue();
-  inline void set_has_stringvalue();
-  inline void clear_has_stringvalue();
-  inline void set_has_boolvalue();
-  inline void clear_has_boolvalue();
-  inline void set_has_cell_style();
-  inline void clear_has_cell_style();
-  inline void set_has_text_style();
-  inline void clear_has_text_style();
-  inline void set_has_formula();
-  inline void clear_has_formula();
-  inline void set_has_formulaerror();
-  inline void clear_has_formulaerror();
-  inline void set_has_current_format();
-  inline void clear_has_current_format();
-  inline void set_has_number_format();
-  inline void clear_has_number_format();
-  inline void set_has_currency_format();
-  inline void clear_has_currency_format();
-  inline void set_has_duration_format();
-  inline void clear_has_duration_format();
-  inline void set_has_date_format();
-  inline void clear_has_date_format();
-  inline void set_has_control_format();
-  inline void clear_has_control_format();
-  inline void set_has_custom_format();
-  inline void clear_has_custom_format();
-  inline void set_has_base_format();
-  inline void clear_has_base_format();
-  inline void set_has_multiple_choice_list_format();
-  inline void clear_has_multiple_choice_list_format();
-  inline void set_has_explicit_format_flags();
-  inline void clear_has_explicit_format_flags();
-  inline void set_has_richtextpayload();
-  inline void clear_has_richtextpayload();
-  inline void set_has_conditional_style();
-  inline void clear_has_conditional_style();
-  inline void set_has_multiple_choice_list();
-  inline void clear_has_multiple_choice_list();
-  inline void set_has_comment_storage();
-  inline void clear_has_comment_storage();
-  inline void set_has_conditional_style_applied_rule();
-  inline void clear_has_conditional_style_applied_rule();
+  // optional uint32 number_of_header_rows = 9;
+  inline bool has_number_of_header_rows() const;
+  inline void clear_number_of_header_rows();
+  static const int kNumberOfHeaderRowsFieldNumber = 9;
+  inline ::google::protobuf::uint32 number_of_header_rows() const;
+  inline void set_number_of_header_rows(::google::protobuf::uint32 value);
 
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+  // optional uint32 number_of_header_columns = 10;
+  inline bool has_number_of_header_columns() const;
+  inline void clear_number_of_header_columns();
+  static const int kNumberOfHeaderColumnsFieldNumber = 10;
+  inline ::google::protobuf::uint32 number_of_header_columns() const;
+  inline void set_number_of_header_columns(::google::protobuf::uint32 value);
 
-  double numbervalue_;
-  int valuetype_;
-  bool boolvalue_;
-  ::std::string* stringvalue_;
-  ::TSP::Reference* cell_style_;
-  ::TSP::Reference* text_style_;
-  ::TSCE::FormulaArchive* formula_;
-  ::TSP::Reference* formulaerror_;
-  ::TSK::FormatStructArchive* current_format_;
-  ::TSK::FormatStructArchive* number_format_;
-  ::TSK::FormatStructArchive* currency_format_;
-  ::TSK::FormatStructArchive* duration_format_;
-  ::TSK::FormatStructArchive* date_format_;
-  ::TSK::FormatStructArchive* control_format_;
-  ::TSK::FormatStructArchive* custom_format_;
-  ::TSK::FormatStructArchive* base_format_;
-  ::TSK::FormatStructArchive* multiple_choice_list_format_;
-  ::TSP::Reference* richtextpayload_;
-  ::TSP::Reference* conditional_style_;
-  ::google::protobuf::uint32 explicit_format_flags_;
-  ::google::protobuf::uint32 conditional_style_applied_rule_;
-  ::TSP::Reference* multiple_choice_list_;
-  ::TSP::Reference* comment_storage_;
+  // optional uint32 number_of_footer_rows = 11;
+  inline bool has_number_of_footer_rows() const;
+  inline void clear_number_of_footer_rows();
+  static const int kNumberOfFooterRowsFieldNumber = 11;
+  inline ::google::protobuf::uint32 number_of_footer_rows() const;
+  inline void set_number_of_footer_rows(::google::protobuf::uint32 value);
 
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(23 + 31) / 32];
+  // optional bool header_rows_frozen = 12;
+  inline bool has_header_rows_frozen() const;
+  inline void clear_header_rows_frozen();
+  static const int kHeaderRowsFrozenFieldNumber = 12;
+  inline bool header_rows_frozen() const;
+  inline void set_header_rows_frozen(bool value);
 
-  friend void  protobuf_AddDesc_TSTArchives_2eproto();
-  friend void protobuf_AssignDesc_TSTArchives_2eproto();
-  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+  // optional bool header_columns_frozen = 13;
+  inline bool has_header_columns_frozen() const;
+  inline void clear_header_columns_frozen();
+  static const int kHeaderColumnsFrozenFieldNumber = 13;
+  inline bool header_columns_frozen() const;
+  inline void set_header_columns_frozen(bool value);
 
-  void InitAsDefaultInstance();
-  static Cell* default_instance_;
-};
-// -------------------------------------------------------------------
+  // optional uint32 number_of_hidden_rows = 14;
+  inline bool has_number_of_hidden_rows() const;
+  inline void clear_number_of_hidden_rows();
+  static const int kNumberOfHiddenRowsFieldNumber = 14;
+  inline ::google::protobuf::uint32 number_of_hidden_rows() const;
+  inline void set_number_of_hidden_rows(::google::protobuf::uint32 value);
 
-class MergeRegionMapArchive : public ::google::protobuf::Message {
- public:
-  MergeRegionMapArchive();
-  virtual ~MergeRegionMapArchive();
+  // optional uint32 number_of_hidden_columns = 15;
+  inline bool has_number_of_hidden_columns() const;
+  inline void clear_number_of_hidden_columns();
+  static const int kNumberOfHiddenColumnsFieldNumber = 15;
+  inline ::google::protobuf::uint32 number_of_hidden_columns() const;
+  inline void set_number_of_hidden_columns(::google::protobuf::uint32 value);
 
-  MergeRegionMapArchive(const MergeRegionMapArchive& from);
+  // optional uint32 number_of_user_hidden_rows = 41;
+  inline bool has_number_of_user_hidden_rows() const;
+  inline void clear_number_of_user_hidden_rows();
+  static const int kNumberOfUserHiddenRowsFieldNumber = 41;
+  inline ::google::protobuf::uint32 number_of_user_hidden_rows() const;
+  inline void set_number_of_user_hidden_rows(::google::protobuf::uint32 value);
 
-  inline MergeRegionMapArchive& operator=(const MergeRegionMapArchive& from) {
-    CopyFrom(from);
-    return *this;
-  }
+  // optional uint32 number_of_user_hidden_columns = 42;
+  inline bool has_number_of_user_hidden_columns() const;
+  inline void clear_number_of_user_hidden_columns();
+  static const int kNumberOfUserHiddenColumnsFieldNumber = 42;
+  inline ::google::protobuf::uint32 number_of_user_hidden_columns() const;
+  inline void set_number_of_user_hidden_columns(::google::protobuf::uint32 value);
 
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
+  // optional uint32 number_of_filtered_rows = 40;
+  inline bool has_number_of_filtered_rows() const;
+  inline void clear_number_of_filtered_rows();
+  static const int kNumberOfFilteredRowsFieldNumber = 40;
+  inline ::google::protobuf::uint32 number_of_filtered_rows() const;
+  inline void set_number_of_filtered_rows(::google::protobuf::uint32 value);
 
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
+  // required double default_row_height = 16;
+  inline bool has_default_row_height() const;
+  inline void clear_default_row_height();
+  static const int kDefaultRowHeightFieldNumber = 16;
+  inline double default_row_height() const;
+  inline void set_default_row_height(double value);
 
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const MergeRegionMapArchive& default_instance();
+  // required double default_column_width = 17;
+  inline bool has_default_column_width() const;
+  inline void clear_default_column_width();
+  static const int kDefaultColumnWidthFieldNumber = 17;
+  inline double default_column_width() const;
+  inline void set_default_column_width(double value);
 
-  void Swap(MergeRegionMapArchive* other);
+  // optional .TST.CellID origin_offset = 23 [deprecated = true];
+  inline bool has_origin_offset() const PROTOBUF_DEPRECATED;
+  inline void clear_origin_offset() PROTOBUF_DEPRECATED;
+  static const int kOriginOffsetFieldNumber = 23;
+  inline const ::TST::CellID& origin_offset() const PROTOBUF_DEPRECATED;
+  inline ::TST::CellID* mutable_origin_offset() PROTOBUF_DEPRECATED;
+  inline ::TST::CellID* release_origin_offset() PROTOBUF_DEPRECATED;
+  inline void set_allocated_origin_offset(::TST::CellID* origin_offset) PROTOBUF_DEPRECATED;
 
-  // implements Message ----------------------------------------------
+  // required uint32 preset_index = 28;
+  inline bool has_preset_index() const;
+  inline void clear_preset_index();
+  static const int kPresetIndexFieldNumber = 28;
+  inline ::google::protobuf::uint32 preset_index() const;
+  inline void set_preset_index(::google::protobuf::uint32 value);
 
-  MergeRegionMapArchive* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const MergeRegionMapArchive& from);
-  void MergeFrom(const MergeRegionMapArchive& from);
-  void Clear();
-  bool IsInitialized() const;
+  // optional bool repeating_header_rows_enabled = 29;
+  inline bool has_repeating_header_rows_enabled() const;
+  inline void clear_repeating_header_rows_enabled();
+  static const int kRepeatingHeaderRowsEnabledFieldNumber = 29;
+  inline bool repeating_header_rows_enabled() const;
+  inline void set_repeating_header_rows_enabled(bool value);
 
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
+  // optional bool repeating_header_columns_enabled = 32;
+  inline bool has_repeating_header_columns_enabled() const;
+  inline void clear_repeating_header_columns_enabled();
+  static const int kRepeatingHeaderColumnsEnabledFieldNumber = 32;
+  inline bool repeating_header_columns_enabled() const;
+  inline void set_repeating_header_columns_enabled(bool value);
 
-  ::google::protobuf::Metadata GetMetadata() const;
+  // optional bool style_apply_clears_all = 31;
+  inline bool has_style_apply_clears_all() const;
+  inline void clear_style_apply_clears_all();
+  static const int kStyleApplyClearsAllFieldNumber = 31;
+  inline bool style_apply_clears_all() const;
+  inline void set_style_apply_clears_all(bool value);
 
-  // nested types ----------------------------------------------------
+  // optional .TSP.Reference hidden_state_formula_owner_for_columns = 34;
+  inline bool has_hidden_state_formula_owner_for_columns() const;
+  inline void clear_hidden_state_formula_owner_for_columns();
+  static const int kHiddenStateFormulaOwnerForColumnsFieldNumber = 34;
+  inline const ::TSP::Reference& hidden_state_formula_owner_for_columns() const;
+  inline ::TSP::Reference* mutable_hidden_state_formula_owner_for_columns();
+  inline ::TSP::Reference* release_hidden_state_formula_owner_for_columns();
+  inline void set_allocated_hidden_state_formula_owner_for_columns(::TSP::Reference* hidden_state_formula_owner_for_columns);
 
-  // accessors -------------------------------------------------------
+  // optional .TSP.Reference hidden_state_formula_owner_for_rows = 35;
+  inline bool has_hidden_state_formula_owner_for_rows() const;
+  inline void clear_hidden_state_formula_owner_for_rows();
+  static const int kHiddenStateFormulaOwnerForRowsFieldNumber = 35;
+  inline const ::TSP::Reference& hidden_state_formula_owner_for_rows() const;
+  inline ::TSP::Reference* mutable_hidden_state_formula_owner_for_rows();
+  inline ::TSP::Reference* release_hidden_state_formula_owner_for_rows();
+  inline void set_allocated_hidden_state_formula_owner_for_rows(::TSP::Reference* hidden_state_formula_owner_for_rows);
 
-  // repeated .TST.CellRange cell_range = 1;
-  inline int cell_range_size() const;
-  inline void clear_cell_range();
-  static const int kCellRangeFieldNumber = 1;
-  inline const ::TST::CellRange& cell_range(int index) const;
-  inline ::TST::CellRange* mutable_cell_range(int index);
-  inline ::TST::CellRange* add_cell_range();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
-      cell_range() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
-      mutable_cell_range();
+  // optional .TSP.Reference filter_set = 38;
+  inline bool has_filter_set() const;
+  inline void clear_filter_set();
+  static const int kFilterSetFieldNumber = 38;
+  inline const ::TSP::Reference& filter_set() const;
+  inline ::TSP::Reference* mutable_filter_set();
+  inline ::TSP::Reference* release_filter_set();
+  inline void set_allocated_filter_set(::TSP::Reference* filter_set);
 
-  // @@protoc_insertion_point(class_scope:TST.MergeRegionMapArchive)
+  // optional .TST.TableSortOrderArchive sort_order = 44;
+  inline bool has_sort_order() const;
+  inline void clear_sort_order();
+  static const int kSortOrderFieldNumber = 44;
+  inline const ::TST::TableSortOrderArchive& sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_sort_order();
+  inline ::TST::TableSortOrderArchive* release_sort_order();
+  inline void set_allocated_sort_order(::TST::TableSortOrderArchive* sort_order);
+
+  // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
+  inline bool has_conditional_style_formula_owner_id() const;
+  inline void clear_conditional_style_formula_owner_id();
+  static const int kConditionalStyleFormulaOwnerIdFieldNumber = 39;
+  inline const ::TSCE::CFUUIDArchive& conditional_style_formula_owner_id() const;
+  inline ::TSCE::CFUUIDArchive* mutable_conditional_style_formula_owner_id();
+  inline ::TSCE::CFUUIDArchive* release_conditional_style_formula_owner_id();
+  inline void set_allocated_conditional_style_formula_owner_id(::TSCE::CFUUIDArchive* conditional_style_formula_owner_id);
+
+  // optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
+  inline bool has_sort_rule_reference_tracker() const;
+  inline void clear_sort_rule_reference_tracker();
+  static const int kSortRuleReferenceTrackerFieldNumber = 45;
+  inline const ::TST::SortRuleReferenceTrackerArchive& sort_rule_reference_tracker() const;
+  inline ::TST::SortRuleReferenceTrackerArchive* mutable_sort_rule_reference_tracker();
+  inline ::TST::SortRuleReferenceTrackerArchive* release_sort_rule_reference_tracker();
+  inline void set_allocated_sort_rule_reference_tracker(::TST::SortRuleReferenceTrackerArchive* sort_rule_reference_tracker);
+
+  // @@protoc_insertion_point(class_scope:TST.TableModelArchive)
  private:
+  inline void set_has_table_id();
+  inline void clear_has_table_id();
+  inline void set_has_from_table_id();
+  inline void clear_has_from_table_id();
+  inline void set_has_table_style();
+  inline void clear_has_table_style();
+  inline void set_has_body_text_style();
+  inline void clear_has_body_text_style();
+  inline void set_has_header_row_text_style();
+  inline void clear_has_header_row_text_style();
+  inline void set_has_header_column_text_style();
+  inline void clear_has_header_column_text_style();
+  inline void set_has_footer_row_text_style();
+  inline void clear_has_footer_row_text_style();
+  inline void set_has_body_cell_style();
+  inline void clear_has_body_cell_style();
+  inline void set_has_header_row_style();
+  inline void clear_has_header_row_style();
+  inline void set_has_header_column_style();
+  inline void clear_has_header_column_style();
+  inline void set_has_footer_row_style();
+  inline void clear_has_footer_row_style();
+  inline void set_has_table_name_style();
+  inline void clear_has_table_name_style();
+  inline void set_has_table_name_shape_style();
+  inline void clear_has_table_name_shape_style();
+  inline void set_has_data_store();
+  inline void clear_has_data_store();
+  inline void set_has_provider();
+  inline void clear_has_provider();
+  inline void set_has_number_of_rows();
+  inline void clear_has_number_of_rows();
+  inline void set_has_number_of_columns();
+  inline void clear_has_number_of_columns();
+  inline void set_has_table_name();
+  inline void clear_has_table_name();
+  inline void set_has_table_name_enabled();
+  inline void clear_has_table_name_enabled();
+  inline void set_has_table_name_height();
+  inline void clear_has_table_name_height();
+  inline void set_has_table_name_border_enabled();
+  inline void clear_has_table_name_border_enabled();
+  inline void set_has_number_of_header_rows();
+  inline void clear_has_number_of_header_rows();
+  inline void set_has_number_of_header_columns();
+  inline void clear_has_number_of_header_columns();
+  inline void set_has_number_of_footer_rows();
+  inline void clear_has_number_of_footer_rows();
+  inline void set_has_header_rows_frozen();
+  inline void clear_has_header_rows_frozen();
+  inline void set_has_header_columns_frozen();
+  inline void clear_has_header_columns_frozen();
+  inline void set_has_number_of_hidden_rows();
+  inline void clear_has_number_of_hidden_rows();
+  inline void set_has_number_of_hidden_columns();
+  inline void clear_has_number_of_hidden_columns();
+  inline void set_has_number_of_user_hidden_rows();
+  inline void clear_has_number_of_user_hidden_rows();
+  inline void set_has_number_of_user_hidden_columns();
+  inline void clear_has_number_of_user_hidden_columns();
+  inline void set_has_number_of_filtered_rows();
+  inline void clear_has_number_of_filtered_rows();
+  inline void set_has_default_row_height();
+  inline void clear_has_default_row_height();
+  inline void set_has_default_column_width();
+  inline void clear_has_default_column_width();
+  inline void set_has_origin_offset();
+  inline void clear_has_origin_offset();
+  inline void set_has_preset_index();
+  inline void clear_has_preset_index();
+  inline void set_has_repeating_header_rows_enabled();
+  inline void clear_has_repeating_header_rows_enabled();
+  inline void set_has_repeating_header_columns_enabled();
+  inline void clear_has_repeating_header_columns_enabled();
+  inline void set_has_style_apply_clears_all();
+  inline void clear_has_style_apply_clears_all();
+  inline void set_has_hidden_state_formula_owner_for_columns();
+  inline void clear_has_hidden_state_formula_owner_for_columns();
+  inline void set_has_hidden_state_formula_owner_for_rows();
+  inline void clear_has_hidden_state_formula_owner_for_rows();
+  inline void set_has_filter_set();
+  inline void clear_has_filter_set();
+  inline void set_has_sort_order();
+  inline void clear_has_sort_order();
+  inline void set_has_conditional_style_formula_owner_id();
+  inline void clear_has_conditional_style_formula_owner_id();
+  inline void set_has_sort_rule_reference_tracker();
+  inline void clear_has_sort_rule_reference_tracker();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > cell_range_;
+  ::std::string* table_id_;
+  ::std::string* from_table_id_;
+  ::TSP::Reference* table_style_;
+  ::TSP::Reference* body_text_style_;
+  ::TSP::Reference* header_row_text_style_;
+  ::TSP::Reference* header_column_text_style_;
+  ::TSP::Reference* footer_row_text_style_;
+  ::TSP::Reference* body_cell_style_;
+  ::TSP::Reference* header_row_style_;
+  ::TSP::Reference* header_column_style_;
+  ::TSP::Reference* footer_row_style_;
+  ::TSP::Reference* table_name_style_;
+  ::TSP::Reference* table_name_shape_style_;
+  ::TST::DataStore* data_store_;
+  ::TSP::Reference* provider_;
+  ::google::protobuf::uint32 number_of_rows_;
+  ::google::protobuf::uint32 number_of_columns_;
+  ::std::string* table_name_;
+  double table_name_height_;
+  ::google::protobuf::uint32 number_of_header_rows_;
+  bool table_name_enabled_;
+  bool table_name_border_enabled_;
+  bool header_rows_frozen_;
+  bool header_columns_frozen_;
+  ::google::protobuf::uint32 number_of_header_columns_;
+  ::google::protobuf::uint32 number_of_footer_rows_;
+  ::google::protobuf::uint32 number_of_hidden_rows_;
+  ::google::protobuf::uint32 number_of_hidden_columns_;
+  ::google::protobuf::uint32 number_of_user_hidden_rows_;
+  ::google::protobuf::uint32 number_of_user_hidden_columns_;
+  double default_row_height_;
+  double default_column_width_;
+  ::google::protobuf::uint32 number_of_filtered_rows_;
+  ::google::protobuf::uint32 preset_index_;
+  ::TST::CellID* origin_offset_;
+  ::TSP::Reference* hidden_state_formula_owner_for_columns_;
+  ::TSP::Reference* hidden_state_formula_owner_for_rows_;
+  ::TSP::Reference* filter_set_;
+  ::TST::TableSortOrderArchive* sort_order_;
+  ::TSCE::CFUUIDArchive* conditional_style_formula_owner_id_;
+  ::TST::SortRuleReferenceTrackerArchive* sort_rule_reference_tracker_;
+  bool repeating_header_rows_enabled_;
+  bool repeating_header_columns_enabled_;
+  bool style_apply_clears_all_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(44 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static MergeRegionMapArchive* default_instance_;
+  static TableModelArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CellMapArchive_CellMapEntry : public ::google::protobuf::Message {
+class DurationWrapperArchive : public ::google::protobuf::Message {
  public:
-  CellMapArchive_CellMapEntry();
-  virtual ~CellMapArchive_CellMapEntry();
+  DurationWrapperArchive();
+  virtual ~DurationWrapperArchive();
 
-  CellMapArchive_CellMapEntry(const CellMapArchive_CellMapEntry& from);
+  DurationWrapperArchive(const DurationWrapperArchive& from);
 
-  inline CellMapArchive_CellMapEntry& operator=(const CellMapArchive_CellMapEntry& from) {
+  inline DurationWrapperArchive& operator=(const DurationWrapperArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4252,17 +4581,17 @@ class CellMapArchive_CellMapEntry : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CellMapArchive_CellMapEntry& default_instance();
+  static const DurationWrapperArchive& default_instance();
 
-  void Swap(CellMapArchive_CellMapEntry* other);
+  void Swap(DurationWrapperArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CellMapArchive_CellMapEntry* New() const;
+  DurationWrapperArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CellMapArchive_CellMapEntry& from);
-  void MergeFrom(const CellMapArchive_CellMapEntry& from);
+  void CopyFrom(const DurationWrapperArchive& from);
+  void MergeFrom(const DurationWrapperArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4285,56 +4614,32 @@ class CellMapArchive_CellMapEntry : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.CellID cellID = 1;
-  inline bool has_cellid() const;
-  inline void clear_cellid();
-  static const int kCellIDFieldNumber = 1;
-  inline const ::TST::CellID& cellid() const;
-  inline ::TST::CellID* mutable_cellid();
-  inline ::TST::CellID* release_cellid();
-  inline void set_allocated_cellid(::TST::CellID* cellid);
-
-  // optional .TST.Cell cell = 2;
-  inline bool has_cell() const;
-  inline void clear_cell();
-  static const int kCellFieldNumber = 2;
-  inline const ::TST::Cell& cell() const;
-  inline ::TST::Cell* mutable_cell();
-  inline ::TST::Cell* release_cell();
-  inline void set_allocated_cell(::TST::Cell* cell);
-
-  // @@protoc_insertion_point(class_scope:TST.CellMapArchive.CellMapEntry)
- private:
-  inline void set_has_cellid();
-  inline void clear_has_cellid();
-  inline void set_has_cell();
-  inline void clear_has_cell();
+  // @@protoc_insertion_point(class_scope:TST.DurationWrapperArchive)
+ private:
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::CellID* cellid_;
-  ::TST::Cell* cell_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[1];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CellMapArchive_CellMapEntry* default_instance_;
+  static DurationWrapperArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CellMapArchive : public ::google::protobuf::Message {
+class Cell : public ::google::protobuf::Message {
  public:
-  CellMapArchive();
-  virtual ~CellMapArchive();
+  Cell();
+  virtual ~Cell();
 
-  CellMapArchive(const CellMapArchive& from);
+  Cell(const Cell& from);
 
-  inline CellMapArchive& operator=(const CellMapArchive& from) {
+  inline Cell& operator=(const Cell& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4348,17 +4653,17 @@ class CellMapArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CellMapArchive& default_instance();
+  static const Cell& default_instance();
 
-  void Swap(CellMapArchive* other);
+  void Swap(Cell* other);
 
   // implements Message ----------------------------------------------
 
-  CellMapArchive* New() const;
+  Cell* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CellMapArchive& from);
-  void MergeFrom(const CellMapArchive& from);
+  void CopyFrom(const Cell& from);
+  void MergeFrom(const Cell& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4379,123 +4684,339 @@ class CellMapArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef CellMapArchive_CellMapEntry CellMapEntry;
-
   // accessors -------------------------------------------------------
 
-  // required uint32 capacity = 1;
-  inline bool has_capacity() const;
-  inline void clear_capacity();
-  static const int kCapacityFieldNumber = 1;
-  inline ::google::protobuf::uint32 capacity() const;
-  inline void set_capacity(::google::protobuf::uint32 value);
-
-  // required uint32 count = 2;
-  inline bool has_count() const;
-  inline void clear_count();
-  static const int kCountFieldNumber = 2;
-  inline ::google::protobuf::uint32 count() const;
-  inline void set_count(::google::protobuf::uint32 value);
+  // required .TST.CellValueType valueType = 2;
+  inline bool has_valuetype() const;
+  inline void clear_valuetype();
+  static const int kValueTypeFieldNumber = 2;
+  inline ::TST::CellValueType valuetype() const;
+  inline void set_valuetype(::TST::CellValueType value);
 
-  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
-  inline int cellmapentry_size() const;
-  inline void clear_cellmapentry();
-  static const int kCellMapEntryFieldNumber = 3;
-  inline const ::TST::CellMapArchive_CellMapEntry& cellmapentry(int index) const;
-  inline ::TST::CellMapArchive_CellMapEntry* mutable_cellmapentry(int index);
-  inline ::TST::CellMapArchive_CellMapEntry* add_cellmapentry();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >&
-      cellmapentry() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >*
-      mutable_cellmapentry();
+  // optional double numberValue = 5;
+  inline bool has_numbervalue() const;
+  inline void clear_numbervalue();
+  static const int kNumberValueFieldNumber = 5;
+  inline double numbervalue() const;
+  inline void set_numbervalue(double value);
 
-  // optional bool may_modify_formulas_in_cells = 4 [default = true];
-  inline bool has_may_modify_formulas_in_cells() const;
-  inline void clear_may_modify_formulas_in_cells();
-  static const int kMayModifyFormulasInCellsFieldNumber = 4;
-  inline bool may_modify_formulas_in_cells() const;
-  inline void set_may_modify_formulas_in_cells(bool value);
+  // optional string stringValue = 6;
+  inline bool has_stringvalue() const;
+  inline void clear_stringvalue();
+  static const int kStringValueFieldNumber = 6;
+  inline const ::std::string& stringvalue() const;
+  inline void set_stringvalue(const ::std::string& value);
+  inline void set_stringvalue(const char* value);
+  inline void set_stringvalue(const char* value, size_t size);
+  inline ::std::string* mutable_stringvalue();
+  inline ::std::string* release_stringvalue();
+  inline void set_allocated_stringvalue(::std::string* stringvalue);
 
-  // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
-  inline bool has_may_modify_values_referenced_by_formulas() const;
-  inline void clear_may_modify_values_referenced_by_formulas();
-  static const int kMayModifyValuesReferencedByFormulasFieldNumber = 5;
-  inline bool may_modify_values_referenced_by_formulas() const;
-  inline void set_may_modify_values_referenced_by_formulas(bool value);
+  // optional bool boolValue = 7;
+  inline bool has_boolvalue() const;
+  inline void clear_boolvalue();
+  static const int kBoolValueFieldNumber = 7;
+  inline bool boolvalue() const;
+  inline void set_boolvalue(bool value);
 
-  // optional bool applies_to_hidden = 6 [default = false];
-  inline bool has_applies_to_hidden() const;
-  inline void clear_applies_to_hidden();
-  static const int kAppliesToHiddenFieldNumber = 6;
-  inline bool applies_to_hidden() const;
-  inline void set_applies_to_hidden(bool value);
+  // optional .TSP.Reference cell_style = 3;
+  inline bool has_cell_style() const;
+  inline void clear_cell_style();
+  static const int kCellStyleFieldNumber = 3;
+  inline const ::TSP::Reference& cell_style() const;
+  inline ::TSP::Reference* mutable_cell_style();
+  inline ::TSP::Reference* release_cell_style();
+  inline void set_allocated_cell_style(::TSP::Reference* cell_style);
 
-  // @@protoc_insertion_point(class_scope:TST.CellMapArchive)
- private:
-  inline void set_has_capacity();
-  inline void clear_has_capacity();
-  inline void set_has_count();
-  inline void clear_has_count();
-  inline void set_has_may_modify_formulas_in_cells();
-  inline void clear_has_may_modify_formulas_in_cells();
-  inline void set_has_may_modify_values_referenced_by_formulas();
-  inline void clear_has_may_modify_values_referenced_by_formulas();
-  inline void set_has_applies_to_hidden();
-  inline void clear_has_applies_to_hidden();
+  // optional .TSP.Reference text_style = 4;
+  inline bool has_text_style() const;
+  inline void clear_text_style();
+  static const int kTextStyleFieldNumber = 4;
+  inline const ::TSP::Reference& text_style() const;
+  inline ::TSP::Reference* mutable_text_style();
+  inline ::TSP::Reference* release_text_style();
+  inline void set_allocated_text_style(::TSP::Reference* text_style);
 
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+  // optional .TSCE.FormulaArchive formula = 8;
+  inline bool has_formula() const;
+  inline void clear_formula();
+  static const int kFormulaFieldNumber = 8;
+  inline const ::TSCE::FormulaArchive& formula() const;
+  inline ::TSCE::FormulaArchive* mutable_formula();
+  inline ::TSCE::FormulaArchive* release_formula();
+  inline void set_allocated_formula(::TSCE::FormulaArchive* formula);
 
-  ::google::protobuf::uint32 capacity_;
-  ::google::protobuf::uint32 count_;
-  ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry > cellmapentry_;
-  bool may_modify_formulas_in_cells_;
-  bool may_modify_values_referenced_by_formulas_;
-  bool applies_to_hidden_;
+  // optional .TSP.Reference formulaError = 10;
+  inline bool has_formulaerror() const;
+  inline void clear_formulaerror();
+  static const int kFormulaErrorFieldNumber = 10;
+  inline const ::TSP::Reference& formulaerror() const;
+  inline ::TSP::Reference* mutable_formulaerror();
+  inline ::TSP::Reference* release_formulaerror();
+  inline void set_allocated_formulaerror(::TSP::Reference* formulaerror);
 
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  // optional .TSK.FormatStructArchive current_format = 9;
+  inline bool has_current_format() const;
+  inline void clear_current_format();
+  static const int kCurrentFormatFieldNumber = 9;
+  inline const ::TSK::FormatStructArchive& current_format() const;
+  inline ::TSK::FormatStructArchive* mutable_current_format();
+  inline ::TSK::FormatStructArchive* release_current_format();
+  inline void set_allocated_current_format(::TSK::FormatStructArchive* current_format);
 
-  friend void  protobuf_AddDesc_TSTArchives_2eproto();
-  friend void protobuf_AssignDesc_TSTArchives_2eproto();
-  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+  // optional .TSK.FormatStructArchive number_format = 11;
+  inline bool has_number_format() const;
+  inline void clear_number_format();
+  static const int kNumberFormatFieldNumber = 11;
+  inline const ::TSK::FormatStructArchive& number_format() const;
+  inline ::TSK::FormatStructArchive* mutable_number_format();
+  inline ::TSK::FormatStructArchive* release_number_format();
+  inline void set_allocated_number_format(::TSK::FormatStructArchive* number_format);
 
-  void InitAsDefaultInstance();
-  static CellMapArchive* default_instance_;
-};
-// -------------------------------------------------------------------
+  // optional .TSK.FormatStructArchive currency_format = 12;
+  inline bool has_currency_format() const;
+  inline void clear_currency_format();
+  static const int kCurrencyFormatFieldNumber = 12;
+  inline const ::TSK::FormatStructArchive& currency_format() const;
+  inline ::TSK::FormatStructArchive* mutable_currency_format();
+  inline ::TSK::FormatStructArchive* release_currency_format();
+  inline void set_allocated_currency_format(::TSK::FormatStructArchive* currency_format);
 
-class DoubleStyleMapArchive_DoubleStyleMapEntryArchive : public ::google::protobuf::Message {
- public:
-  DoubleStyleMapArchive_DoubleStyleMapEntryArchive();
-  virtual ~DoubleStyleMapArchive_DoubleStyleMapEntryArchive();
+  // optional .TSK.FormatStructArchive duration_format = 13;
+  inline bool has_duration_format() const;
+  inline void clear_duration_format();
+  static const int kDurationFormatFieldNumber = 13;
+  inline const ::TSK::FormatStructArchive& duration_format() const;
+  inline ::TSK::FormatStructArchive* mutable_duration_format();
+  inline ::TSK::FormatStructArchive* release_duration_format();
+  inline void set_allocated_duration_format(::TSK::FormatStructArchive* duration_format);
 
-  DoubleStyleMapArchive_DoubleStyleMapEntryArchive(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from);
+  // optional .TSK.FormatStructArchive date_format = 14;
+  inline bool has_date_format() const;
+  inline void clear_date_format();
+  static const int kDateFormatFieldNumber = 14;
+  inline const ::TSK::FormatStructArchive& date_format() const;
+  inline ::TSK::FormatStructArchive* mutable_date_format();
+  inline ::TSK::FormatStructArchive* release_date_format();
+  inline void set_allocated_date_format(::TSK::FormatStructArchive* date_format);
 
-  inline DoubleStyleMapArchive_DoubleStyleMapEntryArchive& operator=(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from) {
-    CopyFrom(from);
-    return *this;
-  }
+  // optional .TSK.FormatStructArchive control_format = 15;
+  inline bool has_control_format() const;
+  inline void clear_control_format();
+  static const int kControlFormatFieldNumber = 15;
+  inline const ::TSK::FormatStructArchive& control_format() const;
+  inline ::TSK::FormatStructArchive* mutable_control_format();
+  inline ::TSK::FormatStructArchive* release_control_format();
+  inline void set_allocated_control_format(::TSK::FormatStructArchive* control_format);
 
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
+  // optional .TSK.FormatStructArchive custom_format = 16;
+  inline bool has_custom_format() const;
+  inline void clear_custom_format();
+  static const int kCustomFormatFieldNumber = 16;
+  inline const ::TSK::FormatStructArchive& custom_format() const;
+  inline ::TSK::FormatStructArchive* mutable_custom_format();
+  inline ::TSK::FormatStructArchive* release_custom_format();
+  inline void set_allocated_custom_format(::TSK::FormatStructArchive* custom_format);
 
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
+  // optional .TSK.FormatStructArchive base_format = 17;
+  inline bool has_base_format() const;
+  inline void clear_base_format();
+  static const int kBaseFormatFieldNumber = 17;
+  inline const ::TSK::FormatStructArchive& base_format() const;
+  inline ::TSK::FormatStructArchive* mutable_base_format();
+  inline ::TSK::FormatStructArchive* release_base_format();
+  inline void set_allocated_base_format(::TSK::FormatStructArchive* base_format);
 
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& default_instance();
+  // optional .TSK.FormatStructArchive multiple_choice_list_format = 18;
+  inline bool has_multiple_choice_list_format() const;
+  inline void clear_multiple_choice_list_format();
+  static const int kMultipleChoiceListFormatFieldNumber = 18;
+  inline const ::TSK::FormatStructArchive& multiple_choice_list_format() const;
+  inline ::TSK::FormatStructArchive* mutable_multiple_choice_list_format();
+  inline ::TSK::FormatStructArchive* release_multiple_choice_list_format();
+  inline void set_allocated_multiple_choice_list_format(::TSK::FormatStructArchive* multiple_choice_list_format);
 
-  void Swap(DoubleStyleMapArchive_DoubleStyleMapEntryArchive* other);
+  // optional uint32 explicit_format_flags = 19;
+  inline bool has_explicit_format_flags() const;
+  inline void clear_explicit_format_flags();
+  static const int kExplicitFormatFlagsFieldNumber = 19;
+  inline ::google::protobuf::uint32 explicit_format_flags() const;
+  inline void set_explicit_format_flags(::google::protobuf::uint32 value);
+
+  // optional .TSP.Reference richTextPayload = 20;
+  inline bool has_richtextpayload() const;
+  inline void clear_richtextpayload();
+  static const int kRichTextPayloadFieldNumber = 20;
+  inline const ::TSP::Reference& richtextpayload() const;
+  inline ::TSP::Reference* mutable_richtextpayload();
+  inline ::TSP::Reference* release_richtextpayload();
+  inline void set_allocated_richtextpayload(::TSP::Reference* richtextpayload);
+
+  // optional .TSP.Reference conditional_style = 21;
+  inline bool has_conditional_style() const;
+  inline void clear_conditional_style();
+  static const int kConditionalStyleFieldNumber = 21;
+  inline const ::TSP::Reference& conditional_style() const;
+  inline ::TSP::Reference* mutable_conditional_style();
+  inline ::TSP::Reference* release_conditional_style();
+  inline void set_allocated_conditional_style(::TSP::Reference* conditional_style);
+
+  // optional .TSP.Reference multiple_choice_list = 22;
+  inline bool has_multiple_choice_list() const;
+  inline void clear_multiple_choice_list();
+  static const int kMultipleChoiceListFieldNumber = 22;
+  inline const ::TSP::Reference& multiple_choice_list() const;
+  inline ::TSP::Reference* mutable_multiple_choice_list();
+  inline ::TSP::Reference* release_multiple_choice_list();
+  inline void set_allocated_multiple_choice_list(::TSP::Reference* multiple_choice_list);
+
+  // optional .TSP.Reference comment_storage = 23;
+  inline bool has_comment_storage() const;
+  inline void clear_comment_storage();
+  static const int kCommentStorageFieldNumber = 23;
+  inline const ::TSP::Reference& comment_storage() const;
+  inline ::TSP::Reference* mutable_comment_storage();
+  inline ::TSP::Reference* release_comment_storage();
+  inline void set_allocated_comment_storage(::TSP::Reference* comment_storage);
+
+  // optional uint32 conditional_style_applied_rule = 24;
+  inline bool has_conditional_style_applied_rule() const;
+  inline void clear_conditional_style_applied_rule();
+  static const int kConditionalStyleAppliedRuleFieldNumber = 24;
+  inline ::google::protobuf::uint32 conditional_style_applied_rule() const;
+  inline void set_conditional_style_applied_rule(::google::protobuf::uint32 value);
+
+  // optional .TST.ImportWarningSetArchive import_warning_set = 25;
+  inline bool has_import_warning_set() const;
+  inline void clear_import_warning_set();
+  static const int kImportWarningSetFieldNumber = 25;
+  inline const ::TST::ImportWarningSetArchive& import_warning_set() const;
+  inline ::TST::ImportWarningSetArchive* mutable_import_warning_set();
+  inline ::TST::ImportWarningSetArchive* release_import_warning_set();
+  inline void set_allocated_import_warning_set(::TST::ImportWarningSetArchive* import_warning_set);
+
+  // @@protoc_insertion_point(class_scope:TST.Cell)
+ private:
+  inline void set_has_valuetype();
+  inline void clear_has_valuetype();
+  inline void set_has_numbervalue();
+  inline void clear_has_numbervalue();
+  inline void set_has_stringvalue();
+  inline void clear_has_stringvalue();
+  inline void set_has_boolvalue();
+  inline void clear_has_boolvalue();
+  inline void set_has_cell_style();
+  inline void clear_has_cell_style();
+  inline void set_has_text_style();
+  inline void clear_has_text_style();
+  inline void set_has_formula();
+  inline void clear_has_formula();
+  inline void set_has_formulaerror();
+  inline void clear_has_formulaerror();
+  inline void set_has_current_format();
+  inline void clear_has_current_format();
+  inline void set_has_number_format();
+  inline void clear_has_number_format();
+  inline void set_has_currency_format();
+  inline void clear_has_currency_format();
+  inline void set_has_duration_format();
+  inline void clear_has_duration_format();
+  inline void set_has_date_format();
+  inline void clear_has_date_format();
+  inline void set_has_control_format();
+  inline void clear_has_control_format();
+  inline void set_has_custom_format();
+  inline void clear_has_custom_format();
+  inline void set_has_base_format();
+  inline void clear_has_base_format();
+  inline void set_has_multiple_choice_list_format();
+  inline void clear_has_multiple_choice_list_format();
+  inline void set_has_explicit_format_flags();
+  inline void clear_has_explicit_format_flags();
+  inline void set_has_richtextpayload();
+  inline void clear_has_richtextpayload();
+  inline void set_has_conditional_style();
+  inline void clear_has_conditional_style();
+  inline void set_has_multiple_choice_list();
+  inline void clear_has_multiple_choice_list();
+  inline void set_has_comment_storage();
+  inline void clear_has_comment_storage();
+  inline void set_has_conditional_style_applied_rule();
+  inline void clear_has_conditional_style_applied_rule();
+  inline void set_has_import_warning_set();
+  inline void clear_has_import_warning_set();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  double numbervalue_;
+  int valuetype_;
+  bool boolvalue_;
+  ::std::string* stringvalue_;
+  ::TSP::Reference* cell_style_;
+  ::TSP::Reference* text_style_;
+  ::TSCE::FormulaArchive* formula_;
+  ::TSP::Reference* formulaerror_;
+  ::TSK::FormatStructArchive* current_format_;
+  ::TSK::FormatStructArchive* number_format_;
+  ::TSK::FormatStructArchive* currency_format_;
+  ::TSK::FormatStructArchive* duration_format_;
+  ::TSK::FormatStructArchive* date_format_;
+  ::TSK::FormatStructArchive* control_format_;
+  ::TSK::FormatStructArchive* custom_format_;
+  ::TSK::FormatStructArchive* base_format_;
+  ::TSK::FormatStructArchive* multiple_choice_list_format_;
+  ::TSP::Reference* richtextpayload_;
+  ::TSP::Reference* conditional_style_;
+  ::google::protobuf::uint32 explicit_format_flags_;
+  ::google::protobuf::uint32 conditional_style_applied_rule_;
+  ::TSP::Reference* multiple_choice_list_;
+  ::TSP::Reference* comment_storage_;
+  ::TST::ImportWarningSetArchive* import_warning_set_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(24 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static Cell* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class MergeRegionMapArchive : public ::google::protobuf::Message {
+ public:
+  MergeRegionMapArchive();
+  virtual ~MergeRegionMapArchive();
+
+  MergeRegionMapArchive(const MergeRegionMapArchive& from);
+
+  inline MergeRegionMapArchive& operator=(const MergeRegionMapArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const MergeRegionMapArchive& default_instance();
+
+  void Swap(MergeRegionMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  DoubleStyleMapArchive_DoubleStyleMapEntryArchive* New() const;
+  MergeRegionMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from);
-  void MergeFrom(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from);
+  void CopyFrom(const MergeRegionMapArchive& from);
+  void MergeFrom(const MergeRegionMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4518,68 +5039,45 @@ class DoubleStyleMapArchive_DoubleStyleMapEntryArchive : public ::google::protob
 
   // accessors -------------------------------------------------------
 
-  // required .TST.CellID cell_id = 1;
-  inline bool has_cell_id() const;
-  inline void clear_cell_id();
-  static const int kCellIdFieldNumber = 1;
-  inline const ::TST::CellID& cell_id() const;
-  inline ::TST::CellID* mutable_cell_id();
-  inline ::TST::CellID* release_cell_id();
-  inline void set_allocated_cell_id(::TST::CellID* cell_id);
-
-  // required .TSP.Reference old_style = 2;
-  inline bool has_old_style() const;
-  inline void clear_old_style();
-  static const int kOldStyleFieldNumber = 2;
-  inline const ::TSP::Reference& old_style() const;
-  inline ::TSP::Reference* mutable_old_style();
-  inline ::TSP::Reference* release_old_style();
-  inline void set_allocated_old_style(::TSP::Reference* old_style);
-
-  // required .TSP.Reference new_style = 3;
-  inline bool has_new_style() const;
-  inline void clear_new_style();
-  static const int kNewStyleFieldNumber = 3;
-  inline const ::TSP::Reference& new_style() const;
-  inline ::TSP::Reference* mutable_new_style();
-  inline ::TSP::Reference* release_new_style();
-  inline void set_allocated_new_style(::TSP::Reference* new_style);
+  // repeated .TST.CellRange cell_range = 1;
+  inline int cell_range_size() const;
+  inline void clear_cell_range();
+  static const int kCellRangeFieldNumber = 1;
+  inline const ::TST::CellRange& cell_range(int index) const;
+  inline ::TST::CellRange* mutable_cell_range(int index);
+  inline ::TST::CellRange* add_cell_range();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
+      cell_range() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
+      mutable_cell_range();
 
-  // @@protoc_insertion_point(class_scope:TST.DoubleStyleMapArchive.DoubleStyleMapEntryArchive)
+  // @@protoc_insertion_point(class_scope:TST.MergeRegionMapArchive)
  private:
-  inline void set_has_cell_id();
-  inline void clear_has_cell_id();
-  inline void set_has_old_style();
-  inline void clear_has_old_style();
-  inline void set_has_new_style();
-  inline void clear_has_new_style();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::CellID* cell_id_;
-  ::TSP::Reference* old_style_;
-  ::TSP::Reference* new_style_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > cell_range_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static DoubleStyleMapArchive_DoubleStyleMapEntryArchive* default_instance_;
+  static MergeRegionMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class DoubleStyleMapArchive : public ::google::protobuf::Message {
+class CellMapArchive_CellMapEntry : public ::google::protobuf::Message {
  public:
-  DoubleStyleMapArchive();
-  virtual ~DoubleStyleMapArchive();
+  CellMapArchive_CellMapEntry();
+  virtual ~CellMapArchive_CellMapEntry();
 
-  DoubleStyleMapArchive(const DoubleStyleMapArchive& from);
+  CellMapArchive_CellMapEntry(const CellMapArchive_CellMapEntry& from);
 
-  inline DoubleStyleMapArchive& operator=(const DoubleStyleMapArchive& from) {
+  inline CellMapArchive_CellMapEntry& operator=(const CellMapArchive_CellMapEntry& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4593,17 +5091,17 @@ class DoubleStyleMapArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const DoubleStyleMapArchive& default_instance();
+  static const CellMapArchive_CellMapEntry& default_instance();
 
-  void Swap(DoubleStyleMapArchive* other);
+  void Swap(CellMapArchive_CellMapEntry* other);
 
   // implements Message ----------------------------------------------
 
-  DoubleStyleMapArchive* New() const;
+  CellMapArchive_CellMapEntry* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const DoubleStyleMapArchive& from);
-  void MergeFrom(const DoubleStyleMapArchive& from);
+  void CopyFrom(const CellMapArchive_CellMapEntry& from);
+  void MergeFrom(const CellMapArchive_CellMapEntry& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4624,69 +5122,58 @@ class DoubleStyleMapArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef DoubleStyleMapArchive_DoubleStyleMapEntryArchive DoubleStyleMapEntryArchive;
-
   // accessors -------------------------------------------------------
 
-  // required uint32 capacity = 1;
-  inline bool has_capacity() const;
-  inline void clear_capacity();
-  static const int kCapacityFieldNumber = 1;
-  inline ::google::protobuf::uint32 capacity() const;
-  inline void set_capacity(::google::protobuf::uint32 value);
-
-  // required uint32 count = 2;
-  inline bool has_count() const;
-  inline void clear_count();
-  static const int kCountFieldNumber = 2;
-  inline ::google::protobuf::uint32 count() const;
-  inline void set_count(::google::protobuf::uint32 value);
+  // required .TST.CellID cellID = 1;
+  inline bool has_cellid() const;
+  inline void clear_cellid();
+  static const int kCellIDFieldNumber = 1;
+  inline const ::TST::CellID& cellid() const;
+  inline ::TST::CellID* mutable_cellid();
+  inline ::TST::CellID* release_cellid();
+  inline void set_allocated_cellid(::TST::CellID* cellid);
 
-  // repeated .TST.DoubleStyleMapArchive.DoubleStyleMapEntryArchive cell_map_entry = 3;
-  inline int cell_map_entry_size() const;
-  inline void clear_cell_map_entry();
-  static const int kCellMapEntryFieldNumber = 3;
-  inline const ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive& cell_map_entry(int index) const;
-  inline ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive* mutable_cell_map_entry(int index);
-  inline ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive* add_cell_map_entry();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive >&
-      cell_map_entry() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive >*
-      mutable_cell_map_entry();
+  // optional .TST.Cell cell = 2;
+  inline bool has_cell() const;
+  inline void clear_cell();
+  static const int kCellFieldNumber = 2;
+  inline const ::TST::Cell& cell() const;
+  inline ::TST::Cell* mutable_cell();
+  inline ::TST::Cell* release_cell();
+  inline void set_allocated_cell(::TST::Cell* cell);
 
-  // @@protoc_insertion_point(class_scope:TST.DoubleStyleMapArchive)
+  // @@protoc_insertion_point(class_scope:TST.CellMapArchive.CellMapEntry)
  private:
-  inline void set_has_capacity();
-  inline void clear_has_capacity();
-  inline void set_has_count();
-  inline void clear_has_count();
+  inline void set_has_cellid();
+  inline void clear_has_cellid();
+  inline void set_has_cell();
+  inline void clear_has_cell();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::uint32 capacity_;
-  ::google::protobuf::uint32 count_;
-  ::google::protobuf::RepeatedPtrField< ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive > cell_map_entry_;
+  ::TST::CellID* cellid_;
+  ::TST::Cell* cell_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static DoubleStyleMapArchive* default_instance_;
+  static CellMapArchive_CellMapEntry* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class StyleTableMapArchive_StyleTableMapEntryArchive : public ::google::protobuf::Message {
+class CellMapArchive : public ::google::protobuf::Message {
  public:
-  StyleTableMapArchive_StyleTableMapEntryArchive();
-  virtual ~StyleTableMapArchive_StyleTableMapEntryArchive();
+  CellMapArchive();
+  virtual ~CellMapArchive();
 
-  StyleTableMapArchive_StyleTableMapEntryArchive(const StyleTableMapArchive_StyleTableMapEntryArchive& from);
+  CellMapArchive(const CellMapArchive& from);
 
-  inline StyleTableMapArchive_StyleTableMapEntryArchive& operator=(const StyleTableMapArchive_StyleTableMapEntryArchive& from) {
+  inline CellMapArchive& operator=(const CellMapArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4700,17 +5187,17 @@ class StyleTableMapArchive_StyleTableMapEntryArchive : public ::google::protobuf
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const StyleTableMapArchive_StyleTableMapEntryArchive& default_instance();
+  static const CellMapArchive& default_instance();
 
-  void Swap(StyleTableMapArchive_StyleTableMapEntryArchive* other);
+  void Swap(CellMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  StyleTableMapArchive_StyleTableMapEntryArchive* New() const;
+  CellMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const StyleTableMapArchive_StyleTableMapEntryArchive& from);
-  void MergeFrom(const StyleTableMapArchive_StyleTableMapEntryArchive& from);
+  void CopyFrom(const CellMapArchive& from);
+  void MergeFrom(const CellMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4731,68 +5218,99 @@ class StyleTableMapArchive_StyleTableMapEntryArchive : public ::google::protobuf
 
   // nested types ----------------------------------------------------
 
+  typedef CellMapArchive_CellMapEntry CellMapEntry;
+
   // accessors -------------------------------------------------------
 
-  // required uint32 key = 1;
-  inline bool has_key() const;
-  inline void clear_key();
-  static const int kKeyFieldNumber = 1;
-  inline ::google::protobuf::uint32 key() const;
-  inline void set_key(::google::protobuf::uint32 value);
+  // required uint32 capacity = 1;
+  inline bool has_capacity() const;
+  inline void clear_capacity();
+  static const int kCapacityFieldNumber = 1;
+  inline ::google::protobuf::uint32 capacity() const;
+  inline void set_capacity(::google::protobuf::uint32 value);
 
-  // required .TSP.Reference old_style = 2;
-  inline bool has_old_style() const;
-  inline void clear_old_style();
-  static const int kOldStyleFieldNumber = 2;
-  inline const ::TSP::Reference& old_style() const;
-  inline ::TSP::Reference* mutable_old_style();
-  inline ::TSP::Reference* release_old_style();
-  inline void set_allocated_old_style(::TSP::Reference* old_style);
+  // required uint32 count = 2;
+  inline bool has_count() const;
+  inline void clear_count();
+  static const int kCountFieldNumber = 2;
+  inline ::google::protobuf::uint32 count() const;
+  inline void set_count(::google::protobuf::uint32 value);
 
-  // required .TSP.Reference new_style = 3;
-  inline bool has_new_style() const;
-  inline void clear_new_style();
-  static const int kNewStyleFieldNumber = 3;
-  inline const ::TSP::Reference& new_style() const;
-  inline ::TSP::Reference* mutable_new_style();
-  inline ::TSP::Reference* release_new_style();
-  inline void set_allocated_new_style(::TSP::Reference* new_style);
+  // repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
+  inline int cellmapentry_size() const;
+  inline void clear_cellmapentry();
+  static const int kCellMapEntryFieldNumber = 3;
+  inline const ::TST::CellMapArchive_CellMapEntry& cellmapentry(int index) const;
+  inline ::TST::CellMapArchive_CellMapEntry* mutable_cellmapentry(int index);
+  inline ::TST::CellMapArchive_CellMapEntry* add_cellmapentry();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >&
+      cellmapentry() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >*
+      mutable_cellmapentry();
 
-  // @@protoc_insertion_point(class_scope:TST.StyleTableMapArchive.StyleTableMapEntryArchive)
+  // optional bool may_modify_formulas_in_cells = 4 [default = true];
+  inline bool has_may_modify_formulas_in_cells() const;
+  inline void clear_may_modify_formulas_in_cells();
+  static const int kMayModifyFormulasInCellsFieldNumber = 4;
+  inline bool may_modify_formulas_in_cells() const;
+  inline void set_may_modify_formulas_in_cells(bool value);
+
+  // optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
+  inline bool has_may_modify_values_referenced_by_formulas() const;
+  inline void clear_may_modify_values_referenced_by_formulas();
+  static const int kMayModifyValuesReferencedByFormulasFieldNumber = 5;
+  inline bool may_modify_values_referenced_by_formulas() const;
+  inline void set_may_modify_values_referenced_by_formulas(bool value);
+
+  // optional bool applies_to_hidden = 6 [default = false];
+  inline bool has_applies_to_hidden() const;
+  inline void clear_applies_to_hidden();
+  static const int kAppliesToHiddenFieldNumber = 6;
+  inline bool applies_to_hidden() const;
+  inline void set_applies_to_hidden(bool value);
+
+  // @@protoc_insertion_point(class_scope:TST.CellMapArchive)
  private:
-  inline void set_has_key();
-  inline void clear_has_key();
-  inline void set_has_old_style();
-  inline void clear_has_old_style();
-  inline void set_has_new_style();
-  inline void clear_has_new_style();
+  inline void set_has_capacity();
+  inline void clear_has_capacity();
+  inline void set_has_count();
+  inline void clear_has_count();
+  inline void set_has_may_modify_formulas_in_cells();
+  inline void clear_has_may_modify_formulas_in_cells();
+  inline void set_has_may_modify_values_referenced_by_formulas();
+  inline void clear_has_may_modify_values_referenced_by_formulas();
+  inline void set_has_applies_to_hidden();
+  inline void clear_has_applies_to_hidden();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSP::Reference* old_style_;
-  ::TSP::Reference* new_style_;
-  ::google::protobuf::uint32 key_;
+  ::google::protobuf::uint32 capacity_;
+  ::google::protobuf::uint32 count_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry > cellmapentry_;
+  bool may_modify_formulas_in_cells_;
+  bool may_modify_values_referenced_by_formulas_;
+  bool applies_to_hidden_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static StyleTableMapArchive_StyleTableMapEntryArchive* default_instance_;
+  static CellMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class StyleTableMapArchive : public ::google::protobuf::Message {
+class CellMapTileArchive_CellMapEntry : public ::google::protobuf::Message {
  public:
-  StyleTableMapArchive();
-  virtual ~StyleTableMapArchive();
+  CellMapTileArchive_CellMapEntry();
+  virtual ~CellMapTileArchive_CellMapEntry();
 
-  StyleTableMapArchive(const StyleTableMapArchive& from);
+  CellMapTileArchive_CellMapEntry(const CellMapTileArchive_CellMapEntry& from);
 
-  inline StyleTableMapArchive& operator=(const StyleTableMapArchive& from) {
+  inline CellMapTileArchive_CellMapEntry& operator=(const CellMapTileArchive_CellMapEntry& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4806,17 +5324,17 @@ class StyleTableMapArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const StyleTableMapArchive& default_instance();
+  static const CellMapTileArchive_CellMapEntry& default_instance();
 
-  void Swap(StyleTableMapArchive* other);
+  void Swap(CellMapTileArchive_CellMapEntry* other);
 
   // implements Message ----------------------------------------------
 
-  StyleTableMapArchive* New() const;
+  CellMapTileArchive_CellMapEntry* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const StyleTableMapArchive& from);
-  void MergeFrom(const StyleTableMapArchive& from);
+  void CopyFrom(const CellMapTileArchive_CellMapEntry& from);
+  void MergeFrom(const CellMapTileArchive_CellMapEntry& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4837,69 +5355,58 @@ class StyleTableMapArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef StyleTableMapArchive_StyleTableMapEntryArchive StyleTableMapEntryArchive;
-
   // accessors -------------------------------------------------------
 
-  // required uint32 capacity = 1;
-  inline bool has_capacity() const;
-  inline void clear_capacity();
-  static const int kCapacityFieldNumber = 1;
-  inline ::google::protobuf::uint32 capacity() const;
-  inline void set_capacity(::google::protobuf::uint32 value);
-
-  // required uint32 count = 2;
-  inline bool has_count() const;
-  inline void clear_count();
-  static const int kCountFieldNumber = 2;
-  inline ::google::protobuf::uint32 count() const;
-  inline void set_count(::google::protobuf::uint32 value);
+  // required .TST.CellID cellID = 1;
+  inline bool has_cellid() const;
+  inline void clear_cellid();
+  static const int kCellIDFieldNumber = 1;
+  inline const ::TST::CellID& cellid() const;
+  inline ::TST::CellID* mutable_cellid();
+  inline ::TST::CellID* release_cellid();
+  inline void set_allocated_cellid(::TST::CellID* cellid);
 
-  // repeated .TST.StyleTableMapArchive.StyleTableMapEntryArchive map_entry = 3;
-  inline int map_entry_size() const;
-  inline void clear_map_entry();
-  static const int kMapEntryFieldNumber = 3;
-  inline const ::TST::StyleTableMapArchive_StyleTableMapEntryArchive& map_entry(int index) const;
-  inline ::TST::StyleTableMapArchive_StyleTableMapEntryArchive* mutable_map_entry(int index);
-  inline ::TST::StyleTableMapArchive_StyleTableMapEntryArchive* add_map_entry();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::StyleTableMapArchive_StyleTableMapEntryArchive >&
-      map_entry() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::StyleTableMapArchive_StyleTableMapEntryArchive >*
-      mutable_map_entry();
+  // optional .TST.Cell cell = 2;
+  inline bool has_cell() const;
+  inline void clear_cell();
+  static const int kCellFieldNumber = 2;
+  inline const ::TST::Cell& cell() const;
+  inline ::TST::Cell* mutable_cell();
+  inline ::TST::Cell* release_cell();
+  inline void set_allocated_cell(::TST::Cell* cell);
 
-  // @@protoc_insertion_point(class_scope:TST.StyleTableMapArchive)
+  // @@protoc_insertion_point(class_scope:TST.CellMapTileArchive.CellMapEntry)
  private:
-  inline void set_has_capacity();
-  inline void clear_has_capacity();
-  inline void set_has_count();
-  inline void clear_has_count();
+  inline void set_has_cellid();
+  inline void clear_has_cellid();
+  inline void set_has_cell();
+  inline void clear_has_cell();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::uint32 capacity_;
-  ::google::protobuf::uint32 count_;
-  ::google::protobuf::RepeatedPtrField< ::TST::StyleTableMapArchive_StyleTableMapEntryArchive > map_entry_;
+  ::TST::CellID* cellid_;
+  ::TST::Cell* cell_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static StyleTableMapArchive* default_instance_;
+  static CellMapTileArchive_CellMapEntry* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class SelectionArchive : public ::google::protobuf::Message {
+class CellMapTileArchive : public ::google::protobuf::Message {
  public:
-  SelectionArchive();
-  virtual ~SelectionArchive();
+  CellMapTileArchive();
+  virtual ~CellMapTileArchive();
 
-  SelectionArchive(const SelectionArchive& from);
+  CellMapTileArchive(const CellMapTileArchive& from);
 
-  inline SelectionArchive& operator=(const SelectionArchive& from) {
+  inline CellMapTileArchive& operator=(const CellMapTileArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4913,17 +5420,17 @@ class SelectionArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const SelectionArchive& default_instance();
+  static const CellMapTileArchive& default_instance();
 
-  void Swap(SelectionArchive* other);
+  void Swap(CellMapTileArchive* other);
 
   // implements Message ----------------------------------------------
 
-  SelectionArchive* New() const;
+  CellMapTileArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const SelectionArchive& from);
-  void MergeFrom(const SelectionArchive& from);
+  void CopyFrom(const CellMapTileArchive& from);
+  void MergeFrom(const CellMapTileArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4944,106 +5451,49 @@ class SelectionArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef CellMapTileArchive_CellMapEntry CellMapEntry;
+
   // accessors -------------------------------------------------------
 
-  // optional .TSP.Reference tableModel = 1 [deprecated = true];
-  inline bool has_tablemodel() const PROTOBUF_DEPRECATED;
-  inline void clear_tablemodel() PROTOBUF_DEPRECATED;
-  static const int kTableModelFieldNumber = 1;
-  inline const ::TSP::Reference& tablemodel() const PROTOBUF_DEPRECATED;
-  inline ::TSP::Reference* mutable_tablemodel() PROTOBUF_DEPRECATED;
-  inline ::TSP::Reference* release_tablemodel() PROTOBUF_DEPRECATED;
-  inline void set_allocated_tablemodel(::TSP::Reference* tablemodel) PROTOBUF_DEPRECATED;
-
-  // required .TST.SelectionTypeArchive selection_type = 4;
-  inline bool has_selection_type() const;
-  inline void clear_selection_type();
-  static const int kSelectionTypeFieldNumber = 4;
-  inline ::TST::SelectionTypeArchive selection_type() const;
-  inline void set_selection_type(::TST::SelectionTypeArchive value);
-
-  // optional .TST.CellID anchor_cell = 5;
-  inline bool has_anchor_cell() const;
-  inline void clear_anchor_cell();
-  static const int kAnchorCellFieldNumber = 5;
-  inline const ::TST::CellID& anchor_cell() const;
-  inline ::TST::CellID* mutable_anchor_cell();
-  inline ::TST::CellID* release_anchor_cell();
-  inline void set_allocated_anchor_cell(::TST::CellID* anchor_cell);
-
-  // repeated .TST.CellRange cell_ranges = 6;
-  inline int cell_ranges_size() const;
-  inline void clear_cell_ranges();
-  static const int kCellRangesFieldNumber = 6;
-  inline const ::TST::CellRange& cell_ranges(int index) const;
-  inline ::TST::CellRange* mutable_cell_ranges(int index);
-  inline ::TST::CellRange* add_cell_ranges();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
-      cell_ranges() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
-      mutable_cell_ranges();
-
-  // repeated .TST.CellRange base_ranges = 7;
-  inline int base_ranges_size() const;
-  inline void clear_base_ranges();
-  static const int kBaseRangesFieldNumber = 7;
-  inline const ::TST::CellRange& base_ranges(int index) const;
-  inline ::TST::CellRange* mutable_base_ranges(int index);
-  inline ::TST::CellRange* add_base_ranges();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
-      base_ranges() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
-      mutable_base_ranges();
-
-  // optional .TST.CellID cursor_cell = 8;
-  inline bool has_cursor_cell() const;
-  inline void clear_cursor_cell();
-  static const int kCursorCellFieldNumber = 8;
-  inline const ::TST::CellID& cursor_cell() const;
-  inline ::TST::CellID* mutable_cursor_cell();
-  inline ::TST::CellID* release_cursor_cell();
-  inline void set_allocated_cursor_cell(::TST::CellID* cursor_cell);
-
-  // @@protoc_insertion_point(class_scope:TST.SelectionArchive)
- private:
-  inline void set_has_tablemodel();
-  inline void clear_has_tablemodel();
-  inline void set_has_selection_type();
-  inline void clear_has_selection_type();
-  inline void set_has_anchor_cell();
-  inline void clear_has_anchor_cell();
-  inline void set_has_cursor_cell();
-  inline void clear_has_cursor_cell();
+  // repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+  inline int cellmap_entry_size() const;
+  inline void clear_cellmap_entry();
+  static const int kCellmapEntryFieldNumber = 2;
+  inline const ::TST::CellMapTileArchive_CellMapEntry& cellmap_entry(int index) const;
+  inline ::TST::CellMapTileArchive_CellMapEntry* mutable_cellmap_entry(int index);
+  inline ::TST::CellMapTileArchive_CellMapEntry* add_cellmap_entry();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellMapTileArchive_CellMapEntry >&
+      cellmap_entry() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellMapTileArchive_CellMapEntry >*
+      mutable_cellmap_entry();
+
+  // @@protoc_insertion_point(class_scope:TST.CellMapTileArchive)
+ private:
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSP::Reference* tablemodel_;
-  ::TST::CellID* anchor_cell_;
-  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > cell_ranges_;
-  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > base_ranges_;
-  ::TST::CellID* cursor_cell_;
-  int selection_type_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CellMapTileArchive_CellMapEntry > cellmap_entry_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static SelectionArchive* default_instance_;
+  static CellMapTileArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FilterRuleArchive : public ::google::protobuf::Message {
+class TiledCellMapArchive : public ::google::protobuf::Message {
  public:
-  FilterRuleArchive();
-  virtual ~FilterRuleArchive();
+  TiledCellMapArchive();
+  virtual ~TiledCellMapArchive();
 
-  FilterRuleArchive(const FilterRuleArchive& from);
+  TiledCellMapArchive(const TiledCellMapArchive& from);
 
-  inline FilterRuleArchive& operator=(const FilterRuleArchive& from) {
+  inline TiledCellMapArchive& operator=(const TiledCellMapArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5057,17 +5507,17 @@ class FilterRuleArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FilterRuleArchive& default_instance();
+  static const TiledCellMapArchive& default_instance();
 
-  void Swap(FilterRuleArchive* other);
+  void Swap(TiledCellMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FilterRuleArchive* New() const;
+  TiledCellMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FilterRuleArchive& from);
-  void MergeFrom(const FilterRuleArchive& from);
+  void CopyFrom(const TiledCellMapArchive& from);
+  void MergeFrom(const TiledCellMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5090,54 +5540,75 @@ class FilterRuleArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.FormulaPredicateArchive predicate = 1;
-  inline bool has_predicate() const;
-  inline void clear_predicate();
-  static const int kPredicateFieldNumber = 1;
-  inline const ::TST::FormulaPredicateArchive& predicate() const;
-  inline ::TST::FormulaPredicateArchive* mutable_predicate();
-  inline ::TST::FormulaPredicateArchive* release_predicate();
-  inline void set_allocated_predicate(::TST::FormulaPredicateArchive* predicate);
+  // repeated .TSP.Reference cellmap_tile = 1;
+  inline int cellmap_tile_size() const;
+  inline void clear_cellmap_tile();
+  static const int kCellmapTileFieldNumber = 1;
+  inline const ::TSP::Reference& cellmap_tile(int index) const;
+  inline ::TSP::Reference* mutable_cellmap_tile(int index);
+  inline ::TSP::Reference* add_cellmap_tile();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      cellmap_tile() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_cellmap_tile();
 
-  // optional bool disabled = 2;
-  inline bool has_disabled() const;
-  inline void clear_disabled();
-  static const int kDisabledFieldNumber = 2;
-  inline bool disabled() const;
-  inline void set_disabled(bool value);
+  // optional bool may_modify_formulas_in_cells = 2 [default = true];
+  inline bool has_may_modify_formulas_in_cells() const;
+  inline void clear_may_modify_formulas_in_cells();
+  static const int kMayModifyFormulasInCellsFieldNumber = 2;
+  inline bool may_modify_formulas_in_cells() const;
+  inline void set_may_modify_formulas_in_cells(bool value);
 
-  // @@protoc_insertion_point(class_scope:TST.FilterRuleArchive)
+  // optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+  inline bool has_may_modify_values_referenced_by_formulas() const;
+  inline void clear_may_modify_values_referenced_by_formulas();
+  static const int kMayModifyValuesReferencedByFormulasFieldNumber = 3;
+  inline bool may_modify_values_referenced_by_formulas() const;
+  inline void set_may_modify_values_referenced_by_formulas(bool value);
+
+  // optional bool applies_to_hidden = 4 [default = false];
+  inline bool has_applies_to_hidden() const;
+  inline void clear_applies_to_hidden();
+  static const int kAppliesToHiddenFieldNumber = 4;
+  inline bool applies_to_hidden() const;
+  inline void set_applies_to_hidden(bool value);
+
+  // @@protoc_insertion_point(class_scope:TST.TiledCellMapArchive)
  private:
-  inline void set_has_predicate();
-  inline void clear_has_predicate();
-  inline void set_has_disabled();
-  inline void clear_has_disabled();
+  inline void set_has_may_modify_formulas_in_cells();
+  inline void clear_has_may_modify_formulas_in_cells();
+  inline void set_has_may_modify_values_referenced_by_formulas();
+  inline void clear_has_may_modify_values_referenced_by_formulas();
+  inline void set_has_applies_to_hidden();
+  inline void clear_has_applies_to_hidden();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::FormulaPredicateArchive* predicate_;
-  bool disabled_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > cellmap_tile_;
+  bool may_modify_formulas_in_cells_;
+  bool may_modify_values_referenced_by_formulas_;
+  bool applies_to_hidden_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FilterRuleArchive* default_instance_;
+  static TiledCellMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class TableStyleArchive : public ::google::protobuf::Message {
+class PropertyMapEntryArchive : public ::google::protobuf::Message {
  public:
-  TableStyleArchive();
-  virtual ~TableStyleArchive();
+  PropertyMapEntryArchive();
+  virtual ~PropertyMapEntryArchive();
 
-  TableStyleArchive(const TableStyleArchive& from);
+  PropertyMapEntryArchive(const PropertyMapEntryArchive& from);
 
-  inline TableStyleArchive& operator=(const TableStyleArchive& from) {
+  inline PropertyMapEntryArchive& operator=(const PropertyMapEntryArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5151,17 +5622,17 @@ class TableStyleArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const TableStyleArchive& default_instance();
+  static const PropertyMapEntryArchive& default_instance();
 
-  void Swap(TableStyleArchive* other);
+  void Swap(PropertyMapEntryArchive* other);
 
   // implements Message ----------------------------------------------
 
-  TableStyleArchive* New() const;
+  PropertyMapEntryArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const TableStyleArchive& from);
-  void MergeFrom(const TableStyleArchive& from);
+  void CopyFrom(const PropertyMapEntryArchive& from);
+  void MergeFrom(const PropertyMapEntryArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5184,66 +5655,128 @@ class TableStyleArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSS.StyleArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSS::StyleArchive& super() const;
-  inline ::TSS::StyleArchive* mutable_super();
-  inline ::TSS::StyleArchive* release_super();
-  inline void set_allocated_super(::TSS::StyleArchive* super);
-
-  // optional uint32 override_count = 10 [default = 0];
-  inline bool has_override_count() const;
-  inline void clear_override_count();
-  static const int kOverrideCountFieldNumber = 10;
-  inline ::google::protobuf::uint32 override_count() const;
-  inline void set_override_count(::google::protobuf::uint32 value);
-
-  // optional .TST.TableStylePropertiesArchive table_properties = 11;
-  inline bool has_table_properties() const;
-  inline void clear_table_properties();
-  static const int kTablePropertiesFieldNumber = 11;
-  inline const ::TST::TableStylePropertiesArchive& table_properties() const;
-  inline ::TST::TableStylePropertiesArchive* mutable_table_properties();
-  inline ::TST::TableStylePropertiesArchive* release_table_properties();
-  inline void set_allocated_table_properties(::TST::TableStylePropertiesArchive* table_properties);
+  // required uint32 property = 1;
+  inline bool has_property() const;
+  inline void clear_property();
+  static const int kPropertyFieldNumber = 1;
+  inline ::google::protobuf::uint32 property() const;
+  inline void set_property(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TST.TableStyleArchive)
+  // required .TSS.ValueType valueType = 2;
+  inline bool has_valuetype() const;
+  inline void clear_valuetype();
+  static const int kValueTypeFieldNumber = 2;
+  inline ::TSS::ValueType valuetype() const;
+  inline void set_valuetype(::TSS::ValueType value);
+
+  // optional int32 int_value = 3;
+  inline bool has_int_value() const;
+  inline void clear_int_value();
+  static const int kIntValueFieldNumber = 3;
+  inline ::google::protobuf::int32 int_value() const;
+  inline void set_int_value(::google::protobuf::int32 value);
+
+  // optional float float_value = 4;
+  inline bool has_float_value() const;
+  inline void clear_float_value();
+  static const int kFloatValueFieldNumber = 4;
+  inline float float_value() const;
+  inline void set_float_value(float value);
+
+  // optional double double_value = 5;
+  inline bool has_double_value() const;
+  inline void clear_double_value();
+  static const int kDoubleValueFieldNumber = 5;
+  inline double double_value() const;
+  inline void set_double_value(double value);
+
+  // optional bool is_nsnull = 6 [default = false];
+  inline bool has_is_nsnull() const;
+  inline void clear_is_nsnull();
+  static const int kIsNsnullFieldNumber = 6;
+  inline bool is_nsnull() const;
+  inline void set_is_nsnull(bool value);
+
+  // optional .TSP.Reference tsp_reference = 7;
+  inline bool has_tsp_reference() const;
+  inline void clear_tsp_reference();
+  static const int kTspReferenceFieldNumber = 7;
+  inline const ::TSP::Reference& tsp_reference() const;
+  inline ::TSP::Reference* mutable_tsp_reference();
+  inline ::TSP::Reference* release_tsp_reference();
+  inline void set_allocated_tsp_reference(::TSP::Reference* tsp_reference);
+
+  // optional .TSD.FillArchive fill = 8;
+  inline bool has_fill() const;
+  inline void clear_fill();
+  static const int kFillFieldNumber = 8;
+  inline const ::TSD::FillArchive& fill() const;
+  inline ::TSD::FillArchive* mutable_fill();
+  inline ::TSD::FillArchive* release_fill();
+  inline void set_allocated_fill(::TSD::FillArchive* fill);
+
+  // optional .TST.ImportWarningSetArchive import_warning_set = 9;
+  inline bool has_import_warning_set() const;
+  inline void clear_import_warning_set();
+  static const int kImportWarningSetFieldNumber = 9;
+  inline const ::TST::ImportWarningSetArchive& import_warning_set() const;
+  inline ::TST::ImportWarningSetArchive* mutable_import_warning_set();
+  inline ::TST::ImportWarningSetArchive* release_import_warning_set();
+  inline void set_allocated_import_warning_set(::TST::ImportWarningSetArchive* import_warning_set);
+
+  // @@protoc_insertion_point(class_scope:TST.PropertyMapEntryArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_override_count();
-  inline void clear_has_override_count();
-  inline void set_has_table_properties();
-  inline void clear_has_table_properties();
+  inline void set_has_property();
+  inline void clear_has_property();
+  inline void set_has_valuetype();
+  inline void clear_has_valuetype();
+  inline void set_has_int_value();
+  inline void clear_has_int_value();
+  inline void set_has_float_value();
+  inline void clear_has_float_value();
+  inline void set_has_double_value();
+  inline void clear_has_double_value();
+  inline void set_has_is_nsnull();
+  inline void clear_has_is_nsnull();
+  inline void set_has_tsp_reference();
+  inline void clear_has_tsp_reference();
+  inline void set_has_fill();
+  inline void clear_has_fill();
+  inline void set_has_import_warning_set();
+  inline void clear_has_import_warning_set();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSS::StyleArchive* super_;
-  ::TST::TableStylePropertiesArchive* table_properties_;
-  ::google::protobuf::uint32 override_count_;
+  ::google::protobuf::uint32 property_;
+  int valuetype_;
+  ::google::protobuf::int32 int_value_;
+  float float_value_;
+  double double_value_;
+  ::TSP::Reference* tsp_reference_;
+  ::TSD::FillArchive* fill_;
+  ::TST::ImportWarningSetArchive* import_warning_set_;
+  bool is_nsnull_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(9 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static TableStyleArchive* default_instance_;
+  static PropertyMapEntryArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CellStyleArchive : public ::google::protobuf::Message {
+class CellDiffArchive : public ::google::protobuf::Message {
  public:
-  CellStyleArchive();
-  virtual ~CellStyleArchive();
+  CellDiffArchive();
+  virtual ~CellDiffArchive();
 
-  CellStyleArchive(const CellStyleArchive& from);
+  CellDiffArchive(const CellDiffArchive& from);
 
-  inline CellStyleArchive& operator=(const CellStyleArchive& from) {
+  inline CellDiffArchive& operator=(const CellDiffArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5257,17 +5790,17 @@ class CellStyleArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CellStyleArchive& default_instance();
+  static const CellDiffArchive& default_instance();
 
-  void Swap(CellStyleArchive* other);
+  void Swap(CellDiffArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CellStyleArchive* New() const;
+  CellDiffArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CellStyleArchive& from);
-  void MergeFrom(const CellStyleArchive& from);
+  void CopyFrom(const CellDiffArchive& from);
+  void MergeFrom(const CellDiffArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5290,66 +5823,58 @@ class CellStyleArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSS.StyleArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSS::StyleArchive& super() const;
-  inline ::TSS::StyleArchive* mutable_super();
-  inline ::TSS::StyleArchive* release_super();
-  inline void set_allocated_super(::TSS::StyleArchive* super);
-
-  // optional uint32 override_count = 10 [default = 0];
-  inline bool has_override_count() const;
-  inline void clear_override_count();
-  static const int kOverrideCountFieldNumber = 10;
-  inline ::google::protobuf::uint32 override_count() const;
-  inline void set_override_count(::google::protobuf::uint32 value);
-
-  // optional .TST.CellStylePropertiesArchive cell_properties = 11;
-  inline bool has_cell_properties() const;
-  inline void clear_cell_properties();
-  static const int kCellPropertiesFieldNumber = 11;
-  inline const ::TST::CellStylePropertiesArchive& cell_properties() const;
-  inline ::TST::CellStylePropertiesArchive* mutable_cell_properties();
-  inline ::TST::CellStylePropertiesArchive* release_cell_properties();
-  inline void set_allocated_cell_properties(::TST::CellStylePropertiesArchive* cell_properties);
-
-  // @@protoc_insertion_point(class_scope:TST.CellStyleArchive)
+  // repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
+  inline int property_map_to_set_size() const;
+  inline void clear_property_map_to_set();
+  static const int kPropertyMapToSetFieldNumber = 1;
+  inline const ::TST::PropertyMapEntryArchive& property_map_to_set(int index) const;
+  inline ::TST::PropertyMapEntryArchive* mutable_property_map_to_set(int index);
+  inline ::TST::PropertyMapEntryArchive* add_property_map_to_set();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >&
+      property_map_to_set() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >*
+      mutable_property_map_to_set();
+
+  // repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
+  inline int property_map_to_reset_size() const;
+  inline void clear_property_map_to_reset();
+  static const int kPropertyMapToResetFieldNumber = 2;
+  inline const ::TST::PropertyMapEntryArchive& property_map_to_reset(int index) const;
+  inline ::TST::PropertyMapEntryArchive* mutable_property_map_to_reset(int index);
+  inline ::TST::PropertyMapEntryArchive* add_property_map_to_reset();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >&
+      property_map_to_reset() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >*
+      mutable_property_map_to_reset();
+
+  // @@protoc_insertion_point(class_scope:TST.CellDiffArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_override_count();
-  inline void clear_has_override_count();
-  inline void set_has_cell_properties();
-  inline void clear_has_cell_properties();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSS::StyleArchive* super_;
-  ::TST::CellStylePropertiesArchive* cell_properties_;
-  ::google::protobuf::uint32 override_count_;
+  ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive > property_map_to_set_;
+  ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive > property_map_to_reset_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CellStyleArchive* default_instance_;
+  static CellDiffArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FormulaPredicateArchive : public ::google::protobuf::Message {
+class CellDiffMapArchive : public ::google::protobuf::Message {
  public:
-  FormulaPredicateArchive();
-  virtual ~FormulaPredicateArchive();
+  CellDiffMapArchive();
+  virtual ~CellDiffMapArchive();
 
-  FormulaPredicateArchive(const FormulaPredicateArchive& from);
+  CellDiffMapArchive(const CellDiffMapArchive& from);
 
-  inline FormulaPredicateArchive& operator=(const FormulaPredicateArchive& from) {
+  inline CellDiffMapArchive& operator=(const CellDiffMapArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5363,17 +5888,17 @@ class FormulaPredicateArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FormulaPredicateArchive& default_instance();
+  static const CellDiffMapArchive& default_instance();
 
-  void Swap(FormulaPredicateArchive* other);
+  void Swap(CellDiffMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FormulaPredicateArchive* New() const;
+  CellDiffMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FormulaPredicateArchive& from);
-  void MergeFrom(const FormulaPredicateArchive& from);
+  void CopyFrom(const CellDiffMapArchive& from);
+  void MergeFrom(const CellDiffMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5394,210 +5919,60 @@ class FormulaPredicateArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef FormulaPredicateArchive_FormulaPredicateType FormulaPredicateType;
-  static const FormulaPredicateType PredNone = FormulaPredicateArchive_FormulaPredicateType_PredNone;
-  static const FormulaPredicateType TextStartsWith = FormulaPredicateArchive_FormulaPredicateType_TextStartsWith;
-  static const FormulaPredicateType TextEndsWith = FormulaPredicateArchive_FormulaPredicateType_TextEndsWith;
-  static const FormulaPredicateType TextContains = FormulaPredicateArchive_FormulaPredicateType_TextContains;
-  static const FormulaPredicateType TextDoesNotContain = FormulaPredicateArchive_FormulaPredicateType_TextDoesNotContain;
-  static const FormulaPredicateType ValueEqual = FormulaPredicateArchive_FormulaPredicateType_ValueEqual;
-  static const FormulaPredicateType ValueNotEqual = FormulaPredicateArchive_FormulaPredicateType_ValueNotEqual;
-  static const FormulaPredicateType ValueGreaterThan = FormulaPredicateArchive_FormulaPredicateType_ValueGreaterThan;
-  static const FormulaPredicateType ValueGreaterThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_ValueGreaterThanOrEqual;
-  static const FormulaPredicateType ValueLessThan = FormulaPredicateArchive_FormulaPredicateType_ValueLessThan;
-  static const FormulaPredicateType ValueLessThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_ValueLessThanOrEqual;
-  static const FormulaPredicateType ValueAboveAverage = FormulaPredicateArchive_FormulaPredicateType_ValueAboveAverage;
-  static const FormulaPredicateType ValueBelowAverage = FormulaPredicateArchive_FormulaPredicateType_ValueBelowAverage;
-  static const FormulaPredicateType ValueBetween = FormulaPredicateArchive_FormulaPredicateType_ValueBetween;
-  static const FormulaPredicateType Formula = FormulaPredicateArchive_FormulaPredicateType_Formula;
-  static const FormulaPredicateType Duplicates = FormulaPredicateArchive_FormulaPredicateType_Duplicates;
-  static const FormulaPredicateType Uniques = FormulaPredicateArchive_FormulaPredicateType_Uniques;
-  static const FormulaPredicateType DateIsToday = FormulaPredicateArchive_FormulaPredicateType_DateIsToday;
-  static const FormulaPredicateType DateIsYesterday = FormulaPredicateArchive_FormulaPredicateType_DateIsYesterday;
-  static const FormulaPredicateType DateIsTomorrow = FormulaPredicateArchive_FormulaPredicateType_DateIsTomorrow;
-  static const FormulaPredicateType DateIsTheDate = FormulaPredicateArchive_FormulaPredicateType_DateIsTheDate;
-  static const FormulaPredicateType DateBeforeTheDate = FormulaPredicateArchive_FormulaPredicateType_DateBeforeTheDate;
-  static const FormulaPredicateType DateAfterTheDate = FormulaPredicateArchive_FormulaPredicateType_DateAfterTheDate;
-  static const FormulaPredicateType DateIsInTheRange = FormulaPredicateArchive_FormulaPredicateType_DateIsInTheRange;
-  static const FormulaPredicateType DateInTheNext = FormulaPredicateArchive_FormulaPredicateType_DateInTheNext;
-  static const FormulaPredicateType DateInTheLast = FormulaPredicateArchive_FormulaPredicateType_DateInTheLast;
-  static const FormulaPredicateType DateIsExactly = FormulaPredicateArchive_FormulaPredicateType_DateIsExactly;
-  static const FormulaPredicateType DateBeforeRelative = FormulaPredicateArchive_FormulaPredicateType_DateBeforeRelative;
-  static const FormulaPredicateType DateAfterRelative = FormulaPredicateArchive_FormulaPredicateType_DateAfterRelative;
-  static const FormulaPredicateType DateBetweenRelative = FormulaPredicateArchive_FormulaPredicateType_DateBetweenRelative;
-  static const FormulaPredicateType ValueTop = FormulaPredicateArchive_FormulaPredicateType_ValueTop;
-  static const FormulaPredicateType ValueBottom = FormulaPredicateArchive_FormulaPredicateType_ValueBottom;
-  static const FormulaPredicateType ValueNotBetween = FormulaPredicateArchive_FormulaPredicateType_ValueNotBetween;
-  static const FormulaPredicateType DateInThis = FormulaPredicateArchive_FormulaPredicateType_DateInThis;
-  static const FormulaPredicateType IsBlank = FormulaPredicateArchive_FormulaPredicateType_IsBlank;
-  static const FormulaPredicateType IsNotBlank = FormulaPredicateArchive_FormulaPredicateType_IsNotBlank;
-  static const FormulaPredicateType TextIs = FormulaPredicateArchive_FormulaPredicateType_TextIs;
-  static const FormulaPredicateType TextIsNot = FormulaPredicateArchive_FormulaPredicateType_TextIsNot;
-  static const FormulaPredicateType DurationEqual = FormulaPredicateArchive_FormulaPredicateType_DurationEqual;
-  static const FormulaPredicateType DurationNotEqual = FormulaPredicateArchive_FormulaPredicateType_DurationNotEqual;
-  static const FormulaPredicateType DurationGreaterThan = FormulaPredicateArchive_FormulaPredicateType_DurationGreaterThan;
-  static const FormulaPredicateType DurationGreaterThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_DurationGreaterThanOrEqual;
-  static const FormulaPredicateType DurationLessThan = FormulaPredicateArchive_FormulaPredicateType_DurationLessThan;
-  static const FormulaPredicateType DurationLessThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_DurationLessThanOrEqual;
-  static const FormulaPredicateType DurationBetween = FormulaPredicateArchive_FormulaPredicateType_DurationBetween;
-  static const FormulaPredicateType DurationNotBetween = FormulaPredicateArchive_FormulaPredicateType_DurationNotBetween;
-  static const FormulaPredicateType DurationAboveAverage = FormulaPredicateArchive_FormulaPredicateType_DurationAboveAverage;
-  static const FormulaPredicateType DurationBelowAverage = FormulaPredicateArchive_FormulaPredicateType_DurationBelowAverage;
-  static const FormulaPredicateType DurationTop = FormulaPredicateArchive_FormulaPredicateType_DurationTop;
-  static const FormulaPredicateType DurationBottom = FormulaPredicateArchive_FormulaPredicateType_DurationBottom;
-  static inline bool FormulaPredicateType_IsValid(int value) {
-    return FormulaPredicateArchive_FormulaPredicateType_IsValid(value);
-  }
-  static const FormulaPredicateType FormulaPredicateType_MIN =
-    FormulaPredicateArchive_FormulaPredicateType_FormulaPredicateType_MIN;
-  static const FormulaPredicateType FormulaPredicateType_MAX =
-    FormulaPredicateArchive_FormulaPredicateType_FormulaPredicateType_MAX;
-  static const int FormulaPredicateType_ARRAYSIZE =
-    FormulaPredicateArchive_FormulaPredicateType_FormulaPredicateType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  FormulaPredicateType_descriptor() {
-    return FormulaPredicateArchive_FormulaPredicateType_descriptor();
-  }
-  static inline const ::std::string& FormulaPredicateType_Name(FormulaPredicateType value) {
-    return FormulaPredicateArchive_FormulaPredicateType_Name(value);
-  }
-  static inline bool FormulaPredicateType_Parse(const ::std::string& name,
-      FormulaPredicateType* value) {
-    return FormulaPredicateArchive_FormulaPredicateType_Parse(name, value);
-  }
-
-  typedef FormulaPredicateArchive_QualifierType QualifierType;
-  static const QualifierType QualNone = FormulaPredicateArchive_QualifierType_QualNone;
-  static const QualifierType Days = FormulaPredicateArchive_QualifierType_Days;
-  static const QualifierType Weeks = FormulaPredicateArchive_QualifierType_Weeks;
-  static const QualifierType Months = FormulaPredicateArchive_QualifierType_Months;
-  static const QualifierType Years = FormulaPredicateArchive_QualifierType_Years;
-  static const QualifierType Ago = FormulaPredicateArchive_QualifierType_Ago;
-  static const QualifierType FromNow = FormulaPredicateArchive_QualifierType_FromNow;
-  static const QualifierType Quarters = FormulaPredicateArchive_QualifierType_Quarters;
-  static const QualifierType Percent = FormulaPredicateArchive_QualifierType_Percent;
-  static const QualifierType Values = FormulaPredicateArchive_QualifierType_Values;
-  static inline bool QualifierType_IsValid(int value) {
-    return FormulaPredicateArchive_QualifierType_IsValid(value);
-  }
-  static const QualifierType QualifierType_MIN =
-    FormulaPredicateArchive_QualifierType_QualifierType_MIN;
-  static const QualifierType QualifierType_MAX =
-    FormulaPredicateArchive_QualifierType_QualifierType_MAX;
-  static const int QualifierType_ARRAYSIZE =
-    FormulaPredicateArchive_QualifierType_QualifierType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  QualifierType_descriptor() {
-    return FormulaPredicateArchive_QualifierType_descriptor();
-  }
-  static inline const ::std::string& QualifierType_Name(QualifierType value) {
-    return FormulaPredicateArchive_QualifierType_Name(value);
-  }
-  static inline bool QualifierType_Parse(const ::std::string& name,
-      QualifierType* value) {
-    return FormulaPredicateArchive_QualifierType_Parse(name, value);
-  }
-
   // accessors -------------------------------------------------------
 
-  // required .TSCE.FormulaArchive formula = 1;
-  inline bool has_formula() const;
-  inline void clear_formula();
-  static const int kFormulaFieldNumber = 1;
-  inline const ::TSCE::FormulaArchive& formula() const;
-  inline ::TSCE::FormulaArchive* mutable_formula();
-  inline ::TSCE::FormulaArchive* release_formula();
-  inline void set_allocated_formula(::TSCE::FormulaArchive* formula);
-
-  // required .TST.FormulaPredicateArchive.FormulaPredicateType predicate_type = 2;
-  inline bool has_predicate_type() const;
-  inline void clear_predicate_type();
-  static const int kPredicateTypeFieldNumber = 2;
-  inline ::TST::FormulaPredicateArchive_FormulaPredicateType predicate_type() const;
-  inline void set_predicate_type(::TST::FormulaPredicateArchive_FormulaPredicateType value);
-
-  // required .TST.FormulaPredicateArchive.QualifierType qualifier1 = 3;
-  inline bool has_qualifier1() const;
-  inline void clear_qualifier1();
-  static const int kQualifier1FieldNumber = 3;
-  inline ::TST::FormulaPredicateArchive_QualifierType qualifier1() const;
-  inline void set_qualifier1(::TST::FormulaPredicateArchive_QualifierType value);
-
-  // required .TST.FormulaPredicateArchive.QualifierType qualifier2 = 4;
-  inline bool has_qualifier2() const;
-  inline void clear_qualifier2();
-  static const int kQualifier2FieldNumber = 4;
-  inline ::TST::FormulaPredicateArchive_QualifierType qualifier2() const;
-  inline void set_qualifier2(::TST::FormulaPredicateArchive_QualifierType value);
-
-  // required int32 param_index1 = 5;
-  inline bool has_param_index1() const;
-  inline void clear_param_index1();
-  static const int kParamIndex1FieldNumber = 5;
-  inline ::google::protobuf::int32 param_index1() const;
-  inline void set_param_index1(::google::protobuf::int32 value);
-
-  // required int32 param_index2 = 6;
-  inline bool has_param_index2() const;
-  inline void clear_param_index2();
-  static const int kParamIndex2FieldNumber = 6;
-  inline ::google::protobuf::int32 param_index2() const;
-  inline void set_param_index2(::google::protobuf::int32 value);
-
-  // required int32 param_index0 = 7;
-  inline bool has_param_index0() const;
-  inline void clear_param_index0();
-  static const int kParamIndex0FieldNumber = 7;
-  inline ::google::protobuf::int32 param_index0() const;
-  inline void set_param_index0(::google::protobuf::int32 value);
+  // repeated .TST.CellID cell_ids = 1;
+  inline int cell_ids_size() const;
+  inline void clear_cell_ids();
+  static const int kCellIdsFieldNumber = 1;
+  inline const ::TST::CellID& cell_ids(int index) const;
+  inline ::TST::CellID* mutable_cell_ids(int index);
+  inline ::TST::CellID* add_cell_ids();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellID >&
+      cell_ids() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellID >*
+      mutable_cell_ids();
+
+  // repeated .TSP.Reference cell_diffs = 2;
+  inline int cell_diffs_size() const;
+  inline void clear_cell_diffs();
+  static const int kCellDiffsFieldNumber = 2;
+  inline const ::TSP::Reference& cell_diffs(int index) const;
+  inline ::TSP::Reference* mutable_cell_diffs(int index);
+  inline ::TSP::Reference* add_cell_diffs();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      cell_diffs() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_cell_diffs();
 
-  // @@protoc_insertion_point(class_scope:TST.FormulaPredicateArchive)
+  // @@protoc_insertion_point(class_scope:TST.CellDiffMapArchive)
  private:
-  inline void set_has_formula();
-  inline void clear_has_formula();
-  inline void set_has_predicate_type();
-  inline void clear_has_predicate_type();
-  inline void set_has_qualifier1();
-  inline void clear_has_qualifier1();
-  inline void set_has_qualifier2();
-  inline void clear_has_qualifier2();
-  inline void set_has_param_index1();
-  inline void clear_has_param_index1();
-  inline void set_has_param_index2();
-  inline void clear_has_param_index2();
-  inline void set_has_param_index0();
-  inline void clear_has_param_index0();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCE::FormulaArchive* formula_;
-  int predicate_type_;
-  int qualifier1_;
-  int qualifier2_;
-  ::google::protobuf::int32 param_index1_;
-  ::google::protobuf::int32 param_index2_;
-  ::google::protobuf::int32 param_index0_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CellID > cell_ids_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > cell_diffs_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FormulaPredicateArchive* default_instance_;
+  static CellDiffMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ConditionalStyleSetArchive_ConditionalStyleRule : public ::google::protobuf::Message {
+class DoubleStyleMapArchive_DoubleStyleMapEntryArchive : public ::google::protobuf::Message {
  public:
-  ConditionalStyleSetArchive_ConditionalStyleRule();
-  virtual ~ConditionalStyleSetArchive_ConditionalStyleRule();
+  DoubleStyleMapArchive_DoubleStyleMapEntryArchive();
+  virtual ~DoubleStyleMapArchive_DoubleStyleMapEntryArchive();
 
-  ConditionalStyleSetArchive_ConditionalStyleRule(const ConditionalStyleSetArchive_ConditionalStyleRule& from);
+  DoubleStyleMapArchive_DoubleStyleMapEntryArchive(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from);
 
-  inline ConditionalStyleSetArchive_ConditionalStyleRule& operator=(const ConditionalStyleSetArchive_ConditionalStyleRule& from) {
+  inline DoubleStyleMapArchive_DoubleStyleMapEntryArchive& operator=(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5611,17 +5986,17 @@ class ConditionalStyleSetArchive_ConditionalStyleRule : public ::google::protobu
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ConditionalStyleSetArchive_ConditionalStyleRule& default_instance();
+  static const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& default_instance();
 
-  void Swap(ConditionalStyleSetArchive_ConditionalStyleRule* other);
+  void Swap(DoubleStyleMapArchive_DoubleStyleMapEntryArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ConditionalStyleSetArchive_ConditionalStyleRule* New() const;
+  DoubleStyleMapArchive_DoubleStyleMapEntryArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ConditionalStyleSetArchive_ConditionalStyleRule& from);
-  void MergeFrom(const ConditionalStyleSetArchive_ConditionalStyleRule& from);
+  void CopyFrom(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from);
+  void MergeFrom(const DoubleStyleMapArchive_DoubleStyleMapEntryArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5644,47 +6019,47 @@ class ConditionalStyleSetArchive_ConditionalStyleRule : public ::google::protobu
 
   // accessors -------------------------------------------------------
 
-  // required .TST.FormulaPredicateArchive predicate = 1;
-  inline bool has_predicate() const;
-  inline void clear_predicate();
-  static const int kPredicateFieldNumber = 1;
-  inline const ::TST::FormulaPredicateArchive& predicate() const;
-  inline ::TST::FormulaPredicateArchive* mutable_predicate();
-  inline ::TST::FormulaPredicateArchive* release_predicate();
-  inline void set_allocated_predicate(::TST::FormulaPredicateArchive* predicate);
+  // required .TST.CellID cell_id = 1;
+  inline bool has_cell_id() const;
+  inline void clear_cell_id();
+  static const int kCellIdFieldNumber = 1;
+  inline const ::TST::CellID& cell_id() const;
+  inline ::TST::CellID* mutable_cell_id();
+  inline ::TST::CellID* release_cell_id();
+  inline void set_allocated_cell_id(::TST::CellID* cell_id);
 
-  // required .TSP.Reference cell_style = 2;
-  inline bool has_cell_style() const;
-  inline void clear_cell_style();
-  static const int kCellStyleFieldNumber = 2;
-  inline const ::TSP::Reference& cell_style() const;
-  inline ::TSP::Reference* mutable_cell_style();
-  inline ::TSP::Reference* release_cell_style();
-  inline void set_allocated_cell_style(::TSP::Reference* cell_style);
+  // required .TSP.Reference old_style = 2;
+  inline bool has_old_style() const;
+  inline void clear_old_style();
+  static const int kOldStyleFieldNumber = 2;
+  inline const ::TSP::Reference& old_style() const;
+  inline ::TSP::Reference* mutable_old_style();
+  inline ::TSP::Reference* release_old_style();
+  inline void set_allocated_old_style(::TSP::Reference* old_style);
 
-  // required .TSP.Reference text_style = 3;
-  inline bool has_text_style() const;
-  inline void clear_text_style();
-  static const int kTextStyleFieldNumber = 3;
-  inline const ::TSP::Reference& text_style() const;
-  inline ::TSP::Reference* mutable_text_style();
-  inline ::TSP::Reference* release_text_style();
-  inline void set_allocated_text_style(::TSP::Reference* text_style);
+  // required .TSP.Reference new_style = 3;
+  inline bool has_new_style() const;
+  inline void clear_new_style();
+  static const int kNewStyleFieldNumber = 3;
+  inline const ::TSP::Reference& new_style() const;
+  inline ::TSP::Reference* mutable_new_style();
+  inline ::TSP::Reference* release_new_style();
+  inline void set_allocated_new_style(::TSP::Reference* new_style);
 
-  // @@protoc_insertion_point(class_scope:TST.ConditionalStyleSetArchive.ConditionalStyleRule)
+  // @@protoc_insertion_point(class_scope:TST.DoubleStyleMapArchive.DoubleStyleMapEntryArchive)
  private:
-  inline void set_has_predicate();
-  inline void clear_has_predicate();
-  inline void set_has_cell_style();
-  inline void clear_has_cell_style();
-  inline void set_has_text_style();
-  inline void clear_has_text_style();
+  inline void set_has_cell_id();
+  inline void clear_has_cell_id();
+  inline void set_has_old_style();
+  inline void clear_has_old_style();
+  inline void set_has_new_style();
+  inline void clear_has_new_style();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::FormulaPredicateArchive* predicate_;
-  ::TSP::Reference* cell_style_;
-  ::TSP::Reference* text_style_;
+  ::TST::CellID* cell_id_;
+  ::TSP::Reference* old_style_;
+  ::TSP::Reference* new_style_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -5694,18 +6069,18 @@ class ConditionalStyleSetArchive_ConditionalStyleRule : public ::google::protobu
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ConditionalStyleSetArchive_ConditionalStyleRule* default_instance_;
+  static DoubleStyleMapArchive_DoubleStyleMapEntryArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ConditionalStyleSetArchive : public ::google::protobuf::Message {
+class DoubleStyleMapArchive : public ::google::protobuf::Message {
  public:
-  ConditionalStyleSetArchive();
-  virtual ~ConditionalStyleSetArchive();
-
-  ConditionalStyleSetArchive(const ConditionalStyleSetArchive& from);
+  DoubleStyleMapArchive();
+  virtual ~DoubleStyleMapArchive();
 
-  inline ConditionalStyleSetArchive& operator=(const ConditionalStyleSetArchive& from) {
+  DoubleStyleMapArchive(const DoubleStyleMapArchive& from);
+
+  inline DoubleStyleMapArchive& operator=(const DoubleStyleMapArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5719,17 +6094,17 @@ class ConditionalStyleSetArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ConditionalStyleSetArchive& default_instance();
+  static const DoubleStyleMapArchive& default_instance();
 
-  void Swap(ConditionalStyleSetArchive* other);
+  void Swap(DoubleStyleMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ConditionalStyleSetArchive* New() const;
+  DoubleStyleMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ConditionalStyleSetArchive& from);
-  void MergeFrom(const ConditionalStyleSetArchive& from);
+  void CopyFrom(const DoubleStyleMapArchive& from);
+  void MergeFrom(const DoubleStyleMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5750,50 +6125,48 @@ class ConditionalStyleSetArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef ConditionalStyleSetArchive_ConditionalStyleRule ConditionalStyleRule;
+  typedef DoubleStyleMapArchive_DoubleStyleMapEntryArchive DoubleStyleMapEntryArchive;
 
   // accessors -------------------------------------------------------
 
-  // required uint32 ruleCount = 1;
-  inline bool has_rulecount() const;
-  inline void clear_rulecount();
-  static const int kRuleCountFieldNumber = 1;
-  inline ::google::protobuf::uint32 rulecount() const;
-  inline void set_rulecount(::google::protobuf::uint32 value);
+  // required uint32 capacity = 1;
+  inline bool has_capacity() const;
+  inline void clear_capacity();
+  static const int kCapacityFieldNumber = 1;
+  inline ::google::protobuf::uint32 capacity() const;
+  inline void set_capacity(::google::protobuf::uint32 value);
 
-  // repeated .TST.ConditionalStyleSetArchive.ConditionalStyleRule rules = 2;
-  inline int rules_size() const;
-  inline void clear_rules();
-  static const int kRulesFieldNumber = 2;
-  inline const ::TST::ConditionalStyleSetArchive_ConditionalStyleRule& rules(int index) const;
-  inline ::TST::ConditionalStyleSetArchive_ConditionalStyleRule* mutable_rules(int index);
-  inline ::TST::ConditionalStyleSetArchive_ConditionalStyleRule* add_rules();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::ConditionalStyleSetArchive_ConditionalStyleRule >&
-      rules() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::ConditionalStyleSetArchive_ConditionalStyleRule >*
-      mutable_rules();
+  // required uint32 count = 2;
+  inline bool has_count() const;
+  inline void clear_count();
+  static const int kCountFieldNumber = 2;
+  inline ::google::protobuf::uint32 count() const;
+  inline void set_count(::google::protobuf::uint32 value);
 
-  // optional .TST.CellID cellID = 3;
-  inline bool has_cellid() const;
-  inline void clear_cellid();
-  static const int kCellIDFieldNumber = 3;
-  inline const ::TST::CellID& cellid() const;
-  inline ::TST::CellID* mutable_cellid();
-  inline ::TST::CellID* release_cellid();
-  inline void set_allocated_cellid(::TST::CellID* cellid);
+  // repeated .TST.DoubleStyleMapArchive.DoubleStyleMapEntryArchive cell_map_entry = 3;
+  inline int cell_map_entry_size() const;
+  inline void clear_cell_map_entry();
+  static const int kCellMapEntryFieldNumber = 3;
+  inline const ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive& cell_map_entry(int index) const;
+  inline ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive* mutable_cell_map_entry(int index);
+  inline ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive* add_cell_map_entry();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive >&
+      cell_map_entry() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive >*
+      mutable_cell_map_entry();
 
-  // @@protoc_insertion_point(class_scope:TST.ConditionalStyleSetArchive)
+  // @@protoc_insertion_point(class_scope:TST.DoubleStyleMapArchive)
  private:
-  inline void set_has_rulecount();
-  inline void clear_has_rulecount();
-  inline void set_has_cellid();
-  inline void clear_has_cellid();
+  inline void set_has_capacity();
+  inline void clear_has_capacity();
+  inline void set_has_count();
+  inline void clear_has_count();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedPtrField< ::TST::ConditionalStyleSetArchive_ConditionalStyleRule > rules_;
-  ::TST::CellID* cellid_;
-  ::google::protobuf::uint32 rulecount_;
+  ::google::protobuf::uint32 capacity_;
+  ::google::protobuf::uint32 count_;
+  ::google::protobuf::RepeatedPtrField< ::TST::DoubleStyleMapArchive_DoubleStyleMapEntryArchive > cell_map_entry_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -5803,18 +6176,18 @@ class ConditionalStyleSetArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ConditionalStyleSetArchive* default_instance_;
+  static DoubleStyleMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FilterSetArchive : public ::google::protobuf::Message {
+class StyleTableMapArchive_StyleTableMapEntryArchive : public ::google::protobuf::Message {
  public:
-  FilterSetArchive();
-  virtual ~FilterSetArchive();
+  StyleTableMapArchive_StyleTableMapEntryArchive();
+  virtual ~StyleTableMapArchive_StyleTableMapEntryArchive();
 
-  FilterSetArchive(const FilterSetArchive& from);
+  StyleTableMapArchive_StyleTableMapEntryArchive(const StyleTableMapArchive_StyleTableMapEntryArchive& from);
 
-  inline FilterSetArchive& operator=(const FilterSetArchive& from) {
+  inline StyleTableMapArchive_StyleTableMapEntryArchive& operator=(const StyleTableMapArchive_StyleTableMapEntryArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5828,17 +6201,17 @@ class FilterSetArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FilterSetArchive& default_instance();
+  static const StyleTableMapArchive_StyleTableMapEntryArchive& default_instance();
 
-  void Swap(FilterSetArchive* other);
+  void Swap(StyleTableMapArchive_StyleTableMapEntryArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FilterSetArchive* New() const;
+  StyleTableMapArchive_StyleTableMapEntryArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FilterSetArchive& from);
-  void MergeFrom(const FilterSetArchive& from);
+  void CopyFrom(const StyleTableMapArchive_StyleTableMapEntryArchive& from);
+  void MergeFrom(const StyleTableMapArchive_StyleTableMapEntryArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5859,127 +6232,68 @@ class FilterSetArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef FilterSetArchive_FilterSetType FilterSetType;
-  static const FilterSetType FilterSetArchiveTypeAll = FilterSetArchive_FilterSetType_FilterSetArchiveTypeAll;
-  static const FilterSetType FilterSetArchiveTypeAny = FilterSetArchive_FilterSetType_FilterSetArchiveTypeAny;
-  static inline bool FilterSetType_IsValid(int value) {
-    return FilterSetArchive_FilterSetType_IsValid(value);
-  }
-  static const FilterSetType FilterSetType_MIN =
-    FilterSetArchive_FilterSetType_FilterSetType_MIN;
-  static const FilterSetType FilterSetType_MAX =
-    FilterSetArchive_FilterSetType_FilterSetType_MAX;
-  static const int FilterSetType_ARRAYSIZE =
-    FilterSetArchive_FilterSetType_FilterSetType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor*
-  FilterSetType_descriptor() {
-    return FilterSetArchive_FilterSetType_descriptor();
-  }
-  static inline const ::std::string& FilterSetType_Name(FilterSetType value) {
-    return FilterSetArchive_FilterSetType_Name(value);
-  }
-  static inline bool FilterSetType_Parse(const ::std::string& name,
-      FilterSetType* value) {
-    return FilterSetArchive_FilterSetType_Parse(name, value);
-  }
-
   // accessors -------------------------------------------------------
 
-  // optional .TST.FilterSetArchive.FilterSetType type = 1 [default = FilterSetArchiveTypeAll];
-  inline bool has_type() const;
-  inline void clear_type();
-  static const int kTypeFieldNumber = 1;
-  inline ::TST::FilterSetArchive_FilterSetType type() const;
-  inline void set_type(::TST::FilterSetArchive_FilterSetType value);
-
-  // optional bool is_enabled = 2 [default = true];
-  inline bool has_is_enabled() const;
-  inline void clear_is_enabled();
-  static const int kIsEnabledFieldNumber = 2;
-  inline bool is_enabled() const;
-  inline void set_is_enabled(bool value);
-
-  // repeated .TST.FilterRuleArchive filter_rules = 3;
-  inline int filter_rules_size() const;
-  inline void clear_filter_rules();
-  static const int kFilterRulesFieldNumber = 3;
-  inline const ::TST::FilterRuleArchive& filter_rules(int index) const;
-  inline ::TST::FilterRuleArchive* mutable_filter_rules(int index);
-  inline ::TST::FilterRuleArchive* add_filter_rules();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::FilterRuleArchive >&
-      filter_rules() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::FilterRuleArchive >*
-      mutable_filter_rules();
-
-  // optional bool needs_formula_rewrite_for_import = 4 [default = false];
-  inline bool has_needs_formula_rewrite_for_import() const;
-  inline void clear_needs_formula_rewrite_for_import();
-  static const int kNeedsFormulaRewriteForImportFieldNumber = 4;
-  inline bool needs_formula_rewrite_for_import() const;
-  inline void set_needs_formula_rewrite_for_import(bool value);
+  // required uint32 key = 1;
+  inline bool has_key() const;
+  inline void clear_key();
+  static const int kKeyFieldNumber = 1;
+  inline ::google::protobuf::uint32 key() const;
+  inline void set_key(::google::protobuf::uint32 value);
 
-  // repeated uint32 filter_offsets = 5;
-  inline int filter_offsets_size() const;
-  inline void clear_filter_offsets();
-  static const int kFilterOffsetsFieldNumber = 5;
-  inline ::google::protobuf::uint32 filter_offsets(int index) const;
-  inline void set_filter_offsets(int index, ::google::protobuf::uint32 value);
-  inline void add_filter_offsets(::google::protobuf::uint32 value);
-  inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-      filter_offsets() const;
-  inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-      mutable_filter_offsets();
+  // required .TSP.Reference old_style = 2;
+  inline bool has_old_style() const;
+  inline void clear_old_style();
+  static const int kOldStyleFieldNumber = 2;
+  inline const ::TSP::Reference& old_style() const;
+  inline ::TSP::Reference* mutable_old_style();
+  inline ::TSP::Reference* release_old_style();
+  inline void set_allocated_old_style(::TSP::Reference* old_style);
 
-  // repeated bool filter_enabled = 6;
-  inline int filter_enabled_size() const;
-  inline void clear_filter_enabled();
-  static const int kFilterEnabledFieldNumber = 6;
-  inline bool filter_enabled(int index) const;
-  inline void set_filter_enabled(int index, bool value);
-  inline void add_filter_enabled(bool value);
-  inline const ::google::protobuf::RepeatedField< bool >&
-      filter_enabled() const;
-  inline ::google::protobuf::RepeatedField< bool >*
-      mutable_filter_enabled();
+  // required .TSP.Reference new_style = 3;
+  inline bool has_new_style() const;
+  inline void clear_new_style();
+  static const int kNewStyleFieldNumber = 3;
+  inline const ::TSP::Reference& new_style() const;
+  inline ::TSP::Reference* mutable_new_style();
+  inline ::TSP::Reference* release_new_style();
+  inline void set_allocated_new_style(::TSP::Reference* new_style);
 
-  // @@protoc_insertion_point(class_scope:TST.FilterSetArchive)
+  // @@protoc_insertion_point(class_scope:TST.StyleTableMapArchive.StyleTableMapEntryArchive)
  private:
-  inline void set_has_type();
-  inline void clear_has_type();
-  inline void set_has_is_enabled();
-  inline void clear_has_is_enabled();
-  inline void set_has_needs_formula_rewrite_for_import();
-  inline void clear_has_needs_formula_rewrite_for_import();
+  inline void set_has_key();
+  inline void clear_has_key();
+  inline void set_has_old_style();
+  inline void clear_has_old_style();
+  inline void set_has_new_style();
+  inline void clear_has_new_style();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  int type_;
-  bool is_enabled_;
-  bool needs_formula_rewrite_for_import_;
-  ::google::protobuf::RepeatedPtrField< ::TST::FilterRuleArchive > filter_rules_;
-  ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > filter_offsets_;
-  ::google::protobuf::RepeatedField< bool > filter_enabled_;
+  ::TSP::Reference* old_style_;
+  ::TSP::Reference* new_style_;
+  ::google::protobuf::uint32 key_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FilterSetArchive* default_instance_;
+  static StyleTableMapArchive_StyleTableMapEntryArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class TokenAttachmentArchive : public ::google::protobuf::Message {
+class StyleTableMapArchive : public ::google::protobuf::Message {
  public:
-  TokenAttachmentArchive();
-  virtual ~TokenAttachmentArchive();
+  StyleTableMapArchive();
+  virtual ~StyleTableMapArchive();
 
-  TokenAttachmentArchive(const TokenAttachmentArchive& from);
+  StyleTableMapArchive(const StyleTableMapArchive& from);
 
-  inline TokenAttachmentArchive& operator=(const TokenAttachmentArchive& from) {
+  inline StyleTableMapArchive& operator=(const StyleTableMapArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5993,17 +6307,17 @@ class TokenAttachmentArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const TokenAttachmentArchive& default_instance();
+  static const StyleTableMapArchive& default_instance();
 
-  void Swap(TokenAttachmentArchive* other);
+  void Swap(StyleTableMapArchive* other);
 
   // implements Message ----------------------------------------------
 
-  TokenAttachmentArchive* New() const;
+  StyleTableMapArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const TokenAttachmentArchive& from);
-  void MergeFrom(const TokenAttachmentArchive& from);
+  void CopyFrom(const StyleTableMapArchive& from);
+  void MergeFrom(const StyleTableMapArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6024,58 +6338,69 @@ class TokenAttachmentArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef StyleTableMapArchive_StyleTableMapEntryArchive StyleTableMapEntryArchive;
+
   // accessors -------------------------------------------------------
 
-  // required .TSWP.UIGraphicalAttachment super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TSWP::UIGraphicalAttachment& super() const;
-  inline ::TSWP::UIGraphicalAttachment* mutable_super();
-  inline ::TSWP::UIGraphicalAttachment* release_super();
-  inline void set_allocated_super(::TSWP::UIGraphicalAttachment* super);
+  // required uint32 capacity = 1;
+  inline bool has_capacity() const;
+  inline void clear_capacity();
+  static const int kCapacityFieldNumber = 1;
+  inline ::google::protobuf::uint32 capacity() const;
+  inline void set_capacity(::google::protobuf::uint32 value);
 
-  // optional .TSP.Reference expressionNode = 2;
-  inline bool has_expressionnode() const;
-  inline void clear_expressionnode();
-  static const int kExpressionNodeFieldNumber = 2;
-  inline const ::TSP::Reference& expressionnode() const;
-  inline ::TSP::Reference* mutable_expressionnode();
-  inline ::TSP::Reference* release_expressionnode();
-  inline void set_allocated_expressionnode(::TSP::Reference* expressionnode);
+  // required uint32 count = 2;
+  inline bool has_count() const;
+  inline void clear_count();
+  static const int kCountFieldNumber = 2;
+  inline ::google::protobuf::uint32 count() const;
+  inline void set_count(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TST.TokenAttachmentArchive)
+  // repeated .TST.StyleTableMapArchive.StyleTableMapEntryArchive map_entry = 3;
+  inline int map_entry_size() const;
+  inline void clear_map_entry();
+  static const int kMapEntryFieldNumber = 3;
+  inline const ::TST::StyleTableMapArchive_StyleTableMapEntryArchive& map_entry(int index) const;
+  inline ::TST::StyleTableMapArchive_StyleTableMapEntryArchive* mutable_map_entry(int index);
+  inline ::TST::StyleTableMapArchive_StyleTableMapEntryArchive* add_map_entry();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::StyleTableMapArchive_StyleTableMapEntryArchive >&
+      map_entry() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::StyleTableMapArchive_StyleTableMapEntryArchive >*
+      mutable_map_entry();
+
+  // @@protoc_insertion_point(class_scope:TST.StyleTableMapArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_expressionnode();
-  inline void clear_has_expressionnode();
+  inline void set_has_capacity();
+  inline void clear_has_capacity();
+  inline void set_has_count();
+  inline void clear_has_count();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSWP::UIGraphicalAttachment* super_;
-  ::TSP::Reference* expressionnode_;
+  ::google::protobuf::uint32 capacity_;
+  ::google::protobuf::uint32 count_;
+  ::google::protobuf::RepeatedPtrField< ::TST::StyleTableMapArchive_StyleTableMapEntryArchive > map_entry_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static TokenAttachmentArchive* default_instance_;
+  static StyleTableMapArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FormulaArchive : public ::google::protobuf::Message {
+class SelectionArchive : public ::google::protobuf::Message {
  public:
-  FormulaArchive();
-  virtual ~FormulaArchive();
+  SelectionArchive();
+  virtual ~SelectionArchive();
 
-  FormulaArchive(const FormulaArchive& from);
+  SelectionArchive(const SelectionArchive& from);
 
-  inline FormulaArchive& operator=(const FormulaArchive& from) {
+  inline SelectionArchive& operator=(const SelectionArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6089,17 +6414,17 @@ class FormulaArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FormulaArchive& default_instance();
+  static const SelectionArchive& default_instance();
 
-  void Swap(FormulaArchive* other);
+  void Swap(SelectionArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FormulaArchive* New() const;
+  SelectionArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FormulaArchive& from);
-  void MergeFrom(const FormulaArchive& from);
+  void CopyFrom(const SelectionArchive& from);
+  void MergeFrom(const SelectionArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6122,44 +6447,104 @@ class FormulaArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // optional .TSP.Reference expressionTree = 1;
-  inline bool has_expressiontree() const;
-  inline void clear_expressiontree();
-  static const int kExpressionTreeFieldNumber = 1;
-  inline const ::TSP::Reference& expressiontree() const;
-  inline ::TSP::Reference* mutable_expressiontree();
-  inline ::TSP::Reference* release_expressiontree();
-  inline void set_allocated_expressiontree(::TSP::Reference* expressiontree);
+  // optional .TSP.Reference tableModel = 1 [deprecated = true];
+  inline bool has_tablemodel() const PROTOBUF_DEPRECATED;
+  inline void clear_tablemodel() PROTOBUF_DEPRECATED;
+  static const int kTableModelFieldNumber = 1;
+  inline const ::TSP::Reference& tablemodel() const PROTOBUF_DEPRECATED;
+  inline ::TSP::Reference* mutable_tablemodel() PROTOBUF_DEPRECATED;
+  inline ::TSP::Reference* release_tablemodel() PROTOBUF_DEPRECATED;
+  inline void set_allocated_tablemodel(::TSP::Reference* tablemodel) PROTOBUF_DEPRECATED;
 
-  // @@protoc_insertion_point(class_scope:TST.FormulaArchive)
+  // required .TST.SelectionTypeArchive selection_type = 4;
+  inline bool has_selection_type() const;
+  inline void clear_selection_type();
+  static const int kSelectionTypeFieldNumber = 4;
+  inline ::TST::SelectionTypeArchive selection_type() const;
+  inline void set_selection_type(::TST::SelectionTypeArchive value);
+
+  // optional .TST.CellID anchor_cell = 5;
+  inline bool has_anchor_cell() const;
+  inline void clear_anchor_cell();
+  static const int kAnchorCellFieldNumber = 5;
+  inline const ::TST::CellID& anchor_cell() const;
+  inline ::TST::CellID* mutable_anchor_cell();
+  inline ::TST::CellID* release_anchor_cell();
+  inline void set_allocated_anchor_cell(::TST::CellID* anchor_cell);
+
+  // repeated .TST.CellRange cell_ranges = 6;
+  inline int cell_ranges_size() const;
+  inline void clear_cell_ranges();
+  static const int kCellRangesFieldNumber = 6;
+  inline const ::TST::CellRange& cell_ranges(int index) const;
+  inline ::TST::CellRange* mutable_cell_ranges(int index);
+  inline ::TST::CellRange* add_cell_ranges();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
+      cell_ranges() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
+      mutable_cell_ranges();
+
+  // repeated .TST.CellRange base_ranges = 7;
+  inline int base_ranges_size() const;
+  inline void clear_base_ranges();
+  static const int kBaseRangesFieldNumber = 7;
+  inline const ::TST::CellRange& base_ranges(int index) const;
+  inline ::TST::CellRange* mutable_base_ranges(int index);
+  inline ::TST::CellRange* add_base_ranges();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
+      base_ranges() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
+      mutable_base_ranges();
+
+  // optional .TST.CellID cursor_cell = 8;
+  inline bool has_cursor_cell() const;
+  inline void clear_cursor_cell();
+  static const int kCursorCellFieldNumber = 8;
+  inline const ::TST::CellID& cursor_cell() const;
+  inline ::TST::CellID* mutable_cursor_cell();
+  inline ::TST::CellID* release_cursor_cell();
+  inline void set_allocated_cursor_cell(::TST::CellID* cursor_cell);
+
+  // @@protoc_insertion_point(class_scope:TST.SelectionArchive)
  private:
-  inline void set_has_expressiontree();
-  inline void clear_has_expressiontree();
+  inline void set_has_tablemodel();
+  inline void clear_has_tablemodel();
+  inline void set_has_selection_type();
+  inline void clear_has_selection_type();
+  inline void set_has_anchor_cell();
+  inline void clear_has_anchor_cell();
+  inline void set_has_cursor_cell();
+  inline void clear_has_cursor_cell();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSP::Reference* expressiontree_;
+  ::TSP::Reference* tablemodel_;
+  ::TST::CellID* anchor_cell_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > cell_ranges_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > base_ranges_;
+  ::TST::CellID* cursor_cell_;
+  int selection_type_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FormulaArchive* default_instance_;
+  static SelectionArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ExpressionNodeArchive : public ::google::protobuf::Message {
+class FilterRuleArchive : public ::google::protobuf::Message {
  public:
-  ExpressionNodeArchive();
-  virtual ~ExpressionNodeArchive();
+  FilterRuleArchive();
+  virtual ~FilterRuleArchive();
 
-  ExpressionNodeArchive(const ExpressionNodeArchive& from);
+  FilterRuleArchive(const FilterRuleArchive& from);
 
-  inline ExpressionNodeArchive& operator=(const ExpressionNodeArchive& from) {
+  inline FilterRuleArchive& operator=(const FilterRuleArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6173,17 +6558,17 @@ class ExpressionNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ExpressionNodeArchive& default_instance();
+  static const FilterRuleArchive& default_instance();
 
-  void Swap(ExpressionNodeArchive* other);
+  void Swap(FilterRuleArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ExpressionNodeArchive* New() const;
+  FilterRuleArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ExpressionNodeArchive& from);
-  void MergeFrom(const ExpressionNodeArchive& from);
+  void CopyFrom(const FilterRuleArchive& from);
+  void MergeFrom(const FilterRuleArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6206,65 +6591,54 @@ class ExpressionNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // repeated .TSP.Reference children = 1;
-  inline int children_size() const;
-  inline void clear_children();
-  static const int kChildrenFieldNumber = 1;
-  inline const ::TSP::Reference& children(int index) const;
-  inline ::TSP::Reference* mutable_children(int index);
-  inline ::TSP::Reference* add_children();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
-      children() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
-      mutable_children();
-
-  // optional uint64 first_index = 2 [default = 0];
-  inline bool has_first_index() const;
-  inline void clear_first_index();
-  static const int kFirstIndexFieldNumber = 2;
-  inline ::google::protobuf::uint64 first_index() const;
-  inline void set_first_index(::google::protobuf::uint64 value);
+  // required .TST.FormulaPredicateArchive predicate = 1;
+  inline bool has_predicate() const;
+  inline void clear_predicate();
+  static const int kPredicateFieldNumber = 1;
+  inline const ::TST::FormulaPredicateArchive& predicate() const;
+  inline ::TST::FormulaPredicateArchive* mutable_predicate();
+  inline ::TST::FormulaPredicateArchive* release_predicate();
+  inline void set_allocated_predicate(::TST::FormulaPredicateArchive* predicate);
 
-  // optional uint64 last_index = 3 [default = 0];
-  inline bool has_last_index() const;
-  inline void clear_last_index();
-  static const int kLastIndexFieldNumber = 3;
-  inline ::google::protobuf::uint64 last_index() const;
-  inline void set_last_index(::google::protobuf::uint64 value);
+  // optional bool disabled = 2;
+  inline bool has_disabled() const;
+  inline void clear_disabled();
+  static const int kDisabledFieldNumber = 2;
+  inline bool disabled() const;
+  inline void set_disabled(bool value);
 
-  // @@protoc_insertion_point(class_scope:TST.ExpressionNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.FilterRuleArchive)
  private:
-  inline void set_has_first_index();
-  inline void clear_has_first_index();
-  inline void set_has_last_index();
-  inline void clear_has_last_index();
+  inline void set_has_predicate();
+  inline void clear_has_predicate();
+  inline void set_has_disabled();
+  inline void clear_has_disabled();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > children_;
-  ::google::protobuf::uint64 first_index_;
-  ::google::protobuf::uint64 last_index_;
+  ::TST::FormulaPredicateArchive* predicate_;
+  bool disabled_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ExpressionNodeArchive* default_instance_;
+  static FilterRuleArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class BooleanNodeArchive : public ::google::protobuf::Message {
+class TableStyleArchive : public ::google::protobuf::Message {
  public:
-  BooleanNodeArchive();
-  virtual ~BooleanNodeArchive();
+  TableStyleArchive();
+  virtual ~TableStyleArchive();
 
-  BooleanNodeArchive(const BooleanNodeArchive& from);
+  TableStyleArchive(const TableStyleArchive& from);
 
-  inline BooleanNodeArchive& operator=(const BooleanNodeArchive& from) {
+  inline TableStyleArchive& operator=(const TableStyleArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6278,17 +6652,17 @@ class BooleanNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const BooleanNodeArchive& default_instance();
+  static const TableStyleArchive& default_instance();
 
-  void Swap(BooleanNodeArchive* other);
+  void Swap(TableStyleArchive* other);
 
   // implements Message ----------------------------------------------
 
-  BooleanNodeArchive* New() const;
+  TableStyleArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const BooleanNodeArchive& from);
-  void MergeFrom(const BooleanNodeArchive& from);
+  void CopyFrom(const TableStyleArchive& from);
+  void MergeFrom(const TableStyleArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6311,54 +6685,66 @@ class BooleanNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.ExpressionNodeArchive super = 1;
+  // required .TSS.StyleArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  inline const ::TSS::StyleArchive& super() const;
+  inline ::TSS::StyleArchive* mutable_super();
+  inline ::TSS::StyleArchive* release_super();
+  inline void set_allocated_super(::TSS::StyleArchive* super);
 
-  // required bool value = 2;
-  inline bool has_value() const;
-  inline void clear_value();
-  static const int kValueFieldNumber = 2;
-  inline bool value() const;
-  inline void set_value(bool value);
+  // optional uint32 override_count = 10 [default = 0];
+  inline bool has_override_count() const;
+  inline void clear_override_count();
+  static const int kOverrideCountFieldNumber = 10;
+  inline ::google::protobuf::uint32 override_count() const;
+  inline void set_override_count(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TST.BooleanNodeArchive)
+  // optional .TST.TableStylePropertiesArchive table_properties = 11;
+  inline bool has_table_properties() const;
+  inline void clear_table_properties();
+  static const int kTablePropertiesFieldNumber = 11;
+  inline const ::TST::TableStylePropertiesArchive& table_properties() const;
+  inline ::TST::TableStylePropertiesArchive* mutable_table_properties();
+  inline ::TST::TableStylePropertiesArchive* release_table_properties();
+  inline void set_allocated_table_properties(::TST::TableStylePropertiesArchive* table_properties);
+
+  // @@protoc_insertion_point(class_scope:TST.TableStyleArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_value();
-  inline void clear_has_value();
+  inline void set_has_override_count();
+  inline void clear_has_override_count();
+  inline void set_has_table_properties();
+  inline void clear_has_table_properties();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::ExpressionNodeArchive* super_;
-  bool value_;
+  ::TSS::StyleArchive* super_;
+  ::TST::TableStylePropertiesArchive* table_properties_;
+  ::google::protobuf::uint32 override_count_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static BooleanNodeArchive* default_instance_;
+  static TableStyleArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class NumberNodeArchive : public ::google::protobuf::Message {
+class CellStyleArchive : public ::google::protobuf::Message {
  public:
-  NumberNodeArchive();
-  virtual ~NumberNodeArchive();
+  CellStyleArchive();
+  virtual ~CellStyleArchive();
 
-  NumberNodeArchive(const NumberNodeArchive& from);
+  CellStyleArchive(const CellStyleArchive& from);
 
-  inline NumberNodeArchive& operator=(const NumberNodeArchive& from) {
+  inline CellStyleArchive& operator=(const CellStyleArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6372,17 +6758,17 @@ class NumberNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const NumberNodeArchive& default_instance();
+  static const CellStyleArchive& default_instance();
 
-  void Swap(NumberNodeArchive* other);
+  void Swap(CellStyleArchive* other);
 
   // implements Message ----------------------------------------------
 
-  NumberNodeArchive* New() const;
+  CellStyleArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const NumberNodeArchive& from);
-  void MergeFrom(const NumberNodeArchive& from);
+  void CopyFrom(const CellStyleArchive& from);
+  void MergeFrom(const CellStyleArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6405,54 +6791,66 @@ class NumberNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.ExpressionNodeArchive super = 1;
+  // required .TSS.StyleArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  inline const ::TSS::StyleArchive& super() const;
+  inline ::TSS::StyleArchive* mutable_super();
+  inline ::TSS::StyleArchive* release_super();
+  inline void set_allocated_super(::TSS::StyleArchive* super);
 
-  // required double number = 2;
-  inline bool has_number() const;
-  inline void clear_number();
-  static const int kNumberFieldNumber = 2;
-  inline double number() const;
-  inline void set_number(double value);
+  // optional uint32 override_count = 10 [default = 0];
+  inline bool has_override_count() const;
+  inline void clear_override_count();
+  static const int kOverrideCountFieldNumber = 10;
+  inline ::google::protobuf::uint32 override_count() const;
+  inline void set_override_count(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TST.NumberNodeArchive)
+  // optional .TST.CellStylePropertiesArchive cell_properties = 11;
+  inline bool has_cell_properties() const;
+  inline void clear_cell_properties();
+  static const int kCellPropertiesFieldNumber = 11;
+  inline const ::TST::CellStylePropertiesArchive& cell_properties() const;
+  inline ::TST::CellStylePropertiesArchive* mutable_cell_properties();
+  inline ::TST::CellStylePropertiesArchive* release_cell_properties();
+  inline void set_allocated_cell_properties(::TST::CellStylePropertiesArchive* cell_properties);
+
+  // @@protoc_insertion_point(class_scope:TST.CellStyleArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_number();
-  inline void clear_has_number();
+  inline void set_has_override_count();
+  inline void clear_has_override_count();
+  inline void set_has_cell_properties();
+  inline void clear_has_cell_properties();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::ExpressionNodeArchive* super_;
-  double number_;
+  ::TSS::StyleArchive* super_;
+  ::TST::CellStylePropertiesArchive* cell_properties_;
+  ::google::protobuf::uint32 override_count_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static NumberNodeArchive* default_instance_;
+  static CellStyleArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class StringNodeArchive : public ::google::protobuf::Message {
+class FormulaPredicateArchive : public ::google::protobuf::Message {
  public:
-  StringNodeArchive();
-  virtual ~StringNodeArchive();
+  FormulaPredicateArchive();
+  virtual ~FormulaPredicateArchive();
 
-  StringNodeArchive(const StringNodeArchive& from);
+  FormulaPredicateArchive(const FormulaPredicateArchive& from);
 
-  inline StringNodeArchive& operator=(const StringNodeArchive& from) {
+  inline FormulaPredicateArchive& operator=(const FormulaPredicateArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6466,17 +6864,17 @@ class StringNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const StringNodeArchive& default_instance();
+  static const FormulaPredicateArchive& default_instance();
 
-  void Swap(StringNodeArchive* other);
+  void Swap(FormulaPredicateArchive* other);
 
   // implements Message ----------------------------------------------
 
-  StringNodeArchive* New() const;
+  FormulaPredicateArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const StringNodeArchive& from);
-  void MergeFrom(const StringNodeArchive& from);
+  void CopyFrom(const FormulaPredicateArchive& from);
+  void MergeFrom(const FormulaPredicateArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6497,61 +6895,210 @@ class StringNodeArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  // accessors -------------------------------------------------------
+  typedef FormulaPredicateArchive_FormulaPredicateType FormulaPredicateType;
+  static const FormulaPredicateType PredNone = FormulaPredicateArchive_FormulaPredicateType_PredNone;
+  static const FormulaPredicateType TextStartsWith = FormulaPredicateArchive_FormulaPredicateType_TextStartsWith;
+  static const FormulaPredicateType TextEndsWith = FormulaPredicateArchive_FormulaPredicateType_TextEndsWith;
+  static const FormulaPredicateType TextContains = FormulaPredicateArchive_FormulaPredicateType_TextContains;
+  static const FormulaPredicateType TextDoesNotContain = FormulaPredicateArchive_FormulaPredicateType_TextDoesNotContain;
+  static const FormulaPredicateType ValueEqual = FormulaPredicateArchive_FormulaPredicateType_ValueEqual;
+  static const FormulaPredicateType ValueNotEqual = FormulaPredicateArchive_FormulaPredicateType_ValueNotEqual;
+  static const FormulaPredicateType ValueGreaterThan = FormulaPredicateArchive_FormulaPredicateType_ValueGreaterThan;
+  static const FormulaPredicateType ValueGreaterThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_ValueGreaterThanOrEqual;
+  static const FormulaPredicateType ValueLessThan = FormulaPredicateArchive_FormulaPredicateType_ValueLessThan;
+  static const FormulaPredicateType ValueLessThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_ValueLessThanOrEqual;
+  static const FormulaPredicateType ValueAboveAverage = FormulaPredicateArchive_FormulaPredicateType_ValueAboveAverage;
+  static const FormulaPredicateType ValueBelowAverage = FormulaPredicateArchive_FormulaPredicateType_ValueBelowAverage;
+  static const FormulaPredicateType ValueBetween = FormulaPredicateArchive_FormulaPredicateType_ValueBetween;
+  static const FormulaPredicateType Formula = FormulaPredicateArchive_FormulaPredicateType_Formula;
+  static const FormulaPredicateType Duplicates = FormulaPredicateArchive_FormulaPredicateType_Duplicates;
+  static const FormulaPredicateType Uniques = FormulaPredicateArchive_FormulaPredicateType_Uniques;
+  static const FormulaPredicateType DateIsToday = FormulaPredicateArchive_FormulaPredicateType_DateIsToday;
+  static const FormulaPredicateType DateIsYesterday = FormulaPredicateArchive_FormulaPredicateType_DateIsYesterday;
+  static const FormulaPredicateType DateIsTomorrow = FormulaPredicateArchive_FormulaPredicateType_DateIsTomorrow;
+  static const FormulaPredicateType DateIsTheDate = FormulaPredicateArchive_FormulaPredicateType_DateIsTheDate;
+  static const FormulaPredicateType DateBeforeTheDate = FormulaPredicateArchive_FormulaPredicateType_DateBeforeTheDate;
+  static const FormulaPredicateType DateAfterTheDate = FormulaPredicateArchive_FormulaPredicateType_DateAfterTheDate;
+  static const FormulaPredicateType DateIsInTheRange = FormulaPredicateArchive_FormulaPredicateType_DateIsInTheRange;
+  static const FormulaPredicateType DateInTheNext = FormulaPredicateArchive_FormulaPredicateType_DateInTheNext;
+  static const FormulaPredicateType DateInTheLast = FormulaPredicateArchive_FormulaPredicateType_DateInTheLast;
+  static const FormulaPredicateType DateIsExactly = FormulaPredicateArchive_FormulaPredicateType_DateIsExactly;
+  static const FormulaPredicateType DateBeforeRelative = FormulaPredicateArchive_FormulaPredicateType_DateBeforeRelative;
+  static const FormulaPredicateType DateAfterRelative = FormulaPredicateArchive_FormulaPredicateType_DateAfterRelative;
+  static const FormulaPredicateType DateBetweenRelative = FormulaPredicateArchive_FormulaPredicateType_DateBetweenRelative;
+  static const FormulaPredicateType ValueTop = FormulaPredicateArchive_FormulaPredicateType_ValueTop;
+  static const FormulaPredicateType ValueBottom = FormulaPredicateArchive_FormulaPredicateType_ValueBottom;
+  static const FormulaPredicateType ValueNotBetween = FormulaPredicateArchive_FormulaPredicateType_ValueNotBetween;
+  static const FormulaPredicateType DateInThis = FormulaPredicateArchive_FormulaPredicateType_DateInThis;
+  static const FormulaPredicateType IsBlank = FormulaPredicateArchive_FormulaPredicateType_IsBlank;
+  static const FormulaPredicateType IsNotBlank = FormulaPredicateArchive_FormulaPredicateType_IsNotBlank;
+  static const FormulaPredicateType TextIs = FormulaPredicateArchive_FormulaPredicateType_TextIs;
+  static const FormulaPredicateType TextIsNot = FormulaPredicateArchive_FormulaPredicateType_TextIsNot;
+  static const FormulaPredicateType DurationEqual = FormulaPredicateArchive_FormulaPredicateType_DurationEqual;
+  static const FormulaPredicateType DurationNotEqual = FormulaPredicateArchive_FormulaPredicateType_DurationNotEqual;
+  static const FormulaPredicateType DurationGreaterThan = FormulaPredicateArchive_FormulaPredicateType_DurationGreaterThan;
+  static const FormulaPredicateType DurationGreaterThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_DurationGreaterThanOrEqual;
+  static const FormulaPredicateType DurationLessThan = FormulaPredicateArchive_FormulaPredicateType_DurationLessThan;
+  static const FormulaPredicateType DurationLessThanOrEqual = FormulaPredicateArchive_FormulaPredicateType_DurationLessThanOrEqual;
+  static const FormulaPredicateType DurationBetween = FormulaPredicateArchive_FormulaPredicateType_DurationBetween;
+  static const FormulaPredicateType DurationNotBetween = FormulaPredicateArchive_FormulaPredicateType_DurationNotBetween;
+  static const FormulaPredicateType DurationAboveAverage = FormulaPredicateArchive_FormulaPredicateType_DurationAboveAverage;
+  static const FormulaPredicateType DurationBelowAverage = FormulaPredicateArchive_FormulaPredicateType_DurationBelowAverage;
+  static const FormulaPredicateType DurationTop = FormulaPredicateArchive_FormulaPredicateType_DurationTop;
+  static const FormulaPredicateType DurationBottom = FormulaPredicateArchive_FormulaPredicateType_DurationBottom;
+  static inline bool FormulaPredicateType_IsValid(int value) {
+    return FormulaPredicateArchive_FormulaPredicateType_IsValid(value);
+  }
+  static const FormulaPredicateType FormulaPredicateType_MIN =
+    FormulaPredicateArchive_FormulaPredicateType_FormulaPredicateType_MIN;
+  static const FormulaPredicateType FormulaPredicateType_MAX =
+    FormulaPredicateArchive_FormulaPredicateType_FormulaPredicateType_MAX;
+  static const int FormulaPredicateType_ARRAYSIZE =
+    FormulaPredicateArchive_FormulaPredicateType_FormulaPredicateType_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  FormulaPredicateType_descriptor() {
+    return FormulaPredicateArchive_FormulaPredicateType_descriptor();
+  }
+  static inline const ::std::string& FormulaPredicateType_Name(FormulaPredicateType value) {
+    return FormulaPredicateArchive_FormulaPredicateType_Name(value);
+  }
+  static inline bool FormulaPredicateType_Parse(const ::std::string& name,
+      FormulaPredicateType* value) {
+    return FormulaPredicateArchive_FormulaPredicateType_Parse(name, value);
+  }
 
-  // required .TST.ExpressionNodeArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  typedef FormulaPredicateArchive_QualifierType QualifierType;
+  static const QualifierType QualNone = FormulaPredicateArchive_QualifierType_QualNone;
+  static const QualifierType Days = FormulaPredicateArchive_QualifierType_Days;
+  static const QualifierType Weeks = FormulaPredicateArchive_QualifierType_Weeks;
+  static const QualifierType Months = FormulaPredicateArchive_QualifierType_Months;
+  static const QualifierType Years = FormulaPredicateArchive_QualifierType_Years;
+  static const QualifierType Ago = FormulaPredicateArchive_QualifierType_Ago;
+  static const QualifierType FromNow = FormulaPredicateArchive_QualifierType_FromNow;
+  static const QualifierType Quarters = FormulaPredicateArchive_QualifierType_Quarters;
+  static const QualifierType Percent = FormulaPredicateArchive_QualifierType_Percent;
+  static const QualifierType Values = FormulaPredicateArchive_QualifierType_Values;
+  static inline bool QualifierType_IsValid(int value) {
+    return FormulaPredicateArchive_QualifierType_IsValid(value);
+  }
+  static const QualifierType QualifierType_MIN =
+    FormulaPredicateArchive_QualifierType_QualifierType_MIN;
+  static const QualifierType QualifierType_MAX =
+    FormulaPredicateArchive_QualifierType_QualifierType_MAX;
+  static const int QualifierType_ARRAYSIZE =
+    FormulaPredicateArchive_QualifierType_QualifierType_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  QualifierType_descriptor() {
+    return FormulaPredicateArchive_QualifierType_descriptor();
+  }
+  static inline const ::std::string& QualifierType_Name(QualifierType value) {
+    return FormulaPredicateArchive_QualifierType_Name(value);
+  }
+  static inline bool QualifierType_Parse(const ::std::string& name,
+      QualifierType* value) {
+    return FormulaPredicateArchive_QualifierType_Parse(name, value);
+  }
 
-  // required string value = 2;
-  inline bool has_value() const;
-  inline void clear_value();
-  static const int kValueFieldNumber = 2;
-  inline const ::std::string& value() const;
-  inline void set_value(const ::std::string& value);
-  inline void set_value(const char* value);
-  inline void set_value(const char* value, size_t size);
-  inline ::std::string* mutable_value();
-  inline ::std::string* release_value();
-  inline void set_allocated_value(::std::string* value);
+  // accessors -------------------------------------------------------
 
-  // @@protoc_insertion_point(class_scope:TST.StringNodeArchive)
+  // required .TSCE.FormulaArchive formula = 1;
+  inline bool has_formula() const;
+  inline void clear_formula();
+  static const int kFormulaFieldNumber = 1;
+  inline const ::TSCE::FormulaArchive& formula() const;
+  inline ::TSCE::FormulaArchive* mutable_formula();
+  inline ::TSCE::FormulaArchive* release_formula();
+  inline void set_allocated_formula(::TSCE::FormulaArchive* formula);
+
+  // required .TST.FormulaPredicateArchive.FormulaPredicateType predicate_type = 2;
+  inline bool has_predicate_type() const;
+  inline void clear_predicate_type();
+  static const int kPredicateTypeFieldNumber = 2;
+  inline ::TST::FormulaPredicateArchive_FormulaPredicateType predicate_type() const;
+  inline void set_predicate_type(::TST::FormulaPredicateArchive_FormulaPredicateType value);
+
+  // required .TST.FormulaPredicateArchive.QualifierType qualifier1 = 3;
+  inline bool has_qualifier1() const;
+  inline void clear_qualifier1();
+  static const int kQualifier1FieldNumber = 3;
+  inline ::TST::FormulaPredicateArchive_QualifierType qualifier1() const;
+  inline void set_qualifier1(::TST::FormulaPredicateArchive_QualifierType value);
+
+  // required .TST.FormulaPredicateArchive.QualifierType qualifier2 = 4;
+  inline bool has_qualifier2() const;
+  inline void clear_qualifier2();
+  static const int kQualifier2FieldNumber = 4;
+  inline ::TST::FormulaPredicateArchive_QualifierType qualifier2() const;
+  inline void set_qualifier2(::TST::FormulaPredicateArchive_QualifierType value);
+
+  // required int32 param_index1 = 5;
+  inline bool has_param_index1() const;
+  inline void clear_param_index1();
+  static const int kParamIndex1FieldNumber = 5;
+  inline ::google::protobuf::int32 param_index1() const;
+  inline void set_param_index1(::google::protobuf::int32 value);
+
+  // required int32 param_index2 = 6;
+  inline bool has_param_index2() const;
+  inline void clear_param_index2();
+  static const int kParamIndex2FieldNumber = 6;
+  inline ::google::protobuf::int32 param_index2() const;
+  inline void set_param_index2(::google::protobuf::int32 value);
+
+  // required int32 param_index0 = 7;
+  inline bool has_param_index0() const;
+  inline void clear_param_index0();
+  static const int kParamIndex0FieldNumber = 7;
+  inline ::google::protobuf::int32 param_index0() const;
+  inline void set_param_index0(::google::protobuf::int32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.FormulaPredicateArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_value();
-  inline void clear_has_value();
+  inline void set_has_formula();
+  inline void clear_has_formula();
+  inline void set_has_predicate_type();
+  inline void clear_has_predicate_type();
+  inline void set_has_qualifier1();
+  inline void clear_has_qualifier1();
+  inline void set_has_qualifier2();
+  inline void clear_has_qualifier2();
+  inline void set_has_param_index1();
+  inline void clear_has_param_index1();
+  inline void set_has_param_index2();
+  inline void clear_has_param_index2();
+  inline void set_has_param_index0();
+  inline void clear_has_param_index0();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::ExpressionNodeArchive* super_;
-  ::std::string* value_;
+  ::TSCE::FormulaArchive* formula_;
+  int predicate_type_;
+  int qualifier1_;
+  int qualifier2_;
+  ::google::protobuf::int32 param_index1_;
+  ::google::protobuf::int32 param_index2_;
+  ::google::protobuf::int32 param_index0_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static StringNodeArchive* default_instance_;
+  static FormulaPredicateArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class IdentifierNodeArchive : public ::google::protobuf::Message {
+class ConditionalStyleSetArchive_ConditionalStyleRule : public ::google::protobuf::Message {
  public:
-  IdentifierNodeArchive();
-  virtual ~IdentifierNodeArchive();
+  ConditionalStyleSetArchive_ConditionalStyleRule();
+  virtual ~ConditionalStyleSetArchive_ConditionalStyleRule();
 
-  IdentifierNodeArchive(const IdentifierNodeArchive& from);
+  ConditionalStyleSetArchive_ConditionalStyleRule(const ConditionalStyleSetArchive_ConditionalStyleRule& from);
 
-  inline IdentifierNodeArchive& operator=(const IdentifierNodeArchive& from) {
+  inline ConditionalStyleSetArchive_ConditionalStyleRule& operator=(const ConditionalStyleSetArchive_ConditionalStyleRule& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6565,17 +7112,17 @@ class IdentifierNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const IdentifierNodeArchive& default_instance();
+  static const ConditionalStyleSetArchive_ConditionalStyleRule& default_instance();
 
-  void Swap(IdentifierNodeArchive* other);
+  void Swap(ConditionalStyleSetArchive_ConditionalStyleRule* other);
 
   // implements Message ----------------------------------------------
 
-  IdentifierNodeArchive* New() const;
+  ConditionalStyleSetArchive_ConditionalStyleRule* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const IdentifierNodeArchive& from);
-  void MergeFrom(const IdentifierNodeArchive& from);
+  void CopyFrom(const ConditionalStyleSetArchive_ConditionalStyleRule& from);
+  void MergeFrom(const ConditionalStyleSetArchive_ConditionalStyleRule& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6598,59 +7145,68 @@ class IdentifierNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.ExpressionNodeArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  // required .TST.FormulaPredicateArchive predicate = 1;
+  inline bool has_predicate() const;
+  inline void clear_predicate();
+  static const int kPredicateFieldNumber = 1;
+  inline const ::TST::FormulaPredicateArchive& predicate() const;
+  inline ::TST::FormulaPredicateArchive* mutable_predicate();
+  inline ::TST::FormulaPredicateArchive* release_predicate();
+  inline void set_allocated_predicate(::TST::FormulaPredicateArchive* predicate);
 
-  // optional string identifier = 2;
-  inline bool has_identifier() const;
-  inline void clear_identifier();
-  static const int kIdentifierFieldNumber = 2;
-  inline const ::std::string& identifier() const;
-  inline void set_identifier(const ::std::string& value);
-  inline void set_identifier(const char* value);
-  inline void set_identifier(const char* value, size_t size);
-  inline ::std::string* mutable_identifier();
-  inline ::std::string* release_identifier();
-  inline void set_allocated_identifier(::std::string* identifier);
+  // required .TSP.Reference cell_style = 2;
+  inline bool has_cell_style() const;
+  inline void clear_cell_style();
+  static const int kCellStyleFieldNumber = 2;
+  inline const ::TSP::Reference& cell_style() const;
+  inline ::TSP::Reference* mutable_cell_style();
+  inline ::TSP::Reference* release_cell_style();
+  inline void set_allocated_cell_style(::TSP::Reference* cell_style);
 
-  // @@protoc_insertion_point(class_scope:TST.IdentifierNodeArchive)
+  // required .TSP.Reference text_style = 3;
+  inline bool has_text_style() const;
+  inline void clear_text_style();
+  static const int kTextStyleFieldNumber = 3;
+  inline const ::TSP::Reference& text_style() const;
+  inline ::TSP::Reference* mutable_text_style();
+  inline ::TSP::Reference* release_text_style();
+  inline void set_allocated_text_style(::TSP::Reference* text_style);
+
+  // @@protoc_insertion_point(class_scope:TST.ConditionalStyleSetArchive.ConditionalStyleRule)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_identifier();
-  inline void clear_has_identifier();
+  inline void set_has_predicate();
+  inline void clear_has_predicate();
+  inline void set_has_cell_style();
+  inline void clear_has_cell_style();
+  inline void set_has_text_style();
+  inline void clear_has_text_style();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::ExpressionNodeArchive* super_;
-  ::std::string* identifier_;
+  ::TST::FormulaPredicateArchive* predicate_;
+  ::TSP::Reference* cell_style_;
+  ::TSP::Reference* text_style_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static IdentifierNodeArchive* default_instance_;
+  static ConditionalStyleSetArchive_ConditionalStyleRule* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ArrayNodeArchive : public ::google::protobuf::Message {
+class ConditionalStyleSetArchive : public ::google::protobuf::Message {
  public:
-  ArrayNodeArchive();
-  virtual ~ArrayNodeArchive();
+  ConditionalStyleSetArchive();
+  virtual ~ConditionalStyleSetArchive();
 
-  ArrayNodeArchive(const ArrayNodeArchive& from);
+  ConditionalStyleSetArchive(const ConditionalStyleSetArchive& from);
 
-  inline ArrayNodeArchive& operator=(const ArrayNodeArchive& from) {
+  inline ConditionalStyleSetArchive& operator=(const ConditionalStyleSetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6664,17 +7220,17 @@ class ArrayNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ArrayNodeArchive& default_instance();
+  static const ConditionalStyleSetArchive& default_instance();
 
-  void Swap(ArrayNodeArchive* other);
+  void Swap(ConditionalStyleSetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ArrayNodeArchive* New() const;
+  ConditionalStyleSetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ArrayNodeArchive& from);
-  void MergeFrom(const ArrayNodeArchive& from);
+  void CopyFrom(const ConditionalStyleSetArchive& from);
+  void MergeFrom(const ConditionalStyleSetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6695,45 +7251,50 @@ class ArrayNodeArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef ConditionalStyleSetArchive_ConditionalStyleRule ConditionalStyleRule;
+
   // accessors -------------------------------------------------------
 
-  // required .TST.ExpressionNodeArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  // required uint32 ruleCount = 1;
+  inline bool has_rulecount() const;
+  inline void clear_rulecount();
+  static const int kRuleCountFieldNumber = 1;
+  inline ::google::protobuf::uint32 rulecount() const;
+  inline void set_rulecount(::google::protobuf::uint32 value);
 
-  // optional uint32 columns = 2;
-  inline bool has_columns() const;
-  inline void clear_columns();
-  static const int kColumnsFieldNumber = 2;
-  inline ::google::protobuf::uint32 columns() const;
-  inline void set_columns(::google::protobuf::uint32 value);
+  // repeated .TST.ConditionalStyleSetArchive.ConditionalStyleRule rules = 2;
+  inline int rules_size() const;
+  inline void clear_rules();
+  static const int kRulesFieldNumber = 2;
+  inline const ::TST::ConditionalStyleSetArchive_ConditionalStyleRule& rules(int index) const;
+  inline ::TST::ConditionalStyleSetArchive_ConditionalStyleRule* mutable_rules(int index);
+  inline ::TST::ConditionalStyleSetArchive_ConditionalStyleRule* add_rules();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::ConditionalStyleSetArchive_ConditionalStyleRule >&
+      rules() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::ConditionalStyleSetArchive_ConditionalStyleRule >*
+      mutable_rules();
 
-  // optional uint32 rows = 3;
-  inline bool has_rows() const;
-  inline void clear_rows();
-  static const int kRowsFieldNumber = 3;
-  inline ::google::protobuf::uint32 rows() const;
-  inline void set_rows(::google::protobuf::uint32 value);
+  // optional .TST.CellID cellID = 3;
+  inline bool has_cellid() const;
+  inline void clear_cellid();
+  static const int kCellIDFieldNumber = 3;
+  inline const ::TST::CellID& cellid() const;
+  inline ::TST::CellID* mutable_cellid();
+  inline ::TST::CellID* release_cellid();
+  inline void set_allocated_cellid(::TST::CellID* cellid);
 
-  // @@protoc_insertion_point(class_scope:TST.ArrayNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.ConditionalStyleSetArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_columns();
-  inline void clear_has_columns();
-  inline void set_has_rows();
-  inline void clear_has_rows();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::TST::ExpressionNodeArchive* super_;
-  ::google::protobuf::uint32 columns_;
-  ::google::protobuf::uint32 rows_;
+  inline void set_has_rulecount();
+  inline void clear_has_rulecount();
+  inline void set_has_cellid();
+  inline void clear_has_cellid();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedPtrField< ::TST::ConditionalStyleSetArchive_ConditionalStyleRule > rules_;
+  ::TST::CellID* cellid_;
+  ::google::protobuf::uint32 rulecount_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -6743,18 +7304,18 @@ class ArrayNodeArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ArrayNodeArchive* default_instance_;
+  static ConditionalStyleSetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ListNodeArchive : public ::google::protobuf::Message {
+class FilterSetArchive : public ::google::protobuf::Message {
  public:
-  ListNodeArchive();
-  virtual ~ListNodeArchive();
+  FilterSetArchive();
+  virtual ~FilterSetArchive();
 
-  ListNodeArchive(const ListNodeArchive& from);
+  FilterSetArchive(const FilterSetArchive& from);
 
-  inline ListNodeArchive& operator=(const ListNodeArchive& from) {
+  inline FilterSetArchive& operator=(const FilterSetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6768,17 +7329,17 @@ class ListNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ListNodeArchive& default_instance();
+  static const FilterSetArchive& default_instance();
 
-  void Swap(ListNodeArchive* other);
+  void Swap(FilterSetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ListNodeArchive* New() const;
+  FilterSetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ListNodeArchive& from);
-  void MergeFrom(const ListNodeArchive& from);
+  void CopyFrom(const FilterSetArchive& from);
+  void MergeFrom(const FilterSetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6799,46 +7360,127 @@ class ListNodeArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef FilterSetArchive_FilterSetType FilterSetType;
+  static const FilterSetType FilterSetArchiveTypeAll = FilterSetArchive_FilterSetType_FilterSetArchiveTypeAll;
+  static const FilterSetType FilterSetArchiveTypeAny = FilterSetArchive_FilterSetType_FilterSetArchiveTypeAny;
+  static inline bool FilterSetType_IsValid(int value) {
+    return FilterSetArchive_FilterSetType_IsValid(value);
+  }
+  static const FilterSetType FilterSetType_MIN =
+    FilterSetArchive_FilterSetType_FilterSetType_MIN;
+  static const FilterSetType FilterSetType_MAX =
+    FilterSetArchive_FilterSetType_FilterSetType_MAX;
+  static const int FilterSetType_ARRAYSIZE =
+    FilterSetArchive_FilterSetType_FilterSetType_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  FilterSetType_descriptor() {
+    return FilterSetArchive_FilterSetType_descriptor();
+  }
+  static inline const ::std::string& FilterSetType_Name(FilterSetType value) {
+    return FilterSetArchive_FilterSetType_Name(value);
+  }
+  static inline bool FilterSetType_Parse(const ::std::string& name,
+      FilterSetType* value) {
+    return FilterSetArchive_FilterSetType_Parse(name, value);
+  }
+
   // accessors -------------------------------------------------------
 
-  // required .TST.ExpressionNodeArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  // optional .TST.FilterSetArchive.FilterSetType type = 1 [default = FilterSetArchiveTypeAll];
+  inline bool has_type() const;
+  inline void clear_type();
+  static const int kTypeFieldNumber = 1;
+  inline ::TST::FilterSetArchive_FilterSetType type() const;
+  inline void set_type(::TST::FilterSetArchive_FilterSetType value);
 
-  // @@protoc_insertion_point(class_scope:TST.ListNodeArchive)
+  // optional bool is_enabled = 2 [default = true];
+  inline bool has_is_enabled() const;
+  inline void clear_is_enabled();
+  static const int kIsEnabledFieldNumber = 2;
+  inline bool is_enabled() const;
+  inline void set_is_enabled(bool value);
+
+  // repeated .TST.FilterRuleArchive filter_rules = 3;
+  inline int filter_rules_size() const;
+  inline void clear_filter_rules();
+  static const int kFilterRulesFieldNumber = 3;
+  inline const ::TST::FilterRuleArchive& filter_rules(int index) const;
+  inline ::TST::FilterRuleArchive* mutable_filter_rules(int index);
+  inline ::TST::FilterRuleArchive* add_filter_rules();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::FilterRuleArchive >&
+      filter_rules() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::FilterRuleArchive >*
+      mutable_filter_rules();
+
+  // optional bool needs_formula_rewrite_for_import = 4 [default = false];
+  inline bool has_needs_formula_rewrite_for_import() const;
+  inline void clear_needs_formula_rewrite_for_import();
+  static const int kNeedsFormulaRewriteForImportFieldNumber = 4;
+  inline bool needs_formula_rewrite_for_import() const;
+  inline void set_needs_formula_rewrite_for_import(bool value);
+
+  // repeated uint32 filter_offsets = 5;
+  inline int filter_offsets_size() const;
+  inline void clear_filter_offsets();
+  static const int kFilterOffsetsFieldNumber = 5;
+  inline ::google::protobuf::uint32 filter_offsets(int index) const;
+  inline void set_filter_offsets(int index, ::google::protobuf::uint32 value);
+  inline void add_filter_offsets(::google::protobuf::uint32 value);
+  inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+      filter_offsets() const;
+  inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+      mutable_filter_offsets();
+
+  // repeated bool filter_enabled = 6;
+  inline int filter_enabled_size() const;
+  inline void clear_filter_enabled();
+  static const int kFilterEnabledFieldNumber = 6;
+  inline bool filter_enabled(int index) const;
+  inline void set_filter_enabled(int index, bool value);
+  inline void add_filter_enabled(bool value);
+  inline const ::google::protobuf::RepeatedField< bool >&
+      filter_enabled() const;
+  inline ::google::protobuf::RepeatedField< bool >*
+      mutable_filter_enabled();
+
+  // @@protoc_insertion_point(class_scope:TST.FilterSetArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
+  inline void set_has_type();
+  inline void clear_has_type();
+  inline void set_has_is_enabled();
+  inline void clear_has_is_enabled();
+  inline void set_has_needs_formula_rewrite_for_import();
+  inline void clear_has_needs_formula_rewrite_for_import();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::ExpressionNodeArchive* super_;
+  int type_;
+  bool is_enabled_;
+  bool needs_formula_rewrite_for_import_;
+  ::google::protobuf::RepeatedPtrField< ::TST::FilterRuleArchive > filter_rules_;
+  ::google::protobuf::RepeatedField< ::google::protobuf::uint32 > filter_offsets_;
+  ::google::protobuf::RepeatedField< bool > filter_enabled_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ListNodeArchive* default_instance_;
+  static FilterSetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class OperatorNodeArchive : public ::google::protobuf::Message {
+class TokenAttachmentArchive : public ::google::protobuf::Message {
  public:
-  OperatorNodeArchive();
-  virtual ~OperatorNodeArchive();
+  TokenAttachmentArchive();
+  virtual ~TokenAttachmentArchive();
 
-  OperatorNodeArchive(const OperatorNodeArchive& from);
+  TokenAttachmentArchive(const TokenAttachmentArchive& from);
 
-  inline OperatorNodeArchive& operator=(const OperatorNodeArchive& from) {
+  inline TokenAttachmentArchive& operator=(const TokenAttachmentArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6852,17 +7494,17 @@ class OperatorNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const OperatorNodeArchive& default_instance();
+  static const TokenAttachmentArchive& default_instance();
 
-  void Swap(OperatorNodeArchive* other);
+  void Swap(TokenAttachmentArchive* other);
 
   // implements Message ----------------------------------------------
 
-  OperatorNodeArchive* New() const;
+  TokenAttachmentArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const OperatorNodeArchive& from);
-  void MergeFrom(const OperatorNodeArchive& from);
+  void CopyFrom(const TokenAttachmentArchive& from);
+  void MergeFrom(const TokenAttachmentArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6885,33 +7527,35 @@ class OperatorNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.ExpressionNodeArchive super = 1;
+  // required .TSWP.UIGraphicalAttachment super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TST::ExpressionNodeArchive& super() const;
-  inline ::TST::ExpressionNodeArchive* mutable_super();
-  inline ::TST::ExpressionNodeArchive* release_super();
-  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+  inline const ::TSWP::UIGraphicalAttachment& super() const;
+  inline ::TSWP::UIGraphicalAttachment* mutable_super();
+  inline ::TSWP::UIGraphicalAttachment* release_super();
+  inline void set_allocated_super(::TSWP::UIGraphicalAttachment* super);
 
-  // required uint32 operatorChar = 2;
-  inline bool has_operatorchar() const;
-  inline void clear_operatorchar();
-  static const int kOperatorCharFieldNumber = 2;
-  inline ::google::protobuf::uint32 operatorchar() const;
-  inline void set_operatorchar(::google::protobuf::uint32 value);
+  // optional .TSP.Reference expressionNode = 2;
+  inline bool has_expressionnode() const;
+  inline void clear_expressionnode();
+  static const int kExpressionNodeFieldNumber = 2;
+  inline const ::TSP::Reference& expressionnode() const;
+  inline ::TSP::Reference* mutable_expressionnode();
+  inline ::TSP::Reference* release_expressionnode();
+  inline void set_allocated_expressionnode(::TSP::Reference* expressionnode);
 
-  // @@protoc_insertion_point(class_scope:TST.OperatorNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.TokenAttachmentArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_operatorchar();
-  inline void clear_has_operatorchar();
+  inline void set_has_expressionnode();
+  inline void clear_has_expressionnode();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::ExpressionNodeArchive* super_;
-  ::google::protobuf::uint32 operatorchar_;
+  ::TSWP::UIGraphicalAttachment* super_;
+  ::TSP::Reference* expressionnode_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
@@ -6921,18 +7565,18 @@ class OperatorNodeArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static OperatorNodeArchive* default_instance_;
+  static TokenAttachmentArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class PostfixOperatorNodeArchive : public ::google::protobuf::Message {
+class FormulaArchive : public ::google::protobuf::Message {
  public:
-  PostfixOperatorNodeArchive();
-  virtual ~PostfixOperatorNodeArchive();
+  FormulaArchive();
+  virtual ~FormulaArchive();
 
-  PostfixOperatorNodeArchive(const PostfixOperatorNodeArchive& from);
+  FormulaArchive(const FormulaArchive& from);
 
-  inline PostfixOperatorNodeArchive& operator=(const PostfixOperatorNodeArchive& from) {
+  inline FormulaArchive& operator=(const FormulaArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6946,17 +7590,17 @@ class PostfixOperatorNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const PostfixOperatorNodeArchive& default_instance();
+  static const FormulaArchive& default_instance();
 
-  void Swap(PostfixOperatorNodeArchive* other);
+  void Swap(FormulaArchive* other);
 
   // implements Message ----------------------------------------------
 
-  PostfixOperatorNodeArchive* New() const;
+  FormulaArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const PostfixOperatorNodeArchive& from);
-  void MergeFrom(const PostfixOperatorNodeArchive& from);
+  void CopyFrom(const FormulaArchive& from);
+  void MergeFrom(const FormulaArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6979,23 +7623,23 @@ class PostfixOperatorNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.OperatorNodeArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::OperatorNodeArchive& super() const;
-  inline ::TST::OperatorNodeArchive* mutable_super();
-  inline ::TST::OperatorNodeArchive* release_super();
-  inline void set_allocated_super(::TST::OperatorNodeArchive* super);
+  // optional .TSP.Reference expressionTree = 1;
+  inline bool has_expressiontree() const;
+  inline void clear_expressiontree();
+  static const int kExpressionTreeFieldNumber = 1;
+  inline const ::TSP::Reference& expressiontree() const;
+  inline ::TSP::Reference* mutable_expressiontree();
+  inline ::TSP::Reference* release_expressiontree();
+  inline void set_allocated_expressiontree(::TSP::Reference* expressiontree);
 
-  // @@protoc_insertion_point(class_scope:TST.PostfixOperatorNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.FormulaArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
+  inline void set_has_expressiontree();
+  inline void clear_has_expressiontree();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::OperatorNodeArchive* super_;
+  ::TSP::Reference* expressiontree_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
@@ -7005,18 +7649,18 @@ class PostfixOperatorNodeArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static PostfixOperatorNodeArchive* default_instance_;
+  static FormulaArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class PrefixOperatorNodeArchive : public ::google::protobuf::Message {
+class ExpressionNodeArchive : public ::google::protobuf::Message {
  public:
-  PrefixOperatorNodeArchive();
-  virtual ~PrefixOperatorNodeArchive();
+  ExpressionNodeArchive();
+  virtual ~ExpressionNodeArchive();
 
-  PrefixOperatorNodeArchive(const PrefixOperatorNodeArchive& from);
+  ExpressionNodeArchive(const ExpressionNodeArchive& from);
 
-  inline PrefixOperatorNodeArchive& operator=(const PrefixOperatorNodeArchive& from) {
+  inline ExpressionNodeArchive& operator=(const ExpressionNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7030,17 +7674,17 @@ class PrefixOperatorNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const PrefixOperatorNodeArchive& default_instance();
+  static const ExpressionNodeArchive& default_instance();
 
-  void Swap(PrefixOperatorNodeArchive* other);
+  void Swap(ExpressionNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  PrefixOperatorNodeArchive* New() const;
+  ExpressionNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const PrefixOperatorNodeArchive& from);
-  void MergeFrom(const PrefixOperatorNodeArchive& from);
+  void CopyFrom(const ExpressionNodeArchive& from);
+  void MergeFrom(const ExpressionNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7063,44 +7707,65 @@ class PrefixOperatorNodeArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.OperatorNodeArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::OperatorNodeArchive& super() const;
-  inline ::TST::OperatorNodeArchive* mutable_super();
-  inline ::TST::OperatorNodeArchive* release_super();
-  inline void set_allocated_super(::TST::OperatorNodeArchive* super);
+  // repeated .TSP.Reference children = 1;
+  inline int children_size() const;
+  inline void clear_children();
+  static const int kChildrenFieldNumber = 1;
+  inline const ::TSP::Reference& children(int index) const;
+  inline ::TSP::Reference* mutable_children(int index);
+  inline ::TSP::Reference* add_children();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+      children() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+      mutable_children();
 
-  // @@protoc_insertion_point(class_scope:TST.PrefixOperatorNodeArchive)
+  // optional uint64 first_index = 2 [default = 0];
+  inline bool has_first_index() const;
+  inline void clear_first_index();
+  static const int kFirstIndexFieldNumber = 2;
+  inline ::google::protobuf::uint64 first_index() const;
+  inline void set_first_index(::google::protobuf::uint64 value);
+
+  // optional uint64 last_index = 3 [default = 0];
+  inline bool has_last_index() const;
+  inline void clear_last_index();
+  static const int kLastIndexFieldNumber = 3;
+  inline ::google::protobuf::uint64 last_index() const;
+  inline void set_last_index(::google::protobuf::uint64 value);
+
+  // @@protoc_insertion_point(class_scope:TST.ExpressionNodeArchive)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
+  inline void set_has_first_index();
+  inline void clear_has_first_index();
+  inline void set_has_last_index();
+  inline void clear_has_last_index();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::OperatorNodeArchive* super_;
+  ::google::protobuf::RepeatedPtrField< ::TSP::Reference > children_;
+  ::google::protobuf::uint64 first_index_;
+  ::google::protobuf::uint64 last_index_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static PrefixOperatorNodeArchive* default_instance_;
+  static ExpressionNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FunctionNodeArchive : public ::google::protobuf::Message {
+class BooleanNodeArchive : public ::google::protobuf::Message {
  public:
-  FunctionNodeArchive();
-  virtual ~FunctionNodeArchive();
+  BooleanNodeArchive();
+  virtual ~BooleanNodeArchive();
 
-  FunctionNodeArchive(const FunctionNodeArchive& from);
+  BooleanNodeArchive(const BooleanNodeArchive& from);
 
-  inline FunctionNodeArchive& operator=(const FunctionNodeArchive& from) {
+  inline BooleanNodeArchive& operator=(const BooleanNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7114,17 +7779,17 @@ class FunctionNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FunctionNodeArchive& default_instance();
+  static const BooleanNodeArchive& default_instance();
 
-  void Swap(FunctionNodeArchive* other);
+  void Swap(BooleanNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FunctionNodeArchive* New() const;
+  BooleanNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FunctionNodeArchive& from);
-  void MergeFrom(const FunctionNodeArchive& from);
+  void CopyFrom(const BooleanNodeArchive& from);
+  void MergeFrom(const BooleanNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7156,60 +7821,45 @@ class FunctionNodeArchive : public ::google::protobuf::Message {
   inline ::TST::ExpressionNodeArchive* release_super();
   inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // required uint32 functionIndex = 2;
-  inline bool has_functionindex() const;
-  inline void clear_functionindex();
-  static const int kFunctionIndexFieldNumber = 2;
-  inline ::google::protobuf::uint32 functionindex() const;
-  inline void set_functionindex(::google::protobuf::uint32 value);
-
-  // optional string invalidFunctionName = 3;
-  inline bool has_invalidfunctionname() const;
-  inline void clear_invalidfunctionname();
-  static const int kInvalidFunctionNameFieldNumber = 3;
-  inline const ::std::string& invalidfunctionname() const;
-  inline void set_invalidfunctionname(const ::std::string& value);
-  inline void set_invalidfunctionname(const char* value);
-  inline void set_invalidfunctionname(const char* value, size_t size);
-  inline ::std::string* mutable_invalidfunctionname();
-  inline ::std::string* release_invalidfunctionname();
-  inline void set_allocated_invalidfunctionname(::std::string* invalidfunctionname);
+  // required bool value = 2;
+  inline bool has_value() const;
+  inline void clear_value();
+  static const int kValueFieldNumber = 2;
+  inline bool value() const;
+  inline void set_value(bool value);
 
-  // @@protoc_insertion_point(class_scope:TST.FunctionNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.BooleanNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_functionindex();
-  inline void clear_has_functionindex();
-  inline void set_has_invalidfunctionname();
-  inline void clear_has_invalidfunctionname();
+  inline void set_has_value();
+  inline void clear_has_value();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
-  ::std::string* invalidfunctionname_;
-  ::google::protobuf::uint32 functionindex_;
+  bool value_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FunctionNodeArchive* default_instance_;
+  static BooleanNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FunctionEndNodeArchive : public ::google::protobuf::Message {
+class NumberNodeArchive : public ::google::protobuf::Message {
  public:
-  FunctionEndNodeArchive();
-  virtual ~FunctionEndNodeArchive();
+  NumberNodeArchive();
+  virtual ~NumberNodeArchive();
 
-  FunctionEndNodeArchive(const FunctionEndNodeArchive& from);
+  NumberNodeArchive(const NumberNodeArchive& from);
 
-  inline FunctionEndNodeArchive& operator=(const FunctionEndNodeArchive& from) {
+  inline NumberNodeArchive& operator=(const NumberNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7223,17 +7873,17 @@ class FunctionEndNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FunctionEndNodeArchive& default_instance();
+  static const NumberNodeArchive& default_instance();
 
-  void Swap(FunctionEndNodeArchive* other);
+  void Swap(NumberNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FunctionEndNodeArchive* New() const;
+  NumberNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FunctionEndNodeArchive& from);
-  void MergeFrom(const FunctionEndNodeArchive& from);
+  void CopyFrom(const NumberNodeArchive& from);
+  void MergeFrom(const NumberNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7265,35 +7915,45 @@ class FunctionEndNodeArchive : public ::google::protobuf::Message {
   inline ::TST::ExpressionNodeArchive* release_super();
   inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TST.FunctionEndNodeArchive)
+  // required double number = 2;
+  inline bool has_number() const;
+  inline void clear_number();
+  static const int kNumberFieldNumber = 2;
+  inline double number() const;
+  inline void set_number(double value);
+
+  // @@protoc_insertion_point(class_scope:TST.NumberNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
+  inline void set_has_number();
+  inline void clear_has_number();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
+  double number_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FunctionEndNodeArchive* default_instance_;
+  static NumberNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class DateNodeArchive : public ::google::protobuf::Message {
+class StringNodeArchive : public ::google::protobuf::Message {
  public:
-  DateNodeArchive();
-  virtual ~DateNodeArchive();
+  StringNodeArchive();
+  virtual ~StringNodeArchive();
 
-  DateNodeArchive(const DateNodeArchive& from);
+  StringNodeArchive(const StringNodeArchive& from);
 
-  inline DateNodeArchive& operator=(const DateNodeArchive& from) {
+  inline StringNodeArchive& operator=(const StringNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7307,17 +7967,17 @@ class DateNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const DateNodeArchive& default_instance();
+  static const StringNodeArchive& default_instance();
 
-  void Swap(DateNodeArchive* other);
+  void Swap(StringNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  DateNodeArchive* New() const;
+  StringNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const DateNodeArchive& from);
-  void MergeFrom(const DateNodeArchive& from);
+  void CopyFrom(const StringNodeArchive& from);
+  void MergeFrom(const StringNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7361,53 +8021,38 @@ class DateNodeArchive : public ::google::protobuf::Message {
   inline ::std::string* release_value();
   inline void set_allocated_value(::std::string* value);
 
-  // optional string format = 3;
-  inline bool has_format() const;
-  inline void clear_format();
-  static const int kFormatFieldNumber = 3;
-  inline const ::std::string& format() const;
-  inline void set_format(const ::std::string& value);
-  inline void set_format(const char* value);
-  inline void set_format(const char* value, size_t size);
-  inline ::std::string* mutable_format();
-  inline ::std::string* release_format();
-  inline void set_allocated_format(::std::string* format);
-
-  // @@protoc_insertion_point(class_scope:TST.DateNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.StringNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
   inline void set_has_value();
   inline void clear_has_value();
-  inline void set_has_format();
-  inline void clear_has_format();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
   ::std::string* value_;
-  ::std::string* format_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static DateNodeArchive* default_instance_;
+  static StringNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ReferenceNodeArchive : public ::google::protobuf::Message {
+class IdentifierNodeArchive : public ::google::protobuf::Message {
  public:
-  ReferenceNodeArchive();
-  virtual ~ReferenceNodeArchive();
+  IdentifierNodeArchive();
+  virtual ~IdentifierNodeArchive();
 
-  ReferenceNodeArchive(const ReferenceNodeArchive& from);
+  IdentifierNodeArchive(const IdentifierNodeArchive& from);
 
-  inline ReferenceNodeArchive& operator=(const ReferenceNodeArchive& from) {
+  inline IdentifierNodeArchive& operator=(const IdentifierNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7421,17 +8066,17 @@ class ReferenceNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ReferenceNodeArchive& default_instance();
+  static const IdentifierNodeArchive& default_instance();
 
-  void Swap(ReferenceNodeArchive* other);
+  void Swap(IdentifierNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ReferenceNodeArchive* New() const;
+  IdentifierNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReferenceNodeArchive& from);
-  void MergeFrom(const ReferenceNodeArchive& from);
+  void CopyFrom(const IdentifierNodeArchive& from);
+  void MergeFrom(const IdentifierNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7463,72 +8108,50 @@ class ReferenceNodeArchive : public ::google::protobuf::Message {
   inline ::TST::ExpressionNodeArchive* release_super();
   inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // required .TSCE.RangeReferenceArchive rangeReference = 2;
-  inline bool has_rangereference() const;
-  inline void clear_rangereference();
-  static const int kRangeReferenceFieldNumber = 2;
-  inline const ::TSCE::RangeReferenceArchive& rangereference() const;
-  inline ::TSCE::RangeReferenceArchive* mutable_rangereference();
-  inline ::TSCE::RangeReferenceArchive* release_rangereference();
-  inline void set_allocated_rangereference(::TSCE::RangeReferenceArchive* rangereference);
-
-  // required uint32 stickyBits = 3;
-  inline bool has_stickybits() const;
-  inline void clear_stickybits();
-  static const int kStickyBitsFieldNumber = 3;
-  inline ::google::protobuf::uint32 stickybits() const;
-  inline void set_stickybits(::google::protobuf::uint32 value);
-
-  // optional string hostTableID = 4;
-  inline bool has_hosttableid() const;
-  inline void clear_hosttableid();
-  static const int kHostTableIDFieldNumber = 4;
-  inline const ::std::string& hosttableid() const;
-  inline void set_hosttableid(const ::std::string& value);
-  inline void set_hosttableid(const char* value);
-  inline void set_hosttableid(const char* value, size_t size);
-  inline ::std::string* mutable_hosttableid();
-  inline ::std::string* release_hosttableid();
-  inline void set_allocated_hosttableid(::std::string* hosttableid);
+  // optional string identifier = 2;
+  inline bool has_identifier() const;
+  inline void clear_identifier();
+  static const int kIdentifierFieldNumber = 2;
+  inline const ::std::string& identifier() const;
+  inline void set_identifier(const ::std::string& value);
+  inline void set_identifier(const char* value);
+  inline void set_identifier(const char* value, size_t size);
+  inline ::std::string* mutable_identifier();
+  inline ::std::string* release_identifier();
+  inline void set_allocated_identifier(::std::string* identifier);
 
-  // @@protoc_insertion_point(class_scope:TST.ReferenceNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.IdentifierNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_rangereference();
-  inline void clear_has_rangereference();
-  inline void set_has_stickybits();
-  inline void clear_has_stickybits();
-  inline void set_has_hosttableid();
-  inline void clear_has_hosttableid();
+  inline void set_has_identifier();
+  inline void clear_has_identifier();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
-  ::TSCE::RangeReferenceArchive* rangereference_;
-  ::std::string* hosttableid_;
-  ::google::protobuf::uint32 stickybits_;
+  ::std::string* identifier_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ReferenceNodeArchive* default_instance_;
+  static IdentifierNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class DurationNodeArchive : public ::google::protobuf::Message {
+class ArrayNodeArchive : public ::google::protobuf::Message {
  public:
-  DurationNodeArchive();
-  virtual ~DurationNodeArchive();
+  ArrayNodeArchive();
+  virtual ~ArrayNodeArchive();
 
-  DurationNodeArchive(const DurationNodeArchive& from);
+  ArrayNodeArchive(const ArrayNodeArchive& from);
 
-  inline DurationNodeArchive& operator=(const DurationNodeArchive& from) {
+  inline ArrayNodeArchive& operator=(const ArrayNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7542,17 +8165,17 @@ class DurationNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const DurationNodeArchive& default_instance();
+  static const ArrayNodeArchive& default_instance();
 
-  void Swap(DurationNodeArchive* other);
+  void Swap(ArrayNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  DurationNodeArchive* New() const;
+  ArrayNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const DurationNodeArchive& from);
-  void MergeFrom(const DurationNodeArchive& from);
+  void CopyFrom(const ArrayNodeArchive& from);
+  void MergeFrom(const ArrayNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7584,75 +8207,55 @@ class DurationNodeArchive : public ::google::protobuf::Message {
   inline ::TST::ExpressionNodeArchive* release_super();
   inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // required double timeinterval = 2;
-  inline bool has_timeinterval() const;
-  inline void clear_timeinterval();
-  static const int kTimeintervalFieldNumber = 2;
-  inline double timeinterval() const;
-  inline void set_timeinterval(double value);
-
-  // required uint32 smallest = 3;
-  inline bool has_smallest() const;
-  inline void clear_smallest();
-  static const int kSmallestFieldNumber = 3;
-  inline ::google::protobuf::uint32 smallest() const;
-  inline void set_smallest(::google::protobuf::uint32 value);
-
-  // required uint32 largest = 4;
-  inline bool has_largest() const;
-  inline void clear_largest();
-  static const int kLargestFieldNumber = 4;
-  inline ::google::protobuf::uint32 largest() const;
-  inline void set_largest(::google::protobuf::uint32 value);
+  // optional uint32 columns = 2;
+  inline bool has_columns() const;
+  inline void clear_columns();
+  static const int kColumnsFieldNumber = 2;
+  inline ::google::protobuf::uint32 columns() const;
+  inline void set_columns(::google::protobuf::uint32 value);
 
-  // required uint32 style = 5;
-  inline bool has_style() const;
-  inline void clear_style();
-  static const int kStyleFieldNumber = 5;
-  inline ::google::protobuf::uint32 style() const;
-  inline void set_style(::google::protobuf::uint32 value);
+  // optional uint32 rows = 3;
+  inline bool has_rows() const;
+  inline void clear_rows();
+  static const int kRowsFieldNumber = 3;
+  inline ::google::protobuf::uint32 rows() const;
+  inline void set_rows(::google::protobuf::uint32 value);
 
-  // @@protoc_insertion_point(class_scope:TST.DurationNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.ArrayNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_timeinterval();
-  inline void clear_has_timeinterval();
-  inline void set_has_smallest();
-  inline void clear_has_smallest();
-  inline void set_has_largest();
-  inline void clear_has_largest();
-  inline void set_has_style();
-  inline void clear_has_style();
+  inline void set_has_columns();
+  inline void clear_has_columns();
+  inline void set_has_rows();
+  inline void clear_has_rows();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
-  double timeinterval_;
-  ::google::protobuf::uint32 smallest_;
-  ::google::protobuf::uint32 largest_;
-  ::google::protobuf::uint32 style_;
+  ::google::protobuf::uint32 columns_;
+  ::google::protobuf::uint32 rows_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static DurationNodeArchive* default_instance_;
+  static ArrayNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class ArgumentPlaceholderNodeArchive : public ::google::protobuf::Message {
+class ListNodeArchive : public ::google::protobuf::Message {
  public:
-  ArgumentPlaceholderNodeArchive();
-  virtual ~ArgumentPlaceholderNodeArchive();
+  ListNodeArchive();
+  virtual ~ListNodeArchive();
 
-  ArgumentPlaceholderNodeArchive(const ArgumentPlaceholderNodeArchive& from);
+  ListNodeArchive(const ListNodeArchive& from);
 
-  inline ArgumentPlaceholderNodeArchive& operator=(const ArgumentPlaceholderNodeArchive& from) {
+  inline ListNodeArchive& operator=(const ListNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7666,17 +8269,17 @@ class ArgumentPlaceholderNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const ArgumentPlaceholderNodeArchive& default_instance();
+  static const ListNodeArchive& default_instance();
 
-  void Swap(ArgumentPlaceholderNodeArchive* other);
+  void Swap(ListNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  ArgumentPlaceholderNodeArchive* New() const;
+  ListNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ArgumentPlaceholderNodeArchive& from);
-  void MergeFrom(const ArgumentPlaceholderNodeArchive& from);
+  void CopyFrom(const ListNodeArchive& from);
+  void MergeFrom(const ListNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7708,65 +8311,35 @@ class ArgumentPlaceholderNodeArchive : public ::google::protobuf::Message {
   inline ::TST::ExpressionNodeArchive* release_super();
   inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // required uint32 functionIndex = 2;
-  inline bool has_functionindex() const;
-  inline void clear_functionindex();
-  static const int kFunctionIndexFieldNumber = 2;
-  inline ::google::protobuf::uint32 functionindex() const;
-  inline void set_functionindex(::google::protobuf::uint32 value);
-
-  // required uint32 argumentIndex = 3;
-  inline bool has_argumentindex() const;
-  inline void clear_argumentindex();
-  static const int kArgumentIndexFieldNumber = 3;
-  inline ::google::protobuf::uint32 argumentindex() const;
-  inline void set_argumentindex(::google::protobuf::uint32 value);
-
-  // optional uint32 mode = 4;
-  inline bool has_mode() const;
-  inline void clear_mode();
-  static const int kModeFieldNumber = 4;
-  inline ::google::protobuf::uint32 mode() const;
-  inline void set_mode(::google::protobuf::uint32 value);
-
-  // @@protoc_insertion_point(class_scope:TST.ArgumentPlaceholderNodeArchive)
+  // @@protoc_insertion_point(class_scope:TST.ListNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_functionindex();
-  inline void clear_has_functionindex();
-  inline void set_has_argumentindex();
-  inline void clear_has_argumentindex();
-  inline void set_has_mode();
-  inline void clear_has_mode();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
-  ::google::protobuf::uint32 functionindex_;
-  ::google::protobuf::uint32 argumentindex_;
-  ::google::protobuf::uint32 mode_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static ArgumentPlaceholderNodeArchive* default_instance_;
+  static ListNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class EmptyExpressionNodeArchive : public ::google::protobuf::Message {
+class OperatorNodeArchive : public ::google::protobuf::Message {
  public:
-  EmptyExpressionNodeArchive();
-  virtual ~EmptyExpressionNodeArchive();
+  OperatorNodeArchive();
+  virtual ~OperatorNodeArchive();
 
-  EmptyExpressionNodeArchive(const EmptyExpressionNodeArchive& from);
+  OperatorNodeArchive(const OperatorNodeArchive& from);
 
-  inline EmptyExpressionNodeArchive& operator=(const EmptyExpressionNodeArchive& from) {
+  inline OperatorNodeArchive& operator=(const OperatorNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7780,17 +8353,17 @@ class EmptyExpressionNodeArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const EmptyExpressionNodeArchive& default_instance();
+  static const OperatorNodeArchive& default_instance();
 
-  void Swap(EmptyExpressionNodeArchive* other);
+  void Swap(OperatorNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  EmptyExpressionNodeArchive* New() const;
+  OperatorNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const EmptyExpressionNodeArchive& from);
-  void MergeFrom(const EmptyExpressionNodeArchive& from);
+  void CopyFrom(const OperatorNodeArchive& from);
+  void MergeFrom(const OperatorNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7822,35 +8395,45 @@ class EmptyExpressionNodeArchive : public ::google::protobuf::Message {
   inline ::TST::ExpressionNodeArchive* release_super();
   inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TST.EmptyExpressionNodeArchive)
+  // required uint32 operatorChar = 2;
+  inline bool has_operatorchar() const;
+  inline void clear_operatorchar();
+  static const int kOperatorCharFieldNumber = 2;
+  inline ::google::protobuf::uint32 operatorchar() const;
+  inline void set_operatorchar(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.OperatorNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
+  inline void set_has_operatorchar();
+  inline void clear_has_operatorchar();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::ExpressionNodeArchive* super_;
+  ::google::protobuf::uint32 operatorchar_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static EmptyExpressionNodeArchive* default_instance_;
+  static OperatorNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class LayoutHintArchive : public ::google::protobuf::Message {
+class PostfixOperatorNodeArchive : public ::google::protobuf::Message {
  public:
-  LayoutHintArchive();
-  virtual ~LayoutHintArchive();
+  PostfixOperatorNodeArchive();
+  virtual ~PostfixOperatorNodeArchive();
 
-  LayoutHintArchive(const LayoutHintArchive& from);
+  PostfixOperatorNodeArchive(const PostfixOperatorNodeArchive& from);
 
-  inline LayoutHintArchive& operator=(const LayoutHintArchive& from) {
+  inline PostfixOperatorNodeArchive& operator=(const PostfixOperatorNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -7864,17 +8447,17 @@ class LayoutHintArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const LayoutHintArchive& default_instance();
+  static const PostfixOperatorNodeArchive& default_instance();
 
-  void Swap(LayoutHintArchive* other);
+  void Swap(PostfixOperatorNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  LayoutHintArchive* New() const;
+  PostfixOperatorNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const LayoutHintArchive& from);
-  void MergeFrom(const LayoutHintArchive& from);
+  void CopyFrom(const PostfixOperatorNodeArchive& from);
+  void MergeFrom(const PostfixOperatorNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -7897,120 +8480,44 @@ class LayoutHintArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required bool isValid = 1;
-  inline bool has_isvalid() const;
-  inline void clear_isvalid();
-  static const int kIsValidFieldNumber = 1;
-  inline bool isvalid() const;
-  inline void set_isvalid(bool value);
+  // required .TST.OperatorNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::OperatorNodeArchive& super() const;
+  inline ::TST::OperatorNodeArchive* mutable_super();
+  inline ::TST::OperatorNodeArchive* release_super();
+  inline void set_allocated_super(::TST::OperatorNodeArchive* super);
 
-  // required .TST.CellRange cellRange = 2;
-  inline bool has_cellrange() const;
-  inline void clear_cellrange();
-  static const int kCellRangeFieldNumber = 2;
-  inline const ::TST::CellRange& cellrange() const;
-  inline ::TST::CellRange* mutable_cellrange();
-  inline ::TST::CellRange* release_cellrange();
-  inline void set_allocated_cellrange(::TST::CellRange* cellrange);
+  // @@protoc_insertion_point(class_scope:TST.PostfixOperatorNodeArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
 
-  // required .TST.CellID hintID = 3;
-  inline bool has_hintid() const;
-  inline void clear_hintid();
-  static const int kHintIDFieldNumber = 3;
-  inline const ::TST::CellID& hintid() const;
-  inline ::TST::CellID* mutable_hintid();
-  inline ::TST::CellID* release_hintid();
-  inline void set_allocated_hintid(::TST::CellID* hintid);
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  // required .TSP.Size maximumSize = 4;
-  inline bool has_maximumsize() const;
-  inline void clear_maximumsize();
-  static const int kMaximumSizeFieldNumber = 4;
-  inline const ::TSP::Size& maximumsize() const;
-  inline ::TSP::Size* mutable_maximumsize();
-  inline ::TSP::Size* release_maximumsize();
-  inline void set_allocated_maximumsize(::TSP::Size* maximumsize);
-
-  // required uint32 partitionPosition = 5;
-  inline bool has_partitionposition() const;
-  inline void clear_partitionposition();
-  static const int kPartitionPositionFieldNumber = 5;
-  inline ::google::protobuf::uint32 partitionposition() const;
-  inline void set_partitionposition(::google::protobuf::uint32 value);
-
-  // required bool horizontal = 6;
-  inline bool has_horizontal() const;
-  inline void clear_horizontal();
-  static const int kHorizontalFieldNumber = 6;
-  inline bool horizontal() const;
-  inline void set_horizontal(bool value);
-
-  // optional .TSP.Size effectiveSize = 7;
-  inline bool has_effectivesize() const;
-  inline void clear_effectivesize();
-  static const int kEffectiveSizeFieldNumber = 7;
-  inline const ::TSP::Size& effectivesize() const;
-  inline ::TSP::Size* mutable_effectivesize();
-  inline ::TSP::Size* release_effectivesize();
-  inline void set_allocated_effectivesize(::TSP::Size* effectivesize);
-
-  // optional uint32 partitioningPass = 8;
-  inline bool has_partitioningpass() const;
-  inline void clear_partitioningpass();
-  static const int kPartitioningPassFieldNumber = 8;
-  inline ::google::protobuf::uint32 partitioningpass() const;
-  inline void set_partitioningpass(::google::protobuf::uint32 value);
-
-  // @@protoc_insertion_point(class_scope:TST.LayoutHintArchive)
- private:
-  inline void set_has_isvalid();
-  inline void clear_has_isvalid();
-  inline void set_has_cellrange();
-  inline void clear_has_cellrange();
-  inline void set_has_hintid();
-  inline void clear_has_hintid();
-  inline void set_has_maximumsize();
-  inline void clear_has_maximumsize();
-  inline void set_has_partitionposition();
-  inline void clear_has_partitionposition();
-  inline void set_has_horizontal();
-  inline void clear_has_horizontal();
-  inline void set_has_effectivesize();
-  inline void clear_has_effectivesize();
-  inline void set_has_partitioningpass();
-  inline void clear_has_partitioningpass();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::TST::CellRange* cellrange_;
-  ::TST::CellID* hintid_;
-  ::TSP::Size* maximumsize_;
-  bool isvalid_;
-  bool horizontal_;
-  ::google::protobuf::uint32 partitionposition_;
-  ::TSP::Size* effectivesize_;
-  ::google::protobuf::uint32 partitioningpass_;
+  ::TST::OperatorNodeArchive* super_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static LayoutHintArchive* default_instance_;
+  static PostfixOperatorNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CompletionTokenAttachmentArchive : public ::google::protobuf::Message {
+class PrefixOperatorNodeArchive : public ::google::protobuf::Message {
  public:
-  CompletionTokenAttachmentArchive();
-  virtual ~CompletionTokenAttachmentArchive();
+  PrefixOperatorNodeArchive();
+  virtual ~PrefixOperatorNodeArchive();
 
-  CompletionTokenAttachmentArchive(const CompletionTokenAttachmentArchive& from);
+  PrefixOperatorNodeArchive(const PrefixOperatorNodeArchive& from);
 
-  inline CompletionTokenAttachmentArchive& operator=(const CompletionTokenAttachmentArchive& from) {
+  inline PrefixOperatorNodeArchive& operator=(const PrefixOperatorNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -8024,17 +8531,17 @@ class CompletionTokenAttachmentArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CompletionTokenAttachmentArchive& default_instance();
+  static const PrefixOperatorNodeArchive& default_instance();
 
-  void Swap(CompletionTokenAttachmentArchive* other);
+  void Swap(PrefixOperatorNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CompletionTokenAttachmentArchive* New() const;
+  PrefixOperatorNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CompletionTokenAttachmentArchive& from);
-  void MergeFrom(const CompletionTokenAttachmentArchive& from);
+  void CopyFrom(const PrefixOperatorNodeArchive& from);
+  void MergeFrom(const PrefixOperatorNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -8057,79 +8564,44 @@ class CompletionTokenAttachmentArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.TokenAttachmentArchive super = 1;
+  // required .TST.OperatorNodeArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TST::TokenAttachmentArchive& super() const;
-  inline ::TST::TokenAttachmentArchive* mutable_super();
-  inline ::TST::TokenAttachmentArchive* release_super();
-  inline void set_allocated_super(::TST::TokenAttachmentArchive* super);
-
-  // optional string completionText = 2;
-  inline bool has_completiontext() const;
-  inline void clear_completiontext();
-  static const int kCompletionTextFieldNumber = 2;
-  inline const ::std::string& completiontext() const;
-  inline void set_completiontext(const ::std::string& value);
-  inline void set_completiontext(const char* value);
-  inline void set_completiontext(const char* value, size_t size);
-  inline ::std::string* mutable_completiontext();
-  inline ::std::string* release_completiontext();
-  inline void set_allocated_completiontext(::std::string* completiontext);
-
-  // optional uint32 caretPosition = 3;
-  inline bool has_caretposition() const;
-  inline void clear_caretposition();
-  static const int kCaretPositionFieldNumber = 3;
-  inline ::google::protobuf::uint32 caretposition() const;
-  inline void set_caretposition(::google::protobuf::uint32 value);
-
-  // optional uint32 prefixStart = 4;
-  inline bool has_prefixstart() const;
-  inline void clear_prefixstart();
-  static const int kPrefixStartFieldNumber = 4;
-  inline ::google::protobuf::uint32 prefixstart() const;
-  inline void set_prefixstart(::google::protobuf::uint32 value);
+  inline const ::TST::OperatorNodeArchive& super() const;
+  inline ::TST::OperatorNodeArchive* mutable_super();
+  inline ::TST::OperatorNodeArchive* release_super();
+  inline void set_allocated_super(::TST::OperatorNodeArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TST.CompletionTokenAttachmentArchive)
+  // @@protoc_insertion_point(class_scope:TST.PrefixOperatorNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_completiontext();
-  inline void clear_has_completiontext();
-  inline void set_has_caretposition();
-  inline void clear_has_caretposition();
-  inline void set_has_prefixstart();
-  inline void clear_has_prefixstart();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::TokenAttachmentArchive* super_;
-  ::std::string* completiontext_;
-  ::google::protobuf::uint32 caretposition_;
-  ::google::protobuf::uint32 prefixstart_;
+  ::TST::OperatorNodeArchive* super_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CompletionTokenAttachmentArchive* default_instance_;
+  static PrefixOperatorNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class HiddenStateFormulaOwnerArchive : public ::google::protobuf::Message {
+class FunctionNodeArchive : public ::google::protobuf::Message {
  public:
-  HiddenStateFormulaOwnerArchive();
-  virtual ~HiddenStateFormulaOwnerArchive();
+  FunctionNodeArchive();
+  virtual ~FunctionNodeArchive();
 
-  HiddenStateFormulaOwnerArchive(const HiddenStateFormulaOwnerArchive& from);
+  FunctionNodeArchive(const FunctionNodeArchive& from);
 
-  inline HiddenStateFormulaOwnerArchive& operator=(const HiddenStateFormulaOwnerArchive& from) {
+  inline FunctionNodeArchive& operator=(const FunctionNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -8143,17 +8615,17 @@ class HiddenStateFormulaOwnerArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const HiddenStateFormulaOwnerArchive& default_instance();
+  static const FunctionNodeArchive& default_instance();
 
-  void Swap(HiddenStateFormulaOwnerArchive* other);
+  void Swap(FunctionNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  HiddenStateFormulaOwnerArchive* New() const;
+  FunctionNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const HiddenStateFormulaOwnerArchive& from);
-  void MergeFrom(const HiddenStateFormulaOwnerArchive& from);
+  void CopyFrom(const FunctionNodeArchive& from);
+  void MergeFrom(const FunctionNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -8176,46 +8648,48 @@ class HiddenStateFormulaOwnerArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // optional .TSCE.CFUUIDArchive owner_id = 1;
-  inline bool has_owner_id() const;
-  inline void clear_owner_id();
-  static const int kOwnerIdFieldNumber = 1;
-  inline const ::TSCE::CFUUIDArchive& owner_id() const;
-  inline ::TSCE::CFUUIDArchive* mutable_owner_id();
-  inline ::TSCE::CFUUIDArchive* release_owner_id();
-  inline void set_allocated_owner_id(::TSCE::CFUUIDArchive* owner_id);
+  // required .TST.ExpressionNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // repeated .TSCE.CellValueArchive threshold_value = 2;
-  inline int threshold_value_size() const;
-  inline void clear_threshold_value();
-  static const int kThresholdValueFieldNumber = 2;
-  inline const ::TSCE::CellValueArchive& threshold_value(int index) const;
-  inline ::TSCE::CellValueArchive* mutable_threshold_value(int index);
-  inline ::TSCE::CellValueArchive* add_threshold_value();
-  inline const ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >&
-      threshold_value() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >*
-      mutable_threshold_value();
+  // required uint32 functionIndex = 2;
+  inline bool has_functionindex() const;
+  inline void clear_functionindex();
+  static const int kFunctionIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 functionindex() const;
+  inline void set_functionindex(::google::protobuf::uint32 value);
 
-  // optional bool needs_to_update_filter_set_for_import = 3 [default = false];
-  inline bool has_needs_to_update_filter_set_for_import() const;
-  inline void clear_needs_to_update_filter_set_for_import();
-  static const int kNeedsToUpdateFilterSetForImportFieldNumber = 3;
-  inline bool needs_to_update_filter_set_for_import() const;
-  inline void set_needs_to_update_filter_set_for_import(bool value);
+  // optional string invalidFunctionName = 3;
+  inline bool has_invalidfunctionname() const;
+  inline void clear_invalidfunctionname();
+  static const int kInvalidFunctionNameFieldNumber = 3;
+  inline const ::std::string& invalidfunctionname() const;
+  inline void set_invalidfunctionname(const ::std::string& value);
+  inline void set_invalidfunctionname(const char* value);
+  inline void set_invalidfunctionname(const char* value, size_t size);
+  inline ::std::string* mutable_invalidfunctionname();
+  inline ::std::string* release_invalidfunctionname();
+  inline void set_allocated_invalidfunctionname(::std::string* invalidfunctionname);
 
-  // @@protoc_insertion_point(class_scope:TST.HiddenStateFormulaOwnerArchive)
+  // @@protoc_insertion_point(class_scope:TST.FunctionNodeArchive)
  private:
-  inline void set_has_owner_id();
-  inline void clear_has_owner_id();
-  inline void set_has_needs_to_update_filter_set_for_import();
-  inline void clear_has_needs_to_update_filter_set_for_import();
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_functionindex();
+  inline void clear_has_functionindex();
+  inline void set_has_invalidfunctionname();
+  inline void clear_has_invalidfunctionname();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSCE::CFUUIDArchive* owner_id_;
-  ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive > threshold_value_;
-  bool needs_to_update_filter_set_for_import_;
+  ::TST::ExpressionNodeArchive* super_;
+  ::std::string* invalidfunctionname_;
+  ::google::protobuf::uint32 functionindex_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -8225,18 +8699,18 @@ class HiddenStateFormulaOwnerArchive : public ::google::protobuf::Message {
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static HiddenStateFormulaOwnerArchive* default_instance_;
+  static FunctionNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class RichTextPayloadArchive : public ::google::protobuf::Message {
+class FunctionEndNodeArchive : public ::google::protobuf::Message {
  public:
-  RichTextPayloadArchive();
-  virtual ~RichTextPayloadArchive();
+  FunctionEndNodeArchive();
+  virtual ~FunctionEndNodeArchive();
 
-  RichTextPayloadArchive(const RichTextPayloadArchive& from);
+  FunctionEndNodeArchive(const FunctionEndNodeArchive& from);
 
-  inline RichTextPayloadArchive& operator=(const RichTextPayloadArchive& from) {
+  inline FunctionEndNodeArchive& operator=(const FunctionEndNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -8250,17 +8724,17 @@ class RichTextPayloadArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const RichTextPayloadArchive& default_instance();
+  static const FunctionEndNodeArchive& default_instance();
 
-  void Swap(RichTextPayloadArchive* other);
+  void Swap(FunctionEndNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  RichTextPayloadArchive* New() const;
+  FunctionEndNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RichTextPayloadArchive& from);
-  void MergeFrom(const RichTextPayloadArchive& from);
+  void CopyFrom(const FunctionEndNodeArchive& from);
+  void MergeFrom(const FunctionEndNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -8283,68 +8757,44 @@ class RichTextPayloadArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSP.Reference storage = 1;
-  inline bool has_storage() const;
-  inline void clear_storage();
-  static const int kStorageFieldNumber = 1;
-  inline const ::TSP::Reference& storage() const;
-  inline ::TSP::Reference* mutable_storage();
-  inline ::TSP::Reference* release_storage();
-  inline void set_allocated_storage(::TSP::Reference* storage);
-
-  // optional .TSP.Range range = 2;
-  inline bool has_range() const;
-  inline void clear_range();
-  static const int kRangeFieldNumber = 2;
-  inline const ::TSP::Range& range() const;
-  inline ::TSP::Range* mutable_range();
-  inline ::TSP::Range* release_range();
-  inline void set_allocated_range(::TSP::Range* range);
-
-  // required .TST.CellID cellid = 3;
-  inline bool has_cellid() const;
-  inline void clear_cellid();
-  static const int kCellidFieldNumber = 3;
-  inline const ::TST::CellID& cellid() const;
-  inline ::TST::CellID* mutable_cellid();
-  inline ::TST::CellID* release_cellid();
-  inline void set_allocated_cellid(::TST::CellID* cellid);
+  // required .TST.ExpressionNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TST.RichTextPayloadArchive)
+  // @@protoc_insertion_point(class_scope:TST.FunctionEndNodeArchive)
  private:
-  inline void set_has_storage();
-  inline void clear_has_storage();
-  inline void set_has_range();
-  inline void clear_has_range();
-  inline void set_has_cellid();
-  inline void clear_has_cellid();
+  inline void set_has_super();
+  inline void clear_has_super();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSP::Reference* storage_;
-  ::TSP::Range* range_;
-  ::TST::CellID* cellid_;
+  ::TST::ExpressionNodeArchive* super_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static RichTextPayloadArchive* default_instance_;
+  static FunctionEndNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class FormulaEqualsTokenAttachmentArchive : public ::google::protobuf::Message {
+class DateNodeArchive : public ::google::protobuf::Message {
  public:
-  FormulaEqualsTokenAttachmentArchive();
-  virtual ~FormulaEqualsTokenAttachmentArchive();
+  DateNodeArchive();
+  virtual ~DateNodeArchive();
 
-  FormulaEqualsTokenAttachmentArchive(const FormulaEqualsTokenAttachmentArchive& from);
+  DateNodeArchive(const DateNodeArchive& from);
 
-  inline FormulaEqualsTokenAttachmentArchive& operator=(const FormulaEqualsTokenAttachmentArchive& from) {
+  inline DateNodeArchive& operator=(const DateNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -8358,17 +8808,17 @@ class FormulaEqualsTokenAttachmentArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const FormulaEqualsTokenAttachmentArchive& default_instance();
+  static const DateNodeArchive& default_instance();
 
-  void Swap(FormulaEqualsTokenAttachmentArchive* other);
+  void Swap(DateNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  FormulaEqualsTokenAttachmentArchive* New() const;
+  DateNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const FormulaEqualsTokenAttachmentArchive& from);
-  void MergeFrom(const FormulaEqualsTokenAttachmentArchive& from);
+  void CopyFrom(const DateNodeArchive& from);
+  void MergeFrom(const DateNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -8391,44 +8841,74 @@ class FormulaEqualsTokenAttachmentArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TSWP.UIGraphicalAttachment super = 1;
+  // required .TST.ExpressionNodeArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSWP::UIGraphicalAttachment& super() const;
-  inline ::TSWP::UIGraphicalAttachment* mutable_super();
-  inline ::TSWP::UIGraphicalAttachment* release_super();
-  inline void set_allocated_super(::TSWP::UIGraphicalAttachment* super);
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TST.FormulaEqualsTokenAttachmentArchive)
+  // required string value = 2;
+  inline bool has_value() const;
+  inline void clear_value();
+  static const int kValueFieldNumber = 2;
+  inline const ::std::string& value() const;
+  inline void set_value(const ::std::string& value);
+  inline void set_value(const char* value);
+  inline void set_value(const char* value, size_t size);
+  inline ::std::string* mutable_value();
+  inline ::std::string* release_value();
+  inline void set_allocated_value(::std::string* value);
+
+  // optional string format = 3;
+  inline bool has_format() const;
+  inline void clear_format();
+  static const int kFormatFieldNumber = 3;
+  inline const ::std::string& format() const;
+  inline void set_format(const ::std::string& value);
+  inline void set_format(const char* value);
+  inline void set_format(const char* value, size_t size);
+  inline ::std::string* mutable_format();
+  inline ::std::string* release_format();
+  inline void set_allocated_format(::std::string* format);
+
+  // @@protoc_insertion_point(class_scope:TST.DateNodeArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
+  inline void set_has_value();
+  inline void clear_has_value();
+  inline void set_has_format();
+  inline void clear_has_format();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSWP::UIGraphicalAttachment* super_;
+  ::TST::ExpressionNodeArchive* super_;
+  ::std::string* value_;
+  ::std::string* format_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static FormulaEqualsTokenAttachmentArchive* default_instance_;
+  static DateNodeArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CellRegion : public ::google::protobuf::Message {
+class ReferenceNodeArchive : public ::google::protobuf::Message {
  public:
-  CellRegion();
-  virtual ~CellRegion();
+  ReferenceNodeArchive();
+  virtual ~ReferenceNodeArchive();
 
-  CellRegion(const CellRegion& from);
+  ReferenceNodeArchive(const ReferenceNodeArchive& from);
 
-  inline CellRegion& operator=(const CellRegion& from) {
+  inline ReferenceNodeArchive& operator=(const ReferenceNodeArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -8442,17 +8922,17 @@ class CellRegion : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CellRegion& default_instance();
+  static const ReferenceNodeArchive& default_instance();
 
-  void Swap(CellRegion* other);
+  void Swap(ReferenceNodeArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CellRegion* New() const;
+  ReferenceNodeArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CellRegion& from);
-  void MergeFrom(const CellRegion& from);
+  void CopyFrom(const ReferenceNodeArchive& from);
+  void MergeFrom(const ReferenceNodeArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -8475,968 +8955,2828 @@ class CellRegion : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // repeated .TST.CellRange cell_ranges = 1;
-  inline int cell_ranges_size() const;
-  inline void clear_cell_ranges();
-  static const int kCellRangesFieldNumber = 1;
-  inline const ::TST::CellRange& cell_ranges(int index) const;
-  inline ::TST::CellRange* mutable_cell_ranges(int index);
-  inline ::TST::CellRange* add_cell_ranges();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
-      cell_ranges() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
-      mutable_cell_ranges();
+  // required .TST.ExpressionNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
 
-  // @@protoc_insertion_point(class_scope:TST.CellRegion)
+  // required .TSCE.RangeReferenceArchive rangeReference = 2;
+  inline bool has_rangereference() const;
+  inline void clear_rangereference();
+  static const int kRangeReferenceFieldNumber = 2;
+  inline const ::TSCE::RangeReferenceArchive& rangereference() const;
+  inline ::TSCE::RangeReferenceArchive* mutable_rangereference();
+  inline ::TSCE::RangeReferenceArchive* release_rangereference();
+  inline void set_allocated_rangereference(::TSCE::RangeReferenceArchive* rangereference);
+
+  // required uint32 stickyBits = 3;
+  inline bool has_stickybits() const;
+  inline void clear_stickybits();
+  static const int kStickyBitsFieldNumber = 3;
+  inline ::google::protobuf::uint32 stickybits() const;
+  inline void set_stickybits(::google::protobuf::uint32 value);
+
+  // optional string hostTableID = 4;
+  inline bool has_hosttableid() const;
+  inline void clear_hosttableid();
+  static const int kHostTableIDFieldNumber = 4;
+  inline const ::std::string& hosttableid() const;
+  inline void set_hosttableid(const ::std::string& value);
+  inline void set_hosttableid(const char* value);
+  inline void set_hosttableid(const char* value, size_t size);
+  inline ::std::string* mutable_hosttableid();
+  inline ::std::string* release_hosttableid();
+  inline void set_allocated_hosttableid(::std::string* hosttableid);
+
+  // @@protoc_insertion_point(class_scope:TST.ReferenceNodeArchive)
  private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_rangereference();
+  inline void clear_has_rangereference();
+  inline void set_has_stickybits();
+  inline void clear_has_stickybits();
+  inline void set_has_hosttableid();
+  inline void clear_has_hosttableid();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > cell_ranges_;
+  ::TST::ExpressionNodeArchive* super_;
+  ::TSCE::RangeReferenceArchive* rangereference_;
+  ::std::string* hosttableid_;
+  ::google::protobuf::uint32 stickybits_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTArchives_2eproto();
   friend void protobuf_AssignDesc_TSTArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CellRegion* default_instance_;
+  static ReferenceNodeArchive* default_instance_;
 };
-// ===================================================================
+// -------------------------------------------------------------------
+
+class DurationNodeArchive : public ::google::protobuf::Message {
+ public:
+  DurationNodeArchive();
+  virtual ~DurationNodeArchive();
+
+  DurationNodeArchive(const DurationNodeArchive& from);
+
+  inline DurationNodeArchive& operator=(const DurationNodeArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const DurationNodeArchive& default_instance();
+
+  void Swap(DurationNodeArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  DurationNodeArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const DurationNodeArchive& from);
+  void MergeFrom(const DurationNodeArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
 
+  // accessors -------------------------------------------------------
+
+  // required .TST.ExpressionNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+
+  // required double timeinterval = 2;
+  inline bool has_timeinterval() const;
+  inline void clear_timeinterval();
+  static const int kTimeintervalFieldNumber = 2;
+  inline double timeinterval() const;
+  inline void set_timeinterval(double value);
+
+  // required uint32 smallest = 3;
+  inline bool has_smallest() const;
+  inline void clear_smallest();
+  static const int kSmallestFieldNumber = 3;
+  inline ::google::protobuf::uint32 smallest() const;
+  inline void set_smallest(::google::protobuf::uint32 value);
+
+  // required uint32 largest = 4;
+  inline bool has_largest() const;
+  inline void clear_largest();
+  static const int kLargestFieldNumber = 4;
+  inline ::google::protobuf::uint32 largest() const;
+  inline void set_largest(::google::protobuf::uint32 value);
+
+  // required uint32 style = 5;
+  inline bool has_style() const;
+  inline void clear_style();
+  static const int kStyleFieldNumber = 5;
+  inline ::google::protobuf::uint32 style() const;
+  inline void set_style(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.DurationNodeArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_timeinterval();
+  inline void clear_has_timeinterval();
+  inline void set_has_smallest();
+  inline void clear_has_smallest();
+  inline void set_has_largest();
+  inline void clear_has_largest();
+  inline void set_has_style();
+  inline void clear_has_style();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::ExpressionNodeArchive* super_;
+  double timeinterval_;
+  ::google::protobuf::uint32 smallest_;
+  ::google::protobuf::uint32 largest_;
+  ::google::protobuf::uint32 style_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static DurationNodeArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class ArgumentPlaceholderNodeArchive : public ::google::protobuf::Message {
+ public:
+  ArgumentPlaceholderNodeArchive();
+  virtual ~ArgumentPlaceholderNodeArchive();
+
+  ArgumentPlaceholderNodeArchive(const ArgumentPlaceholderNodeArchive& from);
+
+  inline ArgumentPlaceholderNodeArchive& operator=(const ArgumentPlaceholderNodeArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const ArgumentPlaceholderNodeArchive& default_instance();
+
+  void Swap(ArgumentPlaceholderNodeArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  ArgumentPlaceholderNodeArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ArgumentPlaceholderNodeArchive& from);
+  void MergeFrom(const ArgumentPlaceholderNodeArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.ExpressionNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+
+  // required uint32 functionIndex = 2;
+  inline bool has_functionindex() const;
+  inline void clear_functionindex();
+  static const int kFunctionIndexFieldNumber = 2;
+  inline ::google::protobuf::uint32 functionindex() const;
+  inline void set_functionindex(::google::protobuf::uint32 value);
+
+  // required uint32 argumentIndex = 3;
+  inline bool has_argumentindex() const;
+  inline void clear_argumentindex();
+  static const int kArgumentIndexFieldNumber = 3;
+  inline ::google::protobuf::uint32 argumentindex() const;
+  inline void set_argumentindex(::google::protobuf::uint32 value);
+
+  // optional uint32 mode = 4;
+  inline bool has_mode() const;
+  inline void clear_mode();
+  static const int kModeFieldNumber = 4;
+  inline ::google::protobuf::uint32 mode() const;
+  inline void set_mode(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.ArgumentPlaceholderNodeArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_functionindex();
+  inline void clear_has_functionindex();
+  inline void set_has_argumentindex();
+  inline void clear_has_argumentindex();
+  inline void set_has_mode();
+  inline void clear_has_mode();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::ExpressionNodeArchive* super_;
+  ::google::protobuf::uint32 functionindex_;
+  ::google::protobuf::uint32 argumentindex_;
+  ::google::protobuf::uint32 mode_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static ArgumentPlaceholderNodeArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class EmptyExpressionNodeArchive : public ::google::protobuf::Message {
+ public:
+  EmptyExpressionNodeArchive();
+  virtual ~EmptyExpressionNodeArchive();
+
+  EmptyExpressionNodeArchive(const EmptyExpressionNodeArchive& from);
+
+  inline EmptyExpressionNodeArchive& operator=(const EmptyExpressionNodeArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const EmptyExpressionNodeArchive& default_instance();
+
+  void Swap(EmptyExpressionNodeArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  EmptyExpressionNodeArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const EmptyExpressionNodeArchive& from);
+  void MergeFrom(const EmptyExpressionNodeArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.ExpressionNodeArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::ExpressionNodeArchive& super() const;
+  inline ::TST::ExpressionNodeArchive* mutable_super();
+  inline ::TST::ExpressionNodeArchive* release_super();
+  inline void set_allocated_super(::TST::ExpressionNodeArchive* super);
+
+  // @@protoc_insertion_point(class_scope:TST.EmptyExpressionNodeArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::ExpressionNodeArchive* super_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static EmptyExpressionNodeArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class LayoutHintArchive : public ::google::protobuf::Message {
+ public:
+  LayoutHintArchive();
+  virtual ~LayoutHintArchive();
+
+  LayoutHintArchive(const LayoutHintArchive& from);
+
+  inline LayoutHintArchive& operator=(const LayoutHintArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const LayoutHintArchive& default_instance();
+
+  void Swap(LayoutHintArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  LayoutHintArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const LayoutHintArchive& from);
+  void MergeFrom(const LayoutHintArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required bool isValid = 1;
+  inline bool has_isvalid() const;
+  inline void clear_isvalid();
+  static const int kIsValidFieldNumber = 1;
+  inline bool isvalid() const;
+  inline void set_isvalid(bool value);
+
+  // required .TST.CellRange cellRange = 2;
+  inline bool has_cellrange() const;
+  inline void clear_cellrange();
+  static const int kCellRangeFieldNumber = 2;
+  inline const ::TST::CellRange& cellrange() const;
+  inline ::TST::CellRange* mutable_cellrange();
+  inline ::TST::CellRange* release_cellrange();
+  inline void set_allocated_cellrange(::TST::CellRange* cellrange);
+
+  // required .TST.CellID hintID = 3;
+  inline bool has_hintid() const;
+  inline void clear_hintid();
+  static const int kHintIDFieldNumber = 3;
+  inline const ::TST::CellID& hintid() const;
+  inline ::TST::CellID* mutable_hintid();
+  inline ::TST::CellID* release_hintid();
+  inline void set_allocated_hintid(::TST::CellID* hintid);
+
+  // required .TSP.Size maximumSize = 4;
+  inline bool has_maximumsize() const;
+  inline void clear_maximumsize();
+  static const int kMaximumSizeFieldNumber = 4;
+  inline const ::TSP::Size& maximumsize() const;
+  inline ::TSP::Size* mutable_maximumsize();
+  inline ::TSP::Size* release_maximumsize();
+  inline void set_allocated_maximumsize(::TSP::Size* maximumsize);
+
+  // required uint32 partitionPosition = 5;
+  inline bool has_partitionposition() const;
+  inline void clear_partitionposition();
+  static const int kPartitionPositionFieldNumber = 5;
+  inline ::google::protobuf::uint32 partitionposition() const;
+  inline void set_partitionposition(::google::protobuf::uint32 value);
+
+  // required bool horizontal = 6;
+  inline bool has_horizontal() const;
+  inline void clear_horizontal();
+  static const int kHorizontalFieldNumber = 6;
+  inline bool horizontal() const;
+  inline void set_horizontal(bool value);
+
+  // optional .TSP.Size effectiveSize = 7;
+  inline bool has_effectivesize() const;
+  inline void clear_effectivesize();
+  static const int kEffectiveSizeFieldNumber = 7;
+  inline const ::TSP::Size& effectivesize() const;
+  inline ::TSP::Size* mutable_effectivesize();
+  inline ::TSP::Size* release_effectivesize();
+  inline void set_allocated_effectivesize(::TSP::Size* effectivesize);
+
+  // optional uint32 partitioningPass = 8;
+  inline bool has_partitioningpass() const;
+  inline void clear_partitioningpass();
+  static const int kPartitioningPassFieldNumber = 8;
+  inline ::google::protobuf::uint32 partitioningpass() const;
+  inline void set_partitioningpass(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.LayoutHintArchive)
+ private:
+  inline void set_has_isvalid();
+  inline void clear_has_isvalid();
+  inline void set_has_cellrange();
+  inline void clear_has_cellrange();
+  inline void set_has_hintid();
+  inline void clear_has_hintid();
+  inline void set_has_maximumsize();
+  inline void clear_has_maximumsize();
+  inline void set_has_partitionposition();
+  inline void clear_has_partitionposition();
+  inline void set_has_horizontal();
+  inline void clear_has_horizontal();
+  inline void set_has_effectivesize();
+  inline void clear_has_effectivesize();
+  inline void set_has_partitioningpass();
+  inline void clear_has_partitioningpass();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::CellRange* cellrange_;
+  ::TST::CellID* hintid_;
+  ::TSP::Size* maximumsize_;
+  bool isvalid_;
+  bool horizontal_;
+  ::google::protobuf::uint32 partitionposition_;
+  ::TSP::Size* effectivesize_;
+  ::google::protobuf::uint32 partitioningpass_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static LayoutHintArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CompletionTokenAttachmentArchive : public ::google::protobuf::Message {
+ public:
+  CompletionTokenAttachmentArchive();
+  virtual ~CompletionTokenAttachmentArchive();
+
+  CompletionTokenAttachmentArchive(const CompletionTokenAttachmentArchive& from);
+
+  inline CompletionTokenAttachmentArchive& operator=(const CompletionTokenAttachmentArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CompletionTokenAttachmentArchive& default_instance();
+
+  void Swap(CompletionTokenAttachmentArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CompletionTokenAttachmentArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CompletionTokenAttachmentArchive& from);
+  void MergeFrom(const CompletionTokenAttachmentArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TokenAttachmentArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TokenAttachmentArchive& super() const;
+  inline ::TST::TokenAttachmentArchive* mutable_super();
+  inline ::TST::TokenAttachmentArchive* release_super();
+  inline void set_allocated_super(::TST::TokenAttachmentArchive* super);
+
+  // optional string completionText = 2;
+  inline bool has_completiontext() const;
+  inline void clear_completiontext();
+  static const int kCompletionTextFieldNumber = 2;
+  inline const ::std::string& completiontext() const;
+  inline void set_completiontext(const ::std::string& value);
+  inline void set_completiontext(const char* value);
+  inline void set_completiontext(const char* value, size_t size);
+  inline ::std::string* mutable_completiontext();
+  inline ::std::string* release_completiontext();
+  inline void set_allocated_completiontext(::std::string* completiontext);
+
+  // optional uint32 caretPosition = 3;
+  inline bool has_caretposition() const;
+  inline void clear_caretposition();
+  static const int kCaretPositionFieldNumber = 3;
+  inline ::google::protobuf::uint32 caretposition() const;
+  inline void set_caretposition(::google::protobuf::uint32 value);
+
+  // optional uint32 prefixStart = 4;
+  inline bool has_prefixstart() const;
+  inline void clear_prefixstart();
+  static const int kPrefixStartFieldNumber = 4;
+  inline ::google::protobuf::uint32 prefixstart() const;
+  inline void set_prefixstart(::google::protobuf::uint32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.CompletionTokenAttachmentArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_completiontext();
+  inline void clear_has_completiontext();
+  inline void set_has_caretposition();
+  inline void clear_has_caretposition();
+  inline void set_has_prefixstart();
+  inline void clear_has_prefixstart();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TokenAttachmentArchive* super_;
+  ::std::string* completiontext_;
+  ::google::protobuf::uint32 caretposition_;
+  ::google::protobuf::uint32 prefixstart_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CompletionTokenAttachmentArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class HiddenStateFormulaOwnerArchive : public ::google::protobuf::Message {
+ public:
+  HiddenStateFormulaOwnerArchive();
+  virtual ~HiddenStateFormulaOwnerArchive();
+
+  HiddenStateFormulaOwnerArchive(const HiddenStateFormulaOwnerArchive& from);
+
+  inline HiddenStateFormulaOwnerArchive& operator=(const HiddenStateFormulaOwnerArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const HiddenStateFormulaOwnerArchive& default_instance();
+
+  void Swap(HiddenStateFormulaOwnerArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  HiddenStateFormulaOwnerArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const HiddenStateFormulaOwnerArchive& from);
+  void MergeFrom(const HiddenStateFormulaOwnerArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional .TSCE.CFUUIDArchive owner_id = 1;
+  inline bool has_owner_id() const;
+  inline void clear_owner_id();
+  static const int kOwnerIdFieldNumber = 1;
+  inline const ::TSCE::CFUUIDArchive& owner_id() const;
+  inline ::TSCE::CFUUIDArchive* mutable_owner_id();
+  inline ::TSCE::CFUUIDArchive* release_owner_id();
+  inline void set_allocated_owner_id(::TSCE::CFUUIDArchive* owner_id);
+
+  // repeated .TSCE.CellValueArchive threshold_value = 2;
+  inline int threshold_value_size() const;
+  inline void clear_threshold_value();
+  static const int kThresholdValueFieldNumber = 2;
+  inline const ::TSCE::CellValueArchive& threshold_value(int index) const;
+  inline ::TSCE::CellValueArchive* mutable_threshold_value(int index);
+  inline ::TSCE::CellValueArchive* add_threshold_value();
+  inline const ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >&
+      threshold_value() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >*
+      mutable_threshold_value();
+
+  // optional bool needs_to_update_filter_set_for_import = 3 [default = false];
+  inline bool has_needs_to_update_filter_set_for_import() const;
+  inline void clear_needs_to_update_filter_set_for_import();
+  static const int kNeedsToUpdateFilterSetForImportFieldNumber = 3;
+  inline bool needs_to_update_filter_set_for_import() const;
+  inline void set_needs_to_update_filter_set_for_import(bool value);
+
+  // @@protoc_insertion_point(class_scope:TST.HiddenStateFormulaOwnerArchive)
+ private:
+  inline void set_has_owner_id();
+  inline void clear_has_owner_id();
+  inline void set_has_needs_to_update_filter_set_for_import();
+  inline void clear_has_needs_to_update_filter_set_for_import();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSCE::CFUUIDArchive* owner_id_;
+  ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive > threshold_value_;
+  bool needs_to_update_filter_set_for_import_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static HiddenStateFormulaOwnerArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class RichTextPayloadArchive : public ::google::protobuf::Message {
+ public:
+  RichTextPayloadArchive();
+  virtual ~RichTextPayloadArchive();
+
+  RichTextPayloadArchive(const RichTextPayloadArchive& from);
+
+  inline RichTextPayloadArchive& operator=(const RichTextPayloadArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const RichTextPayloadArchive& default_instance();
+
+  void Swap(RichTextPayloadArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  RichTextPayloadArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const RichTextPayloadArchive& from);
+  void MergeFrom(const RichTextPayloadArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSP.Reference storage = 1;
+  inline bool has_storage() const;
+  inline void clear_storage();
+  static const int kStorageFieldNumber = 1;
+  inline const ::TSP::Reference& storage() const;
+  inline ::TSP::Reference* mutable_storage();
+  inline ::TSP::Reference* release_storage();
+  inline void set_allocated_storage(::TSP::Reference* storage);
+
+  // optional .TSP.Range range = 2;
+  inline bool has_range() const;
+  inline void clear_range();
+  static const int kRangeFieldNumber = 2;
+  inline const ::TSP::Range& range() const;
+  inline ::TSP::Range* mutable_range();
+  inline ::TSP::Range* release_range();
+  inline void set_allocated_range(::TSP::Range* range);
+
+  // required .TST.CellID cellid = 3;
+  inline bool has_cellid() const;
+  inline void clear_cellid();
+  static const int kCellidFieldNumber = 3;
+  inline const ::TST::CellID& cellid() const;
+  inline ::TST::CellID* mutable_cellid();
+  inline ::TST::CellID* release_cellid();
+  inline void set_allocated_cellid(::TST::CellID* cellid);
+
+  // @@protoc_insertion_point(class_scope:TST.RichTextPayloadArchive)
+ private:
+  inline void set_has_storage();
+  inline void clear_has_storage();
+  inline void set_has_range();
+  inline void clear_has_range();
+  inline void set_has_cellid();
+  inline void clear_has_cellid();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSP::Reference* storage_;
+  ::TSP::Range* range_;
+  ::TST::CellID* cellid_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static RichTextPayloadArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class FormulaEqualsTokenAttachmentArchive : public ::google::protobuf::Message {
+ public:
+  FormulaEqualsTokenAttachmentArchive();
+  virtual ~FormulaEqualsTokenAttachmentArchive();
+
+  FormulaEqualsTokenAttachmentArchive(const FormulaEqualsTokenAttachmentArchive& from);
+
+  inline FormulaEqualsTokenAttachmentArchive& operator=(const FormulaEqualsTokenAttachmentArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const FormulaEqualsTokenAttachmentArchive& default_instance();
+
+  void Swap(FormulaEqualsTokenAttachmentArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  FormulaEqualsTokenAttachmentArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const FormulaEqualsTokenAttachmentArchive& from);
+  void MergeFrom(const FormulaEqualsTokenAttachmentArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSWP.UIGraphicalAttachment super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSWP::UIGraphicalAttachment& super() const;
+  inline ::TSWP::UIGraphicalAttachment* mutable_super();
+  inline ::TSWP::UIGraphicalAttachment* release_super();
+  inline void set_allocated_super(::TSWP::UIGraphicalAttachment* super);
+
+  // @@protoc_insertion_point(class_scope:TST.FormulaEqualsTokenAttachmentArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSWP::UIGraphicalAttachment* super_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static FormulaEqualsTokenAttachmentArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CellRegion : public ::google::protobuf::Message {
+ public:
+  CellRegion();
+  virtual ~CellRegion();
+
+  CellRegion(const CellRegion& from);
+
+  inline CellRegion& operator=(const CellRegion& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CellRegion& default_instance();
+
+  void Swap(CellRegion* other);
+
+  // implements Message ----------------------------------------------
+
+  CellRegion* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CellRegion& from);
+  void MergeFrom(const CellRegion& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // repeated .TST.CellRange cell_ranges = 1;
+  inline int cell_ranges_size() const;
+  inline void clear_cell_ranges();
+  static const int kCellRangesFieldNumber = 1;
+  inline const ::TST::CellRange& cell_ranges(int index) const;
+  inline ::TST::CellRange* mutable_cell_ranges(int index);
+  inline ::TST::CellRange* add_cell_ranges();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
+      cell_ranges() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
+      mutable_cell_ranges();
+
+  // @@protoc_insertion_point(class_scope:TST.CellRegion)
+ private:
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedPtrField< ::TST::CellRange > cell_ranges_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CellRegion* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CellFillStandIn : public ::google::protobuf::Message {
+ public:
+  CellFillStandIn();
+  virtual ~CellFillStandIn();
+
+  CellFillStandIn(const CellFillStandIn& from);
+
+  inline CellFillStandIn& operator=(const CellFillStandIn& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CellFillStandIn& default_instance();
+
+  void Swap(CellFillStandIn* other);
+
+  // implements Message ----------------------------------------------
+
+  CellFillStandIn* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CellFillStandIn& from);
+  void MergeFrom(const CellFillStandIn& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSD.FillArchive fill = 1;
+  inline bool has_fill() const;
+  inline void clear_fill();
+  static const int kFillFieldNumber = 1;
+  inline const ::TSD::FillArchive& fill() const;
+  inline ::TSD::FillArchive* mutable_fill();
+  inline ::TSD::FillArchive* release_fill();
+  inline void set_allocated_fill(::TSD::FillArchive* fill);
+
+  // optional bool type_is_mixed = 2;
+  inline bool has_type_is_mixed() const;
+  inline void clear_type_is_mixed();
+  static const int kTypeIsMixedFieldNumber = 2;
+  inline bool type_is_mixed() const;
+  inline void set_type_is_mixed(bool value);
+
+  // optional bool color_has_been_modified = 3;
+  inline bool has_color_has_been_modified() const;
+  inline void clear_color_has_been_modified();
+  static const int kColorHasBeenModifiedFieldNumber = 3;
+  inline bool color_has_been_modified() const;
+  inline void set_color_has_been_modified(bool value);
+
+  // optional bool color_is_mixed = 4;
+  inline bool has_color_is_mixed() const;
+  inline void clear_color_is_mixed();
+  static const int kColorIsMixedFieldNumber = 4;
+  inline bool color_is_mixed() const;
+  inline void set_color_is_mixed(bool value);
+
+  // optional bool first_color_has_been_modified = 5;
+  inline bool has_first_color_has_been_modified() const;
+  inline void clear_first_color_has_been_modified();
+  static const int kFirstColorHasBeenModifiedFieldNumber = 5;
+  inline bool first_color_has_been_modified() const;
+  inline void set_first_color_has_been_modified(bool value);
+
+  // optional bool first_color_is_mixed = 6;
+  inline bool has_first_color_is_mixed() const;
+  inline void clear_first_color_is_mixed();
+  static const int kFirstColorIsMixedFieldNumber = 6;
+  inline bool first_color_is_mixed() const;
+  inline void set_first_color_is_mixed(bool value);
+
+  // optional bool last_color_has_been_modified = 7;
+  inline bool has_last_color_has_been_modified() const;
+  inline void clear_last_color_has_been_modified();
+  static const int kLastColorHasBeenModifiedFieldNumber = 7;
+  inline bool last_color_has_been_modified() const;
+  inline void set_last_color_has_been_modified(bool value);
+
+  // optional bool last_color_is_mixed = 8;
+  inline bool has_last_color_is_mixed() const;
+  inline void clear_last_color_is_mixed();
+  static const int kLastColorIsMixedFieldNumber = 8;
+  inline bool last_color_is_mixed() const;
+  inline void set_last_color_is_mixed(bool value);
+
+  // optional bool gradient_type_has_been_modified = 9;
+  inline bool has_gradient_type_has_been_modified() const;
+  inline void clear_gradient_type_has_been_modified();
+  static const int kGradientTypeHasBeenModifiedFieldNumber = 9;
+  inline bool gradient_type_has_been_modified() const;
+  inline void set_gradient_type_has_been_modified(bool value);
+
+  // optional bool gradient_type_is_mixed = 10;
+  inline bool has_gradient_type_is_mixed() const;
+  inline void clear_gradient_type_is_mixed();
+  static const int kGradientTypeIsMixedFieldNumber = 10;
+  inline bool gradient_type_is_mixed() const;
+  inline void set_gradient_type_is_mixed(bool value);
+
+  // optional bool gradient_angle_has_been_modified = 11;
+  inline bool has_gradient_angle_has_been_modified() const;
+  inline void clear_gradient_angle_has_been_modified();
+  static const int kGradientAngleHasBeenModifiedFieldNumber = 11;
+  inline bool gradient_angle_has_been_modified() const;
+  inline void set_gradient_angle_has_been_modified(bool value);
+
+  // optional bool gradient_angle_is_mixed = 12;
+  inline bool has_gradient_angle_is_mixed() const;
+  inline void clear_gradient_angle_is_mixed();
+  static const int kGradientAngleIsMixedFieldNumber = 12;
+  inline bool gradient_angle_is_mixed() const;
+  inline void set_gradient_angle_is_mixed(bool value);
+
+  // optional bool image_data_has_been_modified = 13;
+  inline bool has_image_data_has_been_modified() const;
+  inline void clear_image_data_has_been_modified();
+  static const int kImageDataHasBeenModifiedFieldNumber = 13;
+  inline bool image_data_has_been_modified() const;
+  inline void set_image_data_has_been_modified(bool value);
+
+  // optional bool image_data_is_mixed = 14;
+  inline bool has_image_data_is_mixed() const;
+  inline void clear_image_data_is_mixed();
+  static const int kImageDataIsMixedFieldNumber = 14;
+  inline bool image_data_is_mixed() const;
+  inline void set_image_data_is_mixed(bool value);
+
+  // optional bool tint_color_has_been_modified = 15;
+  inline bool has_tint_color_has_been_modified() const;
+  inline void clear_tint_color_has_been_modified();
+  static const int kTintColorHasBeenModifiedFieldNumber = 15;
+  inline bool tint_color_has_been_modified() const;
+  inline void set_tint_color_has_been_modified(bool value);
+
+  // optional bool tint_color_is_mixed = 16;
+  inline bool has_tint_color_is_mixed() const;
+  inline void clear_tint_color_is_mixed();
+  static const int kTintColorIsMixedFieldNumber = 16;
+  inline bool tint_color_is_mixed() const;
+  inline void set_tint_color_is_mixed(bool value);
+
+  // optional bool scale_has_been_modified = 17;
+  inline bool has_scale_has_been_modified() const;
+  inline void clear_scale_has_been_modified();
+  static const int kScaleHasBeenModifiedFieldNumber = 17;
+  inline bool scale_has_been_modified() const;
+  inline void set_scale_has_been_modified(bool value);
+
+  // optional bool scale_is_mixed = 18;
+  inline bool has_scale_is_mixed() const;
+  inline void clear_scale_is_mixed();
+  static const int kScaleIsMixedFieldNumber = 18;
+  inline bool scale_is_mixed() const;
+  inline void set_scale_is_mixed(bool value);
+
+  // optional bool technique_has_been_modified = 19;
+  inline bool has_technique_has_been_modified() const;
+  inline void clear_technique_has_been_modified();
+  static const int kTechniqueHasBeenModifiedFieldNumber = 19;
+  inline bool technique_has_been_modified() const;
+  inline void set_technique_has_been_modified(bool value);
+
+  // optional bool technique_is_mixed = 20;
+  inline bool has_technique_is_mixed() const;
+  inline void clear_technique_is_mixed();
+  static const int kTechniqueIsMixedFieldNumber = 20;
+  inline bool technique_is_mixed() const;
+  inline void set_technique_is_mixed(bool value);
+
+  // @@protoc_insertion_point(class_scope:TST.CellFillStandIn)
+ private:
+  inline void set_has_fill();
+  inline void clear_has_fill();
+  inline void set_has_type_is_mixed();
+  inline void clear_has_type_is_mixed();
+  inline void set_has_color_has_been_modified();
+  inline void clear_has_color_has_been_modified();
+  inline void set_has_color_is_mixed();
+  inline void clear_has_color_is_mixed();
+  inline void set_has_first_color_has_been_modified();
+  inline void clear_has_first_color_has_been_modified();
+  inline void set_has_first_color_is_mixed();
+  inline void clear_has_first_color_is_mixed();
+  inline void set_has_last_color_has_been_modified();
+  inline void clear_has_last_color_has_been_modified();
+  inline void set_has_last_color_is_mixed();
+  inline void clear_has_last_color_is_mixed();
+  inline void set_has_gradient_type_has_been_modified();
+  inline void clear_has_gradient_type_has_been_modified();
+  inline void set_has_gradient_type_is_mixed();
+  inline void clear_has_gradient_type_is_mixed();
+  inline void set_has_gradient_angle_has_been_modified();
+  inline void clear_has_gradient_angle_has_been_modified();
+  inline void set_has_gradient_angle_is_mixed();
+  inline void clear_has_gradient_angle_is_mixed();
+  inline void set_has_image_data_has_been_modified();
+  inline void clear_has_image_data_has_been_modified();
+  inline void set_has_image_data_is_mixed();
+  inline void clear_has_image_data_is_mixed();
+  inline void set_has_tint_color_has_been_modified();
+  inline void clear_has_tint_color_has_been_modified();
+  inline void set_has_tint_color_is_mixed();
+  inline void clear_has_tint_color_is_mixed();
+  inline void set_has_scale_has_been_modified();
+  inline void clear_has_scale_has_been_modified();
+  inline void set_has_scale_is_mixed();
+  inline void clear_has_scale_is_mixed();
+  inline void set_has_technique_has_been_modified();
+  inline void clear_has_technique_has_been_modified();
+  inline void set_has_technique_is_mixed();
+  inline void clear_has_technique_is_mixed();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSD::FillArchive* fill_;
+  bool type_is_mixed_;
+  bool color_has_been_modified_;
+  bool color_is_mixed_;
+  bool first_color_has_been_modified_;
+  bool first_color_is_mixed_;
+  bool last_color_has_been_modified_;
+  bool last_color_is_mixed_;
+  bool gradient_type_has_been_modified_;
+  bool gradient_type_is_mixed_;
+  bool gradient_angle_has_been_modified_;
+  bool gradient_angle_is_mixed_;
+  bool image_data_has_been_modified_;
+  bool image_data_is_mixed_;
+  bool tint_color_has_been_modified_;
+  bool tint_color_is_mixed_;
+  bool scale_has_been_modified_;
+  bool scale_is_mixed_;
+  bool technique_has_been_modified_;
+  bool technique_is_mixed_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(20 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CellFillStandIn* default_instance_;
+};
+// ===================================================================
+
+
+// ===================================================================
+
+// CellID
+
+// required fixed32 packedData = 1;
+inline bool CellID::has_packeddata() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CellID::set_has_packeddata() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CellID::clear_has_packeddata() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CellID::clear_packeddata() {
+  packeddata_ = 0u;
+  clear_has_packeddata();
+}
+inline ::google::protobuf::uint32 CellID::packeddata() const {
+  return packeddata_;
+}
+inline void CellID::set_packeddata(::google::protobuf::uint32 value) {
+  set_has_packeddata();
+  packeddata_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// TableSize
+
+// required fixed32 packedData = 1;
+inline bool TableSize::has_packeddata() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TableSize::set_has_packeddata() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TableSize::clear_has_packeddata() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TableSize::clear_packeddata() {
+  packeddata_ = 0u;
+  clear_has_packeddata();
+}
+inline ::google::protobuf::uint32 TableSize::packeddata() const {
+  return packeddata_;
+}
+inline void TableSize::set_packeddata(::google::protobuf::uint32 value) {
+  set_has_packeddata();
+  packeddata_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CellRange
+
+// required .TST.CellID origin = 1;
+inline bool CellRange::has_origin() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CellRange::set_has_origin() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CellRange::clear_has_origin() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CellRange::clear_origin() {
+  if (origin_ != NULL) origin_->::TST::CellID::Clear();
+  clear_has_origin();
+}
+inline const ::TST::CellID& CellRange::origin() const {
+  return origin_ != NULL ? *origin_ : *default_instance_->origin_;
+}
+inline ::TST::CellID* CellRange::mutable_origin() {
+  set_has_origin();
+  if (origin_ == NULL) origin_ = new ::TST::CellID;
+  return origin_;
+}
+inline ::TST::CellID* CellRange::release_origin() {
+  clear_has_origin();
+  ::TST::CellID* temp = origin_;
+  origin_ = NULL;
+  return temp;
+}
+inline void CellRange::set_allocated_origin(::TST::CellID* origin) {
+  delete origin_;
+  origin_ = origin;
+  if (origin) {
+    set_has_origin();
+  } else {
+    clear_has_origin();
+  }
+}
+
+// required .TST.TableSize size = 2;
+inline bool CellRange::has_size() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CellRange::set_has_size() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CellRange::clear_has_size() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CellRange::clear_size() {
+  if (size_ != NULL) size_->::TST::TableSize::Clear();
+  clear_has_size();
+}
+inline const ::TST::TableSize& CellRange::size() const {
+  return size_ != NULL ? *size_ : *default_instance_->size_;
+}
+inline ::TST::TableSize* CellRange::mutable_size() {
+  set_has_size();
+  if (size_ == NULL) size_ = new ::TST::TableSize;
+  return size_;
+}
+inline ::TST::TableSize* CellRange::release_size() {
+  clear_has_size();
+  ::TST::TableSize* temp = size_;
+  size_ = NULL;
+  return temp;
+}
+inline void CellRange::set_allocated_size(::TST::TableSize* size) {
+  delete size_;
+  size_ = size;
+  if (size) {
+    set_has_size();
+  } else {
+    clear_has_size();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// TableSelection
+
+// required .TST.CellRange cellRange = 1;
+inline bool TableSelection::has_cellrange() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TableSelection::set_has_cellrange() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TableSelection::clear_has_cellrange() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TableSelection::clear_cellrange() {
+  if (cellrange_ != NULL) cellrange_->::TST::CellRange::Clear();
+  clear_has_cellrange();
+}
+inline const ::TST::CellRange& TableSelection::cellrange() const {
+  return cellrange_ != NULL ? *cellrange_ : *default_instance_->cellrange_;
+}
+inline ::TST::CellRange* TableSelection::mutable_cellrange() {
+  set_has_cellrange();
+  if (cellrange_ == NULL) cellrange_ = new ::TST::CellRange;
+  return cellrange_;
+}
+inline ::TST::CellRange* TableSelection::release_cellrange() {
+  clear_has_cellrange();
+  ::TST::CellRange* temp = cellrange_;
+  cellrange_ = NULL;
+  return temp;
+}
+inline void TableSelection::set_allocated_cellrange(::TST::CellRange* cellrange) {
+  delete cellrange_;
+  cellrange_ = cellrange;
+  if (cellrange) {
+    set_has_cellrange();
+  } else {
+    clear_has_cellrange();
+  }
+}
+
+// required .TST.CellRange extendedCellRange = 2;
+inline bool TableSelection::has_extendedcellrange() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TableSelection::set_has_extendedcellrange() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TableSelection::clear_has_extendedcellrange() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TableSelection::clear_extendedcellrange() {
+  if (extendedcellrange_ != NULL) extendedcellrange_->::TST::CellRange::Clear();
+  clear_has_extendedcellrange();
+}
+inline const ::TST::CellRange& TableSelection::extendedcellrange() const {
+  return extendedcellrange_ != NULL ? *extendedcellrange_ : *default_instance_->extendedcellrange_;
+}
+inline ::TST::CellRange* TableSelection::mutable_extendedcellrange() {
+  set_has_extendedcellrange();
+  if (extendedcellrange_ == NULL) extendedcellrange_ = new ::TST::CellRange;
+  return extendedcellrange_;
+}
+inline ::TST::CellRange* TableSelection::release_extendedcellrange() {
+  clear_has_extendedcellrange();
+  ::TST::CellRange* temp = extendedcellrange_;
+  extendedcellrange_ = NULL;
+  return temp;
+}
+inline void TableSelection::set_allocated_extendedcellrange(::TST::CellRange* extendedcellrange) {
+  delete extendedcellrange_;
+  extendedcellrange_ = extendedcellrange;
+  if (extendedcellrange) {
+    set_has_extendedcellrange();
+  } else {
+    clear_has_extendedcellrange();
+  }
+}
+
+// required bool extendedCellRangeValid = 3;
+inline bool TableSelection::has_extendedcellrangevalid() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void TableSelection::set_has_extendedcellrangevalid() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void TableSelection::clear_has_extendedcellrangevalid() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void TableSelection::clear_extendedcellrangevalid() {
+  extendedcellrangevalid_ = false;
+  clear_has_extendedcellrangevalid();
+}
+inline bool TableSelection::extendedcellrangevalid() const {
+  return extendedcellrangevalid_;
+}
+inline void TableSelection::set_extendedcellrangevalid(bool value) {
+  set_has_extendedcellrangevalid();
+  extendedcellrangevalid_ = value;
+}
+
+// required .TST.SelectionTypeArchive selection_type = 4;
+inline bool TableSelection::has_selection_type() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void TableSelection::set_has_selection_type() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void TableSelection::clear_has_selection_type() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void TableSelection::clear_selection_type() {
+  selection_type_ = 0;
+  clear_has_selection_type();
+}
+inline ::TST::SelectionTypeArchive TableSelection::selection_type() const {
+  return static_cast< ::TST::SelectionTypeArchive >(selection_type_);
+}
+inline void TableSelection::set_selection_type(::TST::SelectionTypeArchive value) {
+  assert(::TST::SelectionTypeArchive_IsValid(value));
+  set_has_selection_type();
+  selection_type_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// TileRowInfo
+
+// optional uint32 storage_version = 5;
+inline bool TileRowInfo::has_storage_version() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TileRowInfo::set_has_storage_version() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TileRowInfo::clear_has_storage_version() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TileRowInfo::clear_storage_version() {
+  storage_version_ = 0u;
+  clear_has_storage_version();
+}
+inline ::google::protobuf::uint32 TileRowInfo::storage_version() const {
+  return storage_version_;
+}
+inline void TileRowInfo::set_storage_version(::google::protobuf::uint32 value) {
+  set_has_storage_version();
+  storage_version_ = value;
+}
+
+// required uint32 tileRowIndex = 1;
+inline bool TileRowInfo::has_tilerowindex() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TileRowInfo::set_has_tilerowindex() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TileRowInfo::clear_has_tilerowindex() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TileRowInfo::clear_tilerowindex() {
+  tilerowindex_ = 0u;
+  clear_has_tilerowindex();
+}
+inline ::google::protobuf::uint32 TileRowInfo::tilerowindex() const {
+  return tilerowindex_;
+}
+inline void TileRowInfo::set_tilerowindex(::google::protobuf::uint32 value) {
+  set_has_tilerowindex();
+  tilerowindex_ = value;
+}
+
+// required uint32 cellCount = 2;
+inline bool TileRowInfo::has_cellcount() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void TileRowInfo::set_has_cellcount() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void TileRowInfo::clear_has_cellcount() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void TileRowInfo::clear_cellcount() {
+  cellcount_ = 0u;
+  clear_has_cellcount();
+}
+inline ::google::protobuf::uint32 TileRowInfo::cellcount() const {
+  return cellcount_;
+}
+inline void TileRowInfo::set_cellcount(::google::protobuf::uint32 value) {
+  set_has_cellcount();
+  cellcount_ = value;
+}
+
+// required bytes cellStorageBuffer = 3;
+inline bool TileRowInfo::has_cellstoragebuffer() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void TileRowInfo::set_has_cellstoragebuffer() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void TileRowInfo::clear_has_cellstoragebuffer() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void TileRowInfo::clear_cellstoragebuffer() {
+  if (cellstoragebuffer_ != &::google::protobuf::internal::kEmptyString) {
+    cellstoragebuffer_->clear();
+  }
+  clear_has_cellstoragebuffer();
+}
+inline const ::std::string& TileRowInfo::cellstoragebuffer() const {
+  return *cellstoragebuffer_;
+}
+inline void TileRowInfo::set_cellstoragebuffer(const ::std::string& value) {
+  set_has_cellstoragebuffer();
+  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
+    cellstoragebuffer_ = new ::std::string;
+  }
+  cellstoragebuffer_->assign(value);
+}
+inline void TileRowInfo::set_cellstoragebuffer(const char* value) {
+  set_has_cellstoragebuffer();
+  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
+    cellstoragebuffer_ = new ::std::string;
+  }
+  cellstoragebuffer_->assign(value);
+}
+inline void TileRowInfo::set_cellstoragebuffer(const void* value, size_t size) {
+  set_has_cellstoragebuffer();
+  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
+    cellstoragebuffer_ = new ::std::string;
+  }
+  cellstoragebuffer_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* TileRowInfo::mutable_cellstoragebuffer() {
+  set_has_cellstoragebuffer();
+  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
+    cellstoragebuffer_ = new ::std::string;
+  }
+  return cellstoragebuffer_;
+}
+inline ::std::string* TileRowInfo::release_cellstoragebuffer() {
+  clear_has_cellstoragebuffer();
+  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = cellstoragebuffer_;
+    cellstoragebuffer_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void TileRowInfo::set_allocated_cellstoragebuffer(::std::string* cellstoragebuffer) {
+  if (cellstoragebuffer_ != &::google::protobuf::internal::kEmptyString) {
+    delete cellstoragebuffer_;
+  }
+  if (cellstoragebuffer) {
+    set_has_cellstoragebuffer();
+    cellstoragebuffer_ = cellstoragebuffer;
+  } else {
+    clear_has_cellstoragebuffer();
+    cellstoragebuffer_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required bytes cellOffsets = 4;
+inline bool TileRowInfo::has_celloffsets() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void TileRowInfo::set_has_celloffsets() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void TileRowInfo::clear_has_celloffsets() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void TileRowInfo::clear_celloffsets() {
+  if (celloffsets_ != &::google::protobuf::internal::kEmptyString) {
+    celloffsets_->clear();
+  }
+  clear_has_celloffsets();
+}
+inline const ::std::string& TileRowInfo::celloffsets() const {
+  return *celloffsets_;
+}
+inline void TileRowInfo::set_celloffsets(const ::std::string& value) {
+  set_has_celloffsets();
+  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
+    celloffsets_ = new ::std::string;
+  }
+  celloffsets_->assign(value);
+}
+inline void TileRowInfo::set_celloffsets(const char* value) {
+  set_has_celloffsets();
+  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
+    celloffsets_ = new ::std::string;
+  }
+  celloffsets_->assign(value);
+}
+inline void TileRowInfo::set_celloffsets(const void* value, size_t size) {
+  set_has_celloffsets();
+  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
+    celloffsets_ = new ::std::string;
+  }
+  celloffsets_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* TileRowInfo::mutable_celloffsets() {
+  set_has_celloffsets();
+  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
+    celloffsets_ = new ::std::string;
+  }
+  return celloffsets_;
+}
+inline ::std::string* TileRowInfo::release_celloffsets() {
+  clear_has_celloffsets();
+  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = celloffsets_;
+    celloffsets_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void TileRowInfo::set_allocated_celloffsets(::std::string* celloffsets) {
+  if (celloffsets_ != &::google::protobuf::internal::kEmptyString) {
+    delete celloffsets_;
+  }
+  if (celloffsets) {
+    set_has_celloffsets();
+    celloffsets_ = celloffsets;
+  } else {
+    clear_has_celloffsets();
+    celloffsets_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// -------------------------------------------------------------------
+
+// Tile
+
+// required uint32 maxColumn = 1;
+inline bool Tile::has_maxcolumn() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void Tile::set_has_maxcolumn() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void Tile::clear_has_maxcolumn() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void Tile::clear_maxcolumn() {
+  maxcolumn_ = 0u;
+  clear_has_maxcolumn();
+}
+inline ::google::protobuf::uint32 Tile::maxcolumn() const {
+  return maxcolumn_;
+}
+inline void Tile::set_maxcolumn(::google::protobuf::uint32 value) {
+  set_has_maxcolumn();
+  maxcolumn_ = value;
+}
+
+// required uint32 maxRow = 2;
+inline bool Tile::has_maxrow() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void Tile::set_has_maxrow() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void Tile::clear_has_maxrow() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void Tile::clear_maxrow() {
+  maxrow_ = 0u;
+  clear_has_maxrow();
+}
+inline ::google::protobuf::uint32 Tile::maxrow() const {
+  return maxrow_;
+}
+inline void Tile::set_maxrow(::google::protobuf::uint32 value) {
+  set_has_maxrow();
+  maxrow_ = value;
+}
+
+// required uint32 numCells = 3;
+inline bool Tile::has_numcells() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void Tile::set_has_numcells() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void Tile::clear_has_numcells() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void Tile::clear_numcells() {
+  numcells_ = 0u;
+  clear_has_numcells();
+}
+inline ::google::protobuf::uint32 Tile::numcells() const {
+  return numcells_;
+}
+inline void Tile::set_numcells(::google::protobuf::uint32 value) {
+  set_has_numcells();
+  numcells_ = value;
+}
+
+// required uint32 numrows = 4;
+inline bool Tile::has_numrows() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void Tile::set_has_numrows() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void Tile::clear_has_numrows() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void Tile::clear_numrows() {
+  numrows_ = 0u;
+  clear_has_numrows();
+}
+inline ::google::protobuf::uint32 Tile::numrows() const {
+  return numrows_;
+}
+inline void Tile::set_numrows(::google::protobuf::uint32 value) {
+  set_has_numrows();
+  numrows_ = value;
+}
+
+// optional uint32 storage_version = 6;
+inline bool Tile::has_storage_version() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void Tile::set_has_storage_version() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void Tile::clear_has_storage_version() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void Tile::clear_storage_version() {
+  storage_version_ = 0u;
+  clear_has_storage_version();
+}
+inline ::google::protobuf::uint32 Tile::storage_version() const {
+  return storage_version_;
+}
+inline void Tile::set_storage_version(::google::protobuf::uint32 value) {
+  set_has_storage_version();
+  storage_version_ = value;
+}
+
+// repeated .TST.TileRowInfo rowInfos = 5;
+inline int Tile::rowinfos_size() const {
+  return rowinfos_.size();
+}
+inline void Tile::clear_rowinfos() {
+  rowinfos_.Clear();
+}
+inline const ::TST::TileRowInfo& Tile::rowinfos(int index) const {
+  return rowinfos_.Get(index);
+}
+inline ::TST::TileRowInfo* Tile::mutable_rowinfos(int index) {
+  return rowinfos_.Mutable(index);
+}
+inline ::TST::TileRowInfo* Tile::add_rowinfos() {
+  return rowinfos_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TST::TileRowInfo >&
+Tile::rowinfos() const {
+  return rowinfos_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::TileRowInfo >*
+Tile::mutable_rowinfos() {
+  return &rowinfos_;
+}
+
+// -------------------------------------------------------------------
+
+// TileStorage_Tile
+
+// required uint32 tileid = 1;
+inline bool TileStorage_Tile::has_tileid() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TileStorage_Tile::set_has_tileid() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TileStorage_Tile::clear_has_tileid() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TileStorage_Tile::clear_tileid() {
+  tileid_ = 0u;
+  clear_has_tileid();
+}
+inline ::google::protobuf::uint32 TileStorage_Tile::tileid() const {
+  return tileid_;
+}
+inline void TileStorage_Tile::set_tileid(::google::protobuf::uint32 value) {
+  set_has_tileid();
+  tileid_ = value;
+}
+
+// required .TSP.Reference tile = 2;
+inline bool TileStorage_Tile::has_tile() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TileStorage_Tile::set_has_tile() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TileStorage_Tile::clear_has_tile() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TileStorage_Tile::clear_tile() {
+  if (tile_ != NULL) tile_->::TSP::Reference::Clear();
+  clear_has_tile();
+}
+inline const ::TSP::Reference& TileStorage_Tile::tile() const {
+  return tile_ != NULL ? *tile_ : *default_instance_->tile_;
+}
+inline ::TSP::Reference* TileStorage_Tile::mutable_tile() {
+  set_has_tile();
+  if (tile_ == NULL) tile_ = new ::TSP::Reference;
+  return tile_;
+}
+inline ::TSP::Reference* TileStorage_Tile::release_tile() {
+  clear_has_tile();
+  ::TSP::Reference* temp = tile_;
+  tile_ = NULL;
+  return temp;
+}
+inline void TileStorage_Tile::set_allocated_tile(::TSP::Reference* tile) {
+  delete tile_;
+  tile_ = tile;
+  if (tile) {
+    set_has_tile();
+  } else {
+    clear_has_tile();
+  }
+}
 
-// ===================================================================
+// -------------------------------------------------------------------
 
-// CellID
+// TileStorage
 
-// required fixed32 packedData = 1;
-inline bool CellID::has_packeddata() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// repeated .TST.TileStorage.Tile tiles = 1;
+inline int TileStorage::tiles_size() const {
+  return tiles_.size();
 }
-inline void CellID::set_has_packeddata() {
-  _has_bits_[0] |= 0x00000001u;
+inline void TileStorage::clear_tiles() {
+  tiles_.Clear();
 }
-inline void CellID::clear_has_packeddata() {
-  _has_bits_[0] &= ~0x00000001u;
+inline const ::TST::TileStorage_Tile& TileStorage::tiles(int index) const {
+  return tiles_.Get(index);
 }
-inline void CellID::clear_packeddata() {
-  packeddata_ = 0u;
-  clear_has_packeddata();
+inline ::TST::TileStorage_Tile* TileStorage::mutable_tiles(int index) {
+  return tiles_.Mutable(index);
 }
-inline ::google::protobuf::uint32 CellID::packeddata() const {
-  return packeddata_;
+inline ::TST::TileStorage_Tile* TileStorage::add_tiles() {
+  return tiles_.Add();
 }
-inline void CellID::set_packeddata(::google::protobuf::uint32 value) {
-  set_has_packeddata();
-  packeddata_ = value;
+inline const ::google::protobuf::RepeatedPtrField< ::TST::TileStorage_Tile >&
+TileStorage::tiles() const {
+  return tiles_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::TileStorage_Tile >*
+TileStorage::mutable_tiles() {
+  return &tiles_;
 }
 
 // -------------------------------------------------------------------
 
-// TableSize
+// PopUpMenuModel_CellValue
 
-// required fixed32 packedData = 1;
-inline bool TableSize::has_packeddata() const {
+// required .TST.PopUpMenuModel.CellValueType cell_value_type = 1;
+inline bool PopUpMenuModel_CellValue::has_cell_value_type() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void TableSize::set_has_packeddata() {
+inline void PopUpMenuModel_CellValue::set_has_cell_value_type() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void TableSize::clear_has_packeddata() {
+inline void PopUpMenuModel_CellValue::clear_has_cell_value_type() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void TableSize::clear_packeddata() {
-  packeddata_ = 0u;
-  clear_has_packeddata();
+inline void PopUpMenuModel_CellValue::clear_cell_value_type() {
+  cell_value_type_ = 1;
+  clear_has_cell_value_type();
 }
-inline ::google::protobuf::uint32 TableSize::packeddata() const {
-  return packeddata_;
+inline ::TST::PopUpMenuModel_CellValueType PopUpMenuModel_CellValue::cell_value_type() const {
+  return static_cast< ::TST::PopUpMenuModel_CellValueType >(cell_value_type_);
 }
-inline void TableSize::set_packeddata(::google::protobuf::uint32 value) {
-  set_has_packeddata();
-  packeddata_ = value;
+inline void PopUpMenuModel_CellValue::set_cell_value_type(::TST::PopUpMenuModel_CellValueType value) {
+  assert(::TST::PopUpMenuModel_CellValueType_IsValid(value));
+  set_has_cell_value_type();
+  cell_value_type_ = value;
 }
 
-// -------------------------------------------------------------------
-
-// CellRange
-
-// required .TST.CellID origin = 1;
-inline bool CellRange::has_origin() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// optional .TSCE.BooleanCellValueArchive boolean_value = 2;
+inline bool PopUpMenuModel_CellValue::has_boolean_value() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CellRange::set_has_origin() {
-  _has_bits_[0] |= 0x00000001u;
+inline void PopUpMenuModel_CellValue::set_has_boolean_value() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void CellRange::clear_has_origin() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void PopUpMenuModel_CellValue::clear_has_boolean_value() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void CellRange::clear_origin() {
-  if (origin_ != NULL) origin_->::TST::CellID::Clear();
-  clear_has_origin();
+inline void PopUpMenuModel_CellValue::clear_boolean_value() {
+  if (boolean_value_ != NULL) boolean_value_->::TSCE::BooleanCellValueArchive::Clear();
+  clear_has_boolean_value();
 }
-inline const ::TST::CellID& CellRange::origin() const {
-  return origin_ != NULL ? *origin_ : *default_instance_->origin_;
+inline const ::TSCE::BooleanCellValueArchive& PopUpMenuModel_CellValue::boolean_value() const {
+  return boolean_value_ != NULL ? *boolean_value_ : *default_instance_->boolean_value_;
 }
-inline ::TST::CellID* CellRange::mutable_origin() {
-  set_has_origin();
-  if (origin_ == NULL) origin_ = new ::TST::CellID;
-  return origin_;
+inline ::TSCE::BooleanCellValueArchive* PopUpMenuModel_CellValue::mutable_boolean_value() {
+  set_has_boolean_value();
+  if (boolean_value_ == NULL) boolean_value_ = new ::TSCE::BooleanCellValueArchive;
+  return boolean_value_;
 }
-inline ::TST::CellID* CellRange::release_origin() {
-  clear_has_origin();
-  ::TST::CellID* temp = origin_;
-  origin_ = NULL;
+inline ::TSCE::BooleanCellValueArchive* PopUpMenuModel_CellValue::release_boolean_value() {
+  clear_has_boolean_value();
+  ::TSCE::BooleanCellValueArchive* temp = boolean_value_;
+  boolean_value_ = NULL;
   return temp;
 }
-inline void CellRange::set_allocated_origin(::TST::CellID* origin) {
-  delete origin_;
-  origin_ = origin;
-  if (origin) {
-    set_has_origin();
+inline void PopUpMenuModel_CellValue::set_allocated_boolean_value(::TSCE::BooleanCellValueArchive* boolean_value) {
+  delete boolean_value_;
+  boolean_value_ = boolean_value;
+  if (boolean_value) {
+    set_has_boolean_value();
   } else {
-    clear_has_origin();
+    clear_has_boolean_value();
   }
 }
 
-// required .TST.TableSize size = 2;
-inline bool CellRange::has_size() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+// optional .TSCE.DateCellValueArchive date_value = 3;
+inline bool PopUpMenuModel_CellValue::has_date_value() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CellRange::set_has_size() {
-  _has_bits_[0] |= 0x00000002u;
+inline void PopUpMenuModel_CellValue::set_has_date_value() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void CellRange::clear_has_size() {
-  _has_bits_[0] &= ~0x00000002u;
+inline void PopUpMenuModel_CellValue::clear_has_date_value() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CellRange::clear_size() {
-  if (size_ != NULL) size_->::TST::TableSize::Clear();
-  clear_has_size();
+inline void PopUpMenuModel_CellValue::clear_date_value() {
+  if (date_value_ != NULL) date_value_->::TSCE::DateCellValueArchive::Clear();
+  clear_has_date_value();
 }
-inline const ::TST::TableSize& CellRange::size() const {
-  return size_ != NULL ? *size_ : *default_instance_->size_;
+inline const ::TSCE::DateCellValueArchive& PopUpMenuModel_CellValue::date_value() const {
+  return date_value_ != NULL ? *date_value_ : *default_instance_->date_value_;
 }
-inline ::TST::TableSize* CellRange::mutable_size() {
-  set_has_size();
-  if (size_ == NULL) size_ = new ::TST::TableSize;
-  return size_;
+inline ::TSCE::DateCellValueArchive* PopUpMenuModel_CellValue::mutable_date_value() {
+  set_has_date_value();
+  if (date_value_ == NULL) date_value_ = new ::TSCE::DateCellValueArchive;
+  return date_value_;
 }
-inline ::TST::TableSize* CellRange::release_size() {
-  clear_has_size();
-  ::TST::TableSize* temp = size_;
-  size_ = NULL;
+inline ::TSCE::DateCellValueArchive* PopUpMenuModel_CellValue::release_date_value() {
+  clear_has_date_value();
+  ::TSCE::DateCellValueArchive* temp = date_value_;
+  date_value_ = NULL;
   return temp;
 }
-inline void CellRange::set_allocated_size(::TST::TableSize* size) {
-  delete size_;
-  size_ = size;
-  if (size) {
-    set_has_size();
+inline void PopUpMenuModel_CellValue::set_allocated_date_value(::TSCE::DateCellValueArchive* date_value) {
+  delete date_value_;
+  date_value_ = date_value;
+  if (date_value) {
+    set_has_date_value();
   } else {
-    clear_has_size();
+    clear_has_date_value();
   }
 }
 
-// -------------------------------------------------------------------
-
-// TableSelection
-
-// required .TST.CellRange cellRange = 1;
-inline bool TableSelection::has_cellrange() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// optional .TSCE.NumberCellValueArchive number_value = 4;
+inline bool PopUpMenuModel_CellValue::has_number_value() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void TableSelection::set_has_cellrange() {
-  _has_bits_[0] |= 0x00000001u;
+inline void PopUpMenuModel_CellValue::set_has_number_value() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void TableSelection::clear_has_cellrange() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void PopUpMenuModel_CellValue::clear_has_number_value() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void TableSelection::clear_cellrange() {
-  if (cellrange_ != NULL) cellrange_->::TST::CellRange::Clear();
-  clear_has_cellrange();
+inline void PopUpMenuModel_CellValue::clear_number_value() {
+  if (number_value_ != NULL) number_value_->::TSCE::NumberCellValueArchive::Clear();
+  clear_has_number_value();
 }
-inline const ::TST::CellRange& TableSelection::cellrange() const {
-  return cellrange_ != NULL ? *cellrange_ : *default_instance_->cellrange_;
+inline const ::TSCE::NumberCellValueArchive& PopUpMenuModel_CellValue::number_value() const {
+  return number_value_ != NULL ? *number_value_ : *default_instance_->number_value_;
 }
-inline ::TST::CellRange* TableSelection::mutable_cellrange() {
-  set_has_cellrange();
-  if (cellrange_ == NULL) cellrange_ = new ::TST::CellRange;
-  return cellrange_;
+inline ::TSCE::NumberCellValueArchive* PopUpMenuModel_CellValue::mutable_number_value() {
+  set_has_number_value();
+  if (number_value_ == NULL) number_value_ = new ::TSCE::NumberCellValueArchive;
+  return number_value_;
 }
-inline ::TST::CellRange* TableSelection::release_cellrange() {
-  clear_has_cellrange();
-  ::TST::CellRange* temp = cellrange_;
-  cellrange_ = NULL;
+inline ::TSCE::NumberCellValueArchive* PopUpMenuModel_CellValue::release_number_value() {
+  clear_has_number_value();
+  ::TSCE::NumberCellValueArchive* temp = number_value_;
+  number_value_ = NULL;
   return temp;
 }
-inline void TableSelection::set_allocated_cellrange(::TST::CellRange* cellrange) {
-  delete cellrange_;
-  cellrange_ = cellrange;
-  if (cellrange) {
-    set_has_cellrange();
+inline void PopUpMenuModel_CellValue::set_allocated_number_value(::TSCE::NumberCellValueArchive* number_value) {
+  delete number_value_;
+  number_value_ = number_value;
+  if (number_value) {
+    set_has_number_value();
   } else {
-    clear_has_cellrange();
+    clear_has_number_value();
   }
 }
 
-// required .TST.CellRange extendedCellRange = 2;
-inline bool TableSelection::has_extendedcellrange() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void TableSelection::set_has_extendedcellrange() {
-  _has_bits_[0] |= 0x00000002u;
+// optional .TSCE.StringCellValueArchive string_value = 5;
+inline bool PopUpMenuModel_CellValue::has_string_value() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
 }
-inline void TableSelection::clear_has_extendedcellrange() {
-  _has_bits_[0] &= ~0x00000002u;
+inline void PopUpMenuModel_CellValue::set_has_string_value() {
+  _has_bits_[0] |= 0x00000010u;
 }
-inline void TableSelection::clear_extendedcellrange() {
-  if (extendedcellrange_ != NULL) extendedcellrange_->::TST::CellRange::Clear();
-  clear_has_extendedcellrange();
+inline void PopUpMenuModel_CellValue::clear_has_string_value() {
+  _has_bits_[0] &= ~0x00000010u;
 }
-inline const ::TST::CellRange& TableSelection::extendedcellrange() const {
-  return extendedcellrange_ != NULL ? *extendedcellrange_ : *default_instance_->extendedcellrange_;
+inline void PopUpMenuModel_CellValue::clear_string_value() {
+  if (string_value_ != NULL) string_value_->::TSCE::StringCellValueArchive::Clear();
+  clear_has_string_value();
 }
-inline ::TST::CellRange* TableSelection::mutable_extendedcellrange() {
-  set_has_extendedcellrange();
-  if (extendedcellrange_ == NULL) extendedcellrange_ = new ::TST::CellRange;
-  return extendedcellrange_;
+inline const ::TSCE::StringCellValueArchive& PopUpMenuModel_CellValue::string_value() const {
+  return string_value_ != NULL ? *string_value_ : *default_instance_->string_value_;
 }
-inline ::TST::CellRange* TableSelection::release_extendedcellrange() {
-  clear_has_extendedcellrange();
-  ::TST::CellRange* temp = extendedcellrange_;
-  extendedcellrange_ = NULL;
+inline ::TSCE::StringCellValueArchive* PopUpMenuModel_CellValue::mutable_string_value() {
+  set_has_string_value();
+  if (string_value_ == NULL) string_value_ = new ::TSCE::StringCellValueArchive;
+  return string_value_;
+}
+inline ::TSCE::StringCellValueArchive* PopUpMenuModel_CellValue::release_string_value() {
+  clear_has_string_value();
+  ::TSCE::StringCellValueArchive* temp = string_value_;
+  string_value_ = NULL;
   return temp;
 }
-inline void TableSelection::set_allocated_extendedcellrange(::TST::CellRange* extendedcellrange) {
-  delete extendedcellrange_;
-  extendedcellrange_ = extendedcellrange;
-  if (extendedcellrange) {
-    set_has_extendedcellrange();
+inline void PopUpMenuModel_CellValue::set_allocated_string_value(::TSCE::StringCellValueArchive* string_value) {
+  delete string_value_;
+  string_value_ = string_value;
+  if (string_value) {
+    set_has_string_value();
   } else {
-    clear_has_extendedcellrange();
+    clear_has_string_value();
   }
 }
 
-// required bool extendedCellRangeValid = 3;
-inline bool TableSelection::has_extendedcellrangevalid() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+// -------------------------------------------------------------------
+
+// PopUpMenuModel
+
+// repeated .TST.PopUpMenuModel.CellValue item = 1 [deprecated = true];
+inline int PopUpMenuModel::item_size() const {
+  return item_.size();
 }
-inline void TableSelection::set_has_extendedcellrangevalid() {
-  _has_bits_[0] |= 0x00000004u;
+inline void PopUpMenuModel::clear_item() {
+  item_.Clear();
 }
-inline void TableSelection::clear_has_extendedcellrangevalid() {
-  _has_bits_[0] &= ~0x00000004u;
+inline const ::TST::PopUpMenuModel_CellValue& PopUpMenuModel::item(int index) const {
+  return item_.Get(index);
 }
-inline void TableSelection::clear_extendedcellrangevalid() {
-  extendedcellrangevalid_ = false;
-  clear_has_extendedcellrangevalid();
+inline ::TST::PopUpMenuModel_CellValue* PopUpMenuModel::mutable_item(int index) {
+  return item_.Mutable(index);
 }
-inline bool TableSelection::extendedcellrangevalid() const {
-  return extendedcellrangevalid_;
+inline ::TST::PopUpMenuModel_CellValue* PopUpMenuModel::add_item() {
+  return item_.Add();
 }
-inline void TableSelection::set_extendedcellrangevalid(bool value) {
-  set_has_extendedcellrangevalid();
-  extendedcellrangevalid_ = value;
+inline const ::google::protobuf::RepeatedPtrField< ::TST::PopUpMenuModel_CellValue >&
+PopUpMenuModel::item() const {
+  return item_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::PopUpMenuModel_CellValue >*
+PopUpMenuModel::mutable_item() {
+  return &item_;
 }
 
-// required .TST.SelectionTypeArchive selection_type = 4;
-inline bool TableSelection::has_selection_type() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// repeated .TSCE.CellValueArchive tsce_item = 2;
+inline int PopUpMenuModel::tsce_item_size() const {
+  return tsce_item_.size();
 }
-inline void TableSelection::set_has_selection_type() {
-  _has_bits_[0] |= 0x00000008u;
+inline void PopUpMenuModel::clear_tsce_item() {
+  tsce_item_.Clear();
 }
-inline void TableSelection::clear_has_selection_type() {
-  _has_bits_[0] &= ~0x00000008u;
+inline const ::TSCE::CellValueArchive& PopUpMenuModel::tsce_item(int index) const {
+  return tsce_item_.Get(index);
 }
-inline void TableSelection::clear_selection_type() {
-  selection_type_ = 0;
-  clear_has_selection_type();
+inline ::TSCE::CellValueArchive* PopUpMenuModel::mutable_tsce_item(int index) {
+  return tsce_item_.Mutable(index);
 }
-inline ::TST::SelectionTypeArchive TableSelection::selection_type() const {
-  return static_cast< ::TST::SelectionTypeArchive >(selection_type_);
+inline ::TSCE::CellValueArchive* PopUpMenuModel::add_tsce_item() {
+  return tsce_item_.Add();
 }
-inline void TableSelection::set_selection_type(::TST::SelectionTypeArchive value) {
-  assert(::TST::SelectionTypeArchive_IsValid(value));
-  set_has_selection_type();
-  selection_type_ = value;
+inline const ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >&
+PopUpMenuModel::tsce_item() const {
+  return tsce_item_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >*
+PopUpMenuModel::mutable_tsce_item() {
+  return &tsce_item_;
 }
 
 // -------------------------------------------------------------------
 
-// TileRowInfo
+// ImportWarningSetArchive_FormulaImportWarning
 
-// optional uint32 storage_version = 5;
-inline bool TileRowInfo::has_storage_version() const {
+// required .TST.ImportWarningSetArchive.FormulaWarningType formula_warning_type = 1;
+inline bool ImportWarningSetArchive_FormulaImportWarning::has_formula_warning_type() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void TileRowInfo::set_has_storage_version() {
+inline void ImportWarningSetArchive_FormulaImportWarning::set_has_formula_warning_type() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void TileRowInfo::clear_has_storage_version() {
+inline void ImportWarningSetArchive_FormulaImportWarning::clear_has_formula_warning_type() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void TileRowInfo::clear_storage_version() {
-  storage_version_ = 0u;
-  clear_has_storage_version();
+inline void ImportWarningSetArchive_FormulaImportWarning::clear_formula_warning_type() {
+  formula_warning_type_ = 1;
+  clear_has_formula_warning_type();
 }
-inline ::google::protobuf::uint32 TileRowInfo::storage_version() const {
-  return storage_version_;
+inline ::TST::ImportWarningSetArchive_FormulaWarningType ImportWarningSetArchive_FormulaImportWarning::formula_warning_type() const {
+  return static_cast< ::TST::ImportWarningSetArchive_FormulaWarningType >(formula_warning_type_);
 }
-inline void TileRowInfo::set_storage_version(::google::protobuf::uint32 value) {
-  set_has_storage_version();
-  storage_version_ = value;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_formula_warning_type(::TST::ImportWarningSetArchive_FormulaWarningType value) {
+  assert(::TST::ImportWarningSetArchive_FormulaWarningType_IsValid(value));
+  set_has_formula_warning_type();
+  formula_warning_type_ = value;
 }
 
-// required uint32 tileRowIndex = 1;
-inline bool TileRowInfo::has_tilerowindex() const {
+// optional string original_formula = 2;
+inline bool ImportWarningSetArchive_FormulaImportWarning::has_original_formula() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void TileRowInfo::set_has_tilerowindex() {
+inline void ImportWarningSetArchive_FormulaImportWarning::set_has_original_formula() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void TileRowInfo::clear_has_tilerowindex() {
+inline void ImportWarningSetArchive_FormulaImportWarning::clear_has_original_formula() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void TileRowInfo::clear_tilerowindex() {
-  tilerowindex_ = 0u;
-  clear_has_tilerowindex();
-}
-inline ::google::protobuf::uint32 TileRowInfo::tilerowindex() const {
-  return tilerowindex_;
-}
-inline void TileRowInfo::set_tilerowindex(::google::protobuf::uint32 value) {
-  set_has_tilerowindex();
-  tilerowindex_ = value;
-}
-
-// required uint32 cellCount = 2;
-inline bool TileRowInfo::has_cellcount() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void TileRowInfo::set_has_cellcount() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void TileRowInfo::clear_has_cellcount() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void TileRowInfo::clear_cellcount() {
-  cellcount_ = 0u;
-  clear_has_cellcount();
-}
-inline ::google::protobuf::uint32 TileRowInfo::cellcount() const {
-  return cellcount_;
-}
-inline void TileRowInfo::set_cellcount(::google::protobuf::uint32 value) {
-  set_has_cellcount();
-  cellcount_ = value;
-}
-
-// required bytes cellStorageBuffer = 3;
-inline bool TileRowInfo::has_cellstoragebuffer() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void TileRowInfo::set_has_cellstoragebuffer() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void TileRowInfo::clear_has_cellstoragebuffer() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void TileRowInfo::clear_cellstoragebuffer() {
-  if (cellstoragebuffer_ != &::google::protobuf::internal::kEmptyString) {
-    cellstoragebuffer_->clear();
+inline void ImportWarningSetArchive_FormulaImportWarning::clear_original_formula() {
+  if (original_formula_ != &::google::protobuf::internal::kEmptyString) {
+    original_formula_->clear();
   }
-  clear_has_cellstoragebuffer();
+  clear_has_original_formula();
 }
-inline const ::std::string& TileRowInfo::cellstoragebuffer() const {
-  return *cellstoragebuffer_;
+inline const ::std::string& ImportWarningSetArchive_FormulaImportWarning::original_formula() const {
+  return *original_formula_;
 }
-inline void TileRowInfo::set_cellstoragebuffer(const ::std::string& value) {
-  set_has_cellstoragebuffer();
-  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
-    cellstoragebuffer_ = new ::std::string;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_original_formula(const ::std::string& value) {
+  set_has_original_formula();
+  if (original_formula_ == &::google::protobuf::internal::kEmptyString) {
+    original_formula_ = new ::std::string;
   }
-  cellstoragebuffer_->assign(value);
+  original_formula_->assign(value);
 }
-inline void TileRowInfo::set_cellstoragebuffer(const char* value) {
-  set_has_cellstoragebuffer();
-  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
-    cellstoragebuffer_ = new ::std::string;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_original_formula(const char* value) {
+  set_has_original_formula();
+  if (original_formula_ == &::google::protobuf::internal::kEmptyString) {
+    original_formula_ = new ::std::string;
   }
-  cellstoragebuffer_->assign(value);
+  original_formula_->assign(value);
 }
-inline void TileRowInfo::set_cellstoragebuffer(const void* value, size_t size) {
-  set_has_cellstoragebuffer();
-  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
-    cellstoragebuffer_ = new ::std::string;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_original_formula(const char* value, size_t size) {
+  set_has_original_formula();
+  if (original_formula_ == &::google::protobuf::internal::kEmptyString) {
+    original_formula_ = new ::std::string;
   }
-  cellstoragebuffer_->assign(reinterpret_cast<const char*>(value), size);
+  original_formula_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* TileRowInfo::mutable_cellstoragebuffer() {
-  set_has_cellstoragebuffer();
-  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
-    cellstoragebuffer_ = new ::std::string;
+inline ::std::string* ImportWarningSetArchive_FormulaImportWarning::mutable_original_formula() {
+  set_has_original_formula();
+  if (original_formula_ == &::google::protobuf::internal::kEmptyString) {
+    original_formula_ = new ::std::string;
   }
-  return cellstoragebuffer_;
+  return original_formula_;
 }
-inline ::std::string* TileRowInfo::release_cellstoragebuffer() {
-  clear_has_cellstoragebuffer();
-  if (cellstoragebuffer_ == &::google::protobuf::internal::kEmptyString) {
+inline ::std::string* ImportWarningSetArchive_FormulaImportWarning::release_original_formula() {
+  clear_has_original_formula();
+  if (original_formula_ == &::google::protobuf::internal::kEmptyString) {
     return NULL;
   } else {
-    ::std::string* temp = cellstoragebuffer_;
-    cellstoragebuffer_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    ::std::string* temp = original_formula_;
+    original_formula_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
     return temp;
   }
 }
-inline void TileRowInfo::set_allocated_cellstoragebuffer(::std::string* cellstoragebuffer) {
-  if (cellstoragebuffer_ != &::google::protobuf::internal::kEmptyString) {
-    delete cellstoragebuffer_;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_allocated_original_formula(::std::string* original_formula) {
+  if (original_formula_ != &::google::protobuf::internal::kEmptyString) {
+    delete original_formula_;
   }
-  if (cellstoragebuffer) {
-    set_has_cellstoragebuffer();
-    cellstoragebuffer_ = cellstoragebuffer;
+  if (original_formula) {
+    set_has_original_formula();
+    original_formula_ = original_formula;
   } else {
-    clear_has_cellstoragebuffer();
-    cellstoragebuffer_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_original_formula();
+    original_formula_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   }
 }
 
-// required bytes cellOffsets = 4;
-inline bool TileRowInfo::has_celloffsets() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+// optional string supplementary_text = 3;
+inline bool ImportWarningSetArchive_FormulaImportWarning::has_supplementary_text() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void TileRowInfo::set_has_celloffsets() {
-  _has_bits_[0] |= 0x00000010u;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_has_supplementary_text() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void TileRowInfo::clear_has_celloffsets() {
-  _has_bits_[0] &= ~0x00000010u;
+inline void ImportWarningSetArchive_FormulaImportWarning::clear_has_supplementary_text() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void TileRowInfo::clear_celloffsets() {
-  if (celloffsets_ != &::google::protobuf::internal::kEmptyString) {
-    celloffsets_->clear();
+inline void ImportWarningSetArchive_FormulaImportWarning::clear_supplementary_text() {
+  if (supplementary_text_ != &::google::protobuf::internal::kEmptyString) {
+    supplementary_text_->clear();
   }
-  clear_has_celloffsets();
+  clear_has_supplementary_text();
 }
-inline const ::std::string& TileRowInfo::celloffsets() const {
-  return *celloffsets_;
+inline const ::std::string& ImportWarningSetArchive_FormulaImportWarning::supplementary_text() const {
+  return *supplementary_text_;
 }
-inline void TileRowInfo::set_celloffsets(const ::std::string& value) {
-  set_has_celloffsets();
-  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
-    celloffsets_ = new ::std::string;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_supplementary_text(const ::std::string& value) {
+  set_has_supplementary_text();
+  if (supplementary_text_ == &::google::protobuf::internal::kEmptyString) {
+    supplementary_text_ = new ::std::string;
   }
-  celloffsets_->assign(value);
+  supplementary_text_->assign(value);
 }
-inline void TileRowInfo::set_celloffsets(const char* value) {
-  set_has_celloffsets();
-  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
-    celloffsets_ = new ::std::string;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_supplementary_text(const char* value) {
+  set_has_supplementary_text();
+  if (supplementary_text_ == &::google::protobuf::internal::kEmptyString) {
+    supplementary_text_ = new ::std::string;
   }
-  celloffsets_->assign(value);
+  supplementary_text_->assign(value);
 }
-inline void TileRowInfo::set_celloffsets(const void* value, size_t size) {
-  set_has_celloffsets();
-  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
-    celloffsets_ = new ::std::string;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_supplementary_text(const char* value, size_t size) {
+  set_has_supplementary_text();
+  if (supplementary_text_ == &::google::protobuf::internal::kEmptyString) {
+    supplementary_text_ = new ::std::string;
   }
-  celloffsets_->assign(reinterpret_cast<const char*>(value), size);
+  supplementary_text_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* TileRowInfo::mutable_celloffsets() {
-  set_has_celloffsets();
-  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
-    celloffsets_ = new ::std::string;
+inline ::std::string* ImportWarningSetArchive_FormulaImportWarning::mutable_supplementary_text() {
+  set_has_supplementary_text();
+  if (supplementary_text_ == &::google::protobuf::internal::kEmptyString) {
+    supplementary_text_ = new ::std::string;
   }
-  return celloffsets_;
+  return supplementary_text_;
 }
-inline ::std::string* TileRowInfo::release_celloffsets() {
-  clear_has_celloffsets();
-  if (celloffsets_ == &::google::protobuf::internal::kEmptyString) {
+inline ::std::string* ImportWarningSetArchive_FormulaImportWarning::release_supplementary_text() {
+  clear_has_supplementary_text();
+  if (supplementary_text_ == &::google::protobuf::internal::kEmptyString) {
     return NULL;
   } else {
-    ::std::string* temp = celloffsets_;
-    celloffsets_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    ::std::string* temp = supplementary_text_;
+    supplementary_text_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
     return temp;
   }
 }
-inline void TileRowInfo::set_allocated_celloffsets(::std::string* celloffsets) {
-  if (celloffsets_ != &::google::protobuf::internal::kEmptyString) {
-    delete celloffsets_;
+inline void ImportWarningSetArchive_FormulaImportWarning::set_allocated_supplementary_text(::std::string* supplementary_text) {
+  if (supplementary_text_ != &::google::protobuf::internal::kEmptyString) {
+    delete supplementary_text_;
   }
-  if (celloffsets) {
-    set_has_celloffsets();
-    celloffsets_ = celloffsets;
+  if (supplementary_text) {
+    set_has_supplementary_text();
+    supplementary_text_ = supplementary_text;
   } else {
-    clear_has_celloffsets();
-    celloffsets_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_supplementary_text();
+    supplementary_text_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   }
 }
 
 // -------------------------------------------------------------------
 
-// Tile
+// ImportWarningSetArchive
 
-// required uint32 maxColumn = 1;
-inline bool Tile::has_maxcolumn() const {
+// optional .TST.ImportWarningSetArchive.FormulaImportWarning formula_import_warning = 1;
+inline bool ImportWarningSetArchive::has_formula_import_warning() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Tile::set_has_maxcolumn() {
+inline void ImportWarningSetArchive::set_has_formula_import_warning() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void Tile::clear_has_maxcolumn() {
+inline void ImportWarningSetArchive::clear_has_formula_import_warning() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void Tile::clear_maxcolumn() {
-  maxcolumn_ = 0u;
-  clear_has_maxcolumn();
+inline void ImportWarningSetArchive::clear_formula_import_warning() {
+  if (formula_import_warning_ != NULL) formula_import_warning_->::TST::ImportWarningSetArchive_FormulaImportWarning::Clear();
+  clear_has_formula_import_warning();
+}
+inline const ::TST::ImportWarningSetArchive_FormulaImportWarning& ImportWarningSetArchive::formula_import_warning() const {
+  return formula_import_warning_ != NULL ? *formula_import_warning_ : *default_instance_->formula_import_warning_;
+}
+inline ::TST::ImportWarningSetArchive_FormulaImportWarning* ImportWarningSetArchive::mutable_formula_import_warning() {
+  set_has_formula_import_warning();
+  if (formula_import_warning_ == NULL) formula_import_warning_ = new ::TST::ImportWarningSetArchive_FormulaImportWarning;
+  return formula_import_warning_;
 }
-inline ::google::protobuf::uint32 Tile::maxcolumn() const {
-  return maxcolumn_;
+inline ::TST::ImportWarningSetArchive_FormulaImportWarning* ImportWarningSetArchive::release_formula_import_warning() {
+  clear_has_formula_import_warning();
+  ::TST::ImportWarningSetArchive_FormulaImportWarning* temp = formula_import_warning_;
+  formula_import_warning_ = NULL;
+  return temp;
 }
-inline void Tile::set_maxcolumn(::google::protobuf::uint32 value) {
-  set_has_maxcolumn();
-  maxcolumn_ = value;
+inline void ImportWarningSetArchive::set_allocated_formula_import_warning(::TST::ImportWarningSetArchive_FormulaImportWarning* formula_import_warning) {
+  delete formula_import_warning_;
+  formula_import_warning_ = formula_import_warning;
+  if (formula_import_warning) {
+    set_has_formula_import_warning();
+  } else {
+    clear_has_formula_import_warning();
+  }
 }
 
-// required uint32 maxRow = 2;
-inline bool Tile::has_maxrow() const {
+// optional bool cond_format_above_avg_equal_avg = 2 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_above_avg_equal_avg() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Tile::set_has_maxrow() {
+inline void ImportWarningSetArchive::set_has_cond_format_above_avg_equal_avg() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void Tile::clear_has_maxrow() {
+inline void ImportWarningSetArchive::clear_has_cond_format_above_avg_equal_avg() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void Tile::clear_maxrow() {
-  maxrow_ = 0u;
-  clear_has_maxrow();
+inline void ImportWarningSetArchive::clear_cond_format_above_avg_equal_avg() {
+  cond_format_above_avg_equal_avg_ = false;
+  clear_has_cond_format_above_avg_equal_avg();
 }
-inline ::google::protobuf::uint32 Tile::maxrow() const {
-  return maxrow_;
+inline bool ImportWarningSetArchive::cond_format_above_avg_equal_avg() const {
+  return cond_format_above_avg_equal_avg_;
 }
-inline void Tile::set_maxrow(::google::protobuf::uint32 value) {
-  set_has_maxrow();
-  maxrow_ = value;
+inline void ImportWarningSetArchive::set_cond_format_above_avg_equal_avg(bool value) {
+  set_has_cond_format_above_avg_equal_avg();
+  cond_format_above_avg_equal_avg_ = value;
 }
 
-// required uint32 numCells = 3;
-inline bool Tile::has_numcells() const {
+// optional bool cond_format_above_avg_std_dev = 3 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_above_avg_std_dev() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Tile::set_has_numcells() {
+inline void ImportWarningSetArchive::set_has_cond_format_above_avg_std_dev() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void Tile::clear_has_numcells() {
+inline void ImportWarningSetArchive::clear_has_cond_format_above_avg_std_dev() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void Tile::clear_numcells() {
-  numcells_ = 0u;
-  clear_has_numcells();
+inline void ImportWarningSetArchive::clear_cond_format_above_avg_std_dev() {
+  cond_format_above_avg_std_dev_ = false;
+  clear_has_cond_format_above_avg_std_dev();
 }
-inline ::google::protobuf::uint32 Tile::numcells() const {
-  return numcells_;
+inline bool ImportWarningSetArchive::cond_format_above_avg_std_dev() const {
+  return cond_format_above_avg_std_dev_;
 }
-inline void Tile::set_numcells(::google::protobuf::uint32 value) {
-  set_has_numcells();
-  numcells_ = value;
+inline void ImportWarningSetArchive::set_cond_format_above_avg_std_dev(bool value) {
+  set_has_cond_format_above_avg_std_dev();
+  cond_format_above_avg_std_dev_ = value;
 }
 
-// required uint32 numrows = 4;
-inline bool Tile::has_numrows() const {
+// optional bool cond_format_complex_formula = 4 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_complex_formula() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void Tile::set_has_numrows() {
+inline void ImportWarningSetArchive::set_has_cond_format_complex_formula() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void Tile::clear_has_numrows() {
+inline void ImportWarningSetArchive::clear_has_cond_format_complex_formula() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void Tile::clear_numrows() {
-  numrows_ = 0u;
-  clear_has_numrows();
+inline void ImportWarningSetArchive::clear_cond_format_complex_formula() {
+  cond_format_complex_formula_ = false;
+  clear_has_cond_format_complex_formula();
 }
-inline ::google::protobuf::uint32 Tile::numrows() const {
-  return numrows_;
+inline bool ImportWarningSetArchive::cond_format_complex_formula() const {
+  return cond_format_complex_formula_;
 }
-inline void Tile::set_numrows(::google::protobuf::uint32 value) {
-  set_has_numrows();
-  numrows_ = value;
+inline void ImportWarningSetArchive::set_cond_format_complex_formula(bool value) {
+  set_has_cond_format_complex_formula();
+  cond_format_complex_formula_ = value;
 }
 
-// optional uint32 storage_version = 6;
-inline bool Tile::has_storage_version() const {
+// optional bool cond_format_contains_errors = 5 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_contains_errors() const {
   return (_has_bits_[0] & 0x00000010u) != 0;
 }
-inline void Tile::set_has_storage_version() {
+inline void ImportWarningSetArchive::set_has_cond_format_contains_errors() {
   _has_bits_[0] |= 0x00000010u;
 }
-inline void Tile::clear_has_storage_version() {
+inline void ImportWarningSetArchive::clear_has_cond_format_contains_errors() {
   _has_bits_[0] &= ~0x00000010u;
 }
-inline void Tile::clear_storage_version() {
-  storage_version_ = 0u;
-  clear_has_storage_version();
-}
-inline ::google::protobuf::uint32 Tile::storage_version() const {
-  return storage_version_;
-}
-inline void Tile::set_storage_version(::google::protobuf::uint32 value) {
-  set_has_storage_version();
-  storage_version_ = value;
-}
-
-// repeated .TST.TileRowInfo rowInfos = 5;
-inline int Tile::rowinfos_size() const {
-  return rowinfos_.size();
-}
-inline void Tile::clear_rowinfos() {
-  rowinfos_.Clear();
-}
-inline const ::TST::TileRowInfo& Tile::rowinfos(int index) const {
-  return rowinfos_.Get(index);
-}
-inline ::TST::TileRowInfo* Tile::mutable_rowinfos(int index) {
-  return rowinfos_.Mutable(index);
+inline void ImportWarningSetArchive::clear_cond_format_contains_errors() {
+  cond_format_contains_errors_ = false;
+  clear_has_cond_format_contains_errors();
 }
-inline ::TST::TileRowInfo* Tile::add_rowinfos() {
-  return rowinfos_.Add();
-}
-inline const ::google::protobuf::RepeatedPtrField< ::TST::TileRowInfo >&
-Tile::rowinfos() const {
-  return rowinfos_;
+inline bool ImportWarningSetArchive::cond_format_contains_errors() const {
+  return cond_format_contains_errors_;
 }
-inline ::google::protobuf::RepeatedPtrField< ::TST::TileRowInfo >*
-Tile::mutable_rowinfos() {
-  return &rowinfos_;
+inline void ImportWarningSetArchive::set_cond_format_contains_errors(bool value) {
+  set_has_cond_format_contains_errors();
+  cond_format_contains_errors_ = value;
 }
 
-// -------------------------------------------------------------------
-
-// TileStorage_Tile
-
-// required uint32 tileid = 1;
-inline bool TileStorage_Tile::has_tileid() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// optional bool cond_format_expr = 6 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_expr() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
-inline void TileStorage_Tile::set_has_tileid() {
-  _has_bits_[0] |= 0x00000001u;
+inline void ImportWarningSetArchive::set_has_cond_format_expr() {
+  _has_bits_[0] |= 0x00000020u;
 }
-inline void TileStorage_Tile::clear_has_tileid() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void ImportWarningSetArchive::clear_has_cond_format_expr() {
+  _has_bits_[0] &= ~0x00000020u;
 }
-inline void TileStorage_Tile::clear_tileid() {
-  tileid_ = 0u;
-  clear_has_tileid();
+inline void ImportWarningSetArchive::clear_cond_format_expr() {
+  cond_format_expr_ = false;
+  clear_has_cond_format_expr();
 }
-inline ::google::protobuf::uint32 TileStorage_Tile::tileid() const {
-  return tileid_;
+inline bool ImportWarningSetArchive::cond_format_expr() const {
+  return cond_format_expr_;
 }
-inline void TileStorage_Tile::set_tileid(::google::protobuf::uint32 value) {
-  set_has_tileid();
-  tileid_ = value;
+inline void ImportWarningSetArchive::set_cond_format_expr(bool value) {
+  set_has_cond_format_expr();
+  cond_format_expr_ = value;
 }
 
-// required .TSP.Reference tile = 2;
-inline bool TileStorage_Tile::has_tile() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void TileStorage_Tile::set_has_tile() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void TileStorage_Tile::clear_has_tile() {
-  _has_bits_[0] &= ~0x00000002u;
+// optional bool cond_format_not_contains_errors = 7 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_not_contains_errors() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
 }
-inline void TileStorage_Tile::clear_tile() {
-  if (tile_ != NULL) tile_->::TSP::Reference::Clear();
-  clear_has_tile();
+inline void ImportWarningSetArchive::set_has_cond_format_not_contains_errors() {
+  _has_bits_[0] |= 0x00000040u;
 }
-inline const ::TSP::Reference& TileStorage_Tile::tile() const {
-  return tile_ != NULL ? *tile_ : *default_instance_->tile_;
+inline void ImportWarningSetArchive::clear_has_cond_format_not_contains_errors() {
+  _has_bits_[0] &= ~0x00000040u;
 }
-inline ::TSP::Reference* TileStorage_Tile::mutable_tile() {
-  set_has_tile();
-  if (tile_ == NULL) tile_ = new ::TSP::Reference;
-  return tile_;
+inline void ImportWarningSetArchive::clear_cond_format_not_contains_errors() {
+  cond_format_not_contains_errors_ = false;
+  clear_has_cond_format_not_contains_errors();
 }
-inline ::TSP::Reference* TileStorage_Tile::release_tile() {
-  clear_has_tile();
-  ::TSP::Reference* temp = tile_;
-  tile_ = NULL;
-  return temp;
+inline bool ImportWarningSetArchive::cond_format_not_contains_errors() const {
+  return cond_format_not_contains_errors_;
 }
-inline void TileStorage_Tile::set_allocated_tile(::TSP::Reference* tile) {
-  delete tile_;
-  tile_ = tile;
-  if (tile) {
-    set_has_tile();
-  } else {
-    clear_has_tile();
-  }
+inline void ImportWarningSetArchive::set_cond_format_not_contains_errors(bool value) {
+  set_has_cond_format_not_contains_errors();
+  cond_format_not_contains_errors_ = value;
 }
 
-// -------------------------------------------------------------------
-
-// TileStorage
-
-// repeated .TST.TileStorage.Tile tiles = 1;
-inline int TileStorage::tiles_size() const {
-  return tiles_.size();
-}
-inline void TileStorage::clear_tiles() {
-  tiles_.Clear();
+// optional bool cond_format_parameters_not_all_same_type = 8 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_parameters_not_all_same_type() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
 }
-inline const ::TST::TileStorage_Tile& TileStorage::tiles(int index) const {
-  return tiles_.Get(index);
+inline void ImportWarningSetArchive::set_has_cond_format_parameters_not_all_same_type() {
+  _has_bits_[0] |= 0x00000080u;
 }
-inline ::TST::TileStorage_Tile* TileStorage::mutable_tiles(int index) {
-  return tiles_.Mutable(index);
+inline void ImportWarningSetArchive::clear_has_cond_format_parameters_not_all_same_type() {
+  _has_bits_[0] &= ~0x00000080u;
 }
-inline ::TST::TileStorage_Tile* TileStorage::add_tiles() {
-  return tiles_.Add();
+inline void ImportWarningSetArchive::clear_cond_format_parameters_not_all_same_type() {
+  cond_format_parameters_not_all_same_type_ = false;
+  clear_has_cond_format_parameters_not_all_same_type();
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TST::TileStorage_Tile >&
-TileStorage::tiles() const {
-  return tiles_;
+inline bool ImportWarningSetArchive::cond_format_parameters_not_all_same_type() const {
+  return cond_format_parameters_not_all_same_type_;
 }
-inline ::google::protobuf::RepeatedPtrField< ::TST::TileStorage_Tile >*
-TileStorage::mutable_tiles() {
-  return &tiles_;
+inline void ImportWarningSetArchive::set_cond_format_parameters_not_all_same_type(bool value) {
+  set_has_cond_format_parameters_not_all_same_type();
+  cond_format_parameters_not_all_same_type_ = value;
 }
 
-// -------------------------------------------------------------------
-
-// PopUpMenuModel_CellValue
-
-// required .TST.PopUpMenuModel.CellValueType cell_value_type = 1;
-inline bool PopUpMenuModel_CellValue::has_cell_value_type() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// optional bool cond_format_stop_if_true = 9 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_stop_if_true() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
 }
-inline void PopUpMenuModel_CellValue::set_has_cell_value_type() {
-  _has_bits_[0] |= 0x00000001u;
+inline void ImportWarningSetArchive::set_has_cond_format_stop_if_true() {
+  _has_bits_[0] |= 0x00000100u;
 }
-inline void PopUpMenuModel_CellValue::clear_has_cell_value_type() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void ImportWarningSetArchive::clear_has_cond_format_stop_if_true() {
+  _has_bits_[0] &= ~0x00000100u;
 }
-inline void PopUpMenuModel_CellValue::clear_cell_value_type() {
-  cell_value_type_ = 1;
-  clear_has_cell_value_type();
+inline void ImportWarningSetArchive::clear_cond_format_stop_if_true() {
+  cond_format_stop_if_true_ = false;
+  clear_has_cond_format_stop_if_true();
 }
-inline ::TST::PopUpMenuModel_CellValueType PopUpMenuModel_CellValue::cell_value_type() const {
-  return static_cast< ::TST::PopUpMenuModel_CellValueType >(cell_value_type_);
+inline bool ImportWarningSetArchive::cond_format_stop_if_true() const {
+  return cond_format_stop_if_true_;
 }
-inline void PopUpMenuModel_CellValue::set_cell_value_type(::TST::PopUpMenuModel_CellValueType value) {
-  assert(::TST::PopUpMenuModel_CellValueType_IsValid(value));
-  set_has_cell_value_type();
-  cell_value_type_ = value;
+inline void ImportWarningSetArchive::set_cond_format_stop_if_true(bool value) {
+  set_has_cond_format_stop_if_true();
+  cond_format_stop_if_true_ = value;
 }
 
-// optional .TSCE.BooleanCellValueArchive boolean_value = 2;
-inline bool PopUpMenuModel_CellValue::has_boolean_value() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void PopUpMenuModel_CellValue::set_has_boolean_value() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void PopUpMenuModel_CellValue::clear_has_boolean_value() {
-  _has_bits_[0] &= ~0x00000002u;
+// optional bool cond_format_unsupported_operator = 10 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_unsupported_operator() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
 }
-inline void PopUpMenuModel_CellValue::clear_boolean_value() {
-  if (boolean_value_ != NULL) boolean_value_->::TSCE::BooleanCellValueArchive::Clear();
-  clear_has_boolean_value();
+inline void ImportWarningSetArchive::set_has_cond_format_unsupported_operator() {
+  _has_bits_[0] |= 0x00000200u;
 }
-inline const ::TSCE::BooleanCellValueArchive& PopUpMenuModel_CellValue::boolean_value() const {
-  return boolean_value_ != NULL ? *boolean_value_ : *default_instance_->boolean_value_;
+inline void ImportWarningSetArchive::clear_has_cond_format_unsupported_operator() {
+  _has_bits_[0] &= ~0x00000200u;
 }
-inline ::TSCE::BooleanCellValueArchive* PopUpMenuModel_CellValue::mutable_boolean_value() {
-  set_has_boolean_value();
-  if (boolean_value_ == NULL) boolean_value_ = new ::TSCE::BooleanCellValueArchive;
-  return boolean_value_;
+inline void ImportWarningSetArchive::clear_cond_format_unsupported_operator() {
+  cond_format_unsupported_operator_ = false;
+  clear_has_cond_format_unsupported_operator();
 }
-inline ::TSCE::BooleanCellValueArchive* PopUpMenuModel_CellValue::release_boolean_value() {
-  clear_has_boolean_value();
-  ::TSCE::BooleanCellValueArchive* temp = boolean_value_;
-  boolean_value_ = NULL;
-  return temp;
+inline bool ImportWarningSetArchive::cond_format_unsupported_operator() const {
+  return cond_format_unsupported_operator_;
 }
-inline void PopUpMenuModel_CellValue::set_allocated_boolean_value(::TSCE::BooleanCellValueArchive* boolean_value) {
-  delete boolean_value_;
-  boolean_value_ = boolean_value;
-  if (boolean_value) {
-    set_has_boolean_value();
-  } else {
-    clear_has_boolean_value();
-  }
+inline void ImportWarningSetArchive::set_cond_format_unsupported_operator(bool value) {
+  set_has_cond_format_unsupported_operator();
+  cond_format_unsupported_operator_ = value;
 }
 
-// optional .TSCE.DateCellValueArchive date_value = 3;
-inline bool PopUpMenuModel_CellValue::has_date_value() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void PopUpMenuModel_CellValue::set_has_date_value() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void PopUpMenuModel_CellValue::clear_has_date_value() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void PopUpMenuModel_CellValue::clear_date_value() {
-  if (date_value_ != NULL) date_value_->::TSCE::DateCellValueArchive::Clear();
-  clear_has_date_value();
-}
-inline const ::TSCE::DateCellValueArchive& PopUpMenuModel_CellValue::date_value() const {
-  return date_value_ != NULL ? *date_value_ : *default_instance_->date_value_;
-}
-inline ::TSCE::DateCellValueArchive* PopUpMenuModel_CellValue::mutable_date_value() {
-  set_has_date_value();
-  if (date_value_ == NULL) date_value_ = new ::TSCE::DateCellValueArchive;
-  return date_value_;
-}
-inline ::TSCE::DateCellValueArchive* PopUpMenuModel_CellValue::release_date_value() {
-  clear_has_date_value();
-  ::TSCE::DateCellValueArchive* temp = date_value_;
-  date_value_ = NULL;
-  return temp;
+// optional bool cond_format_unsupported_styling = 11 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_unsupported_styling() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
 }
-inline void PopUpMenuModel_CellValue::set_allocated_date_value(::TSCE::DateCellValueArchive* date_value) {
-  delete date_value_;
-  date_value_ = date_value;
-  if (date_value) {
-    set_has_date_value();
-  } else {
-    clear_has_date_value();
-  }
+inline void ImportWarningSetArchive::set_has_cond_format_unsupported_styling() {
+  _has_bits_[0] |= 0x00000400u;
 }
-
-// optional .TSCE.NumberCellValueArchive number_value = 4;
-inline bool PopUpMenuModel_CellValue::has_number_value() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+inline void ImportWarningSetArchive::clear_has_cond_format_unsupported_styling() {
+  _has_bits_[0] &= ~0x00000400u;
 }
-inline void PopUpMenuModel_CellValue::set_has_number_value() {
-  _has_bits_[0] |= 0x00000008u;
+inline void ImportWarningSetArchive::clear_cond_format_unsupported_styling() {
+  cond_format_unsupported_styling_ = false;
+  clear_has_cond_format_unsupported_styling();
 }
-inline void PopUpMenuModel_CellValue::clear_has_number_value() {
-  _has_bits_[0] &= ~0x00000008u;
+inline bool ImportWarningSetArchive::cond_format_unsupported_styling() const {
+  return cond_format_unsupported_styling_;
 }
-inline void PopUpMenuModel_CellValue::clear_number_value() {
-  if (number_value_ != NULL) number_value_->::TSCE::NumberCellValueArchive::Clear();
-  clear_has_number_value();
+inline void ImportWarningSetArchive::set_cond_format_unsupported_styling(bool value) {
+  set_has_cond_format_unsupported_styling();
+  cond_format_unsupported_styling_ = value;
 }
-inline const ::TSCE::NumberCellValueArchive& PopUpMenuModel_CellValue::number_value() const {
-  return number_value_ != NULL ? *number_value_ : *default_instance_->number_value_;
+
+// optional bool cond_format_unsupported_time_period = 12 [default = false];
+inline bool ImportWarningSetArchive::has_cond_format_unsupported_time_period() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
 }
-inline ::TSCE::NumberCellValueArchive* PopUpMenuModel_CellValue::mutable_number_value() {
-  set_has_number_value();
-  if (number_value_ == NULL) number_value_ = new ::TSCE::NumberCellValueArchive;
-  return number_value_;
+inline void ImportWarningSetArchive::set_has_cond_format_unsupported_time_period() {
+  _has_bits_[0] |= 0x00000800u;
 }
-inline ::TSCE::NumberCellValueArchive* PopUpMenuModel_CellValue::release_number_value() {
-  clear_has_number_value();
-  ::TSCE::NumberCellValueArchive* temp = number_value_;
-  number_value_ = NULL;
-  return temp;
+inline void ImportWarningSetArchive::clear_has_cond_format_unsupported_time_period() {
+  _has_bits_[0] &= ~0x00000800u;
 }
-inline void PopUpMenuModel_CellValue::set_allocated_number_value(::TSCE::NumberCellValueArchive* number_value) {
-  delete number_value_;
-  number_value_ = number_value;
-  if (number_value) {
-    set_has_number_value();
-  } else {
-    clear_has_number_value();
-  }
+inline void ImportWarningSetArchive::clear_cond_format_unsupported_time_period() {
+  cond_format_unsupported_time_period_ = false;
+  clear_has_cond_format_unsupported_time_period();
 }
-
-// optional .TSCE.StringCellValueArchive string_value = 5;
-inline bool PopUpMenuModel_CellValue::has_string_value() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+inline bool ImportWarningSetArchive::cond_format_unsupported_time_period() const {
+  return cond_format_unsupported_time_period_;
 }
-inline void PopUpMenuModel_CellValue::set_has_string_value() {
-  _has_bits_[0] |= 0x00000010u;
+inline void ImportWarningSetArchive::set_cond_format_unsupported_time_period(bool value) {
+  set_has_cond_format_unsupported_time_period();
+  cond_format_unsupported_time_period_ = value;
 }
-inline void PopUpMenuModel_CellValue::clear_has_string_value() {
-  _has_bits_[0] &= ~0x00000010u;
+
+// optional bool error_cell_with_no_formula = 13 [default = false];
+inline bool ImportWarningSetArchive::has_error_cell_with_no_formula() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
 }
-inline void PopUpMenuModel_CellValue::clear_string_value() {
-  if (string_value_ != NULL) string_value_->::TSCE::StringCellValueArchive::Clear();
-  clear_has_string_value();
+inline void ImportWarningSetArchive::set_has_error_cell_with_no_formula() {
+  _has_bits_[0] |= 0x00001000u;
 }
-inline const ::TSCE::StringCellValueArchive& PopUpMenuModel_CellValue::string_value() const {
-  return string_value_ != NULL ? *string_value_ : *default_instance_->string_value_;
+inline void ImportWarningSetArchive::clear_has_error_cell_with_no_formula() {
+  _has_bits_[0] &= ~0x00001000u;
 }
-inline ::TSCE::StringCellValueArchive* PopUpMenuModel_CellValue::mutable_string_value() {
-  set_has_string_value();
-  if (string_value_ == NULL) string_value_ = new ::TSCE::StringCellValueArchive;
-  return string_value_;
+inline void ImportWarningSetArchive::clear_error_cell_with_no_formula() {
+  error_cell_with_no_formula_ = false;
+  clear_has_error_cell_with_no_formula();
 }
-inline ::TSCE::StringCellValueArchive* PopUpMenuModel_CellValue::release_string_value() {
-  clear_has_string_value();
-  ::TSCE::StringCellValueArchive* temp = string_value_;
-  string_value_ = NULL;
-  return temp;
+inline bool ImportWarningSetArchive::error_cell_with_no_formula() const {
+  return error_cell_with_no_formula_;
 }
-inline void PopUpMenuModel_CellValue::set_allocated_string_value(::TSCE::StringCellValueArchive* string_value) {
-  delete string_value_;
-  string_value_ = string_value;
-  if (string_value) {
-    set_has_string_value();
-  } else {
-    clear_has_string_value();
-  }
+inline void ImportWarningSetArchive::set_error_cell_with_no_formula(bool value) {
+  set_has_error_cell_with_no_formula();
+  error_cell_with_no_formula_ = value;
 }
 
-// -------------------------------------------------------------------
-
-// PopUpMenuModel
-
-// repeated .TST.PopUpMenuModel.CellValue item = 1 [deprecated = true];
-inline int PopUpMenuModel::item_size() const {
-  return item_.size();
-}
-inline void PopUpMenuModel::clear_item() {
-  item_.Clear();
+// optional bool unsupported_cond_format = 14 [default = false];
+inline bool ImportWarningSetArchive::has_unsupported_cond_format() const {
+  return (_has_bits_[0] & 0x00002000u) != 0;
 }
-inline const ::TST::PopUpMenuModel_CellValue& PopUpMenuModel::item(int index) const {
-  return item_.Get(index);
+inline void ImportWarningSetArchive::set_has_unsupported_cond_format() {
+  _has_bits_[0] |= 0x00002000u;
 }
-inline ::TST::PopUpMenuModel_CellValue* PopUpMenuModel::mutable_item(int index) {
-  return item_.Mutable(index);
+inline void ImportWarningSetArchive::clear_has_unsupported_cond_format() {
+  _has_bits_[0] &= ~0x00002000u;
 }
-inline ::TST::PopUpMenuModel_CellValue* PopUpMenuModel::add_item() {
-  return item_.Add();
+inline void ImportWarningSetArchive::clear_unsupported_cond_format() {
+  unsupported_cond_format_ = false;
+  clear_has_unsupported_cond_format();
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TST::PopUpMenuModel_CellValue >&
-PopUpMenuModel::item() const {
-  return item_;
+inline bool ImportWarningSetArchive::unsupported_cond_format() const {
+  return unsupported_cond_format_;
 }
-inline ::google::protobuf::RepeatedPtrField< ::TST::PopUpMenuModel_CellValue >*
-PopUpMenuModel::mutable_item() {
-  return &item_;
+inline void ImportWarningSetArchive::set_unsupported_cond_format(bool value) {
+  set_has_unsupported_cond_format();
+  unsupported_cond_format_ = value;
 }
 
-// repeated .TSCE.CellValueArchive tsce_item = 2;
-inline int PopUpMenuModel::tsce_item_size() const {
-  return tsce_item_.size();
+// optional string original_data_format = 15;
+inline bool ImportWarningSetArchive::has_original_data_format() const {
+  return (_has_bits_[0] & 0x00004000u) != 0;
 }
-inline void PopUpMenuModel::clear_tsce_item() {
-  tsce_item_.Clear();
+inline void ImportWarningSetArchive::set_has_original_data_format() {
+  _has_bits_[0] |= 0x00004000u;
 }
-inline const ::TSCE::CellValueArchive& PopUpMenuModel::tsce_item(int index) const {
-  return tsce_item_.Get(index);
+inline void ImportWarningSetArchive::clear_has_original_data_format() {
+  _has_bits_[0] &= ~0x00004000u;
 }
-inline ::TSCE::CellValueArchive* PopUpMenuModel::mutable_tsce_item(int index) {
-  return tsce_item_.Mutable(index);
+inline void ImportWarningSetArchive::clear_original_data_format() {
+  if (original_data_format_ != &::google::protobuf::internal::kEmptyString) {
+    original_data_format_->clear();
+  }
+  clear_has_original_data_format();
 }
-inline ::TSCE::CellValueArchive* PopUpMenuModel::add_tsce_item() {
-  return tsce_item_.Add();
+inline const ::std::string& ImportWarningSetArchive::original_data_format() const {
+  return *original_data_format_;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >&
-PopUpMenuModel::tsce_item() const {
-  return tsce_item_;
+inline void ImportWarningSetArchive::set_original_data_format(const ::std::string& value) {
+  set_has_original_data_format();
+  if (original_data_format_ == &::google::protobuf::internal::kEmptyString) {
+    original_data_format_ = new ::std::string;
+  }
+  original_data_format_->assign(value);
 }
-inline ::google::protobuf::RepeatedPtrField< ::TSCE::CellValueArchive >*
-PopUpMenuModel::mutable_tsce_item() {
-  return &tsce_item_;
+inline void ImportWarningSetArchive::set_original_data_format(const char* value) {
+  set_has_original_data_format();
+  if (original_data_format_ == &::google::protobuf::internal::kEmptyString) {
+    original_data_format_ = new ::std::string;
+  }
+  original_data_format_->assign(value);
+}
+inline void ImportWarningSetArchive::set_original_data_format(const char* value, size_t size) {
+  set_has_original_data_format();
+  if (original_data_format_ == &::google::protobuf::internal::kEmptyString) {
+    original_data_format_ = new ::std::string;
+  }
+  original_data_format_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ImportWarningSetArchive::mutable_original_data_format() {
+  set_has_original_data_format();
+  if (original_data_format_ == &::google::protobuf::internal::kEmptyString) {
+    original_data_format_ = new ::std::string;
+  }
+  return original_data_format_;
+}
+inline ::std::string* ImportWarningSetArchive::release_original_data_format() {
+  clear_has_original_data_format();
+  if (original_data_format_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = original_data_format_;
+    original_data_format_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ImportWarningSetArchive::set_allocated_original_data_format(::std::string* original_data_format) {
+  if (original_data_format_ != &::google::protobuf::internal::kEmptyString) {
+    delete original_data_format_;
+  }
+  if (original_data_format) {
+    set_has_original_data_format();
+    original_data_format_ = original_data_format;
+  } else {
+    clear_has_original_data_format();
+    original_data_format_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
 }
 
 // -------------------------------------------------------------------
@@ -9823,6 +12163,44 @@ inline void TableDataList_ListEntry::set_allocated_comment_storage(::TSP::Refere
   }
 }
 
+// optional .TST.ImportWarningSetArchive import_warning_set = 11;
+inline bool TableDataList_ListEntry::has_import_warning_set() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void TableDataList_ListEntry::set_has_import_warning_set() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void TableDataList_ListEntry::clear_has_import_warning_set() {
+  _has_bits_[0] &= ~0x00000400u;
+}
+inline void TableDataList_ListEntry::clear_import_warning_set() {
+  if (import_warning_set_ != NULL) import_warning_set_->::TST::ImportWarningSetArchive::Clear();
+  clear_has_import_warning_set();
+}
+inline const ::TST::ImportWarningSetArchive& TableDataList_ListEntry::import_warning_set() const {
+  return import_warning_set_ != NULL ? *import_warning_set_ : *default_instance_->import_warning_set_;
+}
+inline ::TST::ImportWarningSetArchive* TableDataList_ListEntry::mutable_import_warning_set() {
+  set_has_import_warning_set();
+  if (import_warning_set_ == NULL) import_warning_set_ = new ::TST::ImportWarningSetArchive;
+  return import_warning_set_;
+}
+inline ::TST::ImportWarningSetArchive* TableDataList_ListEntry::release_import_warning_set() {
+  clear_has_import_warning_set();
+  ::TST::ImportWarningSetArchive* temp = import_warning_set_;
+  import_warning_set_ = NULL;
+  return temp;
+}
+inline void TableDataList_ListEntry::set_allocated_import_warning_set(::TST::ImportWarningSetArchive* import_warning_set) {
+  delete import_warning_set_;
+  import_warning_set_ = import_warning_set;
+  if (import_warning_set) {
+    set_has_import_warning_set();
+  } else {
+    clear_has_import_warning_set();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // TableDataList
@@ -10922,6 +13300,44 @@ inline void DataStore::set_allocated_commentstoragetable(::TSP::Reference* comme
   }
 }
 
+// optional .TSP.Reference importWarningSetTable = 20;
+inline bool DataStore::has_importwarningsettable() const {
+  return (_has_bits_[0] & 0x00080000u) != 0;
+}
+inline void DataStore::set_has_importwarningsettable() {
+  _has_bits_[0] |= 0x00080000u;
+}
+inline void DataStore::clear_has_importwarningsettable() {
+  _has_bits_[0] &= ~0x00080000u;
+}
+inline void DataStore::clear_importwarningsettable() {
+  if (importwarningsettable_ != NULL) importwarningsettable_->::TSP::Reference::Clear();
+  clear_has_importwarningsettable();
+}
+inline const ::TSP::Reference& DataStore::importwarningsettable() const {
+  return importwarningsettable_ != NULL ? *importwarningsettable_ : *default_instance_->importwarningsettable_;
+}
+inline ::TSP::Reference* DataStore::mutable_importwarningsettable() {
+  set_has_importwarningsettable();
+  if (importwarningsettable_ == NULL) importwarningsettable_ = new ::TSP::Reference;
+  return importwarningsettable_;
+}
+inline ::TSP::Reference* DataStore::release_importwarningsettable() {
+  clear_has_importwarningsettable();
+  ::TSP::Reference* temp = importwarningsettable_;
+  importwarningsettable_ = NULL;
+  return temp;
+}
+inline void DataStore::set_allocated_importwarningsettable(::TSP::Reference* importwarningsettable) {
+  delete importwarningsettable_;
+  importwarningsettable_ = importwarningsettable;
+  if (importwarningsettable) {
+    set_has_importwarningsettable();
+  } else {
+    clear_has_importwarningsettable();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // TableInfoArchive
@@ -11820,6 +14236,149 @@ inline void TableStyleNetworkArchive::set_preset_index(::google::protobuf::uint3
 
 // -------------------------------------------------------------------
 
+// TableSortOrderArchive_SortRuleArchive
+
+// required uint32 column = 1;
+inline bool TableSortOrderArchive_SortRuleArchive::has_column() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TableSortOrderArchive_SortRuleArchive::set_has_column() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TableSortOrderArchive_SortRuleArchive::clear_has_column() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TableSortOrderArchive_SortRuleArchive::clear_column() {
+  column_ = 0u;
+  clear_has_column();
+}
+inline ::google::protobuf::uint32 TableSortOrderArchive_SortRuleArchive::column() const {
+  return column_;
+}
+inline void TableSortOrderArchive_SortRuleArchive::set_column(::google::protobuf::uint32 value) {
+  set_has_column();
+  column_ = value;
+}
+
+// required .TST.TableSortOrderArchive.SortRuleArchive.Direction direction = 2;
+inline bool TableSortOrderArchive_SortRuleArchive::has_direction() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TableSortOrderArchive_SortRuleArchive::set_has_direction() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TableSortOrderArchive_SortRuleArchive::clear_has_direction() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TableSortOrderArchive_SortRuleArchive::clear_direction() {
+  direction_ = 0;
+  clear_has_direction();
+}
+inline ::TST::TableSortOrderArchive_SortRuleArchive_Direction TableSortOrderArchive_SortRuleArchive::direction() const {
+  return static_cast< ::TST::TableSortOrderArchive_SortRuleArchive_Direction >(direction_);
+}
+inline void TableSortOrderArchive_SortRuleArchive::set_direction(::TST::TableSortOrderArchive_SortRuleArchive_Direction value) {
+  assert(::TST::TableSortOrderArchive_SortRuleArchive_Direction_IsValid(value));
+  set_has_direction();
+  direction_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// TableSortOrderArchive
+
+// required .TST.TableSortOrderArchive.SortType type = 1;
+inline bool TableSortOrderArchive::has_type() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TableSortOrderArchive::set_has_type() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TableSortOrderArchive::clear_has_type() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TableSortOrderArchive::clear_type() {
+  type_ = 0;
+  clear_has_type();
+}
+inline ::TST::TableSortOrderArchive_SortType TableSortOrderArchive::type() const {
+  return static_cast< ::TST::TableSortOrderArchive_SortType >(type_);
+}
+inline void TableSortOrderArchive::set_type(::TST::TableSortOrderArchive_SortType value) {
+  assert(::TST::TableSortOrderArchive_SortType_IsValid(value));
+  set_has_type();
+  type_ = value;
+}
+
+// repeated .TST.TableSortOrderArchive.SortRuleArchive rules = 2;
+inline int TableSortOrderArchive::rules_size() const {
+  return rules_.size();
+}
+inline void TableSortOrderArchive::clear_rules() {
+  rules_.Clear();
+}
+inline const ::TST::TableSortOrderArchive_SortRuleArchive& TableSortOrderArchive::rules(int index) const {
+  return rules_.Get(index);
+}
+inline ::TST::TableSortOrderArchive_SortRuleArchive* TableSortOrderArchive::mutable_rules(int index) {
+  return rules_.Mutable(index);
+}
+inline ::TST::TableSortOrderArchive_SortRuleArchive* TableSortOrderArchive::add_rules() {
+  return rules_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TST::TableSortOrderArchive_SortRuleArchive >&
+TableSortOrderArchive::rules() const {
+  return rules_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::TableSortOrderArchive_SortRuleArchive >*
+TableSortOrderArchive::mutable_rules() {
+  return &rules_;
+}
+
+// -------------------------------------------------------------------
+
+// SortRuleReferenceTrackerArchive
+
+// required .TSP.Reference reference_tracker = 1;
+inline bool SortRuleReferenceTrackerArchive::has_reference_tracker() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void SortRuleReferenceTrackerArchive::set_has_reference_tracker() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void SortRuleReferenceTrackerArchive::clear_has_reference_tracker() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void SortRuleReferenceTrackerArchive::clear_reference_tracker() {
+  if (reference_tracker_ != NULL) reference_tracker_->::TSP::Reference::Clear();
+  clear_has_reference_tracker();
+}
+inline const ::TSP::Reference& SortRuleReferenceTrackerArchive::reference_tracker() const {
+  return reference_tracker_ != NULL ? *reference_tracker_ : *default_instance_->reference_tracker_;
+}
+inline ::TSP::Reference* SortRuleReferenceTrackerArchive::mutable_reference_tracker() {
+  set_has_reference_tracker();
+  if (reference_tracker_ == NULL) reference_tracker_ = new ::TSP::Reference;
+  return reference_tracker_;
+}
+inline ::TSP::Reference* SortRuleReferenceTrackerArchive::release_reference_tracker() {
+  clear_has_reference_tracker();
+  ::TSP::Reference* temp = reference_tracker_;
+  reference_tracker_ = NULL;
+  return temp;
+}
+inline void SortRuleReferenceTrackerArchive::set_allocated_reference_tracker(::TSP::Reference* reference_tracker) {
+  delete reference_tracker_;
+  reference_tracker_ = reference_tracker;
+  if (reference_tracker) {
+    set_has_reference_tracker();
+  } else {
+    clear_has_reference_tracker();
+  }
+}
+
+// -------------------------------------------------------------------
+
 // TableModelArchive
 
 // required string table_id = 1;
@@ -13124,31 +15683,69 @@ inline ::TSP::Reference* TableModelArchive::mutable_filter_set() {
   if (filter_set_ == NULL) filter_set_ = new ::TSP::Reference;
   return filter_set_;
 }
-inline ::TSP::Reference* TableModelArchive::release_filter_set() {
-  clear_has_filter_set();
-  ::TSP::Reference* temp = filter_set_;
-  filter_set_ = NULL;
+inline ::TSP::Reference* TableModelArchive::release_filter_set() {
+  clear_has_filter_set();
+  ::TSP::Reference* temp = filter_set_;
+  filter_set_ = NULL;
+  return temp;
+}
+inline void TableModelArchive::set_allocated_filter_set(::TSP::Reference* filter_set) {
+  delete filter_set_;
+  filter_set_ = filter_set;
+  if (filter_set) {
+    set_has_filter_set();
+  } else {
+    clear_has_filter_set();
+  }
+}
+
+// optional .TST.TableSortOrderArchive sort_order = 44;
+inline bool TableModelArchive::has_sort_order() const {
+  return (_has_bits_[1] & 0x00000200u) != 0;
+}
+inline void TableModelArchive::set_has_sort_order() {
+  _has_bits_[1] |= 0x00000200u;
+}
+inline void TableModelArchive::clear_has_sort_order() {
+  _has_bits_[1] &= ~0x00000200u;
+}
+inline void TableModelArchive::clear_sort_order() {
+  if (sort_order_ != NULL) sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_sort_order();
+}
+inline const ::TST::TableSortOrderArchive& TableModelArchive::sort_order() const {
+  return sort_order_ != NULL ? *sort_order_ : *default_instance_->sort_order_;
+}
+inline ::TST::TableSortOrderArchive* TableModelArchive::mutable_sort_order() {
+  set_has_sort_order();
+  if (sort_order_ == NULL) sort_order_ = new ::TST::TableSortOrderArchive;
+  return sort_order_;
+}
+inline ::TST::TableSortOrderArchive* TableModelArchive::release_sort_order() {
+  clear_has_sort_order();
+  ::TST::TableSortOrderArchive* temp = sort_order_;
+  sort_order_ = NULL;
   return temp;
 }
-inline void TableModelArchive::set_allocated_filter_set(::TSP::Reference* filter_set) {
-  delete filter_set_;
-  filter_set_ = filter_set;
-  if (filter_set) {
-    set_has_filter_set();
+inline void TableModelArchive::set_allocated_sort_order(::TST::TableSortOrderArchive* sort_order) {
+  delete sort_order_;
+  sort_order_ = sort_order;
+  if (sort_order) {
+    set_has_sort_order();
   } else {
-    clear_has_filter_set();
+    clear_has_sort_order();
   }
 }
 
 // optional .TSCE.CFUUIDArchive conditional_style_formula_owner_id = 39;
 inline bool TableModelArchive::has_conditional_style_formula_owner_id() const {
-  return (_has_bits_[1] & 0x00000200u) != 0;
+  return (_has_bits_[1] & 0x00000400u) != 0;
 }
 inline void TableModelArchive::set_has_conditional_style_formula_owner_id() {
-  _has_bits_[1] |= 0x00000200u;
+  _has_bits_[1] |= 0x00000400u;
 }
 inline void TableModelArchive::clear_has_conditional_style_formula_owner_id() {
-  _has_bits_[1] &= ~0x00000200u;
+  _has_bits_[1] &= ~0x00000400u;
 }
 inline void TableModelArchive::clear_conditional_style_formula_owner_id() {
   if (conditional_style_formula_owner_id_ != NULL) conditional_style_formula_owner_id_->::TSCE::CFUUIDArchive::Clear();
@@ -13178,6 +15775,44 @@ inline void TableModelArchive::set_allocated_conditional_style_formula_owner_id(
   }
 }
 
+// optional .TST.SortRuleReferenceTrackerArchive sort_rule_reference_tracker = 45;
+inline bool TableModelArchive::has_sort_rule_reference_tracker() const {
+  return (_has_bits_[1] & 0x00000800u) != 0;
+}
+inline void TableModelArchive::set_has_sort_rule_reference_tracker() {
+  _has_bits_[1] |= 0x00000800u;
+}
+inline void TableModelArchive::clear_has_sort_rule_reference_tracker() {
+  _has_bits_[1] &= ~0x00000800u;
+}
+inline void TableModelArchive::clear_sort_rule_reference_tracker() {
+  if (sort_rule_reference_tracker_ != NULL) sort_rule_reference_tracker_->::TST::SortRuleReferenceTrackerArchive::Clear();
+  clear_has_sort_rule_reference_tracker();
+}
+inline const ::TST::SortRuleReferenceTrackerArchive& TableModelArchive::sort_rule_reference_tracker() const {
+  return sort_rule_reference_tracker_ != NULL ? *sort_rule_reference_tracker_ : *default_instance_->sort_rule_reference_tracker_;
+}
+inline ::TST::SortRuleReferenceTrackerArchive* TableModelArchive::mutable_sort_rule_reference_tracker() {
+  set_has_sort_rule_reference_tracker();
+  if (sort_rule_reference_tracker_ == NULL) sort_rule_reference_tracker_ = new ::TST::SortRuleReferenceTrackerArchive;
+  return sort_rule_reference_tracker_;
+}
+inline ::TST::SortRuleReferenceTrackerArchive* TableModelArchive::release_sort_rule_reference_tracker() {
+  clear_has_sort_rule_reference_tracker();
+  ::TST::SortRuleReferenceTrackerArchive* temp = sort_rule_reference_tracker_;
+  sort_rule_reference_tracker_ = NULL;
+  return temp;
+}
+inline void TableModelArchive::set_allocated_sort_rule_reference_tracker(::TST::SortRuleReferenceTrackerArchive* sort_rule_reference_tracker) {
+  delete sort_rule_reference_tracker_;
+  sort_rule_reference_tracker_ = sort_rule_reference_tracker;
+  if (sort_rule_reference_tracker) {
+    set_has_sort_rule_reference_tracker();
+  } else {
+    clear_has_sort_rule_reference_tracker();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // DurationWrapperArchive
@@ -14013,6 +16648,44 @@ inline void Cell::set_conditional_style_applied_rule(::google::protobuf::uint32
   conditional_style_applied_rule_ = value;
 }
 
+// optional .TST.ImportWarningSetArchive import_warning_set = 25;
+inline bool Cell::has_import_warning_set() const {
+  return (_has_bits_[0] & 0x00800000u) != 0;
+}
+inline void Cell::set_has_import_warning_set() {
+  _has_bits_[0] |= 0x00800000u;
+}
+inline void Cell::clear_has_import_warning_set() {
+  _has_bits_[0] &= ~0x00800000u;
+}
+inline void Cell::clear_import_warning_set() {
+  if (import_warning_set_ != NULL) import_warning_set_->::TST::ImportWarningSetArchive::Clear();
+  clear_has_import_warning_set();
+}
+inline const ::TST::ImportWarningSetArchive& Cell::import_warning_set() const {
+  return import_warning_set_ != NULL ? *import_warning_set_ : *default_instance_->import_warning_set_;
+}
+inline ::TST::ImportWarningSetArchive* Cell::mutable_import_warning_set() {
+  set_has_import_warning_set();
+  if (import_warning_set_ == NULL) import_warning_set_ = new ::TST::ImportWarningSetArchive;
+  return import_warning_set_;
+}
+inline ::TST::ImportWarningSetArchive* Cell::release_import_warning_set() {
+  clear_has_import_warning_set();
+  ::TST::ImportWarningSetArchive* temp = import_warning_set_;
+  import_warning_set_ = NULL;
+  return temp;
+}
+inline void Cell::set_allocated_import_warning_set(::TST::ImportWarningSetArchive* import_warning_set) {
+  delete import_warning_set_;
+  import_warning_set_ = import_warning_set;
+  if (import_warning_set) {
+    set_has_import_warning_set();
+  } else {
+    clear_has_import_warning_set();
+  }
+}
+
 // -------------------------------------------------------------------
 
 // MergeRegionMapArchive
@@ -14024,57 +16697,276 @@ inline int MergeRegionMapArchive::cell_range_size() const {
 inline void MergeRegionMapArchive::clear_cell_range() {
   cell_range_.Clear();
 }
-inline const ::TST::CellRange& MergeRegionMapArchive::cell_range(int index) const {
-  return cell_range_.Get(index);
+inline const ::TST::CellRange& MergeRegionMapArchive::cell_range(int index) const {
+  return cell_range_.Get(index);
+}
+inline ::TST::CellRange* MergeRegionMapArchive::mutable_cell_range(int index) {
+  return cell_range_.Mutable(index);
+}
+inline ::TST::CellRange* MergeRegionMapArchive::add_cell_range() {
+  return cell_range_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
+MergeRegionMapArchive::cell_range() const {
+  return cell_range_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
+MergeRegionMapArchive::mutable_cell_range() {
+  return &cell_range_;
+}
+
+// -------------------------------------------------------------------
+
+// CellMapArchive_CellMapEntry
+
+// required .TST.CellID cellID = 1;
+inline bool CellMapArchive_CellMapEntry::has_cellid() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CellMapArchive_CellMapEntry::set_has_cellid() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CellMapArchive_CellMapEntry::clear_has_cellid() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CellMapArchive_CellMapEntry::clear_cellid() {
+  if (cellid_ != NULL) cellid_->::TST::CellID::Clear();
+  clear_has_cellid();
+}
+inline const ::TST::CellID& CellMapArchive_CellMapEntry::cellid() const {
+  return cellid_ != NULL ? *cellid_ : *default_instance_->cellid_;
+}
+inline ::TST::CellID* CellMapArchive_CellMapEntry::mutable_cellid() {
+  set_has_cellid();
+  if (cellid_ == NULL) cellid_ = new ::TST::CellID;
+  return cellid_;
+}
+inline ::TST::CellID* CellMapArchive_CellMapEntry::release_cellid() {
+  clear_has_cellid();
+  ::TST::CellID* temp = cellid_;
+  cellid_ = NULL;
+  return temp;
+}
+inline void CellMapArchive_CellMapEntry::set_allocated_cellid(::TST::CellID* cellid) {
+  delete cellid_;
+  cellid_ = cellid;
+  if (cellid) {
+    set_has_cellid();
+  } else {
+    clear_has_cellid();
+  }
+}
+
+// optional .TST.Cell cell = 2;
+inline bool CellMapArchive_CellMapEntry::has_cell() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CellMapArchive_CellMapEntry::set_has_cell() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CellMapArchive_CellMapEntry::clear_has_cell() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CellMapArchive_CellMapEntry::clear_cell() {
+  if (cell_ != NULL) cell_->::TST::Cell::Clear();
+  clear_has_cell();
+}
+inline const ::TST::Cell& CellMapArchive_CellMapEntry::cell() const {
+  return cell_ != NULL ? *cell_ : *default_instance_->cell_;
+}
+inline ::TST::Cell* CellMapArchive_CellMapEntry::mutable_cell() {
+  set_has_cell();
+  if (cell_ == NULL) cell_ = new ::TST::Cell;
+  return cell_;
+}
+inline ::TST::Cell* CellMapArchive_CellMapEntry::release_cell() {
+  clear_has_cell();
+  ::TST::Cell* temp = cell_;
+  cell_ = NULL;
+  return temp;
+}
+inline void CellMapArchive_CellMapEntry::set_allocated_cell(::TST::Cell* cell) {
+  delete cell_;
+  cell_ = cell;
+  if (cell) {
+    set_has_cell();
+  } else {
+    clear_has_cell();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CellMapArchive
+
+// required uint32 capacity = 1;
+inline bool CellMapArchive::has_capacity() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CellMapArchive::set_has_capacity() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CellMapArchive::clear_has_capacity() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CellMapArchive::clear_capacity() {
+  capacity_ = 0u;
+  clear_has_capacity();
+}
+inline ::google::protobuf::uint32 CellMapArchive::capacity() const {
+  return capacity_;
+}
+inline void CellMapArchive::set_capacity(::google::protobuf::uint32 value) {
+  set_has_capacity();
+  capacity_ = value;
+}
+
+// required uint32 count = 2;
+inline bool CellMapArchive::has_count() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CellMapArchive::set_has_count() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CellMapArchive::clear_has_count() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CellMapArchive::clear_count() {
+  count_ = 0u;
+  clear_has_count();
+}
+inline ::google::protobuf::uint32 CellMapArchive::count() const {
+  return count_;
+}
+inline void CellMapArchive::set_count(::google::protobuf::uint32 value) {
+  set_has_count();
+  count_ = value;
+}
+
+// repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
+inline int CellMapArchive::cellmapentry_size() const {
+  return cellmapentry_.size();
+}
+inline void CellMapArchive::clear_cellmapentry() {
+  cellmapentry_.Clear();
+}
+inline const ::TST::CellMapArchive_CellMapEntry& CellMapArchive::cellmapentry(int index) const {
+  return cellmapentry_.Get(index);
+}
+inline ::TST::CellMapArchive_CellMapEntry* CellMapArchive::mutable_cellmapentry(int index) {
+  return cellmapentry_.Mutable(index);
+}
+inline ::TST::CellMapArchive_CellMapEntry* CellMapArchive::add_cellmapentry() {
+  return cellmapentry_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >&
+CellMapArchive::cellmapentry() const {
+  return cellmapentry_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >*
+CellMapArchive::mutable_cellmapentry() {
+  return &cellmapentry_;
+}
+
+// optional bool may_modify_formulas_in_cells = 4 [default = true];
+inline bool CellMapArchive::has_may_modify_formulas_in_cells() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CellMapArchive::set_has_may_modify_formulas_in_cells() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CellMapArchive::clear_has_may_modify_formulas_in_cells() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CellMapArchive::clear_may_modify_formulas_in_cells() {
+  may_modify_formulas_in_cells_ = true;
+  clear_has_may_modify_formulas_in_cells();
+}
+inline bool CellMapArchive::may_modify_formulas_in_cells() const {
+  return may_modify_formulas_in_cells_;
+}
+inline void CellMapArchive::set_may_modify_formulas_in_cells(bool value) {
+  set_has_may_modify_formulas_in_cells();
+  may_modify_formulas_in_cells_ = value;
+}
+
+// optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
+inline bool CellMapArchive::has_may_modify_values_referenced_by_formulas() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CellMapArchive::set_has_may_modify_values_referenced_by_formulas() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CellMapArchive::clear_has_may_modify_values_referenced_by_formulas() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CellMapArchive::clear_may_modify_values_referenced_by_formulas() {
+  may_modify_values_referenced_by_formulas_ = true;
+  clear_has_may_modify_values_referenced_by_formulas();
+}
+inline bool CellMapArchive::may_modify_values_referenced_by_formulas() const {
+  return may_modify_values_referenced_by_formulas_;
+}
+inline void CellMapArchive::set_may_modify_values_referenced_by_formulas(bool value) {
+  set_has_may_modify_values_referenced_by_formulas();
+  may_modify_values_referenced_by_formulas_ = value;
+}
+
+// optional bool applies_to_hidden = 6 [default = false];
+inline bool CellMapArchive::has_applies_to_hidden() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
-inline ::TST::CellRange* MergeRegionMapArchive::mutable_cell_range(int index) {
-  return cell_range_.Mutable(index);
+inline void CellMapArchive::set_has_applies_to_hidden() {
+  _has_bits_[0] |= 0x00000020u;
 }
-inline ::TST::CellRange* MergeRegionMapArchive::add_cell_range() {
-  return cell_range_.Add();
+inline void CellMapArchive::clear_has_applies_to_hidden() {
+  _has_bits_[0] &= ~0x00000020u;
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TST::CellRange >&
-MergeRegionMapArchive::cell_range() const {
-  return cell_range_;
+inline void CellMapArchive::clear_applies_to_hidden() {
+  applies_to_hidden_ = false;
+  clear_has_applies_to_hidden();
 }
-inline ::google::protobuf::RepeatedPtrField< ::TST::CellRange >*
-MergeRegionMapArchive::mutable_cell_range() {
-  return &cell_range_;
+inline bool CellMapArchive::applies_to_hidden() const {
+  return applies_to_hidden_;
+}
+inline void CellMapArchive::set_applies_to_hidden(bool value) {
+  set_has_applies_to_hidden();
+  applies_to_hidden_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CellMapArchive_CellMapEntry
+// CellMapTileArchive_CellMapEntry
 
 // required .TST.CellID cellID = 1;
-inline bool CellMapArchive_CellMapEntry::has_cellid() const {
+inline bool CellMapTileArchive_CellMapEntry::has_cellid() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CellMapArchive_CellMapEntry::set_has_cellid() {
+inline void CellMapTileArchive_CellMapEntry::set_has_cellid() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CellMapArchive_CellMapEntry::clear_has_cellid() {
+inline void CellMapTileArchive_CellMapEntry::clear_has_cellid() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CellMapArchive_CellMapEntry::clear_cellid() {
+inline void CellMapTileArchive_CellMapEntry::clear_cellid() {
   if (cellid_ != NULL) cellid_->::TST::CellID::Clear();
   clear_has_cellid();
 }
-inline const ::TST::CellID& CellMapArchive_CellMapEntry::cellid() const {
+inline const ::TST::CellID& CellMapTileArchive_CellMapEntry::cellid() const {
   return cellid_ != NULL ? *cellid_ : *default_instance_->cellid_;
 }
-inline ::TST::CellID* CellMapArchive_CellMapEntry::mutable_cellid() {
+inline ::TST::CellID* CellMapTileArchive_CellMapEntry::mutable_cellid() {
   set_has_cellid();
   if (cellid_ == NULL) cellid_ = new ::TST::CellID;
   return cellid_;
 }
-inline ::TST::CellID* CellMapArchive_CellMapEntry::release_cellid() {
+inline ::TST::CellID* CellMapTileArchive_CellMapEntry::release_cellid() {
   clear_has_cellid();
   ::TST::CellID* temp = cellid_;
   cellid_ = NULL;
   return temp;
 }
-inline void CellMapArchive_CellMapEntry::set_allocated_cellid(::TST::CellID* cellid) {
+inline void CellMapTileArchive_CellMapEntry::set_allocated_cellid(::TST::CellID* cellid) {
   delete cellid_;
   cellid_ = cellid;
   if (cellid) {
@@ -14085,34 +16977,34 @@ inline void CellMapArchive_CellMapEntry::set_allocated_cellid(::TST::CellID* cel
 }
 
 // optional .TST.Cell cell = 2;
-inline bool CellMapArchive_CellMapEntry::has_cell() const {
+inline bool CellMapTileArchive_CellMapEntry::has_cell() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CellMapArchive_CellMapEntry::set_has_cell() {
+inline void CellMapTileArchive_CellMapEntry::set_has_cell() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CellMapArchive_CellMapEntry::clear_has_cell() {
+inline void CellMapTileArchive_CellMapEntry::clear_has_cell() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CellMapArchive_CellMapEntry::clear_cell() {
+inline void CellMapTileArchive_CellMapEntry::clear_cell() {
   if (cell_ != NULL) cell_->::TST::Cell::Clear();
   clear_has_cell();
 }
-inline const ::TST::Cell& CellMapArchive_CellMapEntry::cell() const {
+inline const ::TST::Cell& CellMapTileArchive_CellMapEntry::cell() const {
   return cell_ != NULL ? *cell_ : *default_instance_->cell_;
 }
-inline ::TST::Cell* CellMapArchive_CellMapEntry::mutable_cell() {
+inline ::TST::Cell* CellMapTileArchive_CellMapEntry::mutable_cell() {
   set_has_cell();
   if (cell_ == NULL) cell_ = new ::TST::Cell;
   return cell_;
 }
-inline ::TST::Cell* CellMapArchive_CellMapEntry::release_cell() {
+inline ::TST::Cell* CellMapTileArchive_CellMapEntry::release_cell() {
   clear_has_cell();
   ::TST::Cell* temp = cell_;
   cell_ = NULL;
   return temp;
 }
-inline void CellMapArchive_CellMapEntry::set_allocated_cell(::TST::Cell* cell) {
+inline void CellMapTileArchive_CellMapEntry::set_allocated_cell(::TST::Cell* cell) {
   delete cell_;
   cell_ = cell;
   if (cell) {
@@ -14124,141 +17016,485 @@ inline void CellMapArchive_CellMapEntry::set_allocated_cell(::TST::Cell* cell) {
 
 // -------------------------------------------------------------------
 
-// CellMapArchive
+// CellMapTileArchive
 
-// required uint32 capacity = 1;
-inline bool CellMapArchive::has_capacity() const {
+// repeated .TST.CellMapTileArchive.CellMapEntry cellmap_entry = 2;
+inline int CellMapTileArchive::cellmap_entry_size() const {
+  return cellmap_entry_.size();
+}
+inline void CellMapTileArchive::clear_cellmap_entry() {
+  cellmap_entry_.Clear();
+}
+inline const ::TST::CellMapTileArchive_CellMapEntry& CellMapTileArchive::cellmap_entry(int index) const {
+  return cellmap_entry_.Get(index);
+}
+inline ::TST::CellMapTileArchive_CellMapEntry* CellMapTileArchive::mutable_cellmap_entry(int index) {
+  return cellmap_entry_.Mutable(index);
+}
+inline ::TST::CellMapTileArchive_CellMapEntry* CellMapTileArchive::add_cellmap_entry() {
+  return cellmap_entry_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TST::CellMapTileArchive_CellMapEntry >&
+CellMapTileArchive::cellmap_entry() const {
+  return cellmap_entry_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::CellMapTileArchive_CellMapEntry >*
+CellMapTileArchive::mutable_cellmap_entry() {
+  return &cellmap_entry_;
+}
+
+// -------------------------------------------------------------------
+
+// TiledCellMapArchive
+
+// repeated .TSP.Reference cellmap_tile = 1;
+inline int TiledCellMapArchive::cellmap_tile_size() const {
+  return cellmap_tile_.size();
+}
+inline void TiledCellMapArchive::clear_cellmap_tile() {
+  cellmap_tile_.Clear();
+}
+inline const ::TSP::Reference& TiledCellMapArchive::cellmap_tile(int index) const {
+  return cellmap_tile_.Get(index);
+}
+inline ::TSP::Reference* TiledCellMapArchive::mutable_cellmap_tile(int index) {
+  return cellmap_tile_.Mutable(index);
+}
+inline ::TSP::Reference* TiledCellMapArchive::add_cellmap_tile() {
+  return cellmap_tile_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+TiledCellMapArchive::cellmap_tile() const {
+  return cellmap_tile_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+TiledCellMapArchive::mutable_cellmap_tile() {
+  return &cellmap_tile_;
+}
+
+// optional bool may_modify_formulas_in_cells = 2 [default = true];
+inline bool TiledCellMapArchive::has_may_modify_formulas_in_cells() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TiledCellMapArchive::set_has_may_modify_formulas_in_cells() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TiledCellMapArchive::clear_has_may_modify_formulas_in_cells() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TiledCellMapArchive::clear_may_modify_formulas_in_cells() {
+  may_modify_formulas_in_cells_ = true;
+  clear_has_may_modify_formulas_in_cells();
+}
+inline bool TiledCellMapArchive::may_modify_formulas_in_cells() const {
+  return may_modify_formulas_in_cells_;
+}
+inline void TiledCellMapArchive::set_may_modify_formulas_in_cells(bool value) {
+  set_has_may_modify_formulas_in_cells();
+  may_modify_formulas_in_cells_ = value;
+}
+
+// optional bool may_modify_values_referenced_by_formulas = 3 [default = true];
+inline bool TiledCellMapArchive::has_may_modify_values_referenced_by_formulas() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void TiledCellMapArchive::set_has_may_modify_values_referenced_by_formulas() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void TiledCellMapArchive::clear_has_may_modify_values_referenced_by_formulas() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void TiledCellMapArchive::clear_may_modify_values_referenced_by_formulas() {
+  may_modify_values_referenced_by_formulas_ = true;
+  clear_has_may_modify_values_referenced_by_formulas();
+}
+inline bool TiledCellMapArchive::may_modify_values_referenced_by_formulas() const {
+  return may_modify_values_referenced_by_formulas_;
+}
+inline void TiledCellMapArchive::set_may_modify_values_referenced_by_formulas(bool value) {
+  set_has_may_modify_values_referenced_by_formulas();
+  may_modify_values_referenced_by_formulas_ = value;
+}
+
+// optional bool applies_to_hidden = 4 [default = false];
+inline bool TiledCellMapArchive::has_applies_to_hidden() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void TiledCellMapArchive::set_has_applies_to_hidden() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void TiledCellMapArchive::clear_has_applies_to_hidden() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void TiledCellMapArchive::clear_applies_to_hidden() {
+  applies_to_hidden_ = false;
+  clear_has_applies_to_hidden();
+}
+inline bool TiledCellMapArchive::applies_to_hidden() const {
+  return applies_to_hidden_;
+}
+inline void TiledCellMapArchive::set_applies_to_hidden(bool value) {
+  set_has_applies_to_hidden();
+  applies_to_hidden_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// PropertyMapEntryArchive
+
+// required uint32 property = 1;
+inline bool PropertyMapEntryArchive::has_property() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CellMapArchive::set_has_capacity() {
+inline void PropertyMapEntryArchive::set_has_property() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CellMapArchive::clear_has_capacity() {
+inline void PropertyMapEntryArchive::clear_has_property() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CellMapArchive::clear_capacity() {
-  capacity_ = 0u;
-  clear_has_capacity();
+inline void PropertyMapEntryArchive::clear_property() {
+  property_ = 0u;
+  clear_has_property();
 }
-inline ::google::protobuf::uint32 CellMapArchive::capacity() const {
-  return capacity_;
+inline ::google::protobuf::uint32 PropertyMapEntryArchive::property() const {
+  return property_;
 }
-inline void CellMapArchive::set_capacity(::google::protobuf::uint32 value) {
-  set_has_capacity();
-  capacity_ = value;
+inline void PropertyMapEntryArchive::set_property(::google::protobuf::uint32 value) {
+  set_has_property();
+  property_ = value;
 }
 
-// required uint32 count = 2;
-inline bool CellMapArchive::has_count() const {
+// required .TSS.ValueType valueType = 2;
+inline bool PropertyMapEntryArchive::has_valuetype() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CellMapArchive::set_has_count() {
+inline void PropertyMapEntryArchive::set_has_valuetype() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CellMapArchive::clear_has_count() {
+inline void PropertyMapEntryArchive::clear_has_valuetype() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CellMapArchive::clear_count() {
-  count_ = 0u;
-  clear_has_count();
+inline void PropertyMapEntryArchive::clear_valuetype() {
+  valuetype_ = 0;
+  clear_has_valuetype();
 }
-inline ::google::protobuf::uint32 CellMapArchive::count() const {
-  return count_;
+inline ::TSS::ValueType PropertyMapEntryArchive::valuetype() const {
+  return static_cast< ::TSS::ValueType >(valuetype_);
 }
-inline void CellMapArchive::set_count(::google::protobuf::uint32 value) {
-  set_has_count();
-  count_ = value;
+inline void PropertyMapEntryArchive::set_valuetype(::TSS::ValueType value) {
+  assert(::TSS::ValueType_IsValid(value));
+  set_has_valuetype();
+  valuetype_ = value;
 }
 
-// repeated .TST.CellMapArchive.CellMapEntry cellMapEntry = 3;
-inline int CellMapArchive::cellmapentry_size() const {
-  return cellmapentry_.size();
-}
-inline void CellMapArchive::clear_cellmapentry() {
-  cellmapentry_.Clear();
+// optional int32 int_value = 3;
+inline bool PropertyMapEntryArchive::has_int_value() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline const ::TST::CellMapArchive_CellMapEntry& CellMapArchive::cellmapentry(int index) const {
-  return cellmapentry_.Get(index);
+inline void PropertyMapEntryArchive::set_has_int_value() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline ::TST::CellMapArchive_CellMapEntry* CellMapArchive::mutable_cellmapentry(int index) {
-  return cellmapentry_.Mutable(index);
+inline void PropertyMapEntryArchive::clear_has_int_value() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::TST::CellMapArchive_CellMapEntry* CellMapArchive::add_cellmapentry() {
-  return cellmapentry_.Add();
+inline void PropertyMapEntryArchive::clear_int_value() {
+  int_value_ = 0;
+  clear_has_int_value();
 }
-inline const ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >&
-CellMapArchive::cellmapentry() const {
-  return cellmapentry_;
+inline ::google::protobuf::int32 PropertyMapEntryArchive::int_value() const {
+  return int_value_;
 }
-inline ::google::protobuf::RepeatedPtrField< ::TST::CellMapArchive_CellMapEntry >*
-CellMapArchive::mutable_cellmapentry() {
-  return &cellmapentry_;
+inline void PropertyMapEntryArchive::set_int_value(::google::protobuf::int32 value) {
+  set_has_int_value();
+  int_value_ = value;
 }
 
-// optional bool may_modify_formulas_in_cells = 4 [default = true];
-inline bool CellMapArchive::has_may_modify_formulas_in_cells() const {
+// optional float float_value = 4;
+inline bool PropertyMapEntryArchive::has_float_value() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CellMapArchive::set_has_may_modify_formulas_in_cells() {
+inline void PropertyMapEntryArchive::set_has_float_value() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CellMapArchive::clear_has_may_modify_formulas_in_cells() {
+inline void PropertyMapEntryArchive::clear_has_float_value() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void CellMapArchive::clear_may_modify_formulas_in_cells() {
-  may_modify_formulas_in_cells_ = true;
-  clear_has_may_modify_formulas_in_cells();
+inline void PropertyMapEntryArchive::clear_float_value() {
+  float_value_ = 0;
+  clear_has_float_value();
+}
+inline float PropertyMapEntryArchive::float_value() const {
+  return float_value_;
+}
+inline void PropertyMapEntryArchive::set_float_value(float value) {
+  set_has_float_value();
+  float_value_ = value;
+}
+
+// optional double double_value = 5;
+inline bool PropertyMapEntryArchive::has_double_value() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void PropertyMapEntryArchive::set_has_double_value() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void PropertyMapEntryArchive::clear_has_double_value() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void PropertyMapEntryArchive::clear_double_value() {
+  double_value_ = 0;
+  clear_has_double_value();
+}
+inline double PropertyMapEntryArchive::double_value() const {
+  return double_value_;
+}
+inline void PropertyMapEntryArchive::set_double_value(double value) {
+  set_has_double_value();
+  double_value_ = value;
+}
+
+// optional bool is_nsnull = 6 [default = false];
+inline bool PropertyMapEntryArchive::has_is_nsnull() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void PropertyMapEntryArchive::set_has_is_nsnull() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void PropertyMapEntryArchive::clear_has_is_nsnull() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void PropertyMapEntryArchive::clear_is_nsnull() {
+  is_nsnull_ = false;
+  clear_has_is_nsnull();
+}
+inline bool PropertyMapEntryArchive::is_nsnull() const {
+  return is_nsnull_;
+}
+inline void PropertyMapEntryArchive::set_is_nsnull(bool value) {
+  set_has_is_nsnull();
+  is_nsnull_ = value;
+}
+
+// optional .TSP.Reference tsp_reference = 7;
+inline bool PropertyMapEntryArchive::has_tsp_reference() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void PropertyMapEntryArchive::set_has_tsp_reference() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void PropertyMapEntryArchive::clear_has_tsp_reference() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void PropertyMapEntryArchive::clear_tsp_reference() {
+  if (tsp_reference_ != NULL) tsp_reference_->::TSP::Reference::Clear();
+  clear_has_tsp_reference();
+}
+inline const ::TSP::Reference& PropertyMapEntryArchive::tsp_reference() const {
+  return tsp_reference_ != NULL ? *tsp_reference_ : *default_instance_->tsp_reference_;
+}
+inline ::TSP::Reference* PropertyMapEntryArchive::mutable_tsp_reference() {
+  set_has_tsp_reference();
+  if (tsp_reference_ == NULL) tsp_reference_ = new ::TSP::Reference;
+  return tsp_reference_;
+}
+inline ::TSP::Reference* PropertyMapEntryArchive::release_tsp_reference() {
+  clear_has_tsp_reference();
+  ::TSP::Reference* temp = tsp_reference_;
+  tsp_reference_ = NULL;
+  return temp;
+}
+inline void PropertyMapEntryArchive::set_allocated_tsp_reference(::TSP::Reference* tsp_reference) {
+  delete tsp_reference_;
+  tsp_reference_ = tsp_reference;
+  if (tsp_reference) {
+    set_has_tsp_reference();
+  } else {
+    clear_has_tsp_reference();
+  }
+}
+
+// optional .TSD.FillArchive fill = 8;
+inline bool PropertyMapEntryArchive::has_fill() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void PropertyMapEntryArchive::set_has_fill() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void PropertyMapEntryArchive::clear_has_fill() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void PropertyMapEntryArchive::clear_fill() {
+  if (fill_ != NULL) fill_->::TSD::FillArchive::Clear();
+  clear_has_fill();
+}
+inline const ::TSD::FillArchive& PropertyMapEntryArchive::fill() const {
+  return fill_ != NULL ? *fill_ : *default_instance_->fill_;
+}
+inline ::TSD::FillArchive* PropertyMapEntryArchive::mutable_fill() {
+  set_has_fill();
+  if (fill_ == NULL) fill_ = new ::TSD::FillArchive;
+  return fill_;
+}
+inline ::TSD::FillArchive* PropertyMapEntryArchive::release_fill() {
+  clear_has_fill();
+  ::TSD::FillArchive* temp = fill_;
+  fill_ = NULL;
+  return temp;
+}
+inline void PropertyMapEntryArchive::set_allocated_fill(::TSD::FillArchive* fill) {
+  delete fill_;
+  fill_ = fill;
+  if (fill) {
+    set_has_fill();
+  } else {
+    clear_has_fill();
+  }
+}
+
+// optional .TST.ImportWarningSetArchive import_warning_set = 9;
+inline bool PropertyMapEntryArchive::has_import_warning_set() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void PropertyMapEntryArchive::set_has_import_warning_set() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void PropertyMapEntryArchive::clear_has_import_warning_set() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void PropertyMapEntryArchive::clear_import_warning_set() {
+  if (import_warning_set_ != NULL) import_warning_set_->::TST::ImportWarningSetArchive::Clear();
+  clear_has_import_warning_set();
+}
+inline const ::TST::ImportWarningSetArchive& PropertyMapEntryArchive::import_warning_set() const {
+  return import_warning_set_ != NULL ? *import_warning_set_ : *default_instance_->import_warning_set_;
+}
+inline ::TST::ImportWarningSetArchive* PropertyMapEntryArchive::mutable_import_warning_set() {
+  set_has_import_warning_set();
+  if (import_warning_set_ == NULL) import_warning_set_ = new ::TST::ImportWarningSetArchive;
+  return import_warning_set_;
+}
+inline ::TST::ImportWarningSetArchive* PropertyMapEntryArchive::release_import_warning_set() {
+  clear_has_import_warning_set();
+  ::TST::ImportWarningSetArchive* temp = import_warning_set_;
+  import_warning_set_ = NULL;
+  return temp;
+}
+inline void PropertyMapEntryArchive::set_allocated_import_warning_set(::TST::ImportWarningSetArchive* import_warning_set) {
+  delete import_warning_set_;
+  import_warning_set_ = import_warning_set;
+  if (import_warning_set) {
+    set_has_import_warning_set();
+  } else {
+    clear_has_import_warning_set();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CellDiffArchive
+
+// repeated .TST.PropertyMapEntryArchive property_map_to_set = 1;
+inline int CellDiffArchive::property_map_to_set_size() const {
+  return property_map_to_set_.size();
+}
+inline void CellDiffArchive::clear_property_map_to_set() {
+  property_map_to_set_.Clear();
+}
+inline const ::TST::PropertyMapEntryArchive& CellDiffArchive::property_map_to_set(int index) const {
+  return property_map_to_set_.Get(index);
+}
+inline ::TST::PropertyMapEntryArchive* CellDiffArchive::mutable_property_map_to_set(int index) {
+  return property_map_to_set_.Mutable(index);
+}
+inline ::TST::PropertyMapEntryArchive* CellDiffArchive::add_property_map_to_set() {
+  return property_map_to_set_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >&
+CellDiffArchive::property_map_to_set() const {
+  return property_map_to_set_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >*
+CellDiffArchive::mutable_property_map_to_set() {
+  return &property_map_to_set_;
+}
+
+// repeated .TST.PropertyMapEntryArchive property_map_to_reset = 2;
+inline int CellDiffArchive::property_map_to_reset_size() const {
+  return property_map_to_reset_.size();
+}
+inline void CellDiffArchive::clear_property_map_to_reset() {
+  property_map_to_reset_.Clear();
+}
+inline const ::TST::PropertyMapEntryArchive& CellDiffArchive::property_map_to_reset(int index) const {
+  return property_map_to_reset_.Get(index);
+}
+inline ::TST::PropertyMapEntryArchive* CellDiffArchive::mutable_property_map_to_reset(int index) {
+  return property_map_to_reset_.Mutable(index);
+}
+inline ::TST::PropertyMapEntryArchive* CellDiffArchive::add_property_map_to_reset() {
+  return property_map_to_reset_.Add();
 }
-inline bool CellMapArchive::may_modify_formulas_in_cells() const {
-  return may_modify_formulas_in_cells_;
+inline const ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >&
+CellDiffArchive::property_map_to_reset() const {
+  return property_map_to_reset_;
 }
-inline void CellMapArchive::set_may_modify_formulas_in_cells(bool value) {
-  set_has_may_modify_formulas_in_cells();
-  may_modify_formulas_in_cells_ = value;
+inline ::google::protobuf::RepeatedPtrField< ::TST::PropertyMapEntryArchive >*
+CellDiffArchive::mutable_property_map_to_reset() {
+  return &property_map_to_reset_;
 }
 
-// optional bool may_modify_values_referenced_by_formulas = 5 [default = true];
-inline bool CellMapArchive::has_may_modify_values_referenced_by_formulas() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+// -------------------------------------------------------------------
+
+// CellDiffMapArchive
+
+// repeated .TST.CellID cell_ids = 1;
+inline int CellDiffMapArchive::cell_ids_size() const {
+  return cell_ids_.size();
 }
-inline void CellMapArchive::set_has_may_modify_values_referenced_by_formulas() {
-  _has_bits_[0] |= 0x00000010u;
+inline void CellDiffMapArchive::clear_cell_ids() {
+  cell_ids_.Clear();
 }
-inline void CellMapArchive::clear_has_may_modify_values_referenced_by_formulas() {
-  _has_bits_[0] &= ~0x00000010u;
+inline const ::TST::CellID& CellDiffMapArchive::cell_ids(int index) const {
+  return cell_ids_.Get(index);
 }
-inline void CellMapArchive::clear_may_modify_values_referenced_by_formulas() {
-  may_modify_values_referenced_by_formulas_ = true;
-  clear_has_may_modify_values_referenced_by_formulas();
+inline ::TST::CellID* CellDiffMapArchive::mutable_cell_ids(int index) {
+  return cell_ids_.Mutable(index);
 }
-inline bool CellMapArchive::may_modify_values_referenced_by_formulas() const {
-  return may_modify_values_referenced_by_formulas_;
+inline ::TST::CellID* CellDiffMapArchive::add_cell_ids() {
+  return cell_ids_.Add();
 }
-inline void CellMapArchive::set_may_modify_values_referenced_by_formulas(bool value) {
-  set_has_may_modify_values_referenced_by_formulas();
-  may_modify_values_referenced_by_formulas_ = value;
+inline const ::google::protobuf::RepeatedPtrField< ::TST::CellID >&
+CellDiffMapArchive::cell_ids() const {
+  return cell_ids_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TST::CellID >*
+CellDiffMapArchive::mutable_cell_ids() {
+  return &cell_ids_;
 }
 
-// optional bool applies_to_hidden = 6 [default = false];
-inline bool CellMapArchive::has_applies_to_hidden() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+// repeated .TSP.Reference cell_diffs = 2;
+inline int CellDiffMapArchive::cell_diffs_size() const {
+  return cell_diffs_.size();
 }
-inline void CellMapArchive::set_has_applies_to_hidden() {
-  _has_bits_[0] |= 0x00000020u;
+inline void CellDiffMapArchive::clear_cell_diffs() {
+  cell_diffs_.Clear();
 }
-inline void CellMapArchive::clear_has_applies_to_hidden() {
-  _has_bits_[0] &= ~0x00000020u;
+inline const ::TSP::Reference& CellDiffMapArchive::cell_diffs(int index) const {
+  return cell_diffs_.Get(index);
 }
-inline void CellMapArchive::clear_applies_to_hidden() {
-  applies_to_hidden_ = false;
-  clear_has_applies_to_hidden();
+inline ::TSP::Reference* CellDiffMapArchive::mutable_cell_diffs(int index) {
+  return cell_diffs_.Mutable(index);
 }
-inline bool CellMapArchive::applies_to_hidden() const {
-  return applies_to_hidden_;
+inline ::TSP::Reference* CellDiffMapArchive::add_cell_diffs() {
+  return cell_diffs_.Add();
 }
-inline void CellMapArchive::set_applies_to_hidden(bool value) {
-  set_has_applies_to_hidden();
-  applies_to_hidden_ = value;
+inline const ::google::protobuf::RepeatedPtrField< ::TSP::Reference >&
+CellDiffMapArchive::cell_diffs() const {
+  return cell_diffs_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::TSP::Reference >*
+CellDiffMapArchive::mutable_cell_diffs() {
+  return &cell_diffs_;
 }
 
 // -------------------------------------------------------------------
@@ -17927,6 +21163,466 @@ CellRegion::mutable_cell_ranges() {
   return &cell_ranges_;
 }
 
+// -------------------------------------------------------------------
+
+// CellFillStandIn
+
+// required .TSD.FillArchive fill = 1;
+inline bool CellFillStandIn::has_fill() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CellFillStandIn::set_has_fill() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CellFillStandIn::clear_has_fill() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CellFillStandIn::clear_fill() {
+  if (fill_ != NULL) fill_->::TSD::FillArchive::Clear();
+  clear_has_fill();
+}
+inline const ::TSD::FillArchive& CellFillStandIn::fill() const {
+  return fill_ != NULL ? *fill_ : *default_instance_->fill_;
+}
+inline ::TSD::FillArchive* CellFillStandIn::mutable_fill() {
+  set_has_fill();
+  if (fill_ == NULL) fill_ = new ::TSD::FillArchive;
+  return fill_;
+}
+inline ::TSD::FillArchive* CellFillStandIn::release_fill() {
+  clear_has_fill();
+  ::TSD::FillArchive* temp = fill_;
+  fill_ = NULL;
+  return temp;
+}
+inline void CellFillStandIn::set_allocated_fill(::TSD::FillArchive* fill) {
+  delete fill_;
+  fill_ = fill;
+  if (fill) {
+    set_has_fill();
+  } else {
+    clear_has_fill();
+  }
+}
+
+// optional bool type_is_mixed = 2;
+inline bool CellFillStandIn::has_type_is_mixed() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CellFillStandIn::set_has_type_is_mixed() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CellFillStandIn::clear_has_type_is_mixed() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CellFillStandIn::clear_type_is_mixed() {
+  type_is_mixed_ = false;
+  clear_has_type_is_mixed();
+}
+inline bool CellFillStandIn::type_is_mixed() const {
+  return type_is_mixed_;
+}
+inline void CellFillStandIn::set_type_is_mixed(bool value) {
+  set_has_type_is_mixed();
+  type_is_mixed_ = value;
+}
+
+// optional bool color_has_been_modified = 3;
+inline bool CellFillStandIn::has_color_has_been_modified() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CellFillStandIn::set_has_color_has_been_modified() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CellFillStandIn::clear_has_color_has_been_modified() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CellFillStandIn::clear_color_has_been_modified() {
+  color_has_been_modified_ = false;
+  clear_has_color_has_been_modified();
+}
+inline bool CellFillStandIn::color_has_been_modified() const {
+  return color_has_been_modified_;
+}
+inline void CellFillStandIn::set_color_has_been_modified(bool value) {
+  set_has_color_has_been_modified();
+  color_has_been_modified_ = value;
+}
+
+// optional bool color_is_mixed = 4;
+inline bool CellFillStandIn::has_color_is_mixed() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CellFillStandIn::set_has_color_is_mixed() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CellFillStandIn::clear_has_color_is_mixed() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CellFillStandIn::clear_color_is_mixed() {
+  color_is_mixed_ = false;
+  clear_has_color_is_mixed();
+}
+inline bool CellFillStandIn::color_is_mixed() const {
+  return color_is_mixed_;
+}
+inline void CellFillStandIn::set_color_is_mixed(bool value) {
+  set_has_color_is_mixed();
+  color_is_mixed_ = value;
+}
+
+// optional bool first_color_has_been_modified = 5;
+inline bool CellFillStandIn::has_first_color_has_been_modified() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CellFillStandIn::set_has_first_color_has_been_modified() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CellFillStandIn::clear_has_first_color_has_been_modified() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CellFillStandIn::clear_first_color_has_been_modified() {
+  first_color_has_been_modified_ = false;
+  clear_has_first_color_has_been_modified();
+}
+inline bool CellFillStandIn::first_color_has_been_modified() const {
+  return first_color_has_been_modified_;
+}
+inline void CellFillStandIn::set_first_color_has_been_modified(bool value) {
+  set_has_first_color_has_been_modified();
+  first_color_has_been_modified_ = value;
+}
+
+// optional bool first_color_is_mixed = 6;
+inline bool CellFillStandIn::has_first_color_is_mixed() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CellFillStandIn::set_has_first_color_is_mixed() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CellFillStandIn::clear_has_first_color_is_mixed() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CellFillStandIn::clear_first_color_is_mixed() {
+  first_color_is_mixed_ = false;
+  clear_has_first_color_is_mixed();
+}
+inline bool CellFillStandIn::first_color_is_mixed() const {
+  return first_color_is_mixed_;
+}
+inline void CellFillStandIn::set_first_color_is_mixed(bool value) {
+  set_has_first_color_is_mixed();
+  first_color_is_mixed_ = value;
+}
+
+// optional bool last_color_has_been_modified = 7;
+inline bool CellFillStandIn::has_last_color_has_been_modified() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void CellFillStandIn::set_has_last_color_has_been_modified() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void CellFillStandIn::clear_has_last_color_has_been_modified() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void CellFillStandIn::clear_last_color_has_been_modified() {
+  last_color_has_been_modified_ = false;
+  clear_has_last_color_has_been_modified();
+}
+inline bool CellFillStandIn::last_color_has_been_modified() const {
+  return last_color_has_been_modified_;
+}
+inline void CellFillStandIn::set_last_color_has_been_modified(bool value) {
+  set_has_last_color_has_been_modified();
+  last_color_has_been_modified_ = value;
+}
+
+// optional bool last_color_is_mixed = 8;
+inline bool CellFillStandIn::has_last_color_is_mixed() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void CellFillStandIn::set_has_last_color_is_mixed() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void CellFillStandIn::clear_has_last_color_is_mixed() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void CellFillStandIn::clear_last_color_is_mixed() {
+  last_color_is_mixed_ = false;
+  clear_has_last_color_is_mixed();
+}
+inline bool CellFillStandIn::last_color_is_mixed() const {
+  return last_color_is_mixed_;
+}
+inline void CellFillStandIn::set_last_color_is_mixed(bool value) {
+  set_has_last_color_is_mixed();
+  last_color_is_mixed_ = value;
+}
+
+// optional bool gradient_type_has_been_modified = 9;
+inline bool CellFillStandIn::has_gradient_type_has_been_modified() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void CellFillStandIn::set_has_gradient_type_has_been_modified() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void CellFillStandIn::clear_has_gradient_type_has_been_modified() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void CellFillStandIn::clear_gradient_type_has_been_modified() {
+  gradient_type_has_been_modified_ = false;
+  clear_has_gradient_type_has_been_modified();
+}
+inline bool CellFillStandIn::gradient_type_has_been_modified() const {
+  return gradient_type_has_been_modified_;
+}
+inline void CellFillStandIn::set_gradient_type_has_been_modified(bool value) {
+  set_has_gradient_type_has_been_modified();
+  gradient_type_has_been_modified_ = value;
+}
+
+// optional bool gradient_type_is_mixed = 10;
+inline bool CellFillStandIn::has_gradient_type_is_mixed() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void CellFillStandIn::set_has_gradient_type_is_mixed() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void CellFillStandIn::clear_has_gradient_type_is_mixed() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void CellFillStandIn::clear_gradient_type_is_mixed() {
+  gradient_type_is_mixed_ = false;
+  clear_has_gradient_type_is_mixed();
+}
+inline bool CellFillStandIn::gradient_type_is_mixed() const {
+  return gradient_type_is_mixed_;
+}
+inline void CellFillStandIn::set_gradient_type_is_mixed(bool value) {
+  set_has_gradient_type_is_mixed();
+  gradient_type_is_mixed_ = value;
+}
+
+// optional bool gradient_angle_has_been_modified = 11;
+inline bool CellFillStandIn::has_gradient_angle_has_been_modified() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void CellFillStandIn::set_has_gradient_angle_has_been_modified() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void CellFillStandIn::clear_has_gradient_angle_has_been_modified() {
+  _has_bits_[0] &= ~0x00000400u;
+}
+inline void CellFillStandIn::clear_gradient_angle_has_been_modified() {
+  gradient_angle_has_been_modified_ = false;
+  clear_has_gradient_angle_has_been_modified();
+}
+inline bool CellFillStandIn::gradient_angle_has_been_modified() const {
+  return gradient_angle_has_been_modified_;
+}
+inline void CellFillStandIn::set_gradient_angle_has_been_modified(bool value) {
+  set_has_gradient_angle_has_been_modified();
+  gradient_angle_has_been_modified_ = value;
+}
+
+// optional bool gradient_angle_is_mixed = 12;
+inline bool CellFillStandIn::has_gradient_angle_is_mixed() const {
+  return (_has_bits_[0] & 0x00000800u) != 0;
+}
+inline void CellFillStandIn::set_has_gradient_angle_is_mixed() {
+  _has_bits_[0] |= 0x00000800u;
+}
+inline void CellFillStandIn::clear_has_gradient_angle_is_mixed() {
+  _has_bits_[0] &= ~0x00000800u;
+}
+inline void CellFillStandIn::clear_gradient_angle_is_mixed() {
+  gradient_angle_is_mixed_ = false;
+  clear_has_gradient_angle_is_mixed();
+}
+inline bool CellFillStandIn::gradient_angle_is_mixed() const {
+  return gradient_angle_is_mixed_;
+}
+inline void CellFillStandIn::set_gradient_angle_is_mixed(bool value) {
+  set_has_gradient_angle_is_mixed();
+  gradient_angle_is_mixed_ = value;
+}
+
+// optional bool image_data_has_been_modified = 13;
+inline bool CellFillStandIn::has_image_data_has_been_modified() const {
+  return (_has_bits_[0] & 0x00001000u) != 0;
+}
+inline void CellFillStandIn::set_has_image_data_has_been_modified() {
+  _has_bits_[0] |= 0x00001000u;
+}
+inline void CellFillStandIn::clear_has_image_data_has_been_modified() {
+  _has_bits_[0] &= ~0x00001000u;
+}
+inline void CellFillStandIn::clear_image_data_has_been_modified() {
+  image_data_has_been_modified_ = false;
+  clear_has_image_data_has_been_modified();
+}
+inline bool CellFillStandIn::image_data_has_been_modified() const {
+  return image_data_has_been_modified_;
+}
+inline void CellFillStandIn::set_image_data_has_been_modified(bool value) {
+  set_has_image_data_has_been_modified();
+  image_data_has_been_modified_ = value;
+}
+
+// optional bool image_data_is_mixed = 14;
+inline bool CellFillStandIn::has_image_data_is_mixed() const {
+  return (_has_bits_[0] & 0x00002000u) != 0;
+}
+inline void CellFillStandIn::set_has_image_data_is_mixed() {
+  _has_bits_[0] |= 0x00002000u;
+}
+inline void CellFillStandIn::clear_has_image_data_is_mixed() {
+  _has_bits_[0] &= ~0x00002000u;
+}
+inline void CellFillStandIn::clear_image_data_is_mixed() {
+  image_data_is_mixed_ = false;
+  clear_has_image_data_is_mixed();
+}
+inline bool CellFillStandIn::image_data_is_mixed() const {
+  return image_data_is_mixed_;
+}
+inline void CellFillStandIn::set_image_data_is_mixed(bool value) {
+  set_has_image_data_is_mixed();
+  image_data_is_mixed_ = value;
+}
+
+// optional bool tint_color_has_been_modified = 15;
+inline bool CellFillStandIn::has_tint_color_has_been_modified() const {
+  return (_has_bits_[0] & 0x00004000u) != 0;
+}
+inline void CellFillStandIn::set_has_tint_color_has_been_modified() {
+  _has_bits_[0] |= 0x00004000u;
+}
+inline void CellFillStandIn::clear_has_tint_color_has_been_modified() {
+  _has_bits_[0] &= ~0x00004000u;
+}
+inline void CellFillStandIn::clear_tint_color_has_been_modified() {
+  tint_color_has_been_modified_ = false;
+  clear_has_tint_color_has_been_modified();
+}
+inline bool CellFillStandIn::tint_color_has_been_modified() const {
+  return tint_color_has_been_modified_;
+}
+inline void CellFillStandIn::set_tint_color_has_been_modified(bool value) {
+  set_has_tint_color_has_been_modified();
+  tint_color_has_been_modified_ = value;
+}
+
+// optional bool tint_color_is_mixed = 16;
+inline bool CellFillStandIn::has_tint_color_is_mixed() const {
+  return (_has_bits_[0] & 0x00008000u) != 0;
+}
+inline void CellFillStandIn::set_has_tint_color_is_mixed() {
+  _has_bits_[0] |= 0x00008000u;
+}
+inline void CellFillStandIn::clear_has_tint_color_is_mixed() {
+  _has_bits_[0] &= ~0x00008000u;
+}
+inline void CellFillStandIn::clear_tint_color_is_mixed() {
+  tint_color_is_mixed_ = false;
+  clear_has_tint_color_is_mixed();
+}
+inline bool CellFillStandIn::tint_color_is_mixed() const {
+  return tint_color_is_mixed_;
+}
+inline void CellFillStandIn::set_tint_color_is_mixed(bool value) {
+  set_has_tint_color_is_mixed();
+  tint_color_is_mixed_ = value;
+}
+
+// optional bool scale_has_been_modified = 17;
+inline bool CellFillStandIn::has_scale_has_been_modified() const {
+  return (_has_bits_[0] & 0x00010000u) != 0;
+}
+inline void CellFillStandIn::set_has_scale_has_been_modified() {
+  _has_bits_[0] |= 0x00010000u;
+}
+inline void CellFillStandIn::clear_has_scale_has_been_modified() {
+  _has_bits_[0] &= ~0x00010000u;
+}
+inline void CellFillStandIn::clear_scale_has_been_modified() {
+  scale_has_been_modified_ = false;
+  clear_has_scale_has_been_modified();
+}
+inline bool CellFillStandIn::scale_has_been_modified() const {
+  return scale_has_been_modified_;
+}
+inline void CellFillStandIn::set_scale_has_been_modified(bool value) {
+  set_has_scale_has_been_modified();
+  scale_has_been_modified_ = value;
+}
+
+// optional bool scale_is_mixed = 18;
+inline bool CellFillStandIn::has_scale_is_mixed() const {
+  return (_has_bits_[0] & 0x00020000u) != 0;
+}
+inline void CellFillStandIn::set_has_scale_is_mixed() {
+  _has_bits_[0] |= 0x00020000u;
+}
+inline void CellFillStandIn::clear_has_scale_is_mixed() {
+  _has_bits_[0] &= ~0x00020000u;
+}
+inline void CellFillStandIn::clear_scale_is_mixed() {
+  scale_is_mixed_ = false;
+  clear_has_scale_is_mixed();
+}
+inline bool CellFillStandIn::scale_is_mixed() const {
+  return scale_is_mixed_;
+}
+inline void CellFillStandIn::set_scale_is_mixed(bool value) {
+  set_has_scale_is_mixed();
+  scale_is_mixed_ = value;
+}
+
+// optional bool technique_has_been_modified = 19;
+inline bool CellFillStandIn::has_technique_has_been_modified() const {
+  return (_has_bits_[0] & 0x00040000u) != 0;
+}
+inline void CellFillStandIn::set_has_technique_has_been_modified() {
+  _has_bits_[0] |= 0x00040000u;
+}
+inline void CellFillStandIn::clear_has_technique_has_been_modified() {
+  _has_bits_[0] &= ~0x00040000u;
+}
+inline void CellFillStandIn::clear_technique_has_been_modified() {
+  technique_has_been_modified_ = false;
+  clear_has_technique_has_been_modified();
+}
+inline bool CellFillStandIn::technique_has_been_modified() const {
+  return technique_has_been_modified_;
+}
+inline void CellFillStandIn::set_technique_has_been_modified(bool value) {
+  set_has_technique_has_been_modified();
+  technique_has_been_modified_ = value;
+}
+
+// optional bool technique_is_mixed = 20;
+inline bool CellFillStandIn::has_technique_is_mixed() const {
+  return (_has_bits_[0] & 0x00080000u) != 0;
+}
+inline void CellFillStandIn::set_has_technique_is_mixed() {
+  _has_bits_[0] |= 0x00080000u;
+}
+inline void CellFillStandIn::clear_has_technique_is_mixed() {
+  _has_bits_[0] &= ~0x00080000u;
+}
+inline void CellFillStandIn::clear_technique_is_mixed() {
+  technique_is_mixed_ = false;
+  clear_has_technique_is_mixed();
+}
+inline bool CellFillStandIn::technique_is_mixed() const {
+  return technique_is_mixed_;
+}
+inline void CellFillStandIn::set_technique_is_mixed(bool value) {
+  set_has_technique_is_mixed();
+  technique_is_mixed_ = value;
+}
+
 
 // @@protoc_insertion_point(namespace_scope)
 
@@ -17941,10 +21637,22 @@ inline const EnumDescriptor* GetEnumDescriptor< ::TST::PopUpMenuModel_CellValueT
   return ::TST::PopUpMenuModel_CellValueType_descriptor();
 }
 template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::TST::ImportWarningSetArchive_FormulaWarningType>() {
+  return ::TST::ImportWarningSetArchive_FormulaWarningType_descriptor();
+}
+template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::TST::TableDataList_ListType>() {
   return ::TST::TableDataList_ListType_descriptor();
 }
 template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::TST::TableSortOrderArchive_SortRuleArchive_Direction>() {
+  return ::TST::TableSortOrderArchive_SortRuleArchive_Direction_descriptor();
+}
+template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::TST::TableSortOrderArchive_SortType>() {
+  return ::TST::TableSortOrderArchive_SortType_descriptor();
+}
+template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::TST::FormulaPredicateArchive_FormulaPredicateType>() {
   return ::TST::FormulaPredicateArchive_FormulaPredicateType_descriptor();
 }
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.cc
index 09fc04e..ee949f5 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.cc
@@ -23,6 +23,9 @@ namespace {
 const ::google::protobuf::Descriptor* TableCommandArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   TableCommandArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandApplyCellDiffArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandApplyCellDiffArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandChangeFreezeHeaderStateArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandChangeFreezeHeaderStateArchive_reflection_ = NULL;
@@ -53,6 +56,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandSetAutomaticDurationUnitsArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandSetAutomaticDurationUnitsArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandReplaceCustomFormatArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandReplaceCustomFormatArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandInsertColumnsOrRowsArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandInsertColumnsOrRowsArchive_reflection_ = NULL;
@@ -104,6 +110,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandStyleCellsArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandStyleCellsArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandSetFillPropertyArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandSetFillPropertyArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandStyleTableArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandStyleTableArchive_reflection_ = NULL;
@@ -134,6 +143,15 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandApplyStrokePresetArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandApplyStrokePresetArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandAddTableStylePresetArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandAddTableStylePresetArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandRemoveTableStylePresetArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandRemoveTableStylePresetArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandReplaceTableStylePresetArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandReplaceTableStylePresetArchive_reflection_ = NULL;
 const ::google::protobuf::Descriptor* CommandApplyTableStylePresetArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandApplyTableStylePresetArchive_reflection_ = NULL;
@@ -314,6 +332,18 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CommandSetStorageLanguageArchive_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CommandSetStorageLanguageArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandSetSortOrderArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandSetSortOrderArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandRewriteSortOrderForTectonicShiftArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandRewriteSortOrderForTectonicShiftArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandRewriteSortOrderForSortArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandRewriteSortOrderForSortArchive_reflection_ = NULL;
+const ::google::protobuf::Descriptor* CommandRewriteSortOrderForTableResizeArchive_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  CommandRewriteSortOrderForTableResizeArchive_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* CommandDirectionArchive_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* CommandRegionArchive_descriptor_ = NULL;
 
@@ -344,7 +374,25 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableCommandArchive));
-  CommandChangeFreezeHeaderStateArchive_descriptor_ = file->message_type(1);
+  CommandApplyCellDiffArchive_descriptor_ = file->message_type(1);
+  static const int CommandApplyCellDiffArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellDiffArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellDiffArchive, cell_region_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellDiffArchive, cell_diff_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellDiffArchive, inverse_cell_diff_map_),
+  };
+  CommandApplyCellDiffArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandApplyCellDiffArchive_descriptor_,
+      CommandApplyCellDiffArchive::default_instance_,
+      CommandApplyCellDiffArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellDiffArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellDiffArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandApplyCellDiffArchive));
+  CommandChangeFreezeHeaderStateArchive_descriptor_ = file->message_type(2);
   static const int CommandChangeFreezeHeaderStateArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChangeFreezeHeaderStateArchive, direction_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandChangeFreezeHeaderStateArchive, new_freeze_state_),
@@ -361,7 +409,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandChangeFreezeHeaderStateArchive));
-  CommandDeleteCellsArchive_descriptor_ = file->message_type(2);
+  CommandDeleteCellsArchive_descriptor_ = file->message_type(3);
   static const int CommandDeleteCellsArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteCellsArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteCellsArchive, undo_map_),
@@ -380,7 +428,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandDeleteCellsArchive));
-  CommandDeleteCellContentsArchive_descriptor_ = file->message_type(3);
+  CommandDeleteCellContentsArchive_descriptor_ = file->message_type(4);
   static const int CommandDeleteCellContentsArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteCellContentsArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteCellContentsArchive, undo_map_),
@@ -399,7 +447,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandDeleteCellContentsArchive));
-  CommandSetMultipleCellsArchive_descriptor_ = file->message_type(4);
+  CommandSetMultipleCellsArchive_descriptor_ = file->message_type(5);
   static const int CommandSetMultipleCellsArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleCellsArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleCellsArchive, undo_map_),
@@ -419,7 +467,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleCellsArchive));
-  CommandSetMultipleCellsCustomArchive_descriptor_ = file->message_type(5);
+  CommandSetMultipleCellsCustomArchive_descriptor_ = file->message_type(6);
   static const int CommandSetMultipleCellsCustomArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleCellsCustomArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleCellsCustomArchive, undo_map_),
@@ -438,7 +486,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleCellsCustomArchive));
-  CommandSetMultipleCellsMultipleChoiceListArchive_descriptor_ = file->message_type(6);
+  CommandSetMultipleCellsMultipleChoiceListArchive_descriptor_ = file->message_type(7);
   static const int CommandSetMultipleCellsMultipleChoiceListArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleCellsMultipleChoiceListArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleCellsMultipleChoiceListArchive, undo_map_),
@@ -456,7 +504,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleCellsMultipleChoiceListArchive));
-  CommandCoerceMultipleCellsArchive_descriptor_ = file->message_type(7);
+  CommandCoerceMultipleCellsArchive_descriptor_ = file->message_type(8);
   static const int CommandCoerceMultipleCellsArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandCoerceMultipleCellsArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandCoerceMultipleCellsArchive, undo_map_),
@@ -475,7 +523,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandCoerceMultipleCellsArchive));
-  CommandSetControlCellsDisplayNumberFormatArchive_descriptor_ = file->message_type(8);
+  CommandSetControlCellsDisplayNumberFormatArchive_descriptor_ = file->message_type(9);
   static const int CommandSetControlCellsDisplayNumberFormatArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlCellsDisplayNumberFormatArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlCellsDisplayNumberFormatArchive, undo_map_),
@@ -493,7 +541,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetControlCellsDisplayNumberFormatArchive));
-  CommandSetAutomaticFormatArchive_descriptor_ = file->message_type(9);
+  CommandSetAutomaticFormatArchive_descriptor_ = file->message_type(10);
   static const int CommandSetAutomaticFormatArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetAutomaticFormatArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetAutomaticFormatArchive, undo_map_),
@@ -511,7 +559,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetAutomaticFormatArchive));
-  CommandSetAutomaticDurationUnitsArchive_descriptor_ = file->message_type(10);
+  CommandSetAutomaticDurationUnitsArchive_descriptor_ = file->message_type(11);
   static const int CommandSetAutomaticDurationUnitsArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetAutomaticDurationUnitsArchive, selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetAutomaticDurationUnitsArchive, undo_map_),
@@ -530,7 +578,24 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetAutomaticDurationUnitsArchive));
-  CommandInsertColumnsOrRowsArchive_descriptor_ = file->message_type(11);
+  CommandReplaceCustomFormatArchive_descriptor_ = file->message_type(12);
+  static const int CommandReplaceCustomFormatArchive_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, undo_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, redo_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, super_),
+  };
+  CommandReplaceCustomFormatArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandReplaceCustomFormatArchive_descriptor_,
+      CommandReplaceCustomFormatArchive::default_instance_,
+      CommandReplaceCustomFormatArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceCustomFormatArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandReplaceCustomFormatArchive));
+  CommandInsertColumnsOrRowsArchive_descriptor_ = file->message_type(13);
   static const int CommandInsertColumnsOrRowsArchive_offsets_[22] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandInsertColumnsOrRowsArchive, direction_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandInsertColumnsOrRowsArchive, index_),
@@ -582,7 +647,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandInsertColumnsOrRowsArchive_StyleIndexPair));
-  CommandPasteArchive_descriptor_ = file->message_type(12);
+  CommandPasteArchive_descriptor_ = file->message_type(14);
   static const int CommandPasteArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandPasteArchive, user_selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandPasteArchive, final_selection_),
@@ -604,7 +669,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandPasteArchive));
-  CommandRemoveColumnsOrRowsArchive_descriptor_ = file->message_type(13);
+  CommandRemoveColumnsOrRowsArchive_descriptor_ = file->message_type(15);
   static const int CommandRemoveColumnsOrRowsArchive_offsets_[16] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveColumnsOrRowsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveColumnsOrRowsArchive, direction_),
@@ -634,7 +699,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRemoveColumnsOrRowsArchive));
-  CommandResizeColumnOrRowArchive_descriptor_ = file->message_type(14);
+  CommandResizeColumnOrRowArchive_descriptor_ = file->message_type(16);
   static const int CommandResizeColumnOrRowArchive_offsets_[11] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandResizeColumnOrRowArchive, direction_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandResizeColumnOrRowArchive, index_),
@@ -659,7 +724,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandResizeColumnOrRowArchive));
-  CommandSetCellArchive_descriptor_ = file->message_type(15);
+  CommandSetCellArchive_descriptor_ = file->message_type(17);
   static const int CommandSetCellArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetCellArchive, cellid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetCellArchive, newcell_),
@@ -678,7 +743,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetCellArchive));
-  CommandTextPreflightInsertCellArchive_descriptor_ = file->message_type(16);
+  CommandTextPreflightInsertCellArchive_descriptor_ = file->message_type(18);
   static const int CommandTextPreflightInsertCellArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTextPreflightInsertCellArchive, editing_cellid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandTextPreflightInsertCellArchive, super_),
@@ -700,7 +765,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandTextPreflightInsertCellArchive));
-  CommandPostflightSetCellArchive_descriptor_ = file->message_type(17);
+  CommandPostflightSetCellArchive_descriptor_ = file->message_type(19);
   static const int CommandPostflightSetCellArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandPostflightSetCellArchive, cellid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandPostflightSetCellArchive, super_),
@@ -721,7 +786,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandPostflightSetCellArchive));
-  CommandSetNumberOfHeadersOrFootersArchive_descriptor_ = file->message_type(18);
+  CommandSetNumberOfHeadersOrFootersArchive_descriptor_ = file->message_type(20);
   static const int CommandSetNumberOfHeadersOrFootersArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetNumberOfHeadersOrFootersArchive, region_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetNumberOfHeadersOrFootersArchive, count_),
@@ -739,7 +804,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetNumberOfHeadersOrFootersArchive));
-  CommandFixWPStylesInRowsOrColumnsArchive_descriptor_ = file->message_type(19);
+  CommandFixWPStylesInRowsOrColumnsArchive_descriptor_ = file->message_type(21);
   static const int CommandFixWPStylesInRowsOrColumnsArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandFixWPStylesInRowsOrColumnsArchive, direction_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandFixWPStylesInRowsOrColumnsArchive, index_),
@@ -761,7 +826,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandFixWPStylesInRowsOrColumnsArchive));
-  CommandFixStylesInHeadersOrFootersArchive_descriptor_ = file->message_type(20);
+  CommandFixStylesInHeadersOrFootersArchive_descriptor_ = file->message_type(22);
   static const int CommandFixStylesInHeadersOrFootersArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandFixStylesInHeadersOrFootersArchive, region_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandFixStylesInHeadersOrFootersArchive, old_number_),
@@ -782,7 +847,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandFixStylesInHeadersOrFootersArchive));
-  CommandSetTableNameArchive_descriptor_ = file->message_type(21);
+  CommandSetTableNameArchive_descriptor_ = file->message_type(23);
   static const int CommandSetTableNameArchive_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableNameArchive, newtablename_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableNameArchive, oldtablename_),
@@ -805,7 +870,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetTableNameArchive));
-  CommandSetTableNameEnabledArchive_descriptor_ = file->message_type(22);
+  CommandSetTableNameEnabledArchive_descriptor_ = file->message_type(24);
   static const int CommandSetTableNameEnabledArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableNameEnabledArchive, table_name_enabled_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableNameEnabledArchive, super_),
@@ -821,7 +886,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetTableNameEnabledArchive));
-  CommandSetTableFontSizeArchive_descriptor_ = file->message_type(23);
+  CommandSetTableFontSizeArchive_descriptor_ = file->message_type(25);
   static const int CommandSetTableFontSizeArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableFontSizeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableFontSizeArchive, scale_factor_),
@@ -841,7 +906,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetTableFontSizeArchive));
-  CommandSetTableFontNameArchive_descriptor_ = file->message_type(24);
+  CommandSetTableFontNameArchive_descriptor_ = file->message_type(26);
   static const int CommandSetTableFontNameArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableFontNameArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableFontNameArchive, font_name_),
@@ -862,7 +927,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetTableFontNameArchive));
-  CommandSetTableNameHeightArchive_descriptor_ = file->message_type(25);
+  CommandSetTableNameHeightArchive_descriptor_ = file->message_type(27);
   static const int CommandSetTableNameHeightArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableNameHeightArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTableNameHeightArchive, old_table_name_height_),
@@ -879,7 +944,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetTableNameHeightArchive));
-  CommandStyleCellsArchive_descriptor_ = file->message_type(26);
+  CommandStyleCellsArchive_descriptor_ = file->message_type(28);
   static const int CommandStyleCellsArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandStyleCellsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandStyleCellsArchive, format_properties_),
@@ -899,7 +964,27 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandStyleCellsArchive));
-  CommandStyleTableArchive_descriptor_ = file->message_type(27);
+  CommandSetFillPropertyArchive_descriptor_ = file->message_type(29);
+  static const int CommandSetFillPropertyArchive_offsets_[6] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, fill_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, cell_fill_stand_in_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, selection_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, undo_cell_map_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, redo_cell_map_),
+  };
+  CommandSetFillPropertyArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandSetFillPropertyArchive_descriptor_,
+      CommandSetFillPropertyArchive::default_instance_,
+      CommandSetFillPropertyArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFillPropertyArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandSetFillPropertyArchive));
+  CommandStyleTableArchive_descriptor_ = file->message_type(30);
   static const int CommandStyleTableArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandStyleTableArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandStyleTableArchive, format_properties_),
@@ -917,7 +1002,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandStyleTableArchive));
-  CommandFillCellsArchive_descriptor_ = file->message_type(28);
+  CommandFillCellsArchive_descriptor_ = file->message_type(31);
   static const int CommandFillCellsArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandFillCellsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandFillCellsArchive, sourceselection_),
@@ -939,7 +1024,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandFillCellsArchive));
-  CommandReplaceTextArchive_descriptor_ = file->message_type(29);
+  CommandReplaceTextArchive_descriptor_ = file->message_type(32);
   static const int CommandReplaceTextArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTextArchive, cellid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTextArchive, newcell_),
@@ -958,7 +1043,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandReplaceTextArchive));
-  CommandReplaceAllTextArchive_descriptor_ = file->message_type(30);
+  CommandReplaceAllTextArchive_descriptor_ = file->message_type(33);
   static const int CommandReplaceAllTextArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceAllTextArchive, tableinfo_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceAllTextArchive, undo_cell_map_),
@@ -975,7 +1060,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandReplaceAllTextArchive));
-  CommandSetRepeatingHeaderEnabledArchive_descriptor_ = file->message_type(31);
+  CommandSetRepeatingHeaderEnabledArchive_descriptor_ = file->message_type(34);
   static const int CommandSetRepeatingHeaderEnabledArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetRepeatingHeaderEnabledArchive, repeating_header_enabled_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetRepeatingHeaderEnabledArchive, direction_),
@@ -992,7 +1077,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetRepeatingHeaderEnabledArchive));
-  CommandSetFiltersEnabledArchive_descriptor_ = file->message_type(32);
+  CommandSetFiltersEnabledArchive_descriptor_ = file->message_type(35);
   static const int CommandSetFiltersEnabledArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFiltersEnabledArchive, enable_filters_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFiltersEnabledArchive, super_),
@@ -1008,7 +1093,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetFiltersEnabledArchive));
-  CommandAddQuickFilterRulesArchive_descriptor_ = file->message_type(33);
+  CommandAddQuickFilterRulesArchive_descriptor_ = file->message_type(36);
   static const int CommandAddQuickFilterRulesArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddQuickFilterRulesArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddQuickFilterRulesArchive, rules_),
@@ -1027,7 +1112,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandAddQuickFilterRulesArchive));
-  CommandDeleteFilterRulesArchive_descriptor_ = file->message_type(34);
+  CommandDeleteFilterRulesArchive_descriptor_ = file->message_type(37);
   static const int CommandDeleteFilterRulesArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteFilterRulesArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDeleteFilterRulesArchive, undo_rules_),
@@ -1047,7 +1132,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandDeleteFilterRulesArchive));
-  CommandModifyFilterRuleArchive_descriptor_ = file->message_type(35);
+  CommandModifyFilterRuleArchive_descriptor_ = file->message_type(38);
   static const int CommandModifyFilterRuleArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandModifyFilterRuleArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandModifyFilterRuleArchive, undo_rule_),
@@ -1066,7 +1151,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandModifyFilterRuleArchive));
-  CommandApplyStrokePresetArchive_descriptor_ = file->message_type(36);
+  CommandApplyStrokePresetArchive_descriptor_ = file->message_type(39);
   static const int CommandApplyStrokePresetArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyStrokePresetArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyStrokePresetArchive, undo_cell_map_),
@@ -1086,7 +1171,62 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandApplyStrokePresetArchive));
-  CommandApplyTableStylePresetArchive_descriptor_ = file->message_type(37);
+  CommandAddTableStylePresetArchive_descriptor_ = file->message_type(40);
+  static const int CommandAddTableStylePresetArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddTableStylePresetArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddTableStylePresetArchive, preset_index_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddTableStylePresetArchive, table_styles_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddTableStylePresetArchive, send_notification_),
+  };
+  CommandAddTableStylePresetArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandAddTableStylePresetArchive_descriptor_,
+      CommandAddTableStylePresetArchive::default_instance_,
+      CommandAddTableStylePresetArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddTableStylePresetArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandAddTableStylePresetArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandAddTableStylePresetArchive));
+  CommandRemoveTableStylePresetArchive_descriptor_ = file->message_type(41);
+  static const int CommandRemoveTableStylePresetArchive_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, theme_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, removed_table_styles_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, preset_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, preset_index_in_theme_),
+  };
+  CommandRemoveTableStylePresetArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandRemoveTableStylePresetArchive_descriptor_,
+      CommandRemoveTableStylePresetArchive::default_instance_,
+      CommandRemoveTableStylePresetArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRemoveTableStylePresetArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandRemoveTableStylePresetArchive));
+  CommandReplaceTableStylePresetArchive_descriptor_ = file->message_type(42);
+  static const int CommandReplaceTableStylePresetArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTableStylePresetArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTableStylePresetArchive, theme_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTableStylePresetArchive, old_table_styles_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTableStylePresetArchive, new_table_styles_),
+  };
+  CommandReplaceTableStylePresetArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandReplaceTableStylePresetArchive_descriptor_,
+      CommandReplaceTableStylePresetArchive::default_instance_,
+      CommandReplaceTableStylePresetArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTableStylePresetArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandReplaceTableStylePresetArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandReplaceTableStylePresetArchive));
+  CommandApplyTableStylePresetArchive_descriptor_ = file->message_type(43);
   static const int CommandApplyTableStylePresetArchive_offsets_[11] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyTableStylePresetArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyTableStylePresetArchive, undo_cell_map_),
@@ -1128,7 +1268,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandApplyTableStylePresetArchive_StyleIndexTuple));
-  CommandSetStyleApplyClearsAllFlagArchive_descriptor_ = file->message_type(38);
+  CommandSetStyleApplyClearsAllFlagArchive_descriptor_ = file->message_type(44);
   static const int CommandSetStyleApplyClearsAllFlagArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetStyleApplyClearsAllFlagArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetStyleApplyClearsAllFlagArchive, apply_clears_all_),
@@ -1144,7 +1284,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetStyleApplyClearsAllFlagArchive));
-  CommandApplyThemeToTableArchive_descriptor_ = file->message_type(39);
+  CommandApplyThemeToTableArchive_descriptor_ = file->message_type(45);
   static const int CommandApplyThemeToTableArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyThemeToTableArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyThemeToTableArchive, undo_cell_map_),
@@ -1163,7 +1303,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandApplyThemeToTableArchive));
-  CommandApplyThemeChildForTableArchive_descriptor_ = file->message_type(40);
+  CommandApplyThemeChildForTableArchive_descriptor_ = file->message_type(46);
   static const int CommandApplyThemeChildForTableArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyThemeChildForTableArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyThemeChildForTableArchive, apply_command_),
@@ -1179,7 +1319,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandApplyThemeChildForTableArchive));
-  CommandToggleTextPropertyArchive_descriptor_ = file->message_type(41);
+  CommandToggleTextPropertyArchive_descriptor_ = file->message_type(47);
   static const int CommandToggleTextPropertyArchive_offsets_[10] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandToggleTextPropertyArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandToggleTextPropertyArchive, selection_),
@@ -1203,7 +1343,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandToggleTextPropertyArchive));
-  CommandResetFillPropertyToDefault_descriptor_ = file->message_type(42);
+  CommandResetFillPropertyToDefault_descriptor_ = file->message_type(48);
   static const int CommandResetFillPropertyToDefault_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandResetFillPropertyToDefault, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandResetFillPropertyToDefault, selection_),
@@ -1221,7 +1361,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandResetFillPropertyToDefault));
-  CommandSetSingleNumberFormatParameterArchive_descriptor_ = file->message_type(43);
+  CommandSetSingleNumberFormatParameterArchive_descriptor_ = file->message_type(49);
   static const int CommandSetSingleNumberFormatParameterArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSingleNumberFormatParameterArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSingleNumberFormatParameterArchive, selection_),
@@ -1239,7 +1379,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetSingleNumberFormatParameterArchive));
-  CommandSetBaseArchive_descriptor_ = file->message_type(44);
+  CommandSetBaseArchive_descriptor_ = file->message_type(50);
   static const int CommandSetBaseArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetBaseArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetBaseArchive, base_),
@@ -1255,7 +1395,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetBaseArchive));
-  CommandSetBasePlacesArchive_descriptor_ = file->message_type(45);
+  CommandSetBasePlacesArchive_descriptor_ = file->message_type(51);
   static const int CommandSetBasePlacesArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetBasePlacesArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetBasePlacesArchive, base_places_),
@@ -1271,7 +1411,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetBasePlacesArchive));
-  CommandSetBaseUseMinusSignArchive_descriptor_ = file->message_type(46);
+  CommandSetBaseUseMinusSignArchive_descriptor_ = file->message_type(52);
   static const int CommandSetBaseUseMinusSignArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetBaseUseMinusSignArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetBaseUseMinusSignArchive, base_use_minus_sign_),
@@ -1287,7 +1427,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetBaseUseMinusSignArchive));
-  CommandSetControlMinimumArchive_descriptor_ = file->message_type(47);
+  CommandSetControlMinimumArchive_descriptor_ = file->message_type(53);
   static const int CommandSetControlMinimumArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlMinimumArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlMinimumArchive, minimum_),
@@ -1304,7 +1444,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetControlMinimumArchive));
-  CommandSetControlMaximumArchive_descriptor_ = file->message_type(48);
+  CommandSetControlMaximumArchive_descriptor_ = file->message_type(54);
   static const int CommandSetControlMaximumArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlMaximumArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlMaximumArchive, maximum_),
@@ -1321,7 +1461,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetControlMaximumArchive));
-  CommandSetControlIncrementArchive_descriptor_ = file->message_type(49);
+  CommandSetControlIncrementArchive_descriptor_ = file->message_type(55);
   static const int CommandSetControlIncrementArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlIncrementArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetControlIncrementArchive, increment_),
@@ -1338,7 +1478,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetControlIncrementArchive));
-  CommandSetCurrencyCodeArchive_descriptor_ = file->message_type(50);
+  CommandSetCurrencyCodeArchive_descriptor_ = file->message_type(56);
   static const int CommandSetCurrencyCodeArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetCurrencyCodeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetCurrencyCodeArchive, currency_code_),
@@ -1354,7 +1494,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetCurrencyCodeArchive));
-  CommandSetFractionAccuracyArchive_descriptor_ = file->message_type(51);
+  CommandSetFractionAccuracyArchive_descriptor_ = file->message_type(57);
   static const int CommandSetFractionAccuracyArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFractionAccuracyArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFractionAccuracyArchive, fraction_accuracy_),
@@ -1370,7 +1510,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetFractionAccuracyArchive));
-  CommandSetMultipleChoiceListFormatForEditedItemArchive_descriptor_ = file->message_type(52);
+  CommandSetMultipleChoiceListFormatForEditedItemArchive_descriptor_ = file->message_type(58);
   static const int CommandSetMultipleChoiceListFormatForEditedItemArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleChoiceListFormatForEditedItemArchive, super_),
   };
@@ -1385,7 +1525,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleChoiceListFormatForEditedItemArchive));
-  CommandSetMultipleChoiceListFormatForDeleteItemArchive_descriptor_ = file->message_type(53);
+  CommandSetMultipleChoiceListFormatForDeleteItemArchive_descriptor_ = file->message_type(59);
   static const int CommandSetMultipleChoiceListFormatForDeleteItemArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleChoiceListFormatForDeleteItemArchive, super_),
   };
@@ -1400,7 +1540,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleChoiceListFormatForDeleteItemArchive));
-  CommandSetMultipleChoiceListFormatForReorderItemArchive_descriptor_ = file->message_type(54);
+  CommandSetMultipleChoiceListFormatForReorderItemArchive_descriptor_ = file->message_type(60);
   static const int CommandSetMultipleChoiceListFormatForReorderItemArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleChoiceListFormatForReorderItemArchive, super_),
   };
@@ -1415,7 +1555,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleChoiceListFormatForReorderItemArchive));
-  CommandSetMultipleChoiceListFormatForInitialValueArchive_descriptor_ = file->message_type(55);
+  CommandSetMultipleChoiceListFormatForInitialValueArchive_descriptor_ = file->message_type(61);
   static const int CommandSetMultipleChoiceListFormatForInitialValueArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetMultipleChoiceListFormatForInitialValueArchive, super_),
   };
@@ -1430,7 +1570,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetMultipleChoiceListFormatForInitialValueArchive));
-  CommandSetNegativeNumberStyleArchive_descriptor_ = file->message_type(56);
+  CommandSetNegativeNumberStyleArchive_descriptor_ = file->message_type(62);
   static const int CommandSetNegativeNumberStyleArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetNegativeNumberStyleArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetNegativeNumberStyleArchive, negative_number_style_),
@@ -1446,7 +1586,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetNegativeNumberStyleArchive));
-  CommandSetExplicitFormatArchive_descriptor_ = file->message_type(57);
+  CommandSetExplicitFormatArchive_descriptor_ = file->message_type(63);
   static const int CommandSetExplicitFormatArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetExplicitFormatArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetExplicitFormatArchive, selection_),
@@ -1465,7 +1605,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetExplicitFormatArchive));
-  CommandSetNumberOfDecimalPlacesArchive_descriptor_ = file->message_type(58);
+  CommandSetNumberOfDecimalPlacesArchive_descriptor_ = file->message_type(64);
   static const int CommandSetNumberOfDecimalPlacesArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetNumberOfDecimalPlacesArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetNumberOfDecimalPlacesArchive, decimal_places_),
@@ -1481,7 +1621,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetNumberOfDecimalPlacesArchive));
-  CommandSetDateTimeFormatArchive_descriptor_ = file->message_type(59);
+  CommandSetDateTimeFormatArchive_descriptor_ = file->message_type(65);
   static const int CommandSetDateTimeFormatArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetDateTimeFormatArchive, super_),
   };
@@ -1496,7 +1636,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetDateTimeFormatArchive));
-  CommandSetShowThousandsSeparatorArchive_descriptor_ = file->message_type(60);
+  CommandSetShowThousandsSeparatorArchive_descriptor_ = file->message_type(66);
   static const int CommandSetShowThousandsSeparatorArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetShowThousandsSeparatorArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetShowThousandsSeparatorArchive, show_thousands_separator_),
@@ -1512,7 +1652,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetShowThousandsSeparatorArchive));
-  CommandSetUseAccountingStyleArchive_descriptor_ = file->message_type(61);
+  CommandSetUseAccountingStyleArchive_descriptor_ = file->message_type(67);
   static const int CommandSetUseAccountingStyleArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetUseAccountingStyleArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetUseAccountingStyleArchive, use_accounting_style_),
@@ -1528,7 +1668,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetUseAccountingStyleArchive));
-  CommandMoveRowsArchive_descriptor_ = file->message_type(62);
+  CommandMoveRowsArchive_descriptor_ = file->message_type(68);
   static const int CommandMoveRowsArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveRowsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveRowsArchive, selection_),
@@ -1550,7 +1690,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMoveRowsArchive));
-  CommandMoveColumnsArchive_descriptor_ = file->message_type(63);
+  CommandMoveColumnsArchive_descriptor_ = file->message_type(69);
   static const int CommandMoveColumnsArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveColumnsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMoveColumnsArchive, selection_),
@@ -1571,7 +1711,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMoveColumnsArchive));
-  CommandSortArchive_descriptor_ = file->message_type(64);
+  CommandSortArchive_descriptor_ = file->message_type(70);
   static const int CommandSortArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSortArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSortArchive, mapping_),
@@ -1588,7 +1728,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSortArchive));
-  CommandRewriteFormulasForSortArchive_descriptor_ = file->message_type(65);
+  CommandRewriteFormulasForSortArchive_descriptor_ = file->message_type(71);
   static const int CommandRewriteFormulasForSortArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForSortArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForSortArchive, formula_map_),
@@ -1607,7 +1747,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFormulasForSortArchive));
-  CommandRewriteFormulasForTectonicShiftArchive_descriptor_ = file->message_type(66);
+  CommandRewriteFormulasForTectonicShiftArchive_descriptor_ = file->message_type(72);
   static const int CommandRewriteFormulasForTectonicShiftArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForTectonicShiftArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForTectonicShiftArchive, formula_map_),
@@ -1624,7 +1764,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFormulasForTectonicShiftArchive));
-  CommandRewriteFormulasForMoveArchive_descriptor_ = file->message_type(67);
+  CommandRewriteFormulasForMoveArchive_descriptor_ = file->message_type(73);
   static const int CommandRewriteFormulasForMoveArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForMoveArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForMoveArchive, formula_map_),
@@ -1642,7 +1782,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFormulasForMoveArchive));
-  CommandRewriteFormulasForCellMergeArchive_descriptor_ = file->message_type(68);
+  CommandRewriteFormulasForCellMergeArchive_descriptor_ = file->message_type(74);
   static const int CommandRewriteFormulasForCellMergeArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForCellMergeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFormulasForCellMergeArchive, formula_map_),
@@ -1660,7 +1800,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFormulasForCellMergeArchive));
-  CommandRewriteFilterFormulasForTableResizeArchive_descriptor_ = file->message_type(69);
+  CommandRewriteFilterFormulasForTableResizeArchive_descriptor_ = file->message_type(75);
   static const int CommandRewriteFilterFormulasForTableResizeArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFilterFormulasForTableResizeArchive, super_),
   };
@@ -1675,7 +1815,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFilterFormulasForTableResizeArchive));
-  CommandRewriteFilterFormulasForTectonicShiftArchive_descriptor_ = file->message_type(70);
+  CommandRewriteFilterFormulasForTectonicShiftArchive_descriptor_ = file->message_type(76);
   static const int CommandRewriteFilterFormulasForTectonicShiftArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFilterFormulasForTectonicShiftArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFilterFormulasForTectonicShiftArchive, filter_set_),
@@ -1692,7 +1832,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFilterFormulasForTectonicShiftArchive));
-  CommandRewriteFilterFormulasForSortArchive_descriptor_ = file->message_type(71);
+  CommandRewriteFilterFormulasForSortArchive_descriptor_ = file->message_type(77);
   static const int CommandRewriteFilterFormulasForSortArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFilterFormulasForSortArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteFilterFormulasForSortArchive, filter_set_),
@@ -1710,7 +1850,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteFilterFormulasForSortArchive));
-  CommandRewriteConditionalStylesForTectonicShiftArchive_descriptor_ = file->message_type(72);
+  CommandRewriteConditionalStylesForTectonicShiftArchive_descriptor_ = file->message_type(78);
   static const int CommandRewriteConditionalStylesForTectonicShiftArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForTectonicShiftArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForTectonicShiftArchive, tectonic_shift_),
@@ -1728,7 +1868,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteConditionalStylesForTectonicShiftArchive));
-  CommandRewriteConditionalStylesForSortArchive_descriptor_ = file->message_type(73);
+  CommandRewriteConditionalStylesForSortArchive_descriptor_ = file->message_type(79);
   static const int CommandRewriteConditionalStylesForSortArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForSortArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForSortArchive, sort_mapping_),
@@ -1747,7 +1887,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteConditionalStylesForSortArchive));
-  CommandRewriteConditionalStylesForRangeMoveArchive_descriptor_ = file->message_type(74);
+  CommandRewriteConditionalStylesForRangeMoveArchive_descriptor_ = file->message_type(80);
   static const int CommandRewriteConditionalStylesForRangeMoveArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForRangeMoveArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForRangeMoveArchive, from_range_reference_),
@@ -1766,7 +1906,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteConditionalStylesForRangeMoveArchive));
-  CommandRewriteConditionalStylesForCellMergeArchive_descriptor_ = file->message_type(75);
+  CommandRewriteConditionalStylesForCellMergeArchive_descriptor_ = file->message_type(81);
   static const int CommandRewriteConditionalStylesForCellMergeArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForCellMergeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteConditionalStylesForCellMergeArchive, merged_table_id_),
@@ -1785,7 +1925,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandRewriteConditionalStylesForCellMergeArchive));
-  CommandMergeUnmergeArchive_descriptor_ = file->message_type(76);
+  CommandMergeUnmergeArchive_descriptor_ = file->message_type(82);
   static const int CommandMergeUnmergeArchive_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMergeUnmergeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMergeUnmergeArchive, merge_action_),
@@ -1806,7 +1946,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMergeUnmergeArchive));
-  CommandHideShowArchive_descriptor_ = file->message_type(77);
+  CommandHideShowArchive_descriptor_ = file->message_type(83);
   static const int CommandHideShowArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandHideShowArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandHideShowArchive, direction_),
@@ -1826,7 +1966,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandHideShowArchive));
-  TableInfoGeometryCommandArchive_descriptor_ = file->message_type(78);
+  TableInfoGeometryCommandArchive_descriptor_ = file->message_type(84);
   static const int TableInfoGeometryCommandArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableInfoGeometryCommandArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableInfoGeometryCommandArchive, scale_factor_),
@@ -1848,7 +1988,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableInfoGeometryCommandArchive));
-  FormulaEditingCommandGroupArchive_descriptor_ = file->message_type(79);
+  FormulaEditingCommandGroupArchive_descriptor_ = file->message_type(85);
   static const int FormulaEditingCommandGroupArchive_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaEditingCommandGroupArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaEditingCommandGroupArchive, undoselectionvalid_),
@@ -1871,7 +2011,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FormulaEditingCommandGroupArchive));
-  FormulaEditingCommandSelectionBehaviorArchive_descriptor_ = file->message_type(80);
+  FormulaEditingCommandSelectionBehaviorArchive_descriptor_ = file->message_type(86);
   static const int FormulaEditingCommandSelectionBehaviorArchive_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaEditingCommandSelectionBehaviorArchive, undoselectionvalid_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FormulaEditingCommandSelectionBehaviorArchive, undoselectionstart_),
@@ -1894,7 +2034,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FormulaEditingCommandSelectionBehaviorArchive));
-  UndoRedoStateCommandSelectionBehaviorArchive_descriptor_ = file->message_type(81);
+  UndoRedoStateCommandSelectionBehaviorArchive_descriptor_ = file->message_type(87);
   static const int UndoRedoStateCommandSelectionBehaviorArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UndoRedoStateCommandSelectionBehaviorArchive, before_undo_redo_state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UndoRedoStateCommandSelectionBehaviorArchive, after_undo_redo_state_),
@@ -1913,7 +2053,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UndoRedoStateCommandSelectionBehaviorArchive));
-  TableCommandSelectionBehaviorArchive_descriptor_ = file->message_type(82);
+  TableCommandSelectionBehaviorArchive_descriptor_ = file->message_type(88);
   static const int TableCommandSelectionBehaviorArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableCommandSelectionBehaviorArchive, before_table_selection_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TableCommandSelectionBehaviorArchive, after_table_selection_),
@@ -1931,7 +2071,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TableCommandSelectionBehaviorArchive));
-  DisableTableNameSelectionBehaviorArchive_descriptor_ = file->message_type(83);
+  DisableTableNameSelectionBehaviorArchive_descriptor_ = file->message_type(89);
   static const int DisableTableNameSelectionBehaviorArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DisableTableNameSelectionBehaviorArchive, super_),
   };
@@ -1946,7 +2086,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DisableTableNameSelectionBehaviorArchive));
-  CommandApplyCellCommentArchive_descriptor_ = file->message_type(84);
+  CommandApplyCellCommentArchive_descriptor_ = file->message_type(90);
   static const int CommandApplyCellCommentArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellCommentArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyCellCommentArchive, cell_id_),
@@ -1964,7 +2104,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandApplyCellCommentArchive));
-  CommandApplyConditionalStyleSetArchive_descriptor_ = file->message_type(85);
+  CommandApplyConditionalStyleSetArchive_descriptor_ = file->message_type(91);
   static const int CommandApplyConditionalStyleSetArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyConditionalStyleSetArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandApplyConditionalStyleSetArchive, selection_),
@@ -1982,7 +2122,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandApplyConditionalStyleSetArchive));
-  CommandSetFormulaTokenizationArchive_descriptor_ = file->message_type(86);
+  CommandSetFormulaTokenizationArchive_descriptor_ = file->message_type(92);
   static const int CommandSetFormulaTokenizationArchive_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFormulaTokenizationArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFormulaTokenizationArchive, tokenization_),
@@ -1998,7 +2138,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetFormulaTokenizationArchive));
-  CommandSetFilterEnabledArchive_descriptor_ = file->message_type(87);
+  CommandSetFilterEnabledArchive_descriptor_ = file->message_type(93);
   static const int CommandSetFilterEnabledArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFilterEnabledArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFilterEnabledArchive, filter_index_),
@@ -2015,7 +2155,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetFilterEnabledArchive));
-  CommandSetFilterRuleEnabledArchive_descriptor_ = file->message_type(88);
+  CommandSetFilterRuleEnabledArchive_descriptor_ = file->message_type(94);
   static const int CommandSetFilterRuleEnabledArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFilterRuleEnabledArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFilterRuleEnabledArchive, filter_index_),
@@ -2033,7 +2173,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetFilterRuleEnabledArchive));
-  CommandSetFilterSetTypeArchive_descriptor_ = file->message_type(89);
+  CommandSetFilterSetTypeArchive_descriptor_ = file->message_type(95);
   static const int CommandSetFilterSetTypeArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFilterSetTypeArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetFilterSetTypeArchive, old_filter_set_type_),
@@ -2050,7 +2190,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetFilterSetTypeArchive));
-  CommandSetStyleNetworkArchive_descriptor_ = file->message_type(90);
+  CommandSetStyleNetworkArchive_descriptor_ = file->message_type(96);
   static const int CommandSetStyleNetworkArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetStyleNetworkArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetStyleNetworkArchive, old_style_network_),
@@ -2067,7 +2207,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetStyleNetworkArchive));
-  CommandMutateCellsArchive_descriptor_ = file->message_type(91);
+  CommandMutateCellsArchive_descriptor_ = file->message_type(97);
   static const int CommandMutateCellsArchive_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutateCellsArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandMutateCellsArchive, undo_cell_map_),
@@ -2085,7 +2225,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandMutateCellsArchive));
-  CommandDisableFilterRulesForColumnArchive_descriptor_ = file->message_type(92);
+  CommandDisableFilterRulesForColumnArchive_descriptor_ = file->message_type(98);
   static const int CommandDisableFilterRulesForColumnArchive_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDisableFilterRulesForColumnArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandDisableFilterRulesForColumnArchive, column_index_),
@@ -2102,7 +2242,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandDisableFilterRulesForColumnArchive));
-  CommandSetTextStyleArchive_descriptor_ = file->message_type(93);
+  CommandSetTextStyleArchive_descriptor_ = file->message_type(99);
   static const int CommandSetTextStyleArchive_offsets_[5] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTextStyleArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetTextStyleArchive, region_),
@@ -2121,7 +2261,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetTextStyleArchive));
-  CommandNotifyForTransformingArchive_descriptor_ = file->message_type(94);
+  CommandNotifyForTransformingArchive_descriptor_ = file->message_type(100);
   static const int CommandNotifyForTransformingArchive_offsets_[1] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandNotifyForTransformingArchive, super_),
   };
@@ -2136,7 +2276,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandNotifyForTransformingArchive));
-  CommandSetStorageLanguageArchive_descriptor_ = file->message_type(95);
+  CommandSetStorageLanguageArchive_descriptor_ = file->message_type(101);
   static const int CommandSetStorageLanguageArchive_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetStorageLanguageArchive, super_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetStorageLanguageArchive, storage_),
@@ -2156,6 +2296,76 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CommandSetStorageLanguageArchive));
+  CommandSetSortOrderArchive_descriptor_ = file->message_type(102);
+  static const int CommandSetSortOrderArchive_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSortOrderArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSortOrderArchive, old_sort_order_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSortOrderArchive, new_sort_order_),
+  };
+  CommandSetSortOrderArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandSetSortOrderArchive_descriptor_,
+      CommandSetSortOrderArchive::default_instance_,
+      CommandSetSortOrderArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSortOrderArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandSetSortOrderArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandSetSortOrderArchive));
+  CommandRewriteSortOrderForTectonicShiftArchive_descriptor_ = file->message_type(103);
+  static const int CommandRewriteSortOrderForTectonicShiftArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTectonicShiftArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTectonicShiftArchive, tectonic_shift_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTectonicShiftArchive, old_sort_order_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTectonicShiftArchive, new_sort_order_),
+  };
+  CommandRewriteSortOrderForTectonicShiftArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandRewriteSortOrderForTectonicShiftArchive_descriptor_,
+      CommandRewriteSortOrderForTectonicShiftArchive::default_instance_,
+      CommandRewriteSortOrderForTectonicShiftArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTectonicShiftArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTectonicShiftArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandRewriteSortOrderForTectonicShiftArchive));
+  CommandRewriteSortOrderForSortArchive_descriptor_ = file->message_type(104);
+  static const int CommandRewriteSortOrderForSortArchive_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForSortArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForSortArchive, sort_mapping_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForSortArchive, old_sort_order_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForSortArchive, new_sort_order_),
+  };
+  CommandRewriteSortOrderForSortArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandRewriteSortOrderForSortArchive_descriptor_,
+      CommandRewriteSortOrderForSortArchive::default_instance_,
+      CommandRewriteSortOrderForSortArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForSortArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForSortArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandRewriteSortOrderForSortArchive));
+  CommandRewriteSortOrderForTableResizeArchive_descriptor_ = file->message_type(105);
+  static const int CommandRewriteSortOrderForTableResizeArchive_offsets_[3] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTableResizeArchive, super_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTableResizeArchive, old_sort_order_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTableResizeArchive, new_sort_order_),
+  };
+  CommandRewriteSortOrderForTableResizeArchive_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      CommandRewriteSortOrderForTableResizeArchive_descriptor_,
+      CommandRewriteSortOrderForTableResizeArchive::default_instance_,
+      CommandRewriteSortOrderForTableResizeArchive_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTableResizeArchive, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(CommandRewriteSortOrderForTableResizeArchive, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(CommandRewriteSortOrderForTableResizeArchive));
   CommandDirectionArchive_descriptor_ = file->enum_type(0);
   CommandRegionArchive_descriptor_ = file->enum_type(1);
 }
@@ -2172,6 +2382,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     TableCommandArchive_descriptor_, &TableCommandArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandApplyCellDiffArchive_descriptor_, &CommandApplyCellDiffArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandChangeFreezeHeaderStateArchive_descriptor_, &CommandChangeFreezeHeaderStateArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -2192,6 +2404,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandSetAutomaticFormatArchive_descriptor_, &CommandSetAutomaticFormatArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandSetAutomaticDurationUnitsArchive_descriptor_, &CommandSetAutomaticDurationUnitsArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandReplaceCustomFormatArchive_descriptor_, &CommandReplaceCustomFormatArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandInsertColumnsOrRowsArchive_descriptor_, &CommandInsertColumnsOrRowsArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -2226,6 +2440,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandSetTableNameHeightArchive_descriptor_, &CommandSetTableNameHeightArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandStyleCellsArchive_descriptor_, &CommandStyleCellsArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandSetFillPropertyArchive_descriptor_, &CommandSetFillPropertyArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandStyleTableArchive_descriptor_, &CommandStyleTableArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -2246,6 +2462,12 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandModifyFilterRuleArchive_descriptor_, &CommandModifyFilterRuleArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandApplyStrokePresetArchive_descriptor_, &CommandApplyStrokePresetArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandAddTableStylePresetArchive_descriptor_, &CommandAddTableStylePresetArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandRemoveTableStylePresetArchive_descriptor_, &CommandRemoveTableStylePresetArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandReplaceTableStylePresetArchive_descriptor_, &CommandReplaceTableStylePresetArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandApplyTableStylePresetArchive_descriptor_, &CommandApplyTableStylePresetArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
@@ -2366,6 +2588,14 @@ void protobuf_RegisterTypes(const ::std::string&) {
     CommandNotifyForTransformingArchive_descriptor_, &CommandNotifyForTransformingArchive::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CommandSetStorageLanguageArchive_descriptor_, &CommandSetStorageLanguageArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandSetSortOrderArchive_descriptor_, &CommandSetSortOrderArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandRewriteSortOrderForTectonicShiftArchive_descriptor_, &CommandRewriteSortOrderForTectonicShiftArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandRewriteSortOrderForSortArchive_descriptor_, &CommandRewriteSortOrderForSortArchive::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    CommandRewriteSortOrderForTableResizeArchive_descriptor_, &CommandRewriteSortOrderForTableResizeArchive::default_instance());
 }
 
 }  // namespace
@@ -2373,6 +2603,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
 void protobuf_ShutdownFile_TSTCommandArchives_2eproto() {
   delete TableCommandArchive::default_instance_;
   delete TableCommandArchive_reflection_;
+  delete CommandApplyCellDiffArchive::default_instance_;
+  delete CommandApplyCellDiffArchive_reflection_;
   delete CommandChangeFreezeHeaderStateArchive::default_instance_;
   delete CommandChangeFreezeHeaderStateArchive_reflection_;
   delete CommandDeleteCellsArchive::default_instance_;
@@ -2393,6 +2625,8 @@ void protobuf_ShutdownFile_TSTCommandArchives_2eproto() {
   delete CommandSetAutomaticFormatArchive_reflection_;
   delete CommandSetAutomaticDurationUnitsArchive::default_instance_;
   delete CommandSetAutomaticDurationUnitsArchive_reflection_;
+  delete CommandReplaceCustomFormatArchive::default_instance_;
+  delete CommandReplaceCustomFormatArchive_reflection_;
   delete CommandInsertColumnsOrRowsArchive::default_instance_;
   delete CommandInsertColumnsOrRowsArchive_reflection_;
   delete CommandInsertColumnsOrRowsArchive_StyleIndexPair::default_instance_;
@@ -2427,6 +2661,8 @@ void protobuf_ShutdownFile_TSTCommandArchives_2eproto() {
   delete CommandSetTableNameHeightArchive_reflection_;
   delete CommandStyleCellsArchive::default_instance_;
   delete CommandStyleCellsArchive_reflection_;
+  delete CommandSetFillPropertyArchive::default_instance_;
+  delete CommandSetFillPropertyArchive_reflection_;
   delete CommandStyleTableArchive::default_instance_;
   delete CommandStyleTableArchive_reflection_;
   delete CommandFillCellsArchive::default_instance_;
@@ -2447,6 +2683,12 @@ void protobuf_ShutdownFile_TSTCommandArchives_2eproto() {
   delete CommandModifyFilterRuleArchive_reflection_;
   delete CommandApplyStrokePresetArchive::default_instance_;
   delete CommandApplyStrokePresetArchive_reflection_;
+  delete CommandAddTableStylePresetArchive::default_instance_;
+  delete CommandAddTableStylePresetArchive_reflection_;
+  delete CommandRemoveTableStylePresetArchive::default_instance_;
+  delete CommandRemoveTableStylePresetArchive_reflection_;
+  delete CommandReplaceTableStylePresetArchive::default_instance_;
+  delete CommandReplaceTableStylePresetArchive_reflection_;
   delete CommandApplyTableStylePresetArchive::default_instance_;
   delete CommandApplyTableStylePresetArchive_reflection_;
   delete CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance_;
@@ -2567,6 +2809,14 @@ void protobuf_ShutdownFile_TSTCommandArchives_2eproto() {
   delete CommandNotifyForTransformingArchive_reflection_;
   delete CommandSetStorageLanguageArchive::default_instance_;
   delete CommandSetStorageLanguageArchive_reflection_;
+  delete CommandSetSortOrderArchive::default_instance_;
+  delete CommandSetSortOrderArchive_reflection_;
+  delete CommandRewriteSortOrderForTectonicShiftArchive::default_instance_;
+  delete CommandRewriteSortOrderForTectonicShiftArchive_reflection_;
+  delete CommandRewriteSortOrderForSortArchive::default_instance_;
+  delete CommandRewriteSortOrderForSortArchive_reflection_;
+  delete CommandRewriteSortOrderForTableResizeArchive::default_instance_;
+  delete CommandRewriteSortOrderForTableResizeArchive_reflection_;
 }
 
 void protobuf_AddDesc_TSTCommandArchives_2eproto() {
@@ -2590,88 +2840,97 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
     ".proto\"\220\001\n\023TableCommandArchive\022!\n\ttableI"
     "nfo\030\001 \002(\0132\016.TSP.Reference\022\023\n\013commandname"
     "\030\002 \001(\t\022\"\n\005super\030\003 \002(\0132\023.TSK.CommandArchi"
-    "ve\022\035\n\025editing_mode_at_start\030\004 \001(\r\"\233\001\n%Co"
-    "mmandChangeFreezeHeaderStateArchive\022/\n\td"
-    "irection\030\001 \002(\0162\034.TST.CommandDirectionArc"
-    "hive\022\030\n\020new_freeze_state\030\002 \002(\010\022\'\n\005super\030"
-    "\003 \002(\0132\030.TST.TableCommandArchive\"\331\001\n\031Comm"
-    "andDeleteCellsArchive\022(\n\tselection\030\001 \002(\013"
-    "2\025.TST.SelectionArchive\022%\n\010undo_map\030\002 \002("
-    "\0132\023.TST.CellMapArchive\022\'\n\005super\030\003 \002(\0132\030."
-    "TST.TableCommandArchive\022%\n\010redo_map\030\004 \002("
-    "\0132\023.TST.CellMapArchive\022\033\n\023invalidate_com"
-    "ments\030\005 \002(\010\"\340\001\n CommandDeleteCellContent"
-    "sArchive\022(\n\tselection\030\001 \002(\0132\025.TST.Select"
-    "ionArchive\022%\n\010undo_map\030\002 \002(\0132\023.TST.CellM"
-    "apArchive\022\'\n\005super\030\003 \002(\0132\030.TST.TableComm"
-    "andArchive\022%\n\010redo_map\030\004 \002(\0132\023.TST.CellM"
-    "apArchive\022\033\n\023invalidate_comments\030\005 \002(\010\"\201"
-    "\002\n\036CommandSetMultipleCellsArchive\022(\n\tsel"
+    "ve\022\035\n\025editing_mode_at_start\030\004 \001(\r\"\276\001\n\033Co"
+    "mmandApplyCellDiffArchive\022\'\n\005super\030\001 \002(\013"
+    "2\030.TST.TableCommandArchive\022$\n\013cell_regio"
+    "n\030\002 \002(\0132\017.TST.CellRegion\022!\n\tcell_diff\030\003 "
+    "\002(\0132\016.TSP.Reference\022-\n\025inverse_cell_diff"
+    "_map\030\004 \002(\0132\016.TSP.Reference\"\233\001\n%CommandCh"
+    "angeFreezeHeaderStateArchive\022/\n\tdirectio"
+    "n\030\001 \002(\0162\034.TST.CommandDirectionArchive\022\030\n"
+    "\020new_freeze_state\030\002 \002(\010\022\'\n\005super\030\003 \002(\0132\030"
+    ".TST.TableCommandArchive\"\331\001\n\031CommandDele"
+    "teCellsArchive\022(\n\tselection\030\001 \002(\0132\025.TST."
+    "SelectionArchive\022%\n\010undo_map\030\002 \002(\0132\023.TST"
+    ".CellMapArchive\022\'\n\005super\030\003 \002(\0132\030.TST.Tab"
+    "leCommandArchive\022%\n\010redo_map\030\004 \002(\0132\023.TST"
+    ".CellMapArchive\022\033\n\023invalidate_comments\030\005"
+    " \002(\010\"\340\001\n CommandDeleteCellContentsArchiv"
+    "e\022(\n\tselection\030\001 \002(\0132\025.TST.SelectionArch"
+    "ive\022%\n\010undo_map\030\002 \002(\0132\023.TST.CellMapArchi"
+    "ve\022\'\n\005super\030\003 \002(\0132\030.TST.TableCommandArch"
+    "ive\022%\n\010redo_map\030\004 \002(\0132\023.TST.CellMapArchi"
+    "ve\022\033\n\023invalidate_comments\030\005 \002(\010\"\201\002\n\036Comm"
+    "andSetMultipleCellsArchive\022(\n\tselection\030"
+    "\001 \002(\0132\025.TST.SelectionArchive\022%\n\010undo_map"
+    "\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010redo_map\030"
+    "\003 \002(\0132\023.TST.CellMapArchive\022\036\n\013source_cel"
+    "l\030\004 \001(\0132\t.TST.Cell\022\036\n\026only_if_format_dif"
+    "fers\030\006 \001(\010\022\'\n\005super\030\007 \002(\0132\030.TST.TableCom"
+    "mandArchive\"\366\001\n$CommandSetMultipleCellsC"
+    "ustomArchive\022(\n\tselection\030\001 \002(\0132\025.TST.Se"
+    "lectionArchive\022%\n\010undo_map\030\002 \002(\0132\023.TST.C"
+    "ellMapArchive\022%\n\010redo_map\030\003 \002(\0132\023.TST.Ce"
+    "llMapArchive\022-\n\013cell_format\030\004 \002(\0132\030.TSK."
+    "FormatStructArchive\022\'\n\005super\030\007 \002(\0132\030.TST"
+    ".TableCommandArchive\"\323\001\n0CommandSetMulti"
+    "pleCellsMultipleChoiceListArchive\022(\n\tsel"
+    "ection\030\001 \002(\0132\025.TST.SelectionArchive\022%\n\010u"
+    "ndo_map\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010re"
+    "do_map\030\003 \002(\0132\023.TST.CellMapArchive\022\'\n\005sup"
+    "er\030\005 \002(\0132\030.TST.TableCommandArchive\"\334\001\n!C"
+    "ommandCoerceMultipleCellsArchive\022(\n\tsele"
+    "ction\030\001 \002(\0132\025.TST.SelectionArchive\022%\n\010un"
+    "do_map\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010red"
+    "o_map\030\003 \002(\0132\023.TST.CellMapArchive\022\026\n\016desi"
+    "red_format\030\004 \002(\005\022\'\n\005super\030\006 \002(\0132\030.TST.Ta"
+    "bleCommandArchive\"\323\001\n0CommandSetControlC"
+    "ellsDisplayNumberFormatArchive\022(\n\tselect"
+    "ion\030\001 \002(\0132\025.TST.SelectionArchive\022%\n\010undo"
+    "_map\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010redo_"
+    "map\030\003 \002(\0132\023.TST.CellMapArchive\022\'\n\005super\030"
+    "\006 \002(\0132\030.TST.TableCommandArchive\"\303\001\n Comm"
+    "andSetAutomaticFormatArchive\022(\n\tselectio"
+    "n\030\001 \002(\0132\025.TST.SelectionArchive\022%\n\010undo_m"
+    "ap\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010redo_ma"
+    "p\030\003 \002(\0132\023.TST.CellMapArchive\022\'\n\005super\030\006 "
+    "\002(\0132\030.TST.TableCommandArchive\"\343\001\n\'Comman"
+    "dSetAutomaticDurationUnitsArchive\022(\n\tsel"
     "ection\030\001 \002(\0132\025.TST.SelectionArchive\022%\n\010u"
     "ndo_map\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010re"
-    "do_map\030\003 \002(\0132\023.TST.CellMapArchive\022\036\n\013sou"
-    "rce_cell\030\004 \001(\0132\t.TST.Cell\022\036\n\026only_if_for"
-    "mat_differs\030\006 \001(\010\022\'\n\005super\030\007 \002(\0132\030.TST.T"
-    "ableCommandArchive\"\366\001\n$CommandSetMultipl"
-    "eCellsCustomArchive\022(\n\tselection\030\001 \002(\0132\025"
-    ".TST.SelectionArchive\022%\n\010undo_map\030\002 \002(\0132"
-    "\023.TST.CellMapArchive\022%\n\010redo_map\030\003 \002(\0132\023"
-    ".TST.CellMapArchive\022-\n\013cell_format\030\004 \002(\013"
-    "2\030.TSK.FormatStructArchive\022\'\n\005super\030\007 \002("
-    "\0132\030.TST.TableCommandArchive\"\323\001\n0CommandS"
-    "etMultipleCellsMultipleChoiceListArchive"
-    "\022(\n\tselection\030\001 \002(\0132\025.TST.SelectionArchi"
-    "ve\022%\n\010undo_map\030\002 \002(\0132\023.TST.CellMapArchiv"
-    "e\022%\n\010redo_map\030\003 \002(\0132\023.TST.CellMapArchive"
-    "\022\'\n\005super\030\005 \002(\0132\030.TST.TableCommandArchiv"
-    "e\"\334\001\n!CommandCoerceMultipleCellsArchive\022"
-    "(\n\tselection\030\001 \002(\0132\025.TST.SelectionArchiv"
-    "e\022%\n\010undo_map\030\002 \002(\0132\023.TST.CellMapArchive"
-    "\022%\n\010redo_map\030\003 \002(\0132\023.TST.CellMapArchive\022"
-    "\026\n\016desired_format\030\004 \002(\005\022\'\n\005super\030\006 \002(\0132\030"
-    ".TST.TableCommandArchive\"\323\001\n0CommandSetC"
-    "ontrolCellsDisplayNumberFormatArchive\022(\n"
-    "\tselection\030\001 \002(\0132\025.TST.SelectionArchive\022"
-    "%\n\010undo_map\030\002 \002(\0132\023.TST.CellMapArchive\022%"
-    "\n\010redo_map\030\003 \002(\0132\023.TST.CellMapArchive\022\'\n"
-    "\005super\030\006 \002(\0132\030.TST.TableCommandArchive\"\303"
-    "\001\n CommandSetAutomaticFormatArchive\022(\n\ts"
-    "election\030\001 \002(\0132\025.TST.SelectionArchive\022%\n"
-    "\010undo_map\030\002 \002(\0132\023.TST.CellMapArchive\022%\n\010"
-    "redo_map\030\003 \002(\0132\023.TST.CellMapArchive\022\'\n\005s"
-    "uper\030\006 \002(\0132\030.TST.TableCommandArchive\"\343\001\n"
-    "\'CommandSetAutomaticDurationUnitsArchive"
-    "\022(\n\tselection\030\001 \002(\0132\025.TST.SelectionArchi"
-    "ve\022%\n\010undo_map\030\002 \002(\0132\023.TST.CellMapArchiv"
-    "e\022%\n\010redo_map\030\003 \002(\0132\023.TST.CellMapArchive"
-    "\022\027\n\017automatic_units\030\004 \001(\010\022\'\n\005super\030\006 \002(\013"
-    "2\030.TST.TableCommandArchive\"\264\006\n!CommandIn"
-    "sertColumnsOrRowsArchive\022/\n\tdirection\030\001 "
-    "\002(\0162\034.TST.CommandDirectionArchive\022\r\n\005ind"
-    "ex\030\002 \002(\r\022\r\n\005count\030\003 \002(\r\022\014\n\004size\030\004 \002(\002\022\016\n"
-    "\006before\030\005 \002(\010\022\024\n\014header_count\030\013 \002(\r\022\025\n\rh"
-    "eaders_added\030\014 \002(\r\022\024\n\014footer_count\030\r \002(\r"
-    "\022\025\n\rfooters_added\030\016 \002(\r\022(\n\020row_column_st"
-    "yle\030\010 \001(\0132\016.TSP.Reference\022,\n\017cell_style_"
-    "redo\030\t \001(\0132\023.TST.CellMapArchive\022\'\n\005super"
-    "\030\n \002(\0132\030.TST.TableCommandArchive\022/\n\027form"
-    "ula_rewrite_command\030\017 \001(\0132\016.TSP.Referenc"
-    "e\022\024\n\014width_factor\030\020 \002(\002\022\025\n\rheight_factor"
-    "\030\021 \002(\002\022!\n\031allow_horizontal_autosize\030\022 \001("
-    "\010\022\026\n\016inherit_styles\030\023 \001(\010\022\027\n\017inherit_for"
-    "mats\030\024 \001(\010\022\030\n\020inherit_formulas\030\030 \001(\010\022U\n\026"
-    "cell_style_index_pairs\030\025 \003(\01325.TST.Comma"
-    "ndInsertColumnsOrRowsArchive.StyleIndexP"
-    "air\022U\n\026text_style_index_pairs\030\026 \003(\01325.TS"
-    "T.CommandInsertColumnsOrRowsArchive.Styl"
-    "eIndexPair\022\r\n\005sizes\030\027 \003(\001\032>\n\016StyleIndexP"
-    "air\022\035\n\005style\030\001 \002(\0132\016.TSP.Reference\022\r\n\005in"
-    "dex\030\002 \002(\r\"\352\002\n\023CommandPasteArchive\022-\n\016use"
-    "r_selection\030\001 \002(\0132\025.TST.SelectionArchive"
-    "\022.\n\017final_selection\030\002 \002(\0132\025.TST.Selectio"
-    "nArchive\022*\n\rundo_cell_map\030\003 \002(\0132\023.TST.Ce"
-    "llMapArchive\022*\n\rredo_cell_map\030\004 \002(\0132\023.TS"
-    "T.CellMapArchive\022$\n\014command_undo\030\006 \001(\0132\016"
+    "do_map\030\003 \002(\0132\023.TST.CellMapArchive\022\027\n\017aut"
+    "omatic_units\030\004 \001(\010\022\'\n\005super\030\006 \002(\0132\030.TST."
+    "TableCommandArchive\"\232\001\n!CommandReplaceCu"
+    "stomFormatArchive\022%\n\010undo_map\030\001 \002(\0132\023.TS"
+    "T.CellMapArchive\022%\n\010redo_map\030\002 \002(\0132\023.TST"
+    ".CellMapArchive\022\'\n\005super\030\006 \002(\0132\030.TST.Tab"
+    "leCommandArchive\"\264\006\n!CommandInsertColumn"
+    "sOrRowsArchive\022/\n\tdirection\030\001 \002(\0162\034.TST."
+    "CommandDirectionArchive\022\r\n\005index\030\002 \002(\r\022\r"
+    "\n\005count\030\003 \002(\r\022\014\n\004size\030\004 \002(\002\022\016\n\006before\030\005 "
+    "\002(\010\022\024\n\014header_count\030\013 \002(\r\022\025\n\rheaders_add"
+    "ed\030\014 \002(\r\022\024\n\014footer_count\030\r \002(\r\022\025\n\rfooter"
+    "s_added\030\016 \002(\r\022(\n\020row_column_style\030\010 \001(\0132"
+    "\016.TSP.Reference\022,\n\017cell_style_redo\030\t \001(\013"
+    "2\023.TST.CellMapArchive\022\'\n\005super\030\n \002(\0132\030.T"
+    "ST.TableCommandArchive\022/\n\027formula_rewrit"
+    "e_command\030\017 \001(\0132\016.TSP.Reference\022\024\n\014width"
+    "_factor\030\020 \002(\002\022\025\n\rheight_factor\030\021 \002(\002\022!\n\031"
+    "allow_horizontal_autosize\030\022 \001(\010\022\026\n\016inher"
+    "it_styles\030\023 \001(\010\022\027\n\017inherit_formats\030\024 \001(\010"
+    "\022\030\n\020inherit_formulas\030\030 \001(\010\022U\n\026cell_style"
+    "_index_pairs\030\025 \003(\01325.TST.CommandInsertCo"
+    "lumnsOrRowsArchive.StyleIndexPair\022U\n\026tex"
+    "t_style_index_pairs\030\026 \003(\01325.TST.CommandI"
+    "nsertColumnsOrRowsArchive.StyleIndexPair"
+    "\022\r\n\005sizes\030\027 \003(\001\032>\n\016StyleIndexPair\022\035\n\005sty"
+    "le\030\001 \002(\0132\016.TSP.Reference\022\r\n\005index\030\002 \002(\r\""
+    "\364\002\n\023CommandPasteArchive\022-\n\016user_selectio"
+    "n\030\001 \002(\0132\025.TST.SelectionArchive\022.\n\017final_"
+    "selection\030\002 \002(\0132\025.TST.SelectionArchive\022/"
+    "\n\rundo_cell_map\030\003 \002(\0132\030.TST.TiledCellMap"
+    "Archive\022/\n\rredo_cell_map\030\004 \002(\0132\030.TST.Til"
+    "edCellMapArchive\022$\n\014command_undo\030\006 \001(\0132\016"
     ".TSP.Reference\022\033\n\023invalidate_comments\030\007 "
     "\002(\010\022\'\n\005super\030\013 \002(\0132\030.TST.TableCommandArc"
     "hive\0220\n\030formula_rewrite_commands\030\017 \003(\0132\016"
@@ -2773,371 +3032,416 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
     ".SelectionArchive\022*\n\rundo_cell_map\030\004 \002(\013"
     "2\023.TST.CellMapArchive\022*\n\rredo_cell_map\030\005"
     " \002(\0132\023.TST.CellMapArchive\022!\n\ttext_undo\030\006"
-    " \001(\0132\016.TSP.Reference\"\276\001\n\030CommandStyleTab"
-    "leArchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableComm"
-    "andArchive\0223\n\021format_properties\030\002 \001(\0132\030."
-    "TSP.ReferenceDictionary\022!\n\told_style\030\003 \001"
-    "(\0132\016.TSP.Reference\022!\n\tnew_style\030\004 \001(\0132\016."
-    "TSP.Reference\"\376\002\n\027CommandFillCellsArchiv"
-    "e\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandArchi"
-    "ve\022.\n\017sourceselection\030\002 \002(\0132\025.TST.Select"
-    "ionArchive\022\'\n\017sourcecellrange\030\003 \002(\0132\016.TS"
-    "T.CellRange\022\'\n\017targetcellrange\030\004 \002(\0132\016.T"
-    "ST.CellRange\022*\n\rundo_cell_map\030\005 \002(\0132\023.TS"
-    "T.CellMapArchive\0220\n\rfillDirection\030\006 \002(\0162"
-    "\031.TST.FillDirectionArchive\022.\n\017targetsele"
-    "ction\030\007 \002(\0132\025.TST.SelectionArchive\022*\n\rre"
-    "do_cell_map\030\010 \002(\0132\023.TST.CellMapArchive\"\305"
-    "\001\n\031CommandReplaceTextArchive\022\033\n\006cellID\030\001"
-    " \002(\0132\013.TST.CellID\022\032\n\007newcell\030\002 \002(\0132\t.TST"
-    ".Cell\022\032\n\007oldcell\030\003 \002(\0132\t.TST.Cell\022\'\n\005sup"
-    "er\030\004 \002(\0132\030.TST.TableCommandArchive\022*\n\022ch"
-    "ild_command_undo\030\005 \001(\0132\016.TSP.Reference\"\231"
-    "\001\n\034CommandReplaceAllTextArchive\022!\n\ttable"
-    "Info\030\001 \002(\0132\016.TSP.Reference\022*\n\rundo_cell_"
-    "map\030\002 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_c"
-    "ell_map\030\003 \002(\0132\023.TST.CellMapArchive\"\245\001\n\'C"
-    "ommandSetRepeatingHeaderEnabledArchive\022 "
-    "\n\030repeating_header_enabled\030\001 \002(\010\022/\n\tdire"
-    "ction\030\002 \002(\0162\034.TST.CommandDirectionArchiv"
-    "e\022\'\n\005super\030\003 \002(\0132\030.TST.TableCommandArchi"
-    "ve\"b\n\037CommandSetFiltersEnabledArchive\022\026\n"
-    "\016enable_filters\030\001 \002(\010\022\'\n\005super\030\002 \002(\0132\030.T"
-    "ST.TableCommandArchive\"\273\001\n!CommandAddQui"
-    "ckFilterRulesArchive\022\'\n\005super\030\001 \002(\0132\030.TS"
-    "T.TableCommandArchive\022%\n\005rules\030\002 \003(\0132\026.T"
-    "ST.FilterRuleArchive\022\024\n\014filter_index\030\003 \002"
-    "(\r\022\024\n\014rule_indices\030\004 \003(\r\022\032\n\022filter_set_e"
-    "nabled\030\005 \002(\010\"\326\001\n\037CommandDeleteFilterRule"
+    " \001(\0132\016.TSP.Reference\"\234\002\n\035CommandSetFillP"
+    "ropertyArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Tabl"
+    "eCommandArchive\022\036\n\004fill\030\002 \001(\0132\020.TSD.Fill"
+    "Archive\0220\n\022cell_fill_stand_in\030\003 \001(\0132\024.TS"
+    "T.CellFillStandIn\022(\n\tselection\030\004 \002(\0132\025.T"
+    "ST.SelectionArchive\022*\n\rundo_cell_map\030\005 \002"
+    "(\0132\023.TST.CellMapArchive\022*\n\rredo_cell_map"
+    "\030\006 \002(\0132\023.TST.CellMapArchive\"\276\001\n\030CommandS"
+    "tyleTableArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Ta"
+    "bleCommandArchive\0223\n\021format_properties\030\002"
+    " \001(\0132\030.TSP.ReferenceDictionary\022!\n\told_st"
+    "yle\030\003 \001(\0132\016.TSP.Reference\022!\n\tnew_style\030\004"
+    " \001(\0132\016.TSP.Reference\"\376\002\n\027CommandFillCell"
     "sArchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableComma"
-    "ndArchive\022*\n\nundo_rules\030\002 \003(\0132\026.TST.Filt"
-    "erRuleArchive\022\024\n\014rule_indices\030\003 \003(\r\022\026\n\016f"
-    "ilter_removed\030\004 \002(\010\022\024\n\014filter_index\030\005 \002("
-    "\r\022\032\n\022filter_set_enabled\030\006 \002(\010\"\311\001\n\036Comman"
-    "dModifyFilterRuleArchive\022\'\n\005super\030\001 \002(\0132"
-    "\030.TST.TableCommandArchive\022)\n\tundo_rule\030\002"
-    " \002(\0132\026.TST.FilterRuleArchive\022)\n\tredo_rul"
-    "e\030\003 \002(\0132\026.TST.FilterRuleArchive\022\022\n\nrule_"
-    "index\030\004 \002(\r\022\024\n\014filter_index\030\005 \002(\r\"\225\002\n\037Co"
-    "mmandApplyStrokePresetArchive\022\'\n\005super\030\001"
-    " \002(\0132\030.TST.TableCommandArchive\022*\n\rundo_c"
-    "ell_map\030\002 \002(\0132\023.TST.CellMapArchive\022*\n\rre"
-    "do_cell_map\030\004 \002(\0132\023.TST.CellMapArchive\022("
-    "\n\tselection\030\003 \002(\0132\025.TST.SelectionArchive"
-    "\0221\n\022expanded_selection\030\006 \001(\0132\025.TST.Selec"
-    "tionArchive\022\024\n\014preset_index\030\005 \002(\005\"\322\005\n#Co"
-    "mmandApplyTableStylePresetArchive\022\'\n\005sup"
-    "er\030\001 \002(\0132\030.TST.TableCommandArchive\022*\n\run"
-    "do_cell_map\030\002 \002(\0132\023.TST.CellMapArchive\022*"
-    "\n\rredo_cell_map\030\004 \002(\0132\023.TST.CellMapArchi"
-    "ve\022\024\n\014preset_index\030\005 \002(\005\0227\n\020old_table_st"
-    "yles\030\007 \002(\0132\035.TST.TableStyleNetworkArchiv"
-    "e\0227\n\020new_table_styles\030\010 \002(\0132\035.TST.TableS"
-    "tyleNetworkArchive\022\030\n\020apply_clears_all\030\n"
-    " \001(\010\022)\n\021font_size_command\030\013 \001(\0132\016.TSP.Re"
-    "ference\022\?\n\'set_style_apply_clears_all_fl"
-    "ag_command\030\014 \001(\0132\016.TSP.Reference\022X\n\026row_"
-    "style_index_tuples\030\r \003(\01328.TST.CommandAp"
-    "plyTableStylePresetArchive.StyleIndexTup"
-    "le\022X\n\026col_style_index_tuples\030\016 \003(\01328.TST"
-    ".CommandApplyTableStylePresetArchive.Sty"
-    "leIndexTuple\032h\n\017StyleIndexTuple\022\r\n\005index"
-    "\030\001 \002(\r\022\"\n\ncell_style\030\005 \001(\0132\016.TSP.Referen"
-    "ce\022\"\n\ntext_style\030\006 \001(\0132\016.TSP.Reference\"m"
-    "\n(CommandSetStyleApplyClearsAllFlagArchi"
-    "ve\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandArch"
-    "ive\022\030\n\020apply_clears_all\030\002 \002(\010\"\224\002\n\037Comman"
-    "dApplyThemeToTableArchive\022\'\n\005super\030\001 \002(\013"
-    "2\030.TST.TableCommandArchive\022*\n\rundo_cell_"
-    "map\030\002 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_c"
-    "ell_map\030\004 \002(\0132\023.TST.CellMapArchive\0227\n\020ol"
-    "d_table_styles\030\007 \002(\0132\035.TST.TableStyleNet"
-    "workArchive\0227\n\020new_table_styles\030\010 \002(\0132\035."
-    "TST.TableStyleNetworkArchive\"\201\001\n%Command"
-    "ApplyThemeChildForTableArchive\0221\n\005super\030"
-    "\001 \002(\0132\".TSS.ApplyThemeChildCommandArchiv"
-    "e\022%\n\rapply_command\030\002 \002(\0132\016.TSP.Reference"
-    "\"\224\003\n CommandToggleTextPropertyArchive\022\'\n"
-    "\005super\030\001 \002(\0132\030.TST.TableCommandArchive\022("
-    "\n\tselection\030\002 \002(\0132\025.TST.SelectionArchive"
-    "\022\020\n\010property\030\003 \002(\r\022*\n\rundo_cell_map\030\004 \002("
-    "\0132\023.TST.CellMapArchive\022*\n\rredo_cell_map\030"
-    "\005 \002(\0132\023.TST.CellMapArchive\022$\n\021default_bo"
-    "dy_cell\030\006 \002(\0132\t.TST.Cell\022\"\n\017default_hr_c"
-    "ell\030\007 \002(\0132\t.TST.Cell\022\"\n\017default_hc_cell\030"
-    "\010 \002(\0132\t.TST.Cell\022\"\n\017default_fr_cell\030\t \002("
-    "\0132\t.TST.Cell\022!\n\ttext_undo\030\n \001(\0132\016.TSP.Re"
-    "ference\"\316\001\n!CommandResetFillPropertyToDe"
-    "fault\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandA"
-    "rchive\022(\n\tselection\030\002 \002(\0132\025.TST.Selectio"
-    "nArchive\022*\n\rundo_cell_map\030\004 \002(\0132\023.TST.Ce"
-    "llMapArchive\022*\n\rredo_cell_map\030\005 \002(\0132\023.TS"
-    "T.CellMapArchive\"\331\001\n,CommandSetSingleNum"
-    "berFormatParameterArchive\022\'\n\005super\030\001 \002(\013"
-    "2\030.TST.TableCommandArchive\022(\n\tselection\030"
-    "\002 \002(\0132\025.TST.SelectionArchive\022*\n\rundo_cel"
-    "l_map\030\003 \002(\0132\023.TST.CellMapArchive\022*\n\rredo"
-    "_cell_map\030\004 \002(\0132\023.TST.CellMapArchive\"g\n\025"
-    "CommandSetBaseArchive\022@\n\005super\030\001 \002(\01321.T"
-    "ST.CommandSetSingleNumberFormatParameter"
-    "Archive\022\014\n\004base\030\002 \002(\r\"t\n\033CommandSetBaseP"
-    "lacesArchive\022@\n\005super\030\001 \002(\01321.TST.Comman"
-    "dSetSingleNumberFormatParameterArchive\022\023"
-    "\n\013base_places\030\002 \002(\r\"\202\001\n!CommandSetBaseUs"
-    "eMinusSignArchive\022@\n\005super\030\001 \002(\01321.TST.C"
-    "ommandSetSingleNumberFormatParameterArch"
-    "ive\022\033\n\023base_use_minus_sign\030\002 \002(\010\"\211\001\n\037Com"
-    "mandSetControlMinimumArchive\022@\n\005super\030\001 "
-    "\002(\01321.TST.CommandSetSingleNumberFormatPa"
-    "rameterArchive\022\017\n\007minimum\030\002 \002(\001\022\023\n\013forma"
-    "t_type\030\003 \002(\r\"\211\001\n\037CommandSetControlMaximu"
-    "mArchive\022@\n\005super\030\001 \002(\01321.TST.CommandSet"
-    "SingleNumberFormatParameterArchive\022\017\n\007ma"
-    "ximum\030\002 \002(\001\022\023\n\013format_type\030\003 \002(\r\"\215\001\n!Com"
-    "mandSetControlIncrementArchive\022@\n\005super\030"
-    "\001 \002(\01321.TST.CommandSetSingleNumberFormat"
-    "ParameterArchive\022\021\n\tincrement\030\002 \002(\001\022\023\n\013f"
-    "ormat_type\030\003 \002(\r\"x\n\035CommandSetCurrencyCo"
-    "deArchive\022@\n\005super\030\001 \002(\01321.TST.CommandSe"
-    "tSingleNumberFormatParameterArchive\022\025\n\rc"
-    "urrency_code\030\002 \002(\t\"\200\001\n!CommandSetFractio"
-    "nAccuracyArchive\022@\n\005super\030\001 \002(\01321.TST.Co"
-    "mmandSetSingleNumberFormatParameterArchi"
-    "ve\022\031\n\021fraction_accuracy\030\002 \002(\r\"z\n6Command"
-    "SetMultipleChoiceListFormatForEditedItem"
-    "Archive\022@\n\005super\030\001 \002(\01321.TST.CommandSetS"
-    "ingleNumberFormatParameterArchive\"z\n6Com"
-    "mandSetMultipleChoiceListFormatForDelete"
-    "ItemArchive\022@\n\005super\030\001 \002(\01321.TST.Command"
-    "SetSingleNumberFormatParameterArchive\"{\n"
-    "7CommandSetMultipleChoiceListFormatForRe"
-    "orderItemArchive\022@\n\005super\030\001 \002(\01321.TST.Co"
-    "mmandSetSingleNumberFormatParameterArchi"
-    "ve\"|\n8CommandSetMultipleChoiceListFormat"
-    "ForInitialValueArchive\022@\n\005super\030\001 \002(\01321."
-    "TST.CommandSetSingleNumberFormatParamete"
-    "rArchive\"\207\001\n$CommandSetNegativeNumberSty"
-    "leArchive\022@\n\005super\030\001 \002(\01321.TST.CommandSe"
-    "tSingleNumberFormatParameterArchive\022\035\n\025n"
-    "egative_number_style\030\002 \002(\r\"\373\001\n\037CommandSe"
-    "tExplicitFormatArchive\022\'\n\005super\030\001 \002(\0132\030."
-    "TST.TableCommandArchive\022(\n\tselection\030\002 \002"
-    "(\0132\025.TST.SelectionArchive\022-\n\013cell_format"
-    "\030\003 \002(\0132\030.TSK.FormatStructArchive\022*\n\rundo"
-    "_cell_map\030\004 \002(\0132\023.TST.CellMapArchive\022*\n\r"
-    "redo_cell_map\030\005 \002(\0132\023.TST.CellMapArchive"
-    "\"\202\001\n&CommandSetNumberOfDecimalPlacesArch"
-    "ive\022@\n\005super\030\001 \002(\01321.TST.CommandSetSingl"
-    "eNumberFormatParameterArchive\022\026\n\016decimal"
-    "_places\030\002 \002(\r\"c\n\037CommandSetDateTimeForma"
-    "tArchive\022@\n\005super\030\001 \002(\01321.TST.CommandSet"
-    "SingleNumberFormatParameterArchive\"\215\001\n\'C"
-    "ommandSetShowThousandsSeparatorArchive\022@"
-    "\n\005super\030\001 \002(\01321.TST.CommandSetSingleNumb"
-    "erFormatParameterArchive\022 \n\030show_thousan"
-    "ds_separator\030\002 \002(\010\"\205\001\n#CommandSetUseAcco"
-    "untingStyleArchive\022@\n\005super\030\001 \002(\01321.TST."
-    "CommandSetSingleNumberFormatParameterArc"
-    "hive\022\034\n\024use_accounting_style\030\002 \002(\010\"\303\002\n\026C"
-    "ommandMoveRowsArchive\022\'\n\005super\030\001 \002(\0132\030.T"
-    "ST.TableCommandArchive\022(\n\tselection\030\002 \001("
-    "\0132\025.TST.SelectionArchive\022\027\n\017start_row_in"
-    "dex\030\003 \002(\r\022\026\n\016dest_row_index\030\004 \002(\r\022\026\n\016num"
-    "ber_of_rows\030\005 \002(\r\022/\n\027formula_rewrite_com"
-    "mand\030\007 \001(\0132\016.TSP.Reference\022$\n\014show_comma"
-    "nd\030\010 \001(\0132\016.TSP.Reference\0226\n\036unmerge_inva"
-    "lid_ranges_command\030\t \001(\0132\016.TSP.Reference"
-    "\"\227\002\n\031CommandMoveColumnsArchive\022\'\n\005super\030"
-    "\001 \002(\0132\030.TST.TableCommandArchive\022(\n\tselec"
-    "tion\030\002 \001(\0132\025.TST.SelectionArchive\022\032\n\022sta"
-    "rt_column_index\030\003 \002(\r\022\031\n\021dest_column_ind"
-    "ex\030\004 \002(\r\022\031\n\021number_of_columns\030\005 \002(\r\022/\n\027f"
-    "ormula_rewrite_command\030\007 \001(\0132\016.TSP.Refer"
-    "ence\022$\n\014show_command\030\010 \001(\0132\016.TSP.Referen"
-    "ce\"\233\001\n\022CommandSortArchive\022\'\n\005super\030\001 \002(\013"
-    "2\030.TST.TableCommandArchive\022+\n\007mapping\030\005 "
-    "\002(\0132\032.TSK.ShuffleMappingArchive\022/\n\027formu"
-    "la_rewrite_command\030\007 \001(\0132\016.TSP.Reference"
-    "\"\372\001\n$CommandRewriteFormulasForSortArchiv"
-    "e\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandArchi"
-    "ve\0221\n\013formula_map\030\002 \002(\0132\034.TSCE.OwnerForm"
-    "ulaMapArchive\0220\n\014sort_mapping\030\003 \002(\0132\032.TS"
-    "K.ShuffleMappingArchive\022,\n\017sorted_table_"
-    "id\030\004 \002(\0132\023.TSCE.CFUUIDArchive\022\026\n\016explode"
-    "_ranges\030\005 \002(\010\"\277\001\n-CommandRewriteFormulas"
-    "ForTectonicShiftArchive\022\'\n\005super\030\001 \002(\0132\030"
-    ".TST.TableCommandArchive\0221\n\013formula_map\030"
-    "\002 \002(\0132\034.TSCE.OwnerFormulaMapArchive\0222\n\016t"
-    "ectonic_shift\030\003 \002(\0132\032.TSCE.TectonicShift"
-    "Archive\"\352\001\n$CommandRewriteFormulasForMov"
-    "eArchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableComma"
-    "ndArchive\0221\n\013formula_map\030\002 \002(\0132\034.TSCE.Ow"
-    "nerFormulaMapArchive\0223\n\016from_reference\030\006"
-    " \002(\0132\033.TSCE.RangeReferenceArchive\0221\n\014to_"
-    "reference\030\007 \002(\0132\033.TSCE.RangeReferenceArc"
-    "hive\"\342\001\n)CommandRewriteFormulasForCellMe"
-    "rgeArchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableCom"
-    "mandArchive\0221\n\013formula_map\030\002 \002(\0132\034.TSCE."
-    "OwnerFormulaMapArchive\0222\n\014merged_range\030\003"
-    " \002(\0132\034.TSCE.RangeCoordinateArchive\022%\n\010ta"
-    "ble_id\030\004 \002(\0132\023.TSCE.CFUUIDArchive\"\\\n1Com"
-    "mandRewriteFilterFormulasForTableResizeA"
-    "rchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommand"
-    "Archive\"\266\001\n3CommandRewriteFilterFormulas"
-    "ForTectonicShiftArchive\022\'\n\005super\030\001 \002(\0132\030"
-    ".TST.TableCommandArchive\022\"\n\nfilter_set\030\002"
-    " \002(\0132\016.TSP.Reference\0222\n\016tectonic_shift\030\003"
-    " \002(\0132\032.TSCE.TectonicShiftArchive\"\331\001\n*Com"
-    "mandRewriteFilterFormulasForSortArchive\022"
+    "ndArchive\022.\n\017sourceselection\030\002 \002(\0132\025.TST"
+    ".SelectionArchive\022\'\n\017sourcecellrange\030\003 \002"
+    "(\0132\016.TST.CellRange\022\'\n\017targetcellrange\030\004 "
+    "\002(\0132\016.TST.CellRange\022*\n\rundo_cell_map\030\005 \002"
+    "(\0132\023.TST.CellMapArchive\0220\n\rfillDirection"
+    "\030\006 \002(\0162\031.TST.FillDirectionArchive\022.\n\017tar"
+    "getselection\030\007 \002(\0132\025.TST.SelectionArchiv"
+    "e\022*\n\rredo_cell_map\030\010 \002(\0132\023.TST.CellMapAr"
+    "chive\"\305\001\n\031CommandReplaceTextArchive\022\033\n\006c"
+    "ellID\030\001 \002(\0132\013.TST.CellID\022\032\n\007newcell\030\002 \002("
+    "\0132\t.TST.Cell\022\032\n\007oldcell\030\003 \002(\0132\t.TST.Cell"
+    "\022\'\n\005super\030\004 \002(\0132\030.TST.TableCommandArchiv"
+    "e\022*\n\022child_command_undo\030\005 \001(\0132\016.TSP.Refe"
+    "rence\"\231\001\n\034CommandReplaceAllTextArchive\022!"
+    "\n\ttableInfo\030\001 \002(\0132\016.TSP.Reference\022*\n\rund"
+    "o_cell_map\030\002 \002(\0132\023.TST.CellMapArchive\022*\n"
+    "\rredo_cell_map\030\003 \002(\0132\023.TST.CellMapArchiv"
+    "e\"\245\001\n\'CommandSetRepeatingHeaderEnabledAr"
+    "chive\022 \n\030repeating_header_enabled\030\001 \002(\010\022"
+    "/\n\tdirection\030\002 \002(\0162\034.TST.CommandDirectio"
+    "nArchive\022\'\n\005super\030\003 \002(\0132\030.TST.TableComma"
+    "ndArchive\"b\n\037CommandSetFiltersEnabledArc"
+    "hive\022\026\n\016enable_filters\030\001 \002(\010\022\'\n\005super\030\002 "
+    "\002(\0132\030.TST.TableCommandArchive\"\273\001\n!Comman"
+    "dAddQuickFilterRulesArchive\022\'\n\005super\030\001 \002"
+    "(\0132\030.TST.TableCommandArchive\022%\n\005rules\030\002 "
+    "\003(\0132\026.TST.FilterRuleArchive\022\024\n\014filter_in"
+    "dex\030\003 \002(\r\022\024\n\014rule_indices\030\004 \003(\r\022\032\n\022filte"
+    "r_set_enabled\030\005 \002(\010\"\326\001\n\037CommandDeleteFil"
+    "terRulesArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Tab"
+    "leCommandArchive\022*\n\nundo_rules\030\002 \003(\0132\026.T"
+    "ST.FilterRuleArchive\022\024\n\014rule_indices\030\003 \003"
+    "(\r\022\026\n\016filter_removed\030\004 \002(\010\022\024\n\014filter_ind"
+    "ex\030\005 \002(\r\022\032\n\022filter_set_enabled\030\006 \002(\010\"\311\001\n"
+    "\036CommandModifyFilterRuleArchive\022\'\n\005super"
+    "\030\001 \002(\0132\030.TST.TableCommandArchive\022)\n\tundo"
+    "_rule\030\002 \002(\0132\026.TST.FilterRuleArchive\022)\n\tr"
+    "edo_rule\030\003 \002(\0132\026.TST.FilterRuleArchive\022\022"
+    "\n\nrule_index\030\004 \002(\r\022\024\n\014filter_index\030\005 \002(\r"
+    "\"\225\002\n\037CommandApplyStrokePresetArchive\022\'\n\005"
+    "super\030\001 \002(\0132\030.TST.TableCommandArchive\022*\n"
+    "\rundo_cell_map\030\002 \002(\0132\023.TST.CellMapArchiv"
+    "e\022*\n\rredo_cell_map\030\004 \002(\0132\023.TST.CellMapAr"
+    "chive\022(\n\tselection\030\003 \002(\0132\025.TST.Selection"
+    "Archive\0221\n\022expanded_selection\030\006 \001(\0132\025.TS"
+    "T.SelectionArchive\022\024\n\014preset_index\030\005 \002(\005"
+    "\"\262\001\n!CommandAddTableStylePresetArchive\022\'"
+    "\n\005super\030\001 \002(\0132\030.TST.TableCommandArchive\022"
+    "\024\n\014preset_index\030\002 \002(\005\0223\n\014table_styles\030\003 "
+    "\002(\0132\035.TST.TableStyleNetworkArchive\022\031\n\021se"
+    "nd_notification\030\004 \002(\010\"\330\001\n$CommandRemoveT"
+    "ableStylePresetArchive\022\"\n\005super\030\001 \002(\0132\023."
+    "TSK.CommandArchive\022\035\n\005theme\030\002 \002(\0132\016.TSP."
+    "Reference\022;\n\024removed_table_styles\030\003 \002(\0132"
+    "\035.TST.TableStyleNetworkArchive\022\021\n\tpreset"
+    "_id\030\004 \002(\005\022\035\n\025preset_index_in_theme\030\005 \002(\005"
+    "\"\334\001\n%CommandReplaceTableStylePresetArchi"
+    "ve\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\035"
+    "\n\005theme\030\002 \002(\0132\016.TSP.Reference\0227\n\020old_tab"
+    "le_styles\030\003 \002(\0132\035.TST.TableStyleNetworkA"
+    "rchive\0227\n\020new_table_styles\030\004 \002(\0132\035.TST.T"
+    "ableStyleNetworkArchive\"\326\005\n#CommandApply"
+    "TableStylePresetArchive\022\'\n\005super\030\001 \002(\0132\030"
+    ".TST.TableCommandArchive\022*\n\rundo_cell_ma"
+    "p\030\002 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_cel"
+    "l_map\030\004 \002(\0132\023.TST.CellMapArchive\022\024\n\014pres"
+    "et_index\030\005 \002(\005\0227\n\020old_table_styles\030\007 \002(\013"
+    "2\035.TST.TableStyleNetworkArchive\022;\n\020new_t"
+    "able_styles\030\010 \001(\0132\035.TST.TableStyleNetwor"
+    "kArchiveB\002\030\001\022\030\n\020apply_clears_all\030\n \001(\010\022)"
+    "\n\021font_size_command\030\013 \001(\0132\016.TSP.Referenc"
+    "e\022\?\n\'set_style_apply_clears_all_flag_com"
+    "mand\030\014 \001(\0132\016.TSP.Reference\022X\n\026row_style_"
+    "index_tuples\030\r \003(\01328.TST.CommandApplyTab"
+    "leStylePresetArchive.StyleIndexTuple\022X\n\026"
+    "col_style_index_tuples\030\016 \003(\01328.TST.Comma"
+    "ndApplyTableStylePresetArchive.StyleInde"
+    "xTuple\032h\n\017StyleIndexTuple\022\r\n\005index\030\001 \002(\r"
+    "\022\"\n\ncell_style\030\005 \001(\0132\016.TSP.Reference\022\"\n\n"
+    "text_style\030\006 \001(\0132\016.TSP.Reference\"m\n(Comm"
+    "andSetStyleApplyClearsAllFlagArchive\022\'\n\005"
+    "super\030\001 \002(\0132\030.TST.TableCommandArchive\022\030\n"
+    "\020apply_clears_all\030\002 \002(\010\"\224\002\n\037CommandApply"
+    "ThemeToTableArchive\022\'\n\005super\030\001 \002(\0132\030.TST"
+    ".TableCommandArchive\022*\n\rundo_cell_map\030\002 "
+    "\002(\0132\023.TST.CellMapArchive\022*\n\rredo_cell_ma"
+    "p\030\004 \002(\0132\023.TST.CellMapArchive\0227\n\020old_tabl"
+    "e_styles\030\007 \002(\0132\035.TST.TableStyleNetworkAr"
+    "chive\0227\n\020new_table_styles\030\010 \002(\0132\035.TST.Ta"
+    "bleStyleNetworkArchive\"\201\001\n%CommandApplyT"
+    "hemeChildForTableArchive\0221\n\005super\030\001 \002(\0132"
+    "\".TSS.ApplyThemeChildCommandArchive\022%\n\ra"
+    "pply_command\030\002 \002(\0132\016.TSP.Reference\"\224\003\n C"
+    "ommandToggleTextPropertyArchive\022\'\n\005super"
+    "\030\001 \002(\0132\030.TST.TableCommandArchive\022(\n\tsele"
+    "ction\030\002 \002(\0132\025.TST.SelectionArchive\022\020\n\010pr"
+    "operty\030\003 \002(\r\022*\n\rundo_cell_map\030\004 \002(\0132\023.TS"
+    "T.CellMapArchive\022*\n\rredo_cell_map\030\005 \002(\0132"
+    "\023.TST.CellMapArchive\022$\n\021default_body_cel"
+    "l\030\006 \002(\0132\t.TST.Cell\022\"\n\017default_hr_cell\030\007 "
+    "\002(\0132\t.TST.Cell\022\"\n\017default_hc_cell\030\010 \002(\0132"
+    "\t.TST.Cell\022\"\n\017default_fr_cell\030\t \002(\0132\t.TS"
+    "T.Cell\022!\n\ttext_undo\030\n \001(\0132\016.TSP.Referenc"
+    "e\"\316\001\n!CommandResetFillPropertyToDefault\022"
     "\'\n\005super\030\001 \002(\0132\030.TST.TableCommandArchive"
-    "\022\"\n\nfilter_set\030\002 \002(\0132\016.TSP.Reference\0220\n\014"
-    "sort_mapping\030\003 \002(\0132\032.TSK.ShuffleMappingA"
-    "rchive\022,\n\017sorted_table_id\030\004 \002(\0132\023.TSCE.C"
-    "FUUIDArchive\"\230\002\n6CommandRewriteCondition"
-    "alStylesForTectonicShiftArchive\022\'\n\005super"
-    "\030\001 \002(\0132\030.TST.TableCommandArchive\0222\n\016tect"
-    "onic_shift\030\002 \002(\0132\032.TSCE.TectonicShiftArc"
-    "hive\022;\n\020cells_to_rewrite\030\003 \001(\0132!.TSCE.Ce"
-    "llCoordinateVectorArchive\022D\n\026conditional"
-    "_style_sets\030\004 \001(\0132$.TSCE.CellCoordinateO"
-    "bjectMapArchive\"\273\002\n-CommandRewriteCondit"
-    "ionalStylesForSortArchive\022\'\n\005super\030\001 \002(\013"
-    "2\030.TST.TableCommandArchive\0220\n\014sort_mappi"
-    "ng\030\002 \002(\0132\032.TSK.ShuffleMappingArchive\022,\n\017"
-    "sorted_table_id\030\003 \002(\0132\023.TSCE.CFUUIDArchi"
-    "ve\022;\n\020cells_to_rewrite\030\004 \001(\0132!.TSCE.Cell"
-    "CoordinateVectorArchive\022D\n\026conditional_s"
-    "tyle_sets\030\005 \001(\0132$.TSCE.CellCoordinateObj"
-    "ectMapArchive\"\324\002\n2CommandRewriteConditio"
-    "nalStylesForRangeMoveArchive\022\'\n\005super\030\001 "
-    "\002(\0132\030.TST.TableCommandArchive\0229\n\024from_ra"
-    "nge_reference\030\007 \001(\0132\033.TSCE.RangeReferenc"
-    "eArchive\0227\n\022to_range_reference\030\010 \001(\0132\033.T"
-    "SCE.RangeReferenceArchive\022;\n\020cells_to_re"
-    "write\030\005 \001(\0132!.TSCE.CellCoordinateVectorA"
-    "rchive\022D\n\026conditional_style_sets\030\006 \001(\0132$"
-    ".TSCE.CellCoordinateObjectMapArchive\"\302\002\n"
-    "2CommandRewriteConditionalStylesForCellM"
-    "ergeArchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableCo"
-    "mmandArchive\022,\n\017merged_table_id\030\002 \002(\0132\023."
-    "TSCE.CFUUIDArchive\0222\n\014merged_range\030\003 \002(\013"
-    "2\034.TSCE.RangeCoordinateArchive\022;\n\020cells_"
-    "to_rewrite\030\004 \001(\0132!.TSCE.CellCoordinateVe"
-    "ctorArchive\022D\n\026conditional_style_sets\030\005 "
-    "\001(\0132$.TSCE.CellCoordinateObjectMapArchiv"
-    "e\"\326\002\n\032CommandMergeUnmergeArchive\022\'\n\005supe"
-    "r\030\001 \002(\0132\030.TST.TableCommandArchive\022-\n\014mer"
-    "ge_action\030\002 \002(\0162\027.TST.MergeActionArchive"
-    "\022(\n\tselection\030\003 \002(\0132\025.TST.SelectionArchi"
+    "\022(\n\tselection\030\002 \002(\0132\025.TST.SelectionArchi"
     "ve\022*\n\rundo_cell_map\030\004 \002(\0132\023.TST.CellMapA"
     "rchive\022*\n\rredo_cell_map\030\005 \002(\0132\023.TST.Cell"
-    "MapArchive\022(\n\020old_merge_ranges\030\010 \001(\0132\016.T"
-    "SP.Reference\0224\n\034undo_formula_rewrite_com"
-    "mand\030\t \001(\0132\016.TSP.Reference\"\204\002\n\026CommandHi"
-    "deShowArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Table"
-    "CommandArchive\022/\n\tdirection\030\002 \002(\0162\034.TST."
-    "CommandDirectionArchive\0224\n\020hide_show_act"
-    "ion\030\003 \002(\0162\032.TST.HideShowActionArchive\022\025\n"
-    "\rhiding_action\030\004 \002(\r\022(\n\021elements_affecte"
-    "d\030\005 \002(\0132\r.TSP.IndexSet\022\031\n\021old_hiding_sta"
-    "tes\030\007 \003(\r\"\335\002\n\037TableInfoGeometryCommandAr"
-    "chive\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchiv"
-    "e\022\037\n\014scale_factor\030\002 \002(\0132\t.TSP.Size\022\"\n\nta"
-    "ble_info\030\003 \001(\0132\016.TSP.Reference\022*\n\014new_ge"
-    "ometry\030\004 \001(\0132\024.TSD.GeometryArchive\022*\n\014ol"
-    "d_geometry\030\005 \001(\0132\024.TSD.GeometryArchive\022\034"
-    "\n\024turn_off_auto_resize\030\006 \001(\010\022,\n$should_c"
-    "lear_object_placeholder_flag\030\007 \001(\010\022-\n%di"
-    "d_match_object_placeholder_geometry\030\010 \001("
-    "\010\"\263\002\n!FormulaEditingCommandGroupArchive\022"
-    "2\n\005super\030\001 \002(\0132#.TSK.ProgressiveCommandG"
-    "roupArchive\022\032\n\022undoSelectionValid\030\002 \002(\010\022"
-    "\032\n\022undoSelectionStart\030\003 \002(\r\022\033\n\023undoSelec"
-    "tionLength\030\004 \002(\r\022\027\n\017undoActiveToken\030\005 \002("
-    "\r\022\032\n\022redoSelectionValid\030\006 \002(\010\022\032\n\022redoSel"
-    "ectionStart\030\007 \002(\r\022\033\n\023redoSelectionLength"
-    "\030\010 \002(\r\022\027\n\017redoActiveToken\030\t \002(\r\"\254\002\n-Form"
-    "ulaEditingCommandSelectionBehaviorArchiv"
-    "e\022\032\n\022undoSelectionValid\030\002 \001(\010\022\032\n\022undoSel"
-    "ectionStart\030\003 \001(\r\022\033\n\023undoSelectionLength"
-    "\030\004 \001(\r\022\027\n\017undoActiveToken\030\005 \001(\r\022\032\n\022redoS"
-    "electionValid\030\006 \001(\010\022\032\n\022redoSelectionStar"
-    "t\030\007 \001(\r\022\033\n\023redoSelectionLength\030\010 \001(\r\022\027\n\017"
-    "redoActiveToken\030\t \001(\r\022\037\n\007storage\030\n \001(\0132\016"
-    ".TSP.Reference\"\246\002\n,UndoRedoStateCommandS"
-    "electionBehaviorArchive\0222\n\026before_undo_r"
-    "edo_state\030\001 \001(\0132\016.TSP.ReferenceB\002\030\001\0221\n\025a"
-    "fter_undo_redo_state\030\002 \001(\0132\016.TSP.Referen"
-    "ceB\002\030\001\022\"\n\ntable_info\030\003 \001(\0132\016.TSP.Referen"
-    "ce\0225\n\026before_table_selection\030\004 \001(\0132\025.TST"
-    ".SelectionArchive\0224\n\025after_table_selecti"
-    "on\030\006 \001(\0132\025.TST.SelectionArchive\"\327\001\n$Tabl"
-    "eCommandSelectionBehaviorArchive\0225\n\026befo"
-    "re_table_selection\030\001 \001(\0132\025.TST.Selection"
-    "Archive\0224\n\025after_table_selection\030\002 \001(\0132\025"
-    ".TST.SelectionArchive\022\"\n\ntable_info\030\003 \001("
-    "\0132\016.TSP.Reference\022\036\n\026last_column_hit_by_"
-    "tap\030\004 \001(\r\"d\n(DisableTableNameSelectionBe"
-    "haviorArchive\0228\n\005super\030\001 \002(\0132).TST.Table"
-    "CommandSelectionBehaviorArchive\"\301\001\n\036Comm"
-    "andApplyCellCommentArchive\022\'\n\005super\030\001 \002("
-    "\0132\030.TST.TableCommandArchive\022\034\n\007cell_id\030\002"
-    " \002(\0132\013.TST.CellID\022+\n\023old_comment_storage"
-    "\030\003 \001(\0132\016.TSP.Reference\022+\n\023new_comment_st"
-    "orage\030\004 \001(\0132\016.TSP.Reference\"\323\001\n&CommandA"
-    "pplyConditionalStyleSetArchive\022\'\n\005super\030"
-    "\001 \002(\0132\030.TST.TableCommandArchive\022(\n\tselec"
-    "tion\030\002 \002(\0132\025.TST.SelectionArchive\022*\n\rund"
-    "o_cell_map\030\003 \002(\0132\023.TST.CellMapArchive\022*\n"
-    "\rredo_cell_map\030\004 \002(\0132\023.TST.CellMapArchiv"
-    "e\"`\n$CommandSetFormulaTokenizationArchiv"
-    "e\022\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\024\n"
-    "\014tokenization\030\002 \002(\010\"p\n\036CommandSetFilterE"
-    "nabledArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Table"
-    "CommandArchive\022\024\n\014filter_index\030\002 \002(\r\022\017\n\007"
-    "enabled\030\004 \002(\010\"\210\001\n\"CommandSetFilterRuleEn"
-    "abledArchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableC"
-    "ommandArchive\022\024\n\014filter_index\030\002 \002(\r\022\022\n\nr"
-    "ule_index\030\003 \002(\r\022\017\n\007enabled\030\004 \002(\010\"\315\001\n\036Com"
-    "mandSetFilterSetTypeArchive\022\'\n\005super\030\001 \002"
-    "(\0132\030.TST.TableCommandArchive\022@\n\023old_filt"
-    "er_set_type\030\002 \002(\0162#.TST.FilterSetArchive"
-    ".FilterSetType\022@\n\023new_filter_set_type\030\003 "
-    "\002(\0162#.TST.FilterSetArchive.FilterSetType"
-    "\"\274\001\n\035CommandSetStyleNetworkArchive\022\'\n\005su"
-    "per\030\001 \002(\0132\030.TST.TableCommandArchive\0228\n\021o"
-    "ld_style_network\030\002 \002(\0132\035.TST.TableStyleN"
-    "etworkArchive\0228\n\021new_style_network\030\003 \002(\013"
-    "2\035.TST.TableStyleNetworkArchive\"\306\001\n\031Comm"
-    "andMutateCellsArchive\022\'\n\005super\030\001 \002(\0132\030.T"
-    "ST.TableCommandArchive\022*\n\rundo_cell_map\030"
-    "\002 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_cell_"
-    "map\030\003 \002(\0132\023.TST.CellMapArchive\022(\n\tselect"
-    "ion\030\004 \001(\0132\025.TST.SelectionArchive\"\200\001\n)Com"
-    "mandDisableFilterRulesForColumnArchive\022\'"
-    "\n\005super\030\001 \002(\0132\030.TST.TableCommandArchive\022"
-    "\024\n\014column_index\030\002 \002(\r\022\024\n\014rule_indices\030\003 "
-    "\003(\r\"\343\001\n\032CommandSetTextStyleArchive\022\'\n\005su"
-    "per\030\001 \002(\0132\030.TST.TableCommandArchive\022\037\n\006r"
-    "egion\030\002 \002(\0132\017.TST.CellRegion\022*\n\rundo_cel"
-    "l_map\030\003 \001(\0132\023.TST.CellMapArchive\022*\n\rredo"
-    "_cell_map\030\004 \001(\0132\023.TST.CellMapArchive\022#\n\013"
-    "subcommands\030\005 \001(\0132\016.TSP.Reference\"N\n#Com"
-    "mandNotifyForTransformingArchive\022\'\n\005supe"
-    "r\030\001 \002(\0132\030.TST.TableCommandArchive\"\330\001\n Co"
-    "mmandSetStorageLanguageArchive\022\"\n\005super\030"
-    "\001 \002(\0132\023.TSK.CommandArchive\022\037\n\007storage\030\002 "
-    "\002(\0132\016.TSP.Reference\022\020\n\010language\030\003 \002(\t\022\026\n"
-    "\016range_location\030\004 \002(\r\022\024\n\014range_length\030\005 "
-    "\002(\r\022/\n\020undo_transaction\030\006 \001(\0132\025.TSWP.Und"
-    "oTransaction*@\n\027CommandDirectionArchive\022"
-    "\020\n\014directionRow\020\000\022\023\n\017directionColumn\020\001*h"
-    "\n\024CommandRegionArchive\022\016\n\nbodyRegion\020\000\022\023"
-    "\n\017headerRowRegion\020\001\022\026\n\022headerColumnRegio"
-    "n\020\002\022\023\n\017footerRowRegion\020\003", 22064);
+    "MapArchive\"\331\001\n,CommandSetSingleNumberFor"
+    "matParameterArchive\022\'\n\005super\030\001 \002(\0132\030.TST"
+    ".TableCommandArchive\022(\n\tselection\030\002 \002(\0132"
+    "\025.TST.SelectionArchive\022*\n\rundo_cell_map\030"
+    "\003 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_cell_"
+    "map\030\004 \002(\0132\023.TST.CellMapArchive\"g\n\025Comman"
+    "dSetBaseArchive\022@\n\005super\030\001 \002(\01321.TST.Com"
+    "mandSetSingleNumberFormatParameterArchiv"
+    "e\022\014\n\004base\030\002 \002(\r\"t\n\033CommandSetBasePlacesA"
+    "rchive\022@\n\005super\030\001 \002(\01321.TST.CommandSetSi"
+    "ngleNumberFormatParameterArchive\022\023\n\013base"
+    "_places\030\002 \002(\r\"\202\001\n!CommandSetBaseUseMinus"
+    "SignArchive\022@\n\005super\030\001 \002(\01321.TST.Command"
+    "SetSingleNumberFormatParameterArchive\022\033\n"
+    "\023base_use_minus_sign\030\002 \002(\010\"\211\001\n\037CommandSe"
+    "tControlMinimumArchive\022@\n\005super\030\001 \002(\01321."
+    "TST.CommandSetSingleNumberFormatParamete"
+    "rArchive\022\017\n\007minimum\030\002 \002(\001\022\023\n\013format_type"
+    "\030\003 \002(\r\"\211\001\n\037CommandSetControlMaximumArchi"
+    "ve\022@\n\005super\030\001 \002(\01321.TST.CommandSetSingle"
+    "NumberFormatParameterArchive\022\017\n\007maximum\030"
+    "\002 \002(\001\022\023\n\013format_type\030\003 \002(\r\"\215\001\n!CommandSe"
+    "tControlIncrementArchive\022@\n\005super\030\001 \002(\0132"
+    "1.TST.CommandSetSingleNumberFormatParame"
+    "terArchive\022\021\n\tincrement\030\002 \002(\001\022\023\n\013format_"
+    "type\030\003 \002(\r\"x\n\035CommandSetCurrencyCodeArch"
+    "ive\022@\n\005super\030\001 \002(\01321.TST.CommandSetSingl"
+    "eNumberFormatParameterArchive\022\025\n\rcurrenc"
+    "y_code\030\002 \002(\t\"\200\001\n!CommandSetFractionAccur"
+    "acyArchive\022@\n\005super\030\001 \002(\01321.TST.CommandS"
+    "etSingleNumberFormatParameterArchive\022\031\n\021"
+    "fraction_accuracy\030\002 \002(\r\"z\n6CommandSetMul"
+    "tipleChoiceListFormatForEditedItemArchiv"
+    "e\022@\n\005super\030\001 \002(\01321.TST.CommandSetSingleN"
+    "umberFormatParameterArchive\"z\n6CommandSe"
+    "tMultipleChoiceListFormatForDeleteItemAr"
+    "chive\022@\n\005super\030\001 \002(\01321.TST.CommandSetSin"
+    "gleNumberFormatParameterArchive\"{\n7Comma"
+    "ndSetMultipleChoiceListFormatForReorderI"
+    "temArchive\022@\n\005super\030\001 \002(\01321.TST.CommandS"
+    "etSingleNumberFormatParameterArchive\"|\n8"
+    "CommandSetMultipleChoiceListFormatForIni"
+    "tialValueArchive\022@\n\005super\030\001 \002(\01321.TST.Co"
+    "mmandSetSingleNumberFormatParameterArchi"
+    "ve\"\207\001\n$CommandSetNegativeNumberStyleArch"
+    "ive\022@\n\005super\030\001 \002(\01321.TST.CommandSetSingl"
+    "eNumberFormatParameterArchive\022\035\n\025negativ"
+    "e_number_style\030\002 \002(\r\"\373\001\n\037CommandSetExpli"
+    "citFormatArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Ta"
+    "bleCommandArchive\022(\n\tselection\030\002 \002(\0132\025.T"
+    "ST.SelectionArchive\022-\n\013cell_format\030\003 \002(\013"
+    "2\030.TSK.FormatStructArchive\022*\n\rundo_cell_"
+    "map\030\004 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_c"
+    "ell_map\030\005 \002(\0132\023.TST.CellMapArchive\"\202\001\n&C"
+    "ommandSetNumberOfDecimalPlacesArchive\022@\n"
+    "\005super\030\001 \002(\01321.TST.CommandSetSingleNumbe"
+    "rFormatParameterArchive\022\026\n\016decimal_place"
+    "s\030\002 \002(\r\"c\n\037CommandSetDateTimeFormatArchi"
+    "ve\022@\n\005super\030\001 \002(\01321.TST.CommandSetSingle"
+    "NumberFormatParameterArchive\"\215\001\n\'Command"
+    "SetShowThousandsSeparatorArchive\022@\n\005supe"
+    "r\030\001 \002(\01321.TST.CommandSetSingleNumberForm"
+    "atParameterArchive\022 \n\030show_thousands_sep"
+    "arator\030\002 \002(\010\"\205\001\n#CommandSetUseAccounting"
+    "StyleArchive\022@\n\005super\030\001 \002(\01321.TST.Comman"
+    "dSetSingleNumberFormatParameterArchive\022\034"
+    "\n\024use_accounting_style\030\002 \002(\010\"\303\002\n\026Command"
+    "MoveRowsArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Tab"
+    "leCommandArchive\022(\n\tselection\030\002 \001(\0132\025.TS"
+    "T.SelectionArchive\022\027\n\017start_row_index\030\003 "
+    "\002(\r\022\026\n\016dest_row_index\030\004 \002(\r\022\026\n\016number_of"
+    "_rows\030\005 \002(\r\022/\n\027formula_rewrite_command\030\007"
+    " \001(\0132\016.TSP.Reference\022$\n\014show_command\030\010 \001"
+    "(\0132\016.TSP.Reference\0226\n\036unmerge_invalid_ra"
+    "nges_command\030\t \001(\0132\016.TSP.Reference\"\227\002\n\031C"
+    "ommandMoveColumnsArchive\022\'\n\005super\030\001 \002(\0132"
+    "\030.TST.TableCommandArchive\022(\n\tselection\030\002"
+    " \001(\0132\025.TST.SelectionArchive\022\032\n\022start_col"
+    "umn_index\030\003 \002(\r\022\031\n\021dest_column_index\030\004 \002"
+    "(\r\022\031\n\021number_of_columns\030\005 \002(\r\022/\n\027formula"
+    "_rewrite_command\030\007 \001(\0132\016.TSP.Reference\022$"
+    "\n\014show_command\030\010 \001(\0132\016.TSP.Reference\"\233\001\n"
+    "\022CommandSortArchive\022\'\n\005super\030\001 \002(\0132\030.TST"
+    ".TableCommandArchive\022+\n\007mapping\030\005 \002(\0132\032."
+    "TSK.ShuffleMappingArchive\022/\n\027formula_rew"
+    "rite_command\030\007 \001(\0132\016.TSP.Reference\"\372\001\n$C"
+    "ommandRewriteFormulasForSortArchive\022\'\n\005s"
+    "uper\030\001 \002(\0132\030.TST.TableCommandArchive\0221\n\013"
+    "formula_map\030\002 \002(\0132\034.TSCE.OwnerFormulaMap"
+    "Archive\0220\n\014sort_mapping\030\003 \002(\0132\032.TSK.Shuf"
+    "fleMappingArchive\022,\n\017sorted_table_id\030\004 \002"
+    "(\0132\023.TSCE.CFUUIDArchive\022\026\n\016explode_range"
+    "s\030\005 \002(\010\"\277\001\n-CommandRewriteFormulasForTec"
+    "tonicShiftArchive\022\'\n\005super\030\001 \002(\0132\030.TST.T"
+    "ableCommandArchive\0221\n\013formula_map\030\002 \002(\0132"
+    "\034.TSCE.OwnerFormulaMapArchive\0222\n\016tectoni"
+    "c_shift\030\003 \002(\0132\032.TSCE.TectonicShiftArchiv"
+    "e\"\352\001\n$CommandRewriteFormulasForMoveArchi"
+    "ve\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandArch"
+    "ive\0221\n\013formula_map\030\002 \002(\0132\034.TSCE.OwnerFor"
+    "mulaMapArchive\0223\n\016from_reference\030\006 \002(\0132\033"
+    ".TSCE.RangeReferenceArchive\0221\n\014to_refere"
+    "nce\030\007 \002(\0132\033.TSCE.RangeReferenceArchive\"\342"
+    "\001\n)CommandRewriteFormulasForCellMergeArc"
+    "hive\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandAr"
+    "chive\0221\n\013formula_map\030\002 \002(\0132\034.TSCE.OwnerF"
+    "ormulaMapArchive\0222\n\014merged_range\030\003 \002(\0132\034"
+    ".TSCE.RangeCoordinateArchive\022%\n\010table_id"
+    "\030\004 \002(\0132\023.TSCE.CFUUIDArchive\"\\\n1CommandRe"
+    "writeFilterFormulasForTableResizeArchive"
+    "\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandArchiv"
+    "e\"\266\001\n3CommandRewriteFilterFormulasForTec"
+    "tonicShiftArchive\022\'\n\005super\030\001 \002(\0132\030.TST.T"
+    "ableCommandArchive\022\"\n\nfilter_set\030\002 \002(\0132\016"
+    ".TSP.Reference\0222\n\016tectonic_shift\030\003 \002(\0132\032"
+    ".TSCE.TectonicShiftArchive\"\331\001\n*CommandRe"
+    "writeFilterFormulasForSortArchive\022\'\n\005sup"
+    "er\030\001 \002(\0132\030.TST.TableCommandArchive\022\"\n\nfi"
+    "lter_set\030\002 \002(\0132\016.TSP.Reference\0220\n\014sort_m"
+    "apping\030\003 \002(\0132\032.TSK.ShuffleMappingArchive"
+    "\022,\n\017sorted_table_id\030\004 \002(\0132\023.TSCE.CFUUIDA"
+    "rchive\"\230\002\n6CommandRewriteConditionalStyl"
+    "esForTectonicShiftArchive\022\'\n\005super\030\001 \002(\013"
+    "2\030.TST.TableCommandArchive\0222\n\016tectonic_s"
+    "hift\030\002 \002(\0132\032.TSCE.TectonicShiftArchive\022;"
+    "\n\020cells_to_rewrite\030\003 \001(\0132!.TSCE.CellCoor"
+    "dinateVectorArchive\022D\n\026conditional_style"
+    "_sets\030\004 \001(\0132$.TSCE.CellCoordinateObjectM"
+    "apArchive\"\273\002\n-CommandRewriteConditionalS"
+    "tylesForSortArchive\022\'\n\005super\030\001 \002(\0132\030.TST"
+    ".TableCommandArchive\0220\n\014sort_mapping\030\002 \002"
+    "(\0132\032.TSK.ShuffleMappingArchive\022,\n\017sorted"
+    "_table_id\030\003 \002(\0132\023.TSCE.CFUUIDArchive\022;\n\020"
+    "cells_to_rewrite\030\004 \001(\0132!.TSCE.CellCoordi"
+    "nateVectorArchive\022D\n\026conditional_style_s"
+    "ets\030\005 \001(\0132$.TSCE.CellCoordinateObjectMap"
+    "Archive\"\324\002\n2CommandRewriteConditionalSty"
+    "lesForRangeMoveArchive\022\'\n\005super\030\001 \002(\0132\030."
+    "TST.TableCommandArchive\0229\n\024from_range_re"
+    "ference\030\007 \001(\0132\033.TSCE.RangeReferenceArchi"
+    "ve\0227\n\022to_range_reference\030\010 \001(\0132\033.TSCE.Ra"
+    "ngeReferenceArchive\022;\n\020cells_to_rewrite\030"
+    "\005 \001(\0132!.TSCE.CellCoordinateVectorArchive"
+    "\022D\n\026conditional_style_sets\030\006 \001(\0132$.TSCE."
+    "CellCoordinateObjectMapArchive\"\302\002\n2Comma"
+    "ndRewriteConditionalStylesForCellMergeAr"
+    "chive\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommandA"
+    "rchive\022,\n\017merged_table_id\030\002 \002(\0132\023.TSCE.C"
+    "FUUIDArchive\0222\n\014merged_range\030\003 \002(\0132\034.TSC"
+    "E.RangeCoordinateArchive\022;\n\020cells_to_rew"
+    "rite\030\004 \001(\0132!.TSCE.CellCoordinateVectorAr"
+    "chive\022D\n\026conditional_style_sets\030\005 \001(\0132$."
+    "TSCE.CellCoordinateObjectMapArchive\"\326\002\n\032"
+    "CommandMergeUnmergeArchive\022\'\n\005super\030\001 \002("
+    "\0132\030.TST.TableCommandArchive\022-\n\014merge_act"
+    "ion\030\002 \002(\0162\027.TST.MergeActionArchive\022(\n\tse"
+    "lection\030\003 \002(\0132\025.TST.SelectionArchive\022*\n\r"
+    "undo_cell_map\030\004 \002(\0132\023.TST.CellMapArchive"
+    "\022*\n\rredo_cell_map\030\005 \002(\0132\023.TST.CellMapArc"
+    "hive\022(\n\020old_merge_ranges\030\010 \001(\0132\016.TSP.Ref"
+    "erence\0224\n\034undo_formula_rewrite_command\030\t"
+    " \001(\0132\016.TSP.Reference\"\204\002\n\026CommandHideShow"
+    "Archive\022\'\n\005super\030\001 \002(\0132\030.TST.TableComman"
+    "dArchive\022/\n\tdirection\030\002 \002(\0162\034.TST.Comman"
+    "dDirectionArchive\0224\n\020hide_show_action\030\003 "
+    "\002(\0162\032.TST.HideShowActionArchive\022\025\n\rhidin"
+    "g_action\030\004 \002(\r\022(\n\021elements_affected\030\005 \002("
+    "\0132\r.TSP.IndexSet\022\031\n\021old_hiding_states\030\007 "
+    "\003(\r\"\335\002\n\037TableInfoGeometryCommandArchive\022"
+    "\"\n\005super\030\001 \002(\0132\023.TSK.CommandArchive\022\037\n\014s"
+    "cale_factor\030\002 \002(\0132\t.TSP.Size\022\"\n\ntable_in"
+    "fo\030\003 \001(\0132\016.TSP.Reference\022*\n\014new_geometry"
+    "\030\004 \001(\0132\024.TSD.GeometryArchive\022*\n\014old_geom"
+    "etry\030\005 \001(\0132\024.TSD.GeometryArchive\022\034\n\024turn"
+    "_off_auto_resize\030\006 \001(\010\022,\n$should_clear_o"
+    "bject_placeholder_flag\030\007 \001(\010\022-\n%did_matc"
+    "h_object_placeholder_geometry\030\010 \001(\010\"\263\002\n!"
+    "FormulaEditingCommandGroupArchive\0222\n\005sup"
+    "er\030\001 \002(\0132#.TSK.ProgressiveCommandGroupAr"
+    "chive\022\032\n\022undoSelectionValid\030\002 \002(\010\022\032\n\022und"
+    "oSelectionStart\030\003 \002(\r\022\033\n\023undoSelectionLe"
+    "ngth\030\004 \002(\r\022\027\n\017undoActiveToken\030\005 \002(\r\022\032\n\022r"
+    "edoSelectionValid\030\006 \002(\010\022\032\n\022redoSelection"
+    "Start\030\007 \002(\r\022\033\n\023redoSelectionLength\030\010 \002(\r"
+    "\022\027\n\017redoActiveToken\030\t \002(\r\"\254\002\n-FormulaEdi"
+    "tingCommandSelectionBehaviorArchive\022\032\n\022u"
+    "ndoSelectionValid\030\002 \001(\010\022\032\n\022undoSelection"
+    "Start\030\003 \001(\r\022\033\n\023undoSelectionLength\030\004 \001(\r"
+    "\022\027\n\017undoActiveToken\030\005 \001(\r\022\032\n\022redoSelecti"
+    "onValid\030\006 \001(\010\022\032\n\022redoSelectionStart\030\007 \001("
+    "\r\022\033\n\023redoSelectionLength\030\010 \001(\r\022\027\n\017redoAc"
+    "tiveToken\030\t \001(\r\022\037\n\007storage\030\n \001(\0132\016.TSP.R"
+    "eference\"\246\002\n,UndoRedoStateCommandSelecti"
+    "onBehaviorArchive\0222\n\026before_undo_redo_st"
+    "ate\030\001 \001(\0132\016.TSP.ReferenceB\002\030\001\0221\n\025after_u"
+    "ndo_redo_state\030\002 \001(\0132\016.TSP.ReferenceB\002\030\001"
+    "\022\"\n\ntable_info\030\003 \001(\0132\016.TSP.Reference\0225\n\026"
+    "before_table_selection\030\004 \001(\0132\025.TST.Selec"
+    "tionArchive\0224\n\025after_table_selection\030\006 \001"
+    "(\0132\025.TST.SelectionArchive\"\327\001\n$TableComma"
+    "ndSelectionBehaviorArchive\0225\n\026before_tab"
+    "le_selection\030\001 \001(\0132\025.TST.SelectionArchiv"
+    "e\0224\n\025after_table_selection\030\002 \001(\0132\025.TST.S"
+    "electionArchive\022\"\n\ntable_info\030\003 \001(\0132\016.TS"
+    "P.Reference\022\036\n\026last_column_hit_by_tap\030\004 "
+    "\001(\r\"d\n(DisableTableNameSelectionBehavior"
+    "Archive\0228\n\005super\030\001 \002(\0132).TST.TableComman"
+    "dSelectionBehaviorArchive\"\301\001\n\036CommandApp"
+    "lyCellCommentArchive\022\'\n\005super\030\001 \002(\0132\030.TS"
+    "T.TableCommandArchive\022\034\n\007cell_id\030\002 \002(\0132\013"
+    ".TST.CellID\022+\n\023old_comment_storage\030\003 \001(\013"
+    "2\016.TSP.Reference\022+\n\023new_comment_storage\030"
+    "\004 \001(\0132\016.TSP.Reference\"\323\001\n&CommandApplyCo"
+    "nditionalStyleSetArchive\022\'\n\005super\030\001 \002(\0132"
+    "\030.TST.TableCommandArchive\022(\n\tselection\030\002"
+    " \002(\0132\025.TST.SelectionArchive\022*\n\rundo_cell"
+    "_map\030\003 \002(\0132\023.TST.CellMapArchive\022*\n\rredo_"
+    "cell_map\030\004 \002(\0132\023.TST.CellMapArchive\"`\n$C"
+    "ommandSetFormulaTokenizationArchive\022\"\n\005s"
+    "uper\030\001 \002(\0132\023.TSK.CommandArchive\022\024\n\014token"
+    "ization\030\002 \002(\010\"p\n\036CommandSetFilterEnabled"
+    "Archive\022\'\n\005super\030\001 \002(\0132\030.TST.TableComman"
+    "dArchive\022\024\n\014filter_index\030\002 \002(\r\022\017\n\007enable"
+    "d\030\004 \002(\010\"\210\001\n\"CommandSetFilterRuleEnabledA"
+    "rchive\022\'\n\005super\030\001 \002(\0132\030.TST.TableCommand"
+    "Archive\022\024\n\014filter_index\030\002 \002(\r\022\022\n\nrule_in"
+    "dex\030\003 \002(\r\022\017\n\007enabled\030\004 \002(\010\"\315\001\n\036CommandSe"
+    "tFilterSetTypeArchive\022\'\n\005super\030\001 \002(\0132\030.T"
+    "ST.TableCommandArchive\022@\n\023old_filter_set"
+    "_type\030\002 \002(\0162#.TST.FilterSetArchive.Filte"
+    "rSetType\022@\n\023new_filter_set_type\030\003 \002(\0162#."
+    "TST.FilterSetArchive.FilterSetType\"\274\001\n\035C"
+    "ommandSetStyleNetworkArchive\022\'\n\005super\030\001 "
+    "\002(\0132\030.TST.TableCommandArchive\0228\n\021old_sty"
+    "le_network\030\002 \002(\0132\035.TST.TableStyleNetwork"
+    "Archive\0228\n\021new_style_network\030\003 \002(\0132\035.TST"
+    ".TableStyleNetworkArchive\"\306\001\n\031CommandMut"
+    "ateCellsArchive\022\'\n\005super\030\001 \002(\0132\030.TST.Tab"
+    "leCommandArchive\022*\n\rundo_cell_map\030\002 \002(\0132"
+    "\023.TST.CellMapArchive\022*\n\rredo_cell_map\030\003 "
+    "\002(\0132\023.TST.CellMapArchive\022(\n\tselection\030\004 "
+    "\001(\0132\025.TST.SelectionArchive\"\200\001\n)CommandDi"
+    "sableFilterRulesForColumnArchive\022\'\n\005supe"
+    "r\030\001 \002(\0132\030.TST.TableCommandArchive\022\024\n\014col"
+    "umn_index\030\002 \002(\r\022\024\n\014rule_indices\030\003 \003(\r\"\343\001"
+    "\n\032CommandSetTextStyleArchive\022\'\n\005super\030\001 "
+    "\002(\0132\030.TST.TableCommandArchive\022\037\n\006region\030"
+    "\002 \002(\0132\017.TST.CellRegion\022*\n\rundo_cell_map\030"
+    "\003 \001(\0132\023.TST.CellMapArchive\022*\n\rredo_cell_"
+    "map\030\004 \001(\0132\023.TST.CellMapArchive\022#\n\013subcom"
+    "mands\030\005 \001(\0132\016.TSP.Reference\"N\n#CommandNo"
+    "tifyForTransformingArchive\022\'\n\005super\030\001 \002("
+    "\0132\030.TST.TableCommandArchive\"\330\001\n CommandS"
+    "etStorageLanguageArchive\022\"\n\005super\030\001 \002(\0132"
+    "\023.TSK.CommandArchive\022\037\n\007storage\030\002 \002(\0132\016."
+    "TSP.Reference\022\020\n\010language\030\003 \002(\t\022\026\n\016range"
+    "_location\030\004 \002(\r\022\024\n\014range_length\030\005 \002(\r\022/\n"
+    "\020undo_transaction\030\006 \001(\0132\025.TSWP.UndoTrans"
+    "action\"\255\001\n\032CommandSetSortOrderArchive\022\'\n"
+    "\005super\030\001 \002(\0132\030.TST.TableCommandArchive\0222"
+    "\n\016old_sort_order\030\002 \001(\0132\032.TST.TableSortOr"
+    "derArchive\0222\n\016new_sort_order\030\003 \001(\0132\032.TST"
+    ".TableSortOrderArchive\"\365\001\n.CommandRewrit"
+    "eSortOrderForTectonicShiftArchive\022\'\n\005sup"
+    "er\030\001 \002(\0132\030.TST.TableCommandArchive\0222\n\016te"
+    "ctonic_shift\030\002 \002(\0132\032.TSCE.TectonicShiftA"
+    "rchive\0222\n\016old_sort_order\030\003 \001(\0132\032.TST.Tab"
+    "leSortOrderArchive\0222\n\016new_sort_order\030\004 \001"
+    "(\0132\032.TST.TableSortOrderArchive\"\352\001\n%Comma"
+    "ndRewriteSortOrderForSortArchive\022\'\n\005supe"
+    "r\030\001 \002(\0132\030.TST.TableCommandArchive\0220\n\014sor"
+    "t_mapping\030\002 \002(\0132\032.TSK.ShuffleMappingArch"
+    "ive\0222\n\016old_sort_order\030\003 \001(\0132\032.TST.TableS"
+    "ortOrderArchive\0222\n\016new_sort_order\030\004 \001(\0132"
+    "\032.TST.TableSortOrderArchive\"\277\001\n,CommandR"
+    "ewriteSortOrderForTableResizeArchive\022\'\n\005"
+    "super\030\001 \002(\0132\030.TST.TableCommandArchive\0222\n"
+    "\016old_sort_order\030\002 \001(\0132\032.TST.TableSortOrd"
+    "erArchive\0222\n\016new_sort_order\030\003 \001(\0132\032.TST."
+    "TableSortOrderArchive*@\n\027CommandDirectio"
+    "nArchive\022\020\n\014directionRow\020\000\022\023\n\017directionC"
+    "olumn\020\001*h\n\024CommandRegionArchive\022\016\n\nbodyR"
+    "egion\020\000\022\023\n\017headerRowRegion\020\001\022\026\n\022headerCo"
+    "lumnRegion\020\002\022\023\n\017footerRowRegion\020\003", 24193);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSTCommandArchives.proto", &protobuf_RegisterTypes);
   TableCommandArchive::default_instance_ = new TableCommandArchive();
+  CommandApplyCellDiffArchive::default_instance_ = new CommandApplyCellDiffArchive();
   CommandChangeFreezeHeaderStateArchive::default_instance_ = new CommandChangeFreezeHeaderStateArchive();
   CommandDeleteCellsArchive::default_instance_ = new CommandDeleteCellsArchive();
   CommandDeleteCellContentsArchive::default_instance_ = new CommandDeleteCellContentsArchive();
@@ -3148,6 +3452,7 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandSetControlCellsDisplayNumberFormatArchive::default_instance_ = new CommandSetControlCellsDisplayNumberFormatArchive();
   CommandSetAutomaticFormatArchive::default_instance_ = new CommandSetAutomaticFormatArchive();
   CommandSetAutomaticDurationUnitsArchive::default_instance_ = new CommandSetAutomaticDurationUnitsArchive();
+  CommandReplaceCustomFormatArchive::default_instance_ = new CommandReplaceCustomFormatArchive();
   CommandInsertColumnsOrRowsArchive::default_instance_ = new CommandInsertColumnsOrRowsArchive();
   CommandInsertColumnsOrRowsArchive_StyleIndexPair::default_instance_ = new CommandInsertColumnsOrRowsArchive_StyleIndexPair();
   CommandPasteArchive::default_instance_ = new CommandPasteArchive();
@@ -3165,6 +3470,7 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandSetTableFontNameArchive::default_instance_ = new CommandSetTableFontNameArchive();
   CommandSetTableNameHeightArchive::default_instance_ = new CommandSetTableNameHeightArchive();
   CommandStyleCellsArchive::default_instance_ = new CommandStyleCellsArchive();
+  CommandSetFillPropertyArchive::default_instance_ = new CommandSetFillPropertyArchive();
   CommandStyleTableArchive::default_instance_ = new CommandStyleTableArchive();
   CommandFillCellsArchive::default_instance_ = new CommandFillCellsArchive();
   CommandReplaceTextArchive::default_instance_ = new CommandReplaceTextArchive();
@@ -3175,6 +3481,9 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandDeleteFilterRulesArchive::default_instance_ = new CommandDeleteFilterRulesArchive();
   CommandModifyFilterRuleArchive::default_instance_ = new CommandModifyFilterRuleArchive();
   CommandApplyStrokePresetArchive::default_instance_ = new CommandApplyStrokePresetArchive();
+  CommandAddTableStylePresetArchive::default_instance_ = new CommandAddTableStylePresetArchive();
+  CommandRemoveTableStylePresetArchive::default_instance_ = new CommandRemoveTableStylePresetArchive();
+  CommandReplaceTableStylePresetArchive::default_instance_ = new CommandReplaceTableStylePresetArchive();
   CommandApplyTableStylePresetArchive::default_instance_ = new CommandApplyTableStylePresetArchive();
   CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance_ = new CommandApplyTableStylePresetArchive_StyleIndexTuple();
   CommandSetStyleApplyClearsAllFlagArchive::default_instance_ = new CommandSetStyleApplyClearsAllFlagArchive();
@@ -3235,7 +3544,12 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandSetTextStyleArchive::default_instance_ = new CommandSetTextStyleArchive();
   CommandNotifyForTransformingArchive::default_instance_ = new CommandNotifyForTransformingArchive();
   CommandSetStorageLanguageArchive::default_instance_ = new CommandSetStorageLanguageArchive();
+  CommandSetSortOrderArchive::default_instance_ = new CommandSetSortOrderArchive();
+  CommandRewriteSortOrderForTectonicShiftArchive::default_instance_ = new CommandRewriteSortOrderForTectonicShiftArchive();
+  CommandRewriteSortOrderForSortArchive::default_instance_ = new CommandRewriteSortOrderForSortArchive();
+  CommandRewriteSortOrderForTableResizeArchive::default_instance_ = new CommandRewriteSortOrderForTableResizeArchive();
   TableCommandArchive::default_instance_->InitAsDefaultInstance();
+  CommandApplyCellDiffArchive::default_instance_->InitAsDefaultInstance();
   CommandChangeFreezeHeaderStateArchive::default_instance_->InitAsDefaultInstance();
   CommandDeleteCellsArchive::default_instance_->InitAsDefaultInstance();
   CommandDeleteCellContentsArchive::default_instance_->InitAsDefaultInstance();
@@ -3246,6 +3560,7 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandSetControlCellsDisplayNumberFormatArchive::default_instance_->InitAsDefaultInstance();
   CommandSetAutomaticFormatArchive::default_instance_->InitAsDefaultInstance();
   CommandSetAutomaticDurationUnitsArchive::default_instance_->InitAsDefaultInstance();
+  CommandReplaceCustomFormatArchive::default_instance_->InitAsDefaultInstance();
   CommandInsertColumnsOrRowsArchive::default_instance_->InitAsDefaultInstance();
   CommandInsertColumnsOrRowsArchive_StyleIndexPair::default_instance_->InitAsDefaultInstance();
   CommandPasteArchive::default_instance_->InitAsDefaultInstance();
@@ -3263,6 +3578,7 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandSetTableFontNameArchive::default_instance_->InitAsDefaultInstance();
   CommandSetTableNameHeightArchive::default_instance_->InitAsDefaultInstance();
   CommandStyleCellsArchive::default_instance_->InitAsDefaultInstance();
+  CommandSetFillPropertyArchive::default_instance_->InitAsDefaultInstance();
   CommandStyleTableArchive::default_instance_->InitAsDefaultInstance();
   CommandFillCellsArchive::default_instance_->InitAsDefaultInstance();
   CommandReplaceTextArchive::default_instance_->InitAsDefaultInstance();
@@ -3273,6 +3589,9 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandDeleteFilterRulesArchive::default_instance_->InitAsDefaultInstance();
   CommandModifyFilterRuleArchive::default_instance_->InitAsDefaultInstance();
   CommandApplyStrokePresetArchive::default_instance_->InitAsDefaultInstance();
+  CommandAddTableStylePresetArchive::default_instance_->InitAsDefaultInstance();
+  CommandRemoveTableStylePresetArchive::default_instance_->InitAsDefaultInstance();
+  CommandReplaceTableStylePresetArchive::default_instance_->InitAsDefaultInstance();
   CommandApplyTableStylePresetArchive::default_instance_->InitAsDefaultInstance();
   CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance_->InitAsDefaultInstance();
   CommandSetStyleApplyClearsAllFlagArchive::default_instance_->InitAsDefaultInstance();
@@ -3333,6 +3652,10 @@ void protobuf_AddDesc_TSTCommandArchives_2eproto() {
   CommandSetTextStyleArchive::default_instance_->InitAsDefaultInstance();
   CommandNotifyForTransformingArchive::default_instance_->InitAsDefaultInstance();
   CommandSetStorageLanguageArchive::default_instance_->InitAsDefaultInstance();
+  CommandSetSortOrderArchive::default_instance_->InitAsDefaultInstance();
+  CommandRewriteSortOrderForTectonicShiftArchive::default_instance_->InitAsDefaultInstance();
+  CommandRewriteSortOrderForSortArchive::default_instance_->InitAsDefaultInstance();
+  CommandRewriteSortOrderForTableResizeArchive::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_TSTCommandArchives_2eproto);
 }
 
@@ -3735,6 +4058,367 @@ ::google::protobuf::Metadata TableCommandArchive::GetMetadata() const {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandApplyCellDiffArchive::kSuperFieldNumber;
+const int CommandApplyCellDiffArchive::kCellRegionFieldNumber;
+const int CommandApplyCellDiffArchive::kCellDiffFieldNumber;
+const int CommandApplyCellDiffArchive::kInverseCellDiffMapFieldNumber;
+#endif  // !_MSC_VER
+
+CommandApplyCellDiffArchive::CommandApplyCellDiffArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandApplyCellDiffArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  cell_region_ = const_cast< ::TST::CellRegion*>(&::TST::CellRegion::default_instance());
+  cell_diff_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  inverse_cell_diff_map_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandApplyCellDiffArchive::CommandApplyCellDiffArchive(const CommandApplyCellDiffArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandApplyCellDiffArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  cell_region_ = NULL;
+  cell_diff_ = NULL;
+  inverse_cell_diff_map_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandApplyCellDiffArchive::~CommandApplyCellDiffArchive() {
+  SharedDtor();
+}
+
+void CommandApplyCellDiffArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete cell_region_;
+    delete cell_diff_;
+    delete inverse_cell_diff_map_;
+  }
+}
+
+void CommandApplyCellDiffArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandApplyCellDiffArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandApplyCellDiffArchive_descriptor_;
+}
+
+const CommandApplyCellDiffArchive& CommandApplyCellDiffArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandApplyCellDiffArchive* CommandApplyCellDiffArchive::default_instance_ = NULL;
+
+CommandApplyCellDiffArchive* CommandApplyCellDiffArchive::New() const {
+  return new CommandApplyCellDiffArchive;
+}
+
+void CommandApplyCellDiffArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_cell_region()) {
+      if (cell_region_ != NULL) cell_region_->::TST::CellRegion::Clear();
+    }
+    if (has_cell_diff()) {
+      if (cell_diff_ != NULL) cell_diff_->::TSP::Reference::Clear();
+    }
+    if (has_inverse_cell_diff_map()) {
+      if (inverse_cell_diff_map_ != NULL) inverse_cell_diff_map_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandApplyCellDiffArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_cell_region;
+        break;
+      }
+
+      // required .TST.CellRegion cell_region = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_region:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cell_region()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_cell_diff;
+        break;
+      }
+
+      // required .TSP.Reference cell_diff = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_diff:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cell_diff()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_inverse_cell_diff_map;
+        break;
+      }
+
+      // required .TSP.Reference inverse_cell_diff_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_inverse_cell_diff_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_inverse_cell_diff_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandApplyCellDiffArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TST.CellRegion cell_region = 2;
+  if (has_cell_region()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->cell_region(), output);
+  }
+
+  // required .TSP.Reference cell_diff = 3;
+  if (has_cell_diff()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->cell_diff(), output);
+  }
+
+  // required .TSP.Reference inverse_cell_diff_map = 4;
+  if (has_inverse_cell_diff_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->inverse_cell_diff_map(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandApplyCellDiffArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.CellRegion cell_region = 2;
+  if (has_cell_region()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->cell_region(), target);
+  }
+
+  // required .TSP.Reference cell_diff = 3;
+  if (has_cell_diff()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->cell_diff(), target);
+  }
+
+  // required .TSP.Reference inverse_cell_diff_map = 4;
+  if (has_inverse_cell_diff_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->inverse_cell_diff_map(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandApplyCellDiffArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TST.CellRegion cell_region = 2;
+    if (has_cell_region()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell_region());
+    }
+
+    // required .TSP.Reference cell_diff = 3;
+    if (has_cell_diff()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell_diff());
+    }
+
+    // required .TSP.Reference inverse_cell_diff_map = 4;
+    if (has_inverse_cell_diff_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->inverse_cell_diff_map());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandApplyCellDiffArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandApplyCellDiffArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyCellDiffArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandApplyCellDiffArchive::MergeFrom(const CommandApplyCellDiffArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_cell_region()) {
+      mutable_cell_region()->::TST::CellRegion::MergeFrom(from.cell_region());
+    }
+    if (from.has_cell_diff()) {
+      mutable_cell_diff()->::TSP::Reference::MergeFrom(from.cell_diff());
+    }
+    if (from.has_inverse_cell_diff_map()) {
+      mutable_inverse_cell_diff_map()->::TSP::Reference::MergeFrom(from.inverse_cell_diff_map());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandApplyCellDiffArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandApplyCellDiffArchive::CopyFrom(const CommandApplyCellDiffArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandApplyCellDiffArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_cell_region()) {
+    if (!this->cell_region().IsInitialized()) return false;
+  }
+  if (has_cell_diff()) {
+    if (!this->cell_diff().IsInitialized()) return false;
+  }
+  if (has_inverse_cell_diff_map()) {
+    if (!this->inverse_cell_diff_map().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandApplyCellDiffArchive::Swap(CommandApplyCellDiffArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(cell_region_, other->cell_region_);
+    std::swap(cell_diff_, other->cell_diff_);
+    std::swap(inverse_cell_diff_map_, other->inverse_cell_diff_map_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandApplyCellDiffArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandApplyCellDiffArchive_descriptor_;
+  metadata.reflection = CommandApplyCellDiffArchive_reflection_;
+  return metadata;
+}
+
+
 // ===================================================================
 
 #ifndef _MSC_VER
@@ -7573,6 +8257,319 @@ ::google::protobuf::Metadata CommandSetAutomaticDurationUnitsArchive::GetMetadat
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandReplaceCustomFormatArchive::kUndoMapFieldNumber;
+const int CommandReplaceCustomFormatArchive::kRedoMapFieldNumber;
+const int CommandReplaceCustomFormatArchive::kSuperFieldNumber;
+#endif  // !_MSC_VER
+
+CommandReplaceCustomFormatArchive::CommandReplaceCustomFormatArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandReplaceCustomFormatArchive::InitAsDefaultInstance() {
+  undo_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+}
+
+CommandReplaceCustomFormatArchive::CommandReplaceCustomFormatArchive(const CommandReplaceCustomFormatArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandReplaceCustomFormatArchive::SharedCtor() {
+  _cached_size_ = 0;
+  undo_map_ = NULL;
+  redo_map_ = NULL;
+  super_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandReplaceCustomFormatArchive::~CommandReplaceCustomFormatArchive() {
+  SharedDtor();
+}
+
+void CommandReplaceCustomFormatArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete undo_map_;
+    delete redo_map_;
+    delete super_;
+  }
+}
+
+void CommandReplaceCustomFormatArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandReplaceCustomFormatArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandReplaceCustomFormatArchive_descriptor_;
+}
+
+const CommandReplaceCustomFormatArchive& CommandReplaceCustomFormatArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandReplaceCustomFormatArchive* CommandReplaceCustomFormatArchive::default_instance_ = NULL;
+
+CommandReplaceCustomFormatArchive* CommandReplaceCustomFormatArchive::New() const {
+  return new CommandReplaceCustomFormatArchive;
+}
+
+void CommandReplaceCustomFormatArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_undo_map()) {
+      if (undo_map_ != NULL) undo_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_map()) {
+      if (redo_map_ != NULL) redo_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandReplaceCustomFormatArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.CellMapArchive undo_map = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_redo_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_map = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_super;
+        break;
+      }
+
+      // required .TST.TableCommandArchive super = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_super:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandReplaceCustomFormatArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.CellMapArchive undo_map = 1;
+  if (has_undo_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->undo_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_map = 2;
+  if (has_redo_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->redo_map(), output);
+  }
+
+  // required .TST.TableCommandArchive super = 6;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->super(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandReplaceCustomFormatArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.CellMapArchive undo_map = 1;
+  if (has_undo_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->undo_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_map = 2;
+  if (has_redo_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->redo_map(), target);
+  }
+
+  // required .TST.TableCommandArchive super = 6;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->super(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandReplaceCustomFormatArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.CellMapArchive undo_map = 1;
+    if (has_undo_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_map());
+    }
+
+    // required .TST.CellMapArchive redo_map = 2;
+    if (has_redo_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_map());
+    }
+
+    // required .TST.TableCommandArchive super = 6;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandReplaceCustomFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandReplaceCustomFormatArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceCustomFormatArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandReplaceCustomFormatArchive::MergeFrom(const CommandReplaceCustomFormatArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_undo_map()) {
+      mutable_undo_map()->::TST::CellMapArchive::MergeFrom(from.undo_map());
+    }
+    if (from.has_redo_map()) {
+      mutable_redo_map()->::TST::CellMapArchive::MergeFrom(from.redo_map());
+    }
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandReplaceCustomFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandReplaceCustomFormatArchive::CopyFrom(const CommandReplaceCustomFormatArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandReplaceCustomFormatArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+
+  if (has_undo_map()) {
+    if (!this->undo_map().IsInitialized()) return false;
+  }
+  if (has_redo_map()) {
+    if (!this->redo_map().IsInitialized()) return false;
+  }
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandReplaceCustomFormatArchive::Swap(CommandReplaceCustomFormatArchive* other) {
+  if (other != this) {
+    std::swap(undo_map_, other->undo_map_);
+    std::swap(redo_map_, other->redo_map_);
+    std::swap(super_, other->super_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandReplaceCustomFormatArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandReplaceCustomFormatArchive_descriptor_;
+  metadata.reflection = CommandReplaceCustomFormatArchive_reflection_;
+  return metadata;
+}
+
+
 // ===================================================================
 
 #ifndef _MSC_VER
@@ -8945,8 +9942,8 @@ CommandPasteArchive::CommandPasteArchive()
 void CommandPasteArchive::InitAsDefaultInstance() {
   user_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
   final_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::TiledCellMapArchive*>(&::TST::TiledCellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::TiledCellMapArchive*>(&::TST::TiledCellMapArchive::default_instance());
   command_undo_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
 }
@@ -9014,10 +10011,10 @@ void CommandPasteArchive::Clear() {
       if (final_selection_ != NULL) final_selection_->::TST::SelectionArchive::Clear();
     }
     if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::TiledCellMapArchive::Clear();
     }
     if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::TiledCellMapArchive::Clear();
     }
     if (has_command_undo()) {
       if (command_undo_ != NULL) command_undo_->::TSP::Reference::Clear();
@@ -9065,7 +10062,7 @@ bool CommandPasteArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // required .TST.CellMapArchive undo_cell_map = 3;
+      // required .TST.TiledCellMapArchive undo_cell_map = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -9079,7 +10076,7 @@ bool CommandPasteArchive::MergePartialFromCodedStream(
         break;
       }
 
-      // required .TST.CellMapArchive redo_cell_map = 4;
+      // required .TST.TiledCellMapArchive redo_cell_map = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -9182,13 +10179,13 @@ void CommandPasteArchive::SerializeWithCachedSizes(
       2, this->final_selection(), output);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 3;
+  // required .TST.TiledCellMapArchive undo_cell_map = 3;
   if (has_undo_cell_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       3, this->undo_cell_map(), output);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
+  // required .TST.TiledCellMapArchive redo_cell_map = 4;
   if (has_redo_cell_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       4, this->redo_cell_map(), output);
@@ -9239,14 +10236,14 @@ ::google::protobuf::uint8* CommandPasteArchive::SerializeWithCachedSizesToArray(
         2, this->final_selection(), target);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 3;
+  // required .TST.TiledCellMapArchive undo_cell_map = 3;
   if (has_undo_cell_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         3, this->undo_cell_map(), target);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
+  // required .TST.TiledCellMapArchive redo_cell_map = 4;
   if (has_redo_cell_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
@@ -9304,14 +10301,14 @@ int CommandPasteArchive::ByteSize() const {
           this->final_selection());
     }
 
-    // required .TST.CellMapArchive undo_cell_map = 3;
+    // required .TST.TiledCellMapArchive undo_cell_map = 3;
     if (has_undo_cell_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->undo_cell_map());
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 4;
+    // required .TST.TiledCellMapArchive redo_cell_map = 4;
     if (has_redo_cell_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
@@ -9380,10 +10377,10 @@ void CommandPasteArchive::MergeFrom(const CommandPasteArchive& from) {
       mutable_final_selection()->::TST::SelectionArchive::MergeFrom(from.final_selection());
     }
     if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+      mutable_undo_cell_map()->::TST::TiledCellMapArchive::MergeFrom(from.undo_cell_map());
     }
     if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+      mutable_redo_cell_map()->::TST::TiledCellMapArchive::MergeFrom(from.redo_cell_map());
     }
     if (from.has_command_undo()) {
       mutable_command_undo()->::TSP::Reference::MergeFrom(from.command_undo());
@@ -16347,6 +17344,463 @@ ::google::protobuf::Metadata CommandStyleCellsArchive::GetMetadata() const {
 }
 
 
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetFillPropertyArchive::kSuperFieldNumber;
+const int CommandSetFillPropertyArchive::kFillFieldNumber;
+const int CommandSetFillPropertyArchive::kCellFillStandInFieldNumber;
+const int CommandSetFillPropertyArchive::kSelectionFieldNumber;
+const int CommandSetFillPropertyArchive::kUndoCellMapFieldNumber;
+const int CommandSetFillPropertyArchive::kRedoCellMapFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetFillPropertyArchive::CommandSetFillPropertyArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetFillPropertyArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  fill_ = const_cast< ::TSD::FillArchive*>(&::TSD::FillArchive::default_instance());
+  cell_fill_stand_in_ = const_cast< ::TST::CellFillStandIn*>(&::TST::CellFillStandIn::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+}
+
+CommandSetFillPropertyArchive::CommandSetFillPropertyArchive(const CommandSetFillPropertyArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetFillPropertyArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  fill_ = NULL;
+  cell_fill_stand_in_ = NULL;
+  selection_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetFillPropertyArchive::~CommandSetFillPropertyArchive() {
+  SharedDtor();
+}
+
+void CommandSetFillPropertyArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete fill_;
+    delete cell_fill_stand_in_;
+    delete selection_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+  }
+}
+
+void CommandSetFillPropertyArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetFillPropertyArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetFillPropertyArchive_descriptor_;
+}
+
+const CommandSetFillPropertyArchive& CommandSetFillPropertyArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetFillPropertyArchive* CommandSetFillPropertyArchive::default_instance_ = NULL;
+
+CommandSetFillPropertyArchive* CommandSetFillPropertyArchive::New() const {
+  return new CommandSetFillPropertyArchive;
+}
+
+void CommandSetFillPropertyArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_fill()) {
+      if (fill_ != NULL) fill_->::TSD::FillArchive::Clear();
+    }
+    if (has_cell_fill_stand_in()) {
+      if (cell_fill_stand_in_ != NULL) cell_fill_stand_in_->::TST::CellFillStandIn::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetFillPropertyArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_fill;
+        break;
+      }
+
+      // optional .TSD.FillArchive fill = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_fill:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_fill()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_cell_fill_stand_in;
+        break;
+      }
+
+      // optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_fill_stand_in:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cell_fill_stand_in()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_selection;
+        break;
+      }
+
+      // required .TST.SelectionArchive selection = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSetFillPropertyArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // optional .TSD.FillArchive fill = 2;
+  if (has_fill()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->fill(), output);
+  }
+
+  // optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+  if (has_cell_fill_stand_in()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->cell_fill_stand_in(), output);
+  }
+
+  // required .TST.SelectionArchive selection = 4;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->selection(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 5;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 6;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->redo_cell_map(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetFillPropertyArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // optional .TSD.FillArchive fill = 2;
+  if (has_fill()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->fill(), target);
+  }
+
+  // optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+  if (has_cell_fill_stand_in()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->cell_fill_stand_in(), target);
+  }
+
+  // required .TST.SelectionArchive selection = 4;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->selection(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 5;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 6;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->redo_cell_map(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetFillPropertyArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TSD.FillArchive fill = 2;
+    if (has_fill()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->fill());
+    }
+
+    // optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+    if (has_cell_fill_stand_in()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell_fill_stand_in());
+    }
+
+    // required .TST.SelectionArchive selection = 4;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 5;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 6;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetFillPropertyArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetFillPropertyArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFillPropertyArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetFillPropertyArchive::MergeFrom(const CommandSetFillPropertyArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_fill()) {
+      mutable_fill()->::TSD::FillArchive::MergeFrom(from.fill());
+    }
+    if (from.has_cell_fill_stand_in()) {
+      mutable_cell_fill_stand_in()->::TST::CellFillStandIn::MergeFrom(from.cell_fill_stand_in());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetFillPropertyArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetFillPropertyArchive::CopyFrom(const CommandSetFillPropertyArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetFillPropertyArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000039) != 0x00000039) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_fill()) {
+    if (!this->fill().IsInitialized()) return false;
+  }
+  if (has_cell_fill_stand_in()) {
+    if (!this->cell_fill_stand_in().IsInitialized()) return false;
+  }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetFillPropertyArchive::Swap(CommandSetFillPropertyArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(fill_, other->fill_);
+    std::swap(cell_fill_stand_in_, other->cell_fill_stand_in_);
+    std::swap(selection_, other->selection_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetFillPropertyArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetFillPropertyArchive_descriptor_;
+  metadata.reflection = CommandSetFillPropertyArchive_reflection_;
+  return metadata;
+}
+
+
 // ===================================================================
 
 #ifndef _MSC_VER
@@ -20192,123 +21646,142 @@ ::google::protobuf::Metadata CommandApplyStrokePresetArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandApplyTableStylePresetArchive_StyleIndexTuple::kIndexFieldNumber;
-const int CommandApplyTableStylePresetArchive_StyleIndexTuple::kCellStyleFieldNumber;
-const int CommandApplyTableStylePresetArchive_StyleIndexTuple::kTextStyleFieldNumber;
+const int CommandAddTableStylePresetArchive::kSuperFieldNumber;
+const int CommandAddTableStylePresetArchive::kPresetIndexFieldNumber;
+const int CommandAddTableStylePresetArchive::kTableStylesFieldNumber;
+const int CommandAddTableStylePresetArchive::kSendNotificationFieldNumber;
 #endif  // !_MSC_VER
 
-CommandApplyTableStylePresetArchive_StyleIndexTuple::CommandApplyTableStylePresetArchive_StyleIndexTuple()
+CommandAddTableStylePresetArchive::CommandAddTableStylePresetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::InitAsDefaultInstance() {
-  cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandAddTableStylePresetArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
 }
 
-CommandApplyTableStylePresetArchive_StyleIndexTuple::CommandApplyTableStylePresetArchive_StyleIndexTuple(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from)
+CommandAddTableStylePresetArchive::CommandAddTableStylePresetArchive(const CommandAddTableStylePresetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::SharedCtor() {
+void CommandAddTableStylePresetArchive::SharedCtor() {
   _cached_size_ = 0;
-  index_ = 0u;
-  cell_style_ = NULL;
-  text_style_ = NULL;
+  super_ = NULL;
+  preset_index_ = 0;
+  table_styles_ = NULL;
+  send_notification_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandApplyTableStylePresetArchive_StyleIndexTuple::~CommandApplyTableStylePresetArchive_StyleIndexTuple() {
+CommandAddTableStylePresetArchive::~CommandAddTableStylePresetArchive() {
   SharedDtor();
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::SharedDtor() {
+void CommandAddTableStylePresetArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete cell_style_;
-    delete text_style_;
+    delete super_;
+    delete table_styles_;
   }
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::SetCachedSize(int size) const {
+void CommandAddTableStylePresetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandApplyTableStylePresetArchive_StyleIndexTuple::descriptor() {
+const ::google::protobuf::Descriptor* CommandAddTableStylePresetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandApplyTableStylePresetArchive_StyleIndexTuple_descriptor_;
+  return CommandAddTableStylePresetArchive_descriptor_;
 }
 
-const CommandApplyTableStylePresetArchive_StyleIndexTuple& CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance() {
+const CommandAddTableStylePresetArchive& CommandAddTableStylePresetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandApplyTableStylePresetArchive_StyleIndexTuple* CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance_ = NULL;
+CommandAddTableStylePresetArchive* CommandAddTableStylePresetArchive::default_instance_ = NULL;
 
-CommandApplyTableStylePresetArchive_StyleIndexTuple* CommandApplyTableStylePresetArchive_StyleIndexTuple::New() const {
-  return new CommandApplyTableStylePresetArchive_StyleIndexTuple;
+CommandAddTableStylePresetArchive* CommandAddTableStylePresetArchive::New() const {
+  return new CommandAddTableStylePresetArchive;
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::Clear() {
+void CommandAddTableStylePresetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    index_ = 0u;
-    if (has_cell_style()) {
-      if (cell_style_ != NULL) cell_style_->::TSP::Reference::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_text_style()) {
-      if (text_style_ != NULL) text_style_->::TSP::Reference::Clear();
+    preset_index_ = 0;
+    if (has_table_styles()) {
+      if (table_styles_ != NULL) table_styles_->::TST::TableStyleNetworkArchive::Clear();
     }
+    send_notification_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandApplyTableStylePresetArchive_StyleIndexTuple::MergePartialFromCodedStream(
+bool CommandAddTableStylePresetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required uint32 index = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_preset_index;
+        break;
+      }
+
+      // required int32 preset_index = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_preset_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &index_)));
-          set_has_index();
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &preset_index_)));
+          set_has_preset_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_cell_style;
+        if (input->ExpectTag(26)) goto parse_table_styles;
         break;
       }
 
-      // optional .TSP.Reference cell_style = 5;
-      case 5: {
+      // required .TST.TableStyleNetworkArchive table_styles = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_style:
+         parse_table_styles:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cell_style()));
+               input, mutable_table_styles()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_text_style;
+        if (input->ExpectTag(32)) goto parse_send_notification;
         break;
       }
 
-      // optional .TSP.Reference text_style = 6;
-      case 6: {
+      // required bool send_notification = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_text_style:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_text_style()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_send_notification:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &send_notification_)));
+          set_has_send_notification();
         } else {
           goto handle_uninterpreted;
         }
@@ -20332,23 +21805,28 @@ bool CommandApplyTableStylePresetArchive_StyleIndexTuple::MergePartialFromCodedS
 #undef DO_
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::SerializeWithCachedSizes(
+void CommandAddTableStylePresetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required uint32 index = 1;
-  if (has_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->index(), output);
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
   }
 
-  // optional .TSP.Reference cell_style = 5;
-  if (has_cell_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->cell_style(), output);
+  // required int32 preset_index = 2;
+  if (has_preset_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->preset_index(), output);
   }
 
-  // optional .TSP.Reference text_style = 6;
-  if (has_text_style()) {
+  // required .TST.TableStyleNetworkArchive table_styles = 3;
+  if (has_table_styles()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->text_style(), output);
+      3, this->table_styles(), output);
+  }
+
+  // required bool send_notification = 4;
+  if (has_send_notification()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->send_notification(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -20357,25 +21835,30 @@ void CommandApplyTableStylePresetArchive_StyleIndexTuple::SerializeWithCachedSiz
   }
 }
 
-::google::protobuf::uint8* CommandApplyTableStylePresetArchive_StyleIndexTuple::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandAddTableStylePresetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required uint32 index = 1;
-  if (has_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->index(), target);
-  }
-
-  // optional .TSP.Reference cell_style = 5;
-  if (has_cell_style()) {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->cell_style(), target);
+        1, this->super(), target);
   }
 
-  // optional .TSP.Reference text_style = 6;
-  if (has_text_style()) {
+  // required int32 preset_index = 2;
+  if (has_preset_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->preset_index(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive table_styles = 3;
+  if (has_table_styles()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->text_style(), target);
+        3, this->table_styles(), target);
+  }
+
+  // required bool send_notification = 4;
+  if (has_send_notification()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->send_notification(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -20385,29 +21868,34 @@ ::google::protobuf::uint8* CommandApplyTableStylePresetArchive_StyleIndexTuple::
   return target;
 }
 
-int CommandApplyTableStylePresetArchive_StyleIndexTuple::ByteSize() const {
+int CommandAddTableStylePresetArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required uint32 index = 1;
-    if (has_index()) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->index());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
     }
 
-    // optional .TSP.Reference cell_style = 5;
-    if (has_cell_style()) {
+    // required int32 preset_index = 2;
+    if (has_preset_index()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cell_style());
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->preset_index());
     }
 
-    // optional .TSP.Reference text_style = 6;
-    if (has_text_style()) {
+    // required .TST.TableStyleNetworkArchive table_styles = 3;
+    if (has_table_styles()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->text_style());
+          this->table_styles());
+    }
+
+    // required bool send_notification = 4;
+    if (has_send_notification()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -20422,10 +21910,10 @@ int CommandApplyTableStylePresetArchive_StyleIndexTuple::ByteSize() const {
   return total_size;
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandAddTableStylePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandApplyTableStylePresetArchive_StyleIndexTuple* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyTableStylePresetArchive_StyleIndexTuple*>(
+  const CommandAddTableStylePresetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandAddTableStylePresetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -20434,195 +21922,165 @@ void CommandApplyTableStylePresetArchive_StyleIndexTuple::MergeFrom(const ::goog
   }
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::MergeFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from) {
+void CommandAddTableStylePresetArchive::MergeFrom(const CommandAddTableStylePresetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_index()) {
-      set_index(from.index());
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_cell_style()) {
-      mutable_cell_style()->::TSP::Reference::MergeFrom(from.cell_style());
+    if (from.has_preset_index()) {
+      set_preset_index(from.preset_index());
     }
-    if (from.has_text_style()) {
-      mutable_text_style()->::TSP::Reference::MergeFrom(from.text_style());
+    if (from.has_table_styles()) {
+      mutable_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.table_styles());
+    }
+    if (from.has_send_notification()) {
+      set_send_notification(from.send_notification());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandAddTableStylePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::CopyFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from) {
+void CommandAddTableStylePresetArchive::CopyFrom(const CommandAddTableStylePresetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandApplyTableStylePresetArchive_StyleIndexTuple::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandAddTableStylePresetArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
-  if (has_cell_style()) {
-    if (!this->cell_style().IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
   }
-  if (has_text_style()) {
-    if (!this->text_style().IsInitialized()) return false;
+  if (has_table_styles()) {
+    if (!this->table_styles().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandApplyTableStylePresetArchive_StyleIndexTuple::Swap(CommandApplyTableStylePresetArchive_StyleIndexTuple* other) {
+void CommandAddTableStylePresetArchive::Swap(CommandAddTableStylePresetArchive* other) {
   if (other != this) {
-    std::swap(index_, other->index_);
-    std::swap(cell_style_, other->cell_style_);
-    std::swap(text_style_, other->text_style_);
+    std::swap(super_, other->super_);
+    std::swap(preset_index_, other->preset_index_);
+    std::swap(table_styles_, other->table_styles_);
+    std::swap(send_notification_, other->send_notification_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandApplyTableStylePresetArchive_StyleIndexTuple::GetMetadata() const {
+::google::protobuf::Metadata CommandAddTableStylePresetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandApplyTableStylePresetArchive_StyleIndexTuple_descriptor_;
-  metadata.reflection = CommandApplyTableStylePresetArchive_StyleIndexTuple_reflection_;
+  metadata.descriptor = CommandAddTableStylePresetArchive_descriptor_;
+  metadata.reflection = CommandAddTableStylePresetArchive_reflection_;
   return metadata;
 }
 
 
-// -------------------------------------------------------------------
+// ===================================================================
 
 #ifndef _MSC_VER
-const int CommandApplyTableStylePresetArchive::kSuperFieldNumber;
-const int CommandApplyTableStylePresetArchive::kUndoCellMapFieldNumber;
-const int CommandApplyTableStylePresetArchive::kRedoCellMapFieldNumber;
-const int CommandApplyTableStylePresetArchive::kPresetIndexFieldNumber;
-const int CommandApplyTableStylePresetArchive::kOldTableStylesFieldNumber;
-const int CommandApplyTableStylePresetArchive::kNewTableStylesFieldNumber;
-const int CommandApplyTableStylePresetArchive::kApplyClearsAllFieldNumber;
-const int CommandApplyTableStylePresetArchive::kFontSizeCommandFieldNumber;
-const int CommandApplyTableStylePresetArchive::kSetStyleApplyClearsAllFlagCommandFieldNumber;
-const int CommandApplyTableStylePresetArchive::kRowStyleIndexTuplesFieldNumber;
-const int CommandApplyTableStylePresetArchive::kColStyleIndexTuplesFieldNumber;
+const int CommandRemoveTableStylePresetArchive::kSuperFieldNumber;
+const int CommandRemoveTableStylePresetArchive::kThemeFieldNumber;
+const int CommandRemoveTableStylePresetArchive::kRemovedTableStylesFieldNumber;
+const int CommandRemoveTableStylePresetArchive::kPresetIdFieldNumber;
+const int CommandRemoveTableStylePresetArchive::kPresetIndexInThemeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandApplyTableStylePresetArchive::CommandApplyTableStylePresetArchive()
+CommandRemoveTableStylePresetArchive::CommandRemoveTableStylePresetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandApplyTableStylePresetArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  old_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
-  new_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
-  font_size_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  set_style_apply_clears_all_flag_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandRemoveTableStylePresetArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  theme_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  removed_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
 }
 
-CommandApplyTableStylePresetArchive::CommandApplyTableStylePresetArchive(const CommandApplyTableStylePresetArchive& from)
+CommandRemoveTableStylePresetArchive::CommandRemoveTableStylePresetArchive(const CommandRemoveTableStylePresetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandApplyTableStylePresetArchive::SharedCtor() {
+void CommandRemoveTableStylePresetArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
-  preset_index_ = 0;
-  old_table_styles_ = NULL;
-  new_table_styles_ = NULL;
-  apply_clears_all_ = false;
-  font_size_command_ = NULL;
-  set_style_apply_clears_all_flag_command_ = NULL;
+  theme_ = NULL;
+  removed_table_styles_ = NULL;
+  preset_id_ = 0;
+  preset_index_in_theme_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandApplyTableStylePresetArchive::~CommandApplyTableStylePresetArchive() {
+CommandRemoveTableStylePresetArchive::~CommandRemoveTableStylePresetArchive() {
   SharedDtor();
 }
 
-void CommandApplyTableStylePresetArchive::SharedDtor() {
+void CommandRemoveTableStylePresetArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
-    delete old_table_styles_;
-    delete new_table_styles_;
-    delete font_size_command_;
-    delete set_style_apply_clears_all_flag_command_;
+    delete theme_;
+    delete removed_table_styles_;
   }
 }
 
-void CommandApplyTableStylePresetArchive::SetCachedSize(int size) const {
+void CommandRemoveTableStylePresetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandApplyTableStylePresetArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRemoveTableStylePresetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandApplyTableStylePresetArchive_descriptor_;
+  return CommandRemoveTableStylePresetArchive_descriptor_;
 }
 
-const CommandApplyTableStylePresetArchive& CommandApplyTableStylePresetArchive::default_instance() {
+const CommandRemoveTableStylePresetArchive& CommandRemoveTableStylePresetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandApplyTableStylePresetArchive* CommandApplyTableStylePresetArchive::default_instance_ = NULL;
+CommandRemoveTableStylePresetArchive* CommandRemoveTableStylePresetArchive::default_instance_ = NULL;
 
-CommandApplyTableStylePresetArchive* CommandApplyTableStylePresetArchive::New() const {
-  return new CommandApplyTableStylePresetArchive;
+CommandRemoveTableStylePresetArchive* CommandRemoveTableStylePresetArchive::New() const {
+  return new CommandRemoveTableStylePresetArchive;
 }
 
-void CommandApplyTableStylePresetArchive::Clear() {
+void CommandRemoveTableStylePresetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    preset_index_ = 0;
-    if (has_old_table_styles()) {
-      if (old_table_styles_ != NULL) old_table_styles_->::TST::TableStyleNetworkArchive::Clear();
-    }
-    if (has_new_table_styles()) {
-      if (new_table_styles_ != NULL) new_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    apply_clears_all_ = false;
-    if (has_font_size_command()) {
-      if (font_size_command_ != NULL) font_size_command_->::TSP::Reference::Clear();
+    if (has_theme()) {
+      if (theme_ != NULL) theme_->::TSP::Reference::Clear();
     }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_set_style_apply_clears_all_flag_command()) {
-      if (set_style_apply_clears_all_flag_command_ != NULL) set_style_apply_clears_all_flag_command_->::TSP::Reference::Clear();
+    if (has_removed_table_styles()) {
+      if (removed_table_styles_ != NULL) removed_table_styles_->::TST::TableStyleNetworkArchive::Clear();
     }
+    preset_id_ = 0;
+    preset_index_in_theme_ = 0;
   }
-  row_style_index_tuples_.Clear();
-  col_style_index_tuples_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandApplyTableStylePresetArchive::MergePartialFromCodedStream(
+bool CommandRemoveTableStylePresetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -20631,152 +22089,66 @@ bool CommandApplyTableStylePresetArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_undo_cell_map;
+        if (input->ExpectTag(18)) goto parse_theme;
         break;
       }
 
-      // required .TST.CellMapArchive undo_cell_map = 2;
+      // required .TSP.Reference theme = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
+         parse_theme:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
+               input, mutable_theme()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_redo_cell_map;
+        if (input->ExpectTag(26)) goto parse_removed_table_styles;
         break;
       }
 
-      // required .TST.CellMapArchive redo_cell_map = 4;
-      case 4: {
+      // required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
+         parse_removed_table_styles:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+               input, mutable_removed_table_styles()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(40)) goto parse_preset_index;
+        if (input->ExpectTag(32)) goto parse_preset_id;
         break;
       }
 
-      // required int32 preset_index = 5;
-      case 5: {
+      // required int32 preset_id = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_preset_index:
+         parse_preset_id:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &preset_index_)));
-          set_has_preset_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_old_table_styles;
-        break;
-      }
-
-      // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_table_styles:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_table_styles()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_new_table_styles;
-        break;
-      }
-
-      // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_table_styles:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_table_styles()));
+                 input, &preset_id_)));
+          set_has_preset_id();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(80)) goto parse_apply_clears_all;
+        if (input->ExpectTag(40)) goto parse_preset_index_in_theme;
         break;
       }
 
-      // optional bool apply_clears_all = 10;
-      case 10: {
+      // required int32 preset_index_in_theme = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_apply_clears_all:
+         parse_preset_index_in_theme:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &apply_clears_all_)));
-          set_has_apply_clears_all();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(90)) goto parse_font_size_command;
-        break;
-      }
-
-      // optional .TSP.Reference font_size_command = 11;
-      case 11: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_font_size_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_font_size_command()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(98)) goto parse_set_style_apply_clears_all_flag_command;
-        break;
-      }
-
-      // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
-      case 12: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_set_style_apply_clears_all_flag_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_set_style_apply_clears_all_flag_command()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(106)) goto parse_row_style_index_tuples;
-        break;
-      }
-
-      // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
-      case 13: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_row_style_index_tuples:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_row_style_index_tuples()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(106)) goto parse_row_style_index_tuples;
-        if (input->ExpectTag(114)) goto parse_col_style_index_tuples;
-        break;
-      }
-
-      // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
-      case 14: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_col_style_index_tuples:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_col_style_index_tuples()));
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &preset_index_in_theme_)));
+          set_has_preset_index_in_theme();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(114)) goto parse_col_style_index_tuples;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -20797,70 +22169,34 @@ bool CommandApplyTableStylePresetArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandApplyTableStylePresetArchive::SerializeWithCachedSizes(
+void CommandRemoveTableStylePresetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->undo_cell_map(), output);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->redo_cell_map(), output);
-  }
-
-  // required int32 preset_index = 5;
-  if (has_preset_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->preset_index(), output);
-  }
-
-  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-  if (has_old_table_styles()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->old_table_styles(), output);
-  }
-
-  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-  if (has_new_table_styles()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->new_table_styles(), output);
-  }
-
-  // optional bool apply_clears_all = 10;
-  if (has_apply_clears_all()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->apply_clears_all(), output);
-  }
-
-  // optional .TSP.Reference font_size_command = 11;
-  if (has_font_size_command()) {
+  // required .TSP.Reference theme = 2;
+  if (has_theme()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      11, this->font_size_command(), output);
+      2, this->theme(), output);
   }
 
-  // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
-  if (has_set_style_apply_clears_all_flag_command()) {
+  // required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+  if (has_removed_table_styles()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      12, this->set_style_apply_clears_all_flag_command(), output);
+      3, this->removed_table_styles(), output);
   }
 
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
-  for (int i = 0; i < this->row_style_index_tuples_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      13, this->row_style_index_tuples(i), output);
+  // required int32 preset_id = 4;
+  if (has_preset_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->preset_id(), output);
   }
 
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
-  for (int i = 0; i < this->col_style_index_tuples_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      14, this->col_style_index_tuples(i), output);
+  // required int32 preset_index_in_theme = 5;
+  if (has_preset_index_in_theme()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->preset_index_in_theme(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -20869,79 +22205,37 @@ void CommandApplyTableStylePresetArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandApplyTableStylePresetArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRemoveTableStylePresetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->undo_cell_map(), target);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->redo_cell_map(), target);
-  }
-
-  // required int32 preset_index = 5;
-  if (has_preset_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->preset_index(), target);
-  }
-
-  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-  if (has_old_table_styles()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->old_table_styles(), target);
-  }
-
-  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-  if (has_new_table_styles()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->new_table_styles(), target);
-  }
-
-  // optional bool apply_clears_all = 10;
-  if (has_apply_clears_all()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->apply_clears_all(), target);
-  }
-
-  // optional .TSP.Reference font_size_command = 11;
-  if (has_font_size_command()) {
+  // required .TSP.Reference theme = 2;
+  if (has_theme()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        11, this->font_size_command(), target);
+        2, this->theme(), target);
   }
 
-  // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
-  if (has_set_style_apply_clears_all_flag_command()) {
+  // required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+  if (has_removed_table_styles()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        12, this->set_style_apply_clears_all_flag_command(), target);
+        3, this->removed_table_styles(), target);
   }
 
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
-  for (int i = 0; i < this->row_style_index_tuples_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        13, this->row_style_index_tuples(i), target);
+  // required int32 preset_id = 4;
+  if (has_preset_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->preset_id(), target);
   }
 
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
-  for (int i = 0; i < this->col_style_index_tuples_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        14, this->col_style_index_tuples(i), target);
+  // required int32 preset_index_in_theme = 5;
+  if (has_preset_index_in_theme()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->preset_index_in_theme(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -20951,220 +22245,136 @@ ::google::protobuf::uint8* CommandApplyTableStylePresetArchive::SerializeWithCac
   return target;
 }
 
-int CommandApplyTableStylePresetArchive::ByteSize() const {
+int CommandRemoveTableStylePresetArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TSK.CommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TST.CellMapArchive undo_cell_map = 2;
-    if (has_undo_cell_map()) {
+    // required .TSP.Reference theme = 2;
+    if (has_theme()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+          this->theme());
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 4;
-    if (has_redo_cell_map()) {
+    // required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+    if (has_removed_table_styles()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+          this->removed_table_styles());
     }
 
-    // required int32 preset_index = 5;
-    if (has_preset_index()) {
+    // required int32 preset_id = 4;
+    if (has_preset_id()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->preset_index());
+          this->preset_id());
     }
 
-    // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-    if (has_old_table_styles()) {
+    // required int32 preset_index_in_theme = 5;
+    if (has_preset_index_in_theme()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_table_styles());
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->preset_index_in_theme());
     }
 
-    // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-    if (has_new_table_styles()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_table_styles());
-    }
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
 
-    // optional bool apply_clears_all = 10;
-    if (has_apply_clears_all()) {
-      total_size += 1 + 1;
-    }
+void CommandRemoveTableStylePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandRemoveTableStylePresetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRemoveTableStylePresetArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
 
-    // optional .TSP.Reference font_size_command = 11;
-    if (has_font_size_command()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->font_size_command());
-    }
-
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
-    if (has_set_style_apply_clears_all_flag_command()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->set_style_apply_clears_all_flag_command());
-    }
-
-  }
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
-  total_size += 1 * this->row_style_index_tuples_size();
-  for (int i = 0; i < this->row_style_index_tuples_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->row_style_index_tuples(i));
-  }
-
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
-  total_size += 1 * this->col_style_index_tuples_size();
-  for (int i = 0; i < this->col_style_index_tuples_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->col_style_index_tuples(i));
-  }
-
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void CommandApplyTableStylePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const CommandApplyTableStylePresetArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyTableStylePresetArchive*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void CommandApplyTableStylePresetArchive::MergeFrom(const CommandApplyTableStylePresetArchive& from) {
+void CommandRemoveTableStylePresetArchive::MergeFrom(const CommandRemoveTableStylePresetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  row_style_index_tuples_.MergeFrom(from.row_style_index_tuples_);
-  col_style_index_tuples_.MergeFrom(from.col_style_index_tuples_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
-    }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
-    }
-    if (from.has_preset_index()) {
-      set_preset_index(from.preset_index());
-    }
-    if (from.has_old_table_styles()) {
-      mutable_old_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_table_styles());
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_new_table_styles()) {
-      mutable_new_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_table_styles());
+    if (from.has_theme()) {
+      mutable_theme()->::TSP::Reference::MergeFrom(from.theme());
     }
-    if (from.has_apply_clears_all()) {
-      set_apply_clears_all(from.apply_clears_all());
+    if (from.has_removed_table_styles()) {
+      mutable_removed_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.removed_table_styles());
     }
-    if (from.has_font_size_command()) {
-      mutable_font_size_command()->::TSP::Reference::MergeFrom(from.font_size_command());
+    if (from.has_preset_id()) {
+      set_preset_id(from.preset_id());
     }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_set_style_apply_clears_all_flag_command()) {
-      mutable_set_style_apply_clears_all_flag_command()->::TSP::Reference::MergeFrom(from.set_style_apply_clears_all_flag_command());
+    if (from.has_preset_index_in_theme()) {
+      set_preset_index_in_theme(from.preset_index_in_theme());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandApplyTableStylePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRemoveTableStylePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandApplyTableStylePresetArchive::CopyFrom(const CommandApplyTableStylePresetArchive& from) {
+void CommandRemoveTableStylePresetArchive::CopyFrom(const CommandRemoveTableStylePresetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandApplyTableStylePresetArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000003f) != 0x0000003f) return false;
+bool CommandRemoveTableStylePresetArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
-  if (has_old_table_styles()) {
-    if (!this->old_table_styles().IsInitialized()) return false;
-  }
-  if (has_new_table_styles()) {
-    if (!this->new_table_styles().IsInitialized()) return false;
-  }
-  if (has_font_size_command()) {
-    if (!this->font_size_command().IsInitialized()) return false;
-  }
-  if (has_set_style_apply_clears_all_flag_command()) {
-    if (!this->set_style_apply_clears_all_flag_command().IsInitialized()) return false;
+  if (has_theme()) {
+    if (!this->theme().IsInitialized()) return false;
   }
-  for (int i = 0; i < row_style_index_tuples_size(); i++) {
-    if (!this->row_style_index_tuples(i).IsInitialized()) return false;
-  }
-  for (int i = 0; i < col_style_index_tuples_size(); i++) {
-    if (!this->col_style_index_tuples(i).IsInitialized()) return false;
+  if (has_removed_table_styles()) {
+    if (!this->removed_table_styles().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandApplyTableStylePresetArchive::Swap(CommandApplyTableStylePresetArchive* other) {
+void CommandRemoveTableStylePresetArchive::Swap(CommandRemoveTableStylePresetArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
-    std::swap(preset_index_, other->preset_index_);
-    std::swap(old_table_styles_, other->old_table_styles_);
-    std::swap(new_table_styles_, other->new_table_styles_);
-    std::swap(apply_clears_all_, other->apply_clears_all_);
-    std::swap(font_size_command_, other->font_size_command_);
-    std::swap(set_style_apply_clears_all_flag_command_, other->set_style_apply_clears_all_flag_command_);
-    row_style_index_tuples_.Swap(&other->row_style_index_tuples_);
-    col_style_index_tuples_.Swap(&other->col_style_index_tuples_);
+    std::swap(theme_, other->theme_);
+    std::swap(removed_table_styles_, other->removed_table_styles_);
+    std::swap(preset_id_, other->preset_id_);
+    std::swap(preset_index_in_theme_, other->preset_index_in_theme_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandApplyTableStylePresetArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRemoveTableStylePresetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandApplyTableStylePresetArchive_descriptor_;
-  metadata.reflection = CommandApplyTableStylePresetArchive_reflection_;
+  metadata.descriptor = CommandRemoveTableStylePresetArchive_descriptor_;
+  metadata.reflection = CommandRemoveTableStylePresetArchive_reflection_;
   return metadata;
 }
 
@@ -21172,81 +22382,99 @@ ::google::protobuf::Metadata CommandApplyTableStylePresetArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetStyleApplyClearsAllFlagArchive::kSuperFieldNumber;
-const int CommandSetStyleApplyClearsAllFlagArchive::kApplyClearsAllFieldNumber;
+const int CommandReplaceTableStylePresetArchive::kSuperFieldNumber;
+const int CommandReplaceTableStylePresetArchive::kThemeFieldNumber;
+const int CommandReplaceTableStylePresetArchive::kOldTableStylesFieldNumber;
+const int CommandReplaceTableStylePresetArchive::kNewTableStylesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetStyleApplyClearsAllFlagArchive::CommandSetStyleApplyClearsAllFlagArchive()
+CommandReplaceTableStylePresetArchive::CommandReplaceTableStylePresetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+void CommandReplaceTableStylePresetArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  theme_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  old_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+  new_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
 }
 
-CommandSetStyleApplyClearsAllFlagArchive::CommandSetStyleApplyClearsAllFlagArchive(const CommandSetStyleApplyClearsAllFlagArchive& from)
+CommandReplaceTableStylePresetArchive::CommandReplaceTableStylePresetArchive(const CommandReplaceTableStylePresetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::SharedCtor() {
+void CommandReplaceTableStylePresetArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  apply_clears_all_ = false;
+  theme_ = NULL;
+  old_table_styles_ = NULL;
+  new_table_styles_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetStyleApplyClearsAllFlagArchive::~CommandSetStyleApplyClearsAllFlagArchive() {
+CommandReplaceTableStylePresetArchive::~CommandReplaceTableStylePresetArchive() {
   SharedDtor();
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::SharedDtor() {
+void CommandReplaceTableStylePresetArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete theme_;
+    delete old_table_styles_;
+    delete new_table_styles_;
   }
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::SetCachedSize(int size) const {
+void CommandReplaceTableStylePresetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetStyleApplyClearsAllFlagArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandReplaceTableStylePresetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetStyleApplyClearsAllFlagArchive_descriptor_;
+  return CommandReplaceTableStylePresetArchive_descriptor_;
 }
 
-const CommandSetStyleApplyClearsAllFlagArchive& CommandSetStyleApplyClearsAllFlagArchive::default_instance() {
+const CommandReplaceTableStylePresetArchive& CommandReplaceTableStylePresetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetStyleApplyClearsAllFlagArchive* CommandSetStyleApplyClearsAllFlagArchive::default_instance_ = NULL;
+CommandReplaceTableStylePresetArchive* CommandReplaceTableStylePresetArchive::default_instance_ = NULL;
 
-CommandSetStyleApplyClearsAllFlagArchive* CommandSetStyleApplyClearsAllFlagArchive::New() const {
-  return new CommandSetStyleApplyClearsAllFlagArchive;
+CommandReplaceTableStylePresetArchive* CommandReplaceTableStylePresetArchive::New() const {
+  return new CommandReplaceTableStylePresetArchive;
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::Clear() {
+void CommandReplaceTableStylePresetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    }
+    if (has_theme()) {
+      if (theme_ != NULL) theme_->::TSP::Reference::Clear();
+    }
+    if (has_old_table_styles()) {
+      if (old_table_styles_ != NULL) old_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    }
+    if (has_new_table_styles()) {
+      if (new_table_styles_ != NULL) new_table_styles_->::TST::TableStyleNetworkArchive::Clear();
     }
-    apply_clears_all_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetStyleApplyClearsAllFlagArchive::MergePartialFromCodedStream(
+bool CommandReplaceTableStylePresetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -21255,19 +22483,45 @@ bool CommandSetStyleApplyClearsAllFlagArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_apply_clears_all;
+        if (input->ExpectTag(18)) goto parse_theme;
         break;
       }
 
-      // required bool apply_clears_all = 2;
+      // required .TSP.Reference theme = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_apply_clears_all:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &apply_clears_all_)));
-          set_has_apply_clears_all();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_theme:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_theme()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_old_table_styles;
+        break;
+      }
+
+      // required .TST.TableStyleNetworkArchive old_table_styles = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_table_styles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_table_styles()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_new_table_styles;
+        break;
+      }
+
+      // required .TST.TableStyleNetworkArchive new_table_styles = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_table_styles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_table_styles()));
         } else {
           goto handle_uninterpreted;
         }
@@ -21291,17 +22545,30 @@ bool CommandSetStyleApplyClearsAllFlagArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::SerializeWithCachedSizes(
+void CommandReplaceTableStylePresetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required bool apply_clears_all = 2;
-  if (has_apply_clears_all()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->apply_clears_all(), output);
+  // required .TSP.Reference theme = 2;
+  if (has_theme()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->theme(), output);
+  }
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 3;
+  if (has_old_table_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->old_table_styles(), output);
+  }
+
+  // required .TST.TableStyleNetworkArchive new_table_styles = 4;
+  if (has_new_table_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->new_table_styles(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -21310,18 +22577,34 @@ void CommandSetStyleApplyClearsAllFlagArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetStyleApplyClearsAllFlagArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandReplaceTableStylePresetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required bool apply_clears_all = 2;
-  if (has_apply_clears_all()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->apply_clears_all(), target);
+  // required .TSP.Reference theme = 2;
+  if (has_theme()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->theme(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 3;
+  if (has_old_table_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->old_table_styles(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive new_table_styles = 4;
+  if (has_new_table_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->new_table_styles(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -21331,20 +22614,36 @@ ::google::protobuf::uint8* CommandSetStyleApplyClearsAllFlagArchive::SerializeWi
   return target;
 }
 
-int CommandSetStyleApplyClearsAllFlagArchive::ByteSize() const {
+int CommandReplaceTableStylePresetArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TSK.CommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required bool apply_clears_all = 2;
-    if (has_apply_clears_all()) {
-      total_size += 1 + 1;
+    // required .TSP.Reference theme = 2;
+    if (has_theme()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->theme());
+    }
+
+    // required .TST.TableStyleNetworkArchive old_table_styles = 3;
+    if (has_old_table_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_table_styles());
+    }
+
+    // required .TST.TableStyleNetworkArchive new_table_styles = 4;
+    if (has_new_table_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_table_styles());
     }
 
   }
@@ -21359,10 +22658,10 @@ int CommandSetStyleApplyClearsAllFlagArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceTableStylePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetStyleApplyClearsAllFlagArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetStyleApplyClearsAllFlagArchive*>(
+  const CommandReplaceTableStylePresetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandReplaceTableStylePresetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -21371,55 +22670,72 @@ void CommandSetStyleApplyClearsAllFlagArchive::MergeFrom(const ::google::protobu
   }
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::MergeFrom(const CommandSetStyleApplyClearsAllFlagArchive& from) {
+void CommandReplaceTableStylePresetArchive::MergeFrom(const CommandReplaceTableStylePresetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_apply_clears_all()) {
-      set_apply_clears_all(from.apply_clears_all());
+    if (from.has_theme()) {
+      mutable_theme()->::TSP::Reference::MergeFrom(from.theme());
+    }
+    if (from.has_old_table_styles()) {
+      mutable_old_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_table_styles());
+    }
+    if (from.has_new_table_styles()) {
+      mutable_new_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_table_styles());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandReplaceTableStylePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::CopyFrom(const CommandSetStyleApplyClearsAllFlagArchive& from) {
+void CommandReplaceTableStylePresetArchive::CopyFrom(const CommandReplaceTableStylePresetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetStyleApplyClearsAllFlagArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandReplaceTableStylePresetArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_theme()) {
+    if (!this->theme().IsInitialized()) return false;
+  }
+  if (has_old_table_styles()) {
+    if (!this->old_table_styles().IsInitialized()) return false;
+  }
+  if (has_new_table_styles()) {
+    if (!this->new_table_styles().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetStyleApplyClearsAllFlagArchive::Swap(CommandSetStyleApplyClearsAllFlagArchive* other) {
+void CommandReplaceTableStylePresetArchive::Swap(CommandReplaceTableStylePresetArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(apply_clears_all_, other->apply_clears_all_);
+    std::swap(theme_, other->theme_);
+    std::swap(old_table_styles_, other->old_table_styles_);
+    std::swap(new_table_styles_, other->new_table_styles_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetStyleApplyClearsAllFlagArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandReplaceTableStylePresetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetStyleApplyClearsAllFlagArchive_descriptor_;
-  metadata.reflection = CommandSetStyleApplyClearsAllFlagArchive_reflection_;
+  metadata.descriptor = CommandReplaceTableStylePresetArchive_descriptor_;
+  metadata.reflection = CommandReplaceTableStylePresetArchive_reflection_;
   return metadata;
 }
 
@@ -21427,167 +22743,123 @@ ::google::protobuf::Metadata CommandSetStyleApplyClearsAllFlagArchive::GetMetada
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandApplyThemeToTableArchive::kSuperFieldNumber;
-const int CommandApplyThemeToTableArchive::kUndoCellMapFieldNumber;
-const int CommandApplyThemeToTableArchive::kRedoCellMapFieldNumber;
-const int CommandApplyThemeToTableArchive::kOldTableStylesFieldNumber;
-const int CommandApplyThemeToTableArchive::kNewTableStylesFieldNumber;
+const int CommandApplyTableStylePresetArchive_StyleIndexTuple::kIndexFieldNumber;
+const int CommandApplyTableStylePresetArchive_StyleIndexTuple::kCellStyleFieldNumber;
+const int CommandApplyTableStylePresetArchive_StyleIndexTuple::kTextStyleFieldNumber;
 #endif  // !_MSC_VER
 
-CommandApplyThemeToTableArchive::CommandApplyThemeToTableArchive()
+CommandApplyTableStylePresetArchive_StyleIndexTuple::CommandApplyTableStylePresetArchive_StyleIndexTuple()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandApplyThemeToTableArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  old_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
-  new_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::InitAsDefaultInstance() {
+  cell_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  text_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandApplyThemeToTableArchive::CommandApplyThemeToTableArchive(const CommandApplyThemeToTableArchive& from)
+CommandApplyTableStylePresetArchive_StyleIndexTuple::CommandApplyTableStylePresetArchive_StyleIndexTuple(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandApplyThemeToTableArchive::SharedCtor() {
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
-  old_table_styles_ = NULL;
-  new_table_styles_ = NULL;
+  index_ = 0u;
+  cell_style_ = NULL;
+  text_style_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandApplyThemeToTableArchive::~CommandApplyThemeToTableArchive() {
+CommandApplyTableStylePresetArchive_StyleIndexTuple::~CommandApplyTableStylePresetArchive_StyleIndexTuple() {
   SharedDtor();
 }
 
-void CommandApplyThemeToTableArchive::SharedDtor() {
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
-    delete old_table_styles_;
-    delete new_table_styles_;
+    delete cell_style_;
+    delete text_style_;
   }
 }
 
-void CommandApplyThemeToTableArchive::SetCachedSize(int size) const {
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandApplyThemeToTableArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandApplyTableStylePresetArchive_StyleIndexTuple::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandApplyThemeToTableArchive_descriptor_;
+  return CommandApplyTableStylePresetArchive_StyleIndexTuple_descriptor_;
 }
 
-const CommandApplyThemeToTableArchive& CommandApplyThemeToTableArchive::default_instance() {
+const CommandApplyTableStylePresetArchive_StyleIndexTuple& CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandApplyThemeToTableArchive* CommandApplyThemeToTableArchive::default_instance_ = NULL;
+CommandApplyTableStylePresetArchive_StyleIndexTuple* CommandApplyTableStylePresetArchive_StyleIndexTuple::default_instance_ = NULL;
 
-CommandApplyThemeToTableArchive* CommandApplyThemeToTableArchive::New() const {
-  return new CommandApplyThemeToTableArchive;
+CommandApplyTableStylePresetArchive_StyleIndexTuple* CommandApplyTableStylePresetArchive_StyleIndexTuple::New() const {
+  return new CommandApplyTableStylePresetArchive_StyleIndexTuple;
 }
 
-void CommandApplyThemeToTableArchive::Clear() {
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_old_table_styles()) {
-      if (old_table_styles_ != NULL) old_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    index_ = 0u;
+    if (has_cell_style()) {
+      if (cell_style_ != NULL) cell_style_->::TSP::Reference::Clear();
     }
-    if (has_new_table_styles()) {
-      if (new_table_styles_ != NULL) new_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    if (has_text_style()) {
+      if (text_style_ != NULL) text_style_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandApplyThemeToTableArchive::MergePartialFromCodedStream(
+bool CommandApplyTableStylePresetArchive_StyleIndexTuple::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required uint32 index = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_undo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive undo_cell_map = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_redo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive redo_cell_map = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &index_)));
+          set_has_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_old_table_styles;
+        if (input->ExpectTag(42)) goto parse_cell_style;
         break;
       }
 
-      // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-      case 7: {
+      // optional .TSP.Reference cell_style = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_table_styles:
+         parse_cell_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_table_styles()));
+               input, mutable_cell_style()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_new_table_styles;
+        if (input->ExpectTag(50)) goto parse_text_style;
         break;
       }
 
-      // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-      case 8: {
+      // optional .TSP.Reference text_style = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_table_styles:
+         parse_text_style:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_table_styles()));
+               input, mutable_text_style()));
         } else {
           goto handle_uninterpreted;
         }
@@ -21611,36 +22883,23 @@ bool CommandApplyThemeToTableArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandApplyThemeToTableArchive::SerializeWithCachedSizes(
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->undo_cell_map(), output);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->redo_cell_map(), output);
+  // required uint32 index = 1;
+  if (has_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->index(), output);
   }
 
-  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-  if (has_old_table_styles()) {
+  // optional .TSP.Reference cell_style = 5;
+  if (has_cell_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->old_table_styles(), output);
+      5, this->cell_style(), output);
   }
 
-  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-  if (has_new_table_styles()) {
+  // optional .TSP.Reference text_style = 6;
+  if (has_text_style()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->new_table_styles(), output);
+      6, this->text_style(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -21649,41 +22908,25 @@ void CommandApplyThemeToTableArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandApplyThemeToTableArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandApplyTableStylePresetArchive_StyleIndexTuple::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->undo_cell_map(), target);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->redo_cell_map(), target);
+  // required uint32 index = 1;
+  if (has_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->index(), target);
   }
 
-  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-  if (has_old_table_styles()) {
+  // optional .TSP.Reference cell_style = 5;
+  if (has_cell_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->old_table_styles(), target);
+        5, this->cell_style(), target);
   }
 
-  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-  if (has_new_table_styles()) {
+  // optional .TSP.Reference text_style = 6;
+  if (has_text_style()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        8, this->new_table_styles(), target);
+        6, this->text_style(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -21693,43 +22936,2631 @@ ::google::protobuf::uint8* CommandApplyThemeToTableArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandApplyThemeToTableArchive::ByteSize() const {
+int CommandApplyTableStylePresetArchive_StyleIndexTuple::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
-    if (has_super()) {
+    // required uint32 index = 1;
+    if (has_index()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->index());
     }
 
-    // required .TST.CellMapArchive undo_cell_map = 2;
-    if (has_undo_cell_map()) {
+    // optional .TSP.Reference cell_style = 5;
+    if (has_cell_style()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+          this->cell_style());
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 4;
-    if (has_redo_cell_map()) {
+    // optional .TSP.Reference text_style = 6;
+    if (has_text_style()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+          this->text_style());
     }
 
-    // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-    if (has_old_table_styles()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandApplyTableStylePresetArchive_StyleIndexTuple* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyTableStylePresetArchive_StyleIndexTuple*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::MergeFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_index()) {
+      set_index(from.index());
+    }
+    if (from.has_cell_style()) {
+      mutable_cell_style()->::TSP::Reference::MergeFrom(from.cell_style());
+    }
+    if (from.has_text_style()) {
+      mutable_text_style()->::TSP::Reference::MergeFrom(from.text_style());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::CopyFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandApplyTableStylePresetArchive_StyleIndexTuple::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+
+  if (has_cell_style()) {
+    if (!this->cell_style().IsInitialized()) return false;
+  }
+  if (has_text_style()) {
+    if (!this->text_style().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandApplyTableStylePresetArchive_StyleIndexTuple::Swap(CommandApplyTableStylePresetArchive_StyleIndexTuple* other) {
+  if (other != this) {
+    std::swap(index_, other->index_);
+    std::swap(cell_style_, other->cell_style_);
+    std::swap(text_style_, other->text_style_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandApplyTableStylePresetArchive_StyleIndexTuple::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandApplyTableStylePresetArchive_StyleIndexTuple_descriptor_;
+  metadata.reflection = CommandApplyTableStylePresetArchive_StyleIndexTuple_reflection_;
+  return metadata;
+}
+
+
+// -------------------------------------------------------------------
+
+#ifndef _MSC_VER
+const int CommandApplyTableStylePresetArchive::kSuperFieldNumber;
+const int CommandApplyTableStylePresetArchive::kUndoCellMapFieldNumber;
+const int CommandApplyTableStylePresetArchive::kRedoCellMapFieldNumber;
+const int CommandApplyTableStylePresetArchive::kPresetIndexFieldNumber;
+const int CommandApplyTableStylePresetArchive::kOldTableStylesFieldNumber;
+const int CommandApplyTableStylePresetArchive::kNewTableStylesFieldNumber;
+const int CommandApplyTableStylePresetArchive::kApplyClearsAllFieldNumber;
+const int CommandApplyTableStylePresetArchive::kFontSizeCommandFieldNumber;
+const int CommandApplyTableStylePresetArchive::kSetStyleApplyClearsAllFlagCommandFieldNumber;
+const int CommandApplyTableStylePresetArchive::kRowStyleIndexTuplesFieldNumber;
+const int CommandApplyTableStylePresetArchive::kColStyleIndexTuplesFieldNumber;
+#endif  // !_MSC_VER
+
+CommandApplyTableStylePresetArchive::CommandApplyTableStylePresetArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandApplyTableStylePresetArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  old_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+  new_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+  font_size_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  set_style_apply_clears_all_flag_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandApplyTableStylePresetArchive::CommandApplyTableStylePresetArchive(const CommandApplyTableStylePresetArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandApplyTableStylePresetArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  preset_index_ = 0;
+  old_table_styles_ = NULL;
+  new_table_styles_ = NULL;
+  apply_clears_all_ = false;
+  font_size_command_ = NULL;
+  set_style_apply_clears_all_flag_command_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandApplyTableStylePresetArchive::~CommandApplyTableStylePresetArchive() {
+  SharedDtor();
+}
+
+void CommandApplyTableStylePresetArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+    delete old_table_styles_;
+    delete new_table_styles_;
+    delete font_size_command_;
+    delete set_style_apply_clears_all_flag_command_;
+  }
+}
+
+void CommandApplyTableStylePresetArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandApplyTableStylePresetArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandApplyTableStylePresetArchive_descriptor_;
+}
+
+const CommandApplyTableStylePresetArchive& CommandApplyTableStylePresetArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandApplyTableStylePresetArchive* CommandApplyTableStylePresetArchive::default_instance_ = NULL;
+
+CommandApplyTableStylePresetArchive* CommandApplyTableStylePresetArchive::New() const {
+  return new CommandApplyTableStylePresetArchive;
+}
+
+void CommandApplyTableStylePresetArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    preset_index_ = 0;
+    if (has_old_table_styles()) {
+      if (old_table_styles_ != NULL) old_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    }
+    if (has_new_table_styles()) {
+      if (new_table_styles_ != NULL) new_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    }
+    apply_clears_all_ = false;
+    if (has_font_size_command()) {
+      if (font_size_command_ != NULL) font_size_command_->::TSP::Reference::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_set_style_apply_clears_all_flag_command()) {
+      if (set_style_apply_clears_all_flag_command_ != NULL) set_style_apply_clears_all_flag_command_->::TSP::Reference::Clear();
+    }
+  }
+  row_style_index_tuples_.Clear();
+  col_style_index_tuples_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandApplyTableStylePresetArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_preset_index;
+        break;
+      }
+
+      // required int32 preset_index = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_preset_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &preset_index_)));
+          set_has_preset_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_old_table_styles;
+        break;
+      }
+
+      // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_table_styles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_table_styles()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_new_table_styles;
+        break;
+      }
+
+      // optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_table_styles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_table_styles()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_apply_clears_all;
+        break;
+      }
+
+      // optional bool apply_clears_all = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_apply_clears_all:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &apply_clears_all_)));
+          set_has_apply_clears_all();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(90)) goto parse_font_size_command;
+        break;
+      }
+
+      // optional .TSP.Reference font_size_command = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_font_size_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_font_size_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(98)) goto parse_set_style_apply_clears_all_flag_command;
+        break;
+      }
+
+      // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
+      case 12: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_set_style_apply_clears_all_flag_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_set_style_apply_clears_all_flag_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(106)) goto parse_row_style_index_tuples;
+        break;
+      }
+
+      // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
+      case 13: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_row_style_index_tuples:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_row_style_index_tuples()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(106)) goto parse_row_style_index_tuples;
+        if (input->ExpectTag(114)) goto parse_col_style_index_tuples;
+        break;
+      }
+
+      // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
+      case 14: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_col_style_index_tuples:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_col_style_index_tuples()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(114)) goto parse_col_style_index_tuples;
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandApplyTableStylePresetArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 2;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->redo_cell_map(), output);
+  }
+
+  // required int32 preset_index = 5;
+  if (has_preset_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->preset_index(), output);
+  }
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+  if (has_old_table_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->old_table_styles(), output);
+  }
+
+  // optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
+  if (has_new_table_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->new_table_styles(), output);
+  }
+
+  // optional bool apply_clears_all = 10;
+  if (has_apply_clears_all()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(10, this->apply_clears_all(), output);
+  }
+
+  // optional .TSP.Reference font_size_command = 11;
+  if (has_font_size_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      11, this->font_size_command(), output);
+  }
+
+  // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
+  if (has_set_style_apply_clears_all_flag_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      12, this->set_style_apply_clears_all_flag_command(), output);
+  }
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
+  for (int i = 0; i < this->row_style_index_tuples_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      13, this->row_style_index_tuples(i), output);
+  }
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
+  for (int i = 0; i < this->col_style_index_tuples_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      14, this->col_style_index_tuples(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandApplyTableStylePresetArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 2;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->redo_cell_map(), target);
+  }
+
+  // required int32 preset_index = 5;
+  if (has_preset_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->preset_index(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+  if (has_old_table_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->old_table_styles(), target);
+  }
+
+  // optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
+  if (has_new_table_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->new_table_styles(), target);
+  }
+
+  // optional bool apply_clears_all = 10;
+  if (has_apply_clears_all()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(10, this->apply_clears_all(), target);
+  }
+
+  // optional .TSP.Reference font_size_command = 11;
+  if (has_font_size_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        11, this->font_size_command(), target);
+  }
+
+  // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
+  if (has_set_style_apply_clears_all_flag_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        12, this->set_style_apply_clears_all_flag_command(), target);
+  }
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
+  for (int i = 0; i < this->row_style_index_tuples_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        13, this->row_style_index_tuples(i), target);
+  }
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
+  for (int i = 0; i < this->col_style_index_tuples_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        14, this->col_style_index_tuples(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandApplyTableStylePresetArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 2;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 4;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+    // required int32 preset_index = 5;
+    if (has_preset_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->preset_index());
+    }
+
+    // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+    if (has_old_table_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_table_styles());
+    }
+
+    // optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
+    if (has_new_table_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_table_styles());
+    }
+
+    // optional bool apply_clears_all = 10;
+    if (has_apply_clears_all()) {
+      total_size += 1 + 1;
+    }
+
+    // optional .TSP.Reference font_size_command = 11;
+    if (has_font_size_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->font_size_command());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
+    if (has_set_style_apply_clears_all_flag_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->set_style_apply_clears_all_flag_command());
+    }
+
+  }
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
+  total_size += 1 * this->row_style_index_tuples_size();
+  for (int i = 0; i < this->row_style_index_tuples_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->row_style_index_tuples(i));
+  }
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
+  total_size += 1 * this->col_style_index_tuples_size();
+  for (int i = 0; i < this->col_style_index_tuples_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->col_style_index_tuples(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandApplyTableStylePresetArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandApplyTableStylePresetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyTableStylePresetArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandApplyTableStylePresetArchive::MergeFrom(const CommandApplyTableStylePresetArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  row_style_index_tuples_.MergeFrom(from.row_style_index_tuples_);
+  col_style_index_tuples_.MergeFrom(from.col_style_index_tuples_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+    if (from.has_preset_index()) {
+      set_preset_index(from.preset_index());
+    }
+    if (from.has_old_table_styles()) {
+      mutable_old_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_table_styles());
+    }
+    if (from.has_new_table_styles()) {
+      mutable_new_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_table_styles());
+    }
+    if (from.has_apply_clears_all()) {
+      set_apply_clears_all(from.apply_clears_all());
+    }
+    if (from.has_font_size_command()) {
+      mutable_font_size_command()->::TSP::Reference::MergeFrom(from.font_size_command());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_set_style_apply_clears_all_flag_command()) {
+      mutable_set_style_apply_clears_all_flag_command()->::TSP::Reference::MergeFrom(from.set_style_apply_clears_all_flag_command());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandApplyTableStylePresetArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandApplyTableStylePresetArchive::CopyFrom(const CommandApplyTableStylePresetArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandApplyTableStylePresetArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  if (has_old_table_styles()) {
+    if (!this->old_table_styles().IsInitialized()) return false;
+  }
+  if (has_new_table_styles()) {
+    if (!this->new_table_styles().IsInitialized()) return false;
+  }
+  if (has_font_size_command()) {
+    if (!this->font_size_command().IsInitialized()) return false;
+  }
+  if (has_set_style_apply_clears_all_flag_command()) {
+    if (!this->set_style_apply_clears_all_flag_command().IsInitialized()) return false;
+  }
+  for (int i = 0; i < row_style_index_tuples_size(); i++) {
+    if (!this->row_style_index_tuples(i).IsInitialized()) return false;
+  }
+  for (int i = 0; i < col_style_index_tuples_size(); i++) {
+    if (!this->col_style_index_tuples(i).IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandApplyTableStylePresetArchive::Swap(CommandApplyTableStylePresetArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(preset_index_, other->preset_index_);
+    std::swap(old_table_styles_, other->old_table_styles_);
+    std::swap(new_table_styles_, other->new_table_styles_);
+    std::swap(apply_clears_all_, other->apply_clears_all_);
+    std::swap(font_size_command_, other->font_size_command_);
+    std::swap(set_style_apply_clears_all_flag_command_, other->set_style_apply_clears_all_flag_command_);
+    row_style_index_tuples_.Swap(&other->row_style_index_tuples_);
+    col_style_index_tuples_.Swap(&other->col_style_index_tuples_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandApplyTableStylePresetArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandApplyTableStylePresetArchive_descriptor_;
+  metadata.reflection = CommandApplyTableStylePresetArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetStyleApplyClearsAllFlagArchive::kSuperFieldNumber;
+const int CommandSetStyleApplyClearsAllFlagArchive::kApplyClearsAllFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetStyleApplyClearsAllFlagArchive::CommandSetStyleApplyClearsAllFlagArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+}
+
+CommandSetStyleApplyClearsAllFlagArchive::CommandSetStyleApplyClearsAllFlagArchive(const CommandSetStyleApplyClearsAllFlagArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  apply_clears_all_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetStyleApplyClearsAllFlagArchive::~CommandSetStyleApplyClearsAllFlagArchive() {
+  SharedDtor();
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+  }
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetStyleApplyClearsAllFlagArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetStyleApplyClearsAllFlagArchive_descriptor_;
+}
+
+const CommandSetStyleApplyClearsAllFlagArchive& CommandSetStyleApplyClearsAllFlagArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetStyleApplyClearsAllFlagArchive* CommandSetStyleApplyClearsAllFlagArchive::default_instance_ = NULL;
+
+CommandSetStyleApplyClearsAllFlagArchive* CommandSetStyleApplyClearsAllFlagArchive::New() const {
+  return new CommandSetStyleApplyClearsAllFlagArchive;
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    apply_clears_all_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetStyleApplyClearsAllFlagArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_apply_clears_all;
+        break;
+      }
+
+      // required bool apply_clears_all = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_apply_clears_all:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &apply_clears_all_)));
+          set_has_apply_clears_all();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required bool apply_clears_all = 2;
+  if (has_apply_clears_all()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->apply_clears_all(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetStyleApplyClearsAllFlagArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required bool apply_clears_all = 2;
+  if (has_apply_clears_all()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->apply_clears_all(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetStyleApplyClearsAllFlagArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required bool apply_clears_all = 2;
+    if (has_apply_clears_all()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetStyleApplyClearsAllFlagArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetStyleApplyClearsAllFlagArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::MergeFrom(const CommandSetStyleApplyClearsAllFlagArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_apply_clears_all()) {
+      set_apply_clears_all(from.apply_clears_all());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::CopyFrom(const CommandSetStyleApplyClearsAllFlagArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetStyleApplyClearsAllFlagArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetStyleApplyClearsAllFlagArchive::Swap(CommandSetStyleApplyClearsAllFlagArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(apply_clears_all_, other->apply_clears_all_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandSetStyleApplyClearsAllFlagArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandSetStyleApplyClearsAllFlagArchive_descriptor_;
+  metadata.reflection = CommandSetStyleApplyClearsAllFlagArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandApplyThemeToTableArchive::kSuperFieldNumber;
+const int CommandApplyThemeToTableArchive::kUndoCellMapFieldNumber;
+const int CommandApplyThemeToTableArchive::kRedoCellMapFieldNumber;
+const int CommandApplyThemeToTableArchive::kOldTableStylesFieldNumber;
+const int CommandApplyThemeToTableArchive::kNewTableStylesFieldNumber;
+#endif  // !_MSC_VER
+
+CommandApplyThemeToTableArchive::CommandApplyThemeToTableArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandApplyThemeToTableArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  old_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+  new_table_styles_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+}
+
+CommandApplyThemeToTableArchive::CommandApplyThemeToTableArchive(const CommandApplyThemeToTableArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandApplyThemeToTableArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  old_table_styles_ = NULL;
+  new_table_styles_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandApplyThemeToTableArchive::~CommandApplyThemeToTableArchive() {
+  SharedDtor();
+}
+
+void CommandApplyThemeToTableArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+    delete old_table_styles_;
+    delete new_table_styles_;
+  }
+}
+
+void CommandApplyThemeToTableArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandApplyThemeToTableArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandApplyThemeToTableArchive_descriptor_;
+}
+
+const CommandApplyThemeToTableArchive& CommandApplyThemeToTableArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandApplyThemeToTableArchive* CommandApplyThemeToTableArchive::default_instance_ = NULL;
+
+CommandApplyThemeToTableArchive* CommandApplyThemeToTableArchive::New() const {
+  return new CommandApplyThemeToTableArchive;
+}
+
+void CommandApplyThemeToTableArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_old_table_styles()) {
+      if (old_table_styles_ != NULL) old_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    }
+    if (has_new_table_styles()) {
+      if (new_table_styles_ != NULL) new_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandApplyThemeToTableArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_old_table_styles;
+        break;
+      }
+
+      // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_table_styles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_table_styles()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_new_table_styles;
+        break;
+      }
+
+      // required .TST.TableStyleNetworkArchive new_table_styles = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_table_styles:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_table_styles()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandApplyThemeToTableArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 2;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->redo_cell_map(), output);
+  }
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+  if (has_old_table_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->old_table_styles(), output);
+  }
+
+  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
+  if (has_new_table_styles()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->new_table_styles(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandApplyThemeToTableArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 2;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->redo_cell_map(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+  if (has_old_table_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->old_table_styles(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
+  if (has_new_table_styles()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->new_table_styles(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandApplyThemeToTableArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 2;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 4;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+    // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+    if (has_old_table_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->old_table_styles());
     }
 
-    // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-    if (has_new_table_styles()) {
+    // required .TST.TableStyleNetworkArchive new_table_styles = 8;
+    if (has_new_table_styles()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_table_styles());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandApplyThemeToTableArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandApplyThemeToTableArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyThemeToTableArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandApplyThemeToTableArchive::MergeFrom(const CommandApplyThemeToTableArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+    if (from.has_old_table_styles()) {
+      mutable_old_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_table_styles());
+    }
+    if (from.has_new_table_styles()) {
+      mutable_new_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_table_styles());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandApplyThemeToTableArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandApplyThemeToTableArchive::CopyFrom(const CommandApplyThemeToTableArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandApplyThemeToTableArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  if (has_old_table_styles()) {
+    if (!this->old_table_styles().IsInitialized()) return false;
+  }
+  if (has_new_table_styles()) {
+    if (!this->new_table_styles().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandApplyThemeToTableArchive::Swap(CommandApplyThemeToTableArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(old_table_styles_, other->old_table_styles_);
+    std::swap(new_table_styles_, other->new_table_styles_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandApplyThemeToTableArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandApplyThemeToTableArchive_descriptor_;
+  metadata.reflection = CommandApplyThemeToTableArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandApplyThemeChildForTableArchive::kSuperFieldNumber;
+const int CommandApplyThemeChildForTableArchive::kApplyCommandFieldNumber;
+#endif  // !_MSC_VER
+
+CommandApplyThemeChildForTableArchive::CommandApplyThemeChildForTableArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandApplyThemeChildForTableArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSS::ApplyThemeChildCommandArchive*>(&::TSS::ApplyThemeChildCommandArchive::default_instance());
+  apply_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandApplyThemeChildForTableArchive::CommandApplyThemeChildForTableArchive(const CommandApplyThemeChildForTableArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandApplyThemeChildForTableArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  apply_command_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandApplyThemeChildForTableArchive::~CommandApplyThemeChildForTableArchive() {
+  SharedDtor();
+}
+
+void CommandApplyThemeChildForTableArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete apply_command_;
+  }
+}
+
+void CommandApplyThemeChildForTableArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandApplyThemeChildForTableArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandApplyThemeChildForTableArchive_descriptor_;
+}
+
+const CommandApplyThemeChildForTableArchive& CommandApplyThemeChildForTableArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandApplyThemeChildForTableArchive* CommandApplyThemeChildForTableArchive::default_instance_ = NULL;
+
+CommandApplyThemeChildForTableArchive* CommandApplyThemeChildForTableArchive::New() const {
+  return new CommandApplyThemeChildForTableArchive;
+}
+
+void CommandApplyThemeChildForTableArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
+    }
+    if (has_apply_command()) {
+      if (apply_command_ != NULL) apply_command_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandApplyThemeChildForTableArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TSS.ApplyThemeChildCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_apply_command;
+        break;
+      }
+
+      // required .TSP.Reference apply_command = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_apply_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_apply_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandApplyThemeChildForTableArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TSP.Reference apply_command = 2;
+  if (has_apply_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->apply_command(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandApplyThemeChildForTableArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TSP.Reference apply_command = 2;
+  if (has_apply_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->apply_command(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandApplyThemeChildForTableArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TSS.ApplyThemeChildCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TSP.Reference apply_command = 2;
+    if (has_apply_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->apply_command());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandApplyThemeChildForTableArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandApplyThemeChildForTableArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyThemeChildForTableArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandApplyThemeChildForTableArchive::MergeFrom(const CommandApplyThemeChildForTableArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TSS::ApplyThemeChildCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_apply_command()) {
+      mutable_apply_command()->::TSP::Reference::MergeFrom(from.apply_command());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandApplyThemeChildForTableArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandApplyThemeChildForTableArchive::CopyFrom(const CommandApplyThemeChildForTableArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandApplyThemeChildForTableArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_apply_command()) {
+    if (!this->apply_command().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandApplyThemeChildForTableArchive::Swap(CommandApplyThemeChildForTableArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(apply_command_, other->apply_command_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandApplyThemeChildForTableArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandApplyThemeChildForTableArchive_descriptor_;
+  metadata.reflection = CommandApplyThemeChildForTableArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandToggleTextPropertyArchive::kSuperFieldNumber;
+const int CommandToggleTextPropertyArchive::kSelectionFieldNumber;
+const int CommandToggleTextPropertyArchive::kPropertyFieldNumber;
+const int CommandToggleTextPropertyArchive::kUndoCellMapFieldNumber;
+const int CommandToggleTextPropertyArchive::kRedoCellMapFieldNumber;
+const int CommandToggleTextPropertyArchive::kDefaultBodyCellFieldNumber;
+const int CommandToggleTextPropertyArchive::kDefaultHrCellFieldNumber;
+const int CommandToggleTextPropertyArchive::kDefaultHcCellFieldNumber;
+const int CommandToggleTextPropertyArchive::kDefaultFrCellFieldNumber;
+const int CommandToggleTextPropertyArchive::kTextUndoFieldNumber;
+#endif  // !_MSC_VER
+
+CommandToggleTextPropertyArchive::CommandToggleTextPropertyArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandToggleTextPropertyArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  default_body_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+  default_hr_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+  default_hc_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+  default_fr_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
+  text_undo_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+}
+
+CommandToggleTextPropertyArchive::CommandToggleTextPropertyArchive(const CommandToggleTextPropertyArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandToggleTextPropertyArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  selection_ = NULL;
+  property_ = 0u;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  default_body_cell_ = NULL;
+  default_hr_cell_ = NULL;
+  default_hc_cell_ = NULL;
+  default_fr_cell_ = NULL;
+  text_undo_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandToggleTextPropertyArchive::~CommandToggleTextPropertyArchive() {
+  SharedDtor();
+}
+
+void CommandToggleTextPropertyArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete selection_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+    delete default_body_cell_;
+    delete default_hr_cell_;
+    delete default_hc_cell_;
+    delete default_fr_cell_;
+    delete text_undo_;
+  }
+}
+
+void CommandToggleTextPropertyArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandToggleTextPropertyArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandToggleTextPropertyArchive_descriptor_;
+}
+
+const CommandToggleTextPropertyArchive& CommandToggleTextPropertyArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandToggleTextPropertyArchive* CommandToggleTextPropertyArchive::default_instance_ = NULL;
+
+CommandToggleTextPropertyArchive* CommandToggleTextPropertyArchive::New() const {
+  return new CommandToggleTextPropertyArchive;
+}
+
+void CommandToggleTextPropertyArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    property_ = 0u;
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_default_body_cell()) {
+      if (default_body_cell_ != NULL) default_body_cell_->::TST::Cell::Clear();
+    }
+    if (has_default_hr_cell()) {
+      if (default_hr_cell_ != NULL) default_hr_cell_->::TST::Cell::Clear();
+    }
+    if (has_default_hc_cell()) {
+      if (default_hc_cell_ != NULL) default_hc_cell_->::TST::Cell::Clear();
+    }
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_default_fr_cell()) {
+      if (default_fr_cell_ != NULL) default_fr_cell_->::TST::Cell::Clear();
+    }
+    if (has_text_undo()) {
+      if (text_undo_ != NULL) text_undo_->::TSP::Reference::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandToggleTextPropertyArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_selection;
+        break;
+      }
+
+      // required .TST.SelectionArchive selection = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_property;
+        break;
+      }
+
+      // required uint32 property = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_property:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &property_)));
+          set_has_property();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_default_body_cell;
+        break;
+      }
+
+      // required .TST.Cell default_body_cell = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_default_body_cell:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_default_body_cell()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_default_hr_cell;
+        break;
+      }
+
+      // required .TST.Cell default_hr_cell = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_default_hr_cell:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_default_hr_cell()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_default_hc_cell;
+        break;
+      }
+
+      // required .TST.Cell default_hc_cell = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_default_hc_cell:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_default_hc_cell()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_default_fr_cell;
+        break;
+      }
+
+      // required .TST.Cell default_fr_cell = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_default_fr_cell:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_default_fr_cell()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(82)) goto parse_text_undo;
+        break;
+      }
+
+      // optional .TSP.Reference text_undo = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_text_undo:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_text_undo()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandToggleTextPropertyArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->selection(), output);
+  }
+
+  // required uint32 property = 3;
+  if (has_property()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->property(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->redo_cell_map(), output);
+  }
+
+  // required .TST.Cell default_body_cell = 6;
+  if (has_default_body_cell()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->default_body_cell(), output);
+  }
+
+  // required .TST.Cell default_hr_cell = 7;
+  if (has_default_hr_cell()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->default_hr_cell(), output);
+  }
+
+  // required .TST.Cell default_hc_cell = 8;
+  if (has_default_hc_cell()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->default_hc_cell(), output);
+  }
+
+  // required .TST.Cell default_fr_cell = 9;
+  if (has_default_fr_cell()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->default_fr_cell(), output);
+  }
+
+  // optional .TSP.Reference text_undo = 10;
+  if (has_text_undo()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      10, this->text_undo(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandToggleTextPropertyArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->selection(), target);
+  }
+
+  // required uint32 property = 3;
+  if (has_property()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->property(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->redo_cell_map(), target);
+  }
+
+  // required .TST.Cell default_body_cell = 6;
+  if (has_default_body_cell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->default_body_cell(), target);
+  }
+
+  // required .TST.Cell default_hr_cell = 7;
+  if (has_default_hr_cell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->default_hr_cell(), target);
+  }
+
+  // required .TST.Cell default_hc_cell = 8;
+  if (has_default_hc_cell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->default_hc_cell(), target);
+  }
+
+  // required .TST.Cell default_fr_cell = 9;
+  if (has_default_fr_cell()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->default_fr_cell(), target);
+  }
+
+  // optional .TSP.Reference text_undo = 10;
+  if (has_text_undo()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        10, this->text_undo(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandToggleTextPropertyArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // required uint32 property = 3;
+    if (has_property()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->property());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 4;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 5;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+    // required .TST.Cell default_body_cell = 6;
+    if (has_default_body_cell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->default_body_cell());
+    }
+
+    // required .TST.Cell default_hr_cell = 7;
+    if (has_default_hr_cell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->default_hr_cell());
+    }
+
+    // required .TST.Cell default_hc_cell = 8;
+    if (has_default_hc_cell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->default_hc_cell());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // required .TST.Cell default_fr_cell = 9;
+    if (has_default_fr_cell()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->default_fr_cell());
+    }
+
+    // optional .TSP.Reference text_undo = 10;
+    if (has_text_undo()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->text_undo());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandToggleTextPropertyArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandToggleTextPropertyArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandToggleTextPropertyArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandToggleTextPropertyArchive::MergeFrom(const CommandToggleTextPropertyArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_property()) {
+      set_property(from.property());
+    }
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+    if (from.has_default_body_cell()) {
+      mutable_default_body_cell()->::TST::Cell::MergeFrom(from.default_body_cell());
+    }
+    if (from.has_default_hr_cell()) {
+      mutable_default_hr_cell()->::TST::Cell::MergeFrom(from.default_hr_cell());
+    }
+    if (from.has_default_hc_cell()) {
+      mutable_default_hc_cell()->::TST::Cell::MergeFrom(from.default_hc_cell());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_default_fr_cell()) {
+      mutable_default_fr_cell()->::TST::Cell::MergeFrom(from.default_fr_cell());
+    }
+    if (from.has_text_undo()) {
+      mutable_text_undo()->::TSP::Reference::MergeFrom(from.text_undo());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandToggleTextPropertyArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandToggleTextPropertyArchive::CopyFrom(const CommandToggleTextPropertyArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandToggleTextPropertyArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x000001ff) != 0x000001ff) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  if (has_default_body_cell()) {
+    if (!this->default_body_cell().IsInitialized()) return false;
+  }
+  if (has_default_hr_cell()) {
+    if (!this->default_hr_cell().IsInitialized()) return false;
+  }
+  if (has_default_hc_cell()) {
+    if (!this->default_hc_cell().IsInitialized()) return false;
+  }
+  if (has_default_fr_cell()) {
+    if (!this->default_fr_cell().IsInitialized()) return false;
+  }
+  if (has_text_undo()) {
+    if (!this->text_undo().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandToggleTextPropertyArchive::Swap(CommandToggleTextPropertyArchive* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(selection_, other->selection_);
+    std::swap(property_, other->property_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(default_body_cell_, other->default_body_cell_);
+    std::swap(default_hr_cell_, other->default_hr_cell_);
+    std::swap(default_hc_cell_, other->default_hc_cell_);
+    std::swap(default_fr_cell_, other->default_fr_cell_);
+    std::swap(text_undo_, other->text_undo_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata CommandToggleTextPropertyArchive::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandToggleTextPropertyArchive_descriptor_;
+  metadata.reflection = CommandToggleTextPropertyArchive_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandResetFillPropertyToDefault::kSuperFieldNumber;
+const int CommandResetFillPropertyToDefault::kSelectionFieldNumber;
+const int CommandResetFillPropertyToDefault::kUndoCellMapFieldNumber;
+const int CommandResetFillPropertyToDefault::kRedoCellMapFieldNumber;
+#endif  // !_MSC_VER
+
+CommandResetFillPropertyToDefault::CommandResetFillPropertyToDefault()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandResetFillPropertyToDefault::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+}
+
+CommandResetFillPropertyToDefault::CommandResetFillPropertyToDefault(const CommandResetFillPropertyToDefault& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandResetFillPropertyToDefault::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  selection_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandResetFillPropertyToDefault::~CommandResetFillPropertyToDefault() {
+  SharedDtor();
+}
+
+void CommandResetFillPropertyToDefault::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete selection_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+  }
+}
+
+void CommandResetFillPropertyToDefault::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandResetFillPropertyToDefault::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandResetFillPropertyToDefault_descriptor_;
+}
+
+const CommandResetFillPropertyToDefault& CommandResetFillPropertyToDefault::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandResetFillPropertyToDefault* CommandResetFillPropertyToDefault::default_instance_ = NULL;
+
+CommandResetFillPropertyToDefault* CommandResetFillPropertyToDefault::New() const {
+  return new CommandResetFillPropertyToDefault;
+}
+
+void CommandResetFillPropertyToDefault::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandResetFillPropertyToDefault::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_selection;
+        break;
+      }
+
+      // required .TST.SelectionArchive selection = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void CommandResetFillPropertyToDefault::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->selection(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->redo_cell_map(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandResetFillPropertyToDefault::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->selection(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->redo_cell_map(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandResetFillPropertyToDefault::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_table_styles());
+          this->selection());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 4;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 5;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
     }
 
   }
@@ -21744,10 +25575,10 @@ int CommandApplyThemeToTableArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandApplyThemeToTableArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandResetFillPropertyToDefault::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandApplyThemeToTableArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyThemeToTableArchive*>(
+  const CommandResetFillPropertyToDefault* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandResetFillPropertyToDefault*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -21756,79 +25587,433 @@ void CommandApplyThemeToTableArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandApplyThemeToTableArchive::MergeFrom(const CommandApplyThemeToTableArchive& from) {
+void CommandResetFillPropertyToDefault::MergeFrom(const CommandResetFillPropertyToDefault& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
     if (from.has_undo_cell_map()) {
       mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
     }
     if (from.has_redo_cell_map()) {
       mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
     }
-    if (from.has_old_table_styles()) {
-      mutable_old_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_table_styles());
-    }
-    if (from.has_new_table_styles()) {
-      mutable_new_table_styles()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_table_styles());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandApplyThemeToTableArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandResetFillPropertyToDefault::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandApplyThemeToTableArchive::CopyFrom(const CommandApplyThemeToTableArchive& from) {
+void CommandResetFillPropertyToDefault::CopyFrom(const CommandResetFillPropertyToDefault& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandApplyThemeToTableArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool CommandResetFillPropertyToDefault::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
   if (has_undo_cell_map()) {
     if (!this->undo_cell_map().IsInitialized()) return false;
   }
   if (has_redo_cell_map()) {
     if (!this->redo_cell_map().IsInitialized()) return false;
   }
-  if (has_old_table_styles()) {
-    if (!this->old_table_styles().IsInitialized()) return false;
+  return true;
+}
+
+void CommandResetFillPropertyToDefault::Swap(CommandResetFillPropertyToDefault* other) {
+  if (other != this) {
+    std::swap(super_, other->super_);
+    std::swap(selection_, other->selection_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
   }
-  if (has_new_table_styles()) {
-    if (!this->new_table_styles().IsInitialized()) return false;
+}
+
+::google::protobuf::Metadata CommandResetFillPropertyToDefault::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = CommandResetFillPropertyToDefault_descriptor_;
+  metadata.reflection = CommandResetFillPropertyToDefault_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int CommandSetSingleNumberFormatParameterArchive::kSuperFieldNumber;
+const int CommandSetSingleNumberFormatParameterArchive::kSelectionFieldNumber;
+const int CommandSetSingleNumberFormatParameterArchive::kUndoCellMapFieldNumber;
+const int CommandSetSingleNumberFormatParameterArchive::kRedoCellMapFieldNumber;
+#endif  // !_MSC_VER
+
+CommandSetSingleNumberFormatParameterArchive::CommandSetSingleNumberFormatParameterArchive()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void CommandSetSingleNumberFormatParameterArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+}
+
+CommandSetSingleNumberFormatParameterArchive::CommandSetSingleNumberFormatParameterArchive(const CommandSetSingleNumberFormatParameterArchive& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void CommandSetSingleNumberFormatParameterArchive::SharedCtor() {
+  _cached_size_ = 0;
+  super_ = NULL;
+  selection_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+CommandSetSingleNumberFormatParameterArchive::~CommandSetSingleNumberFormatParameterArchive() {
+  SharedDtor();
+}
+
+void CommandSetSingleNumberFormatParameterArchive::SharedDtor() {
+  if (this != default_instance_) {
+    delete super_;
+    delete selection_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+  }
+}
+
+void CommandSetSingleNumberFormatParameterArchive::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* CommandSetSingleNumberFormatParameterArchive::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return CommandSetSingleNumberFormatParameterArchive_descriptor_;
+}
+
+const CommandSetSingleNumberFormatParameterArchive& CommandSetSingleNumberFormatParameterArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
+
+CommandSetSingleNumberFormatParameterArchive* CommandSetSingleNumberFormatParameterArchive::default_instance_ = NULL;
+
+CommandSetSingleNumberFormatParameterArchive* CommandSetSingleNumberFormatParameterArchive::New() const {
+  return new CommandSetSingleNumberFormatParameterArchive;
+}
+
+void CommandSetSingleNumberFormatParameterArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandSetSingleNumberFormatParameterArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_selection;
+        break;
+      }
+
+      // required .TST.SelectionArchive selection = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
   }
   return true;
+#undef DO_
 }
 
-void CommandApplyThemeToTableArchive::Swap(CommandApplyThemeToTableArchive* other) {
+void CommandSetSingleNumberFormatParameterArchive::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
+  }
+
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->selection(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 3;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->redo_cell_map(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* CommandSetSingleNumberFormatParameterArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->selection(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 3;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->redo_cell_map(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int CommandSetSingleNumberFormatParameterArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // required .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 3;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 4;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void CommandSetSingleNumberFormatParameterArchive::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const CommandSetSingleNumberFormatParameterArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSingleNumberFormatParameterArchive*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void CommandSetSingleNumberFormatParameterArchive::MergeFrom(const CommandSetSingleNumberFormatParameterArchive& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void CommandSetSingleNumberFormatParameterArchive::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void CommandSetSingleNumberFormatParameterArchive::CopyFrom(const CommandSetSingleNumberFormatParameterArchive& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool CommandSetSingleNumberFormatParameterArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  return true;
+}
+
+void CommandSetSingleNumberFormatParameterArchive::Swap(CommandSetSingleNumberFormatParameterArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(selection_, other->selection_);
     std::swap(undo_cell_map_, other->undo_cell_map_);
     std::swap(redo_cell_map_, other->redo_cell_map_);
-    std::swap(old_table_styles_, other->old_table_styles_);
-    std::swap(new_table_styles_, other->new_table_styles_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandApplyThemeToTableArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetSingleNumberFormatParameterArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandApplyThemeToTableArchive_descriptor_;
-  metadata.reflection = CommandApplyThemeToTableArchive_reflection_;
+  metadata.descriptor = CommandSetSingleNumberFormatParameterArchive_descriptor_;
+  metadata.reflection = CommandSetSingleNumberFormatParameterArchive_reflection_;
   return metadata;
 }
 
@@ -21836,85 +26021,81 @@ ::google::protobuf::Metadata CommandApplyThemeToTableArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandApplyThemeChildForTableArchive::kSuperFieldNumber;
-const int CommandApplyThemeChildForTableArchive::kApplyCommandFieldNumber;
+const int CommandSetBaseArchive::kSuperFieldNumber;
+const int CommandSetBaseArchive::kBaseFieldNumber;
 #endif  // !_MSC_VER
 
-CommandApplyThemeChildForTableArchive::CommandApplyThemeChildForTableArchive()
+CommandSetBaseArchive::CommandSetBaseArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandApplyThemeChildForTableArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSS::ApplyThemeChildCommandArchive*>(&::TSS::ApplyThemeChildCommandArchive::default_instance());
-  apply_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetBaseArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandApplyThemeChildForTableArchive::CommandApplyThemeChildForTableArchive(const CommandApplyThemeChildForTableArchive& from)
+CommandSetBaseArchive::CommandSetBaseArchive(const CommandSetBaseArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandApplyThemeChildForTableArchive::SharedCtor() {
+void CommandSetBaseArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  apply_command_ = NULL;
+  base_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandApplyThemeChildForTableArchive::~CommandApplyThemeChildForTableArchive() {
+CommandSetBaseArchive::~CommandSetBaseArchive() {
   SharedDtor();
 }
 
-void CommandApplyThemeChildForTableArchive::SharedDtor() {
+void CommandSetBaseArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete apply_command_;
   }
 }
 
-void CommandApplyThemeChildForTableArchive::SetCachedSize(int size) const {
+void CommandSetBaseArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandApplyThemeChildForTableArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetBaseArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandApplyThemeChildForTableArchive_descriptor_;
+  return CommandSetBaseArchive_descriptor_;
 }
 
-const CommandApplyThemeChildForTableArchive& CommandApplyThemeChildForTableArchive::default_instance() {
+const CommandSetBaseArchive& CommandSetBaseArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandApplyThemeChildForTableArchive* CommandApplyThemeChildForTableArchive::default_instance_ = NULL;
-
-CommandApplyThemeChildForTableArchive* CommandApplyThemeChildForTableArchive::New() const {
-  return new CommandApplyThemeChildForTableArchive;
+CommandSetBaseArchive* CommandSetBaseArchive::default_instance_ = NULL;
+
+CommandSetBaseArchive* CommandSetBaseArchive::New() const {
+  return new CommandSetBaseArchive;
 }
 
-void CommandApplyThemeChildForTableArchive::Clear() {
+void CommandSetBaseArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSS::ApplyThemeChildCommandArchive::Clear();
-    }
-    if (has_apply_command()) {
-      if (apply_command_ != NULL) apply_command_->::TSP::Reference::Clear();
+      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    base_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandApplyThemeChildForTableArchive::MergePartialFromCodedStream(
+bool CommandSetBaseArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSS.ApplyThemeChildCommandArchive super = 1;
+      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -21923,17 +26104,19 @@ bool CommandApplyThemeChildForTableArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_apply_command;
+        if (input->ExpectTag(16)) goto parse_base;
         break;
       }
 
-      // required .TSP.Reference apply_command = 2;
+      // required uint32 base = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_apply_command:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_apply_command()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_base:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &base_)));
+          set_has_base();
         } else {
           goto handle_uninterpreted;
         }
@@ -21957,18 +26140,17 @@ bool CommandApplyThemeChildForTableArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandApplyThemeChildForTableArchive::SerializeWithCachedSizes(
+void CommandSetBaseArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference apply_command = 2;
-  if (has_apply_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->apply_command(), output);
+  // required uint32 base = 2;
+  if (has_base()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->base(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -21977,20 +26159,18 @@ void CommandApplyThemeChildForTableArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandApplyThemeChildForTableArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetBaseArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference apply_command = 2;
-  if (has_apply_command()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->apply_command(), target);
+  // required uint32 base = 2;
+  if (has_base()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->base(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -22000,22 +26180,22 @@ ::google::protobuf::uint8* CommandApplyThemeChildForTableArchive::SerializeWithC
   return target;
 }
 
-int CommandApplyThemeChildForTableArchive::ByteSize() const {
+int CommandSetBaseArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSS.ApplyThemeChildCommandArchive super = 1;
+    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSP.Reference apply_command = 2;
-    if (has_apply_command()) {
+    // required uint32 base = 2;
+    if (has_base()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->apply_command());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->base());
     }
 
   }
@@ -22030,10 +26210,10 @@ int CommandApplyThemeChildForTableArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandApplyThemeChildForTableArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetBaseArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandApplyThemeChildForTableArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyThemeChildForTableArchive*>(
+  const CommandSetBaseArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetBaseArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -22042,58 +26222,55 @@ void CommandApplyThemeChildForTableArchive::MergeFrom(const ::google::protobuf::
   }
 }
 
-void CommandApplyThemeChildForTableArchive::MergeFrom(const CommandApplyThemeChildForTableArchive& from) {
+void CommandSetBaseArchive::MergeFrom(const CommandSetBaseArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSS::ApplyThemeChildCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_apply_command()) {
-      mutable_apply_command()->::TSP::Reference::MergeFrom(from.apply_command());
+    if (from.has_base()) {
+      set_base(from.base());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandApplyThemeChildForTableArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetBaseArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandApplyThemeChildForTableArchive::CopyFrom(const CommandApplyThemeChildForTableArchive& from) {
+void CommandSetBaseArchive::CopyFrom(const CommandSetBaseArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandApplyThemeChildForTableArchive::IsInitialized() const {
+bool CommandSetBaseArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_apply_command()) {
-    if (!this->apply_command().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandApplyThemeChildForTableArchive::Swap(CommandApplyThemeChildForTableArchive* other) {
+void CommandSetBaseArchive::Swap(CommandSetBaseArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(apply_command_, other->apply_command_);
+    std::swap(base_, other->base_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandApplyThemeChildForTableArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetBaseArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandApplyThemeChildForTableArchive_descriptor_;
-  metadata.reflection = CommandApplyThemeChildForTableArchive_reflection_;
+  metadata.descriptor = CommandSetBaseArchive_descriptor_;
+  metadata.reflection = CommandSetBaseArchive_reflection_;
   return metadata;
 }
 
@@ -22101,139 +26278,81 @@ ::google::protobuf::Metadata CommandApplyThemeChildForTableArchive::GetMetadata(
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandToggleTextPropertyArchive::kSuperFieldNumber;
-const int CommandToggleTextPropertyArchive::kSelectionFieldNumber;
-const int CommandToggleTextPropertyArchive::kPropertyFieldNumber;
-const int CommandToggleTextPropertyArchive::kUndoCellMapFieldNumber;
-const int CommandToggleTextPropertyArchive::kRedoCellMapFieldNumber;
-const int CommandToggleTextPropertyArchive::kDefaultBodyCellFieldNumber;
-const int CommandToggleTextPropertyArchive::kDefaultHrCellFieldNumber;
-const int CommandToggleTextPropertyArchive::kDefaultHcCellFieldNumber;
-const int CommandToggleTextPropertyArchive::kDefaultFrCellFieldNumber;
-const int CommandToggleTextPropertyArchive::kTextUndoFieldNumber;
+const int CommandSetBasePlacesArchive::kSuperFieldNumber;
+const int CommandSetBasePlacesArchive::kBasePlacesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandToggleTextPropertyArchive::CommandToggleTextPropertyArchive()
+CommandSetBasePlacesArchive::CommandSetBasePlacesArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandToggleTextPropertyArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  default_body_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
-  default_hr_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
-  default_hc_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
-  default_fr_cell_ = const_cast< ::TST::Cell*>(&::TST::Cell::default_instance());
-  text_undo_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetBasePlacesArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandToggleTextPropertyArchive::CommandToggleTextPropertyArchive(const CommandToggleTextPropertyArchive& from)
+CommandSetBasePlacesArchive::CommandSetBasePlacesArchive(const CommandSetBasePlacesArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandToggleTextPropertyArchive::SharedCtor() {
+void CommandSetBasePlacesArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  property_ = 0u;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
-  default_body_cell_ = NULL;
-  default_hr_cell_ = NULL;
-  default_hc_cell_ = NULL;
-  default_fr_cell_ = NULL;
-  text_undo_ = NULL;
+  base_places_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandToggleTextPropertyArchive::~CommandToggleTextPropertyArchive() {
+CommandSetBasePlacesArchive::~CommandSetBasePlacesArchive() {
   SharedDtor();
 }
 
-void CommandToggleTextPropertyArchive::SharedDtor() {
+void CommandSetBasePlacesArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
-    delete default_body_cell_;
-    delete default_hr_cell_;
-    delete default_hc_cell_;
-    delete default_fr_cell_;
-    delete text_undo_;
   }
 }
 
-void CommandToggleTextPropertyArchive::SetCachedSize(int size) const {
+void CommandSetBasePlacesArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandToggleTextPropertyArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetBasePlacesArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandToggleTextPropertyArchive_descriptor_;
+  return CommandSetBasePlacesArchive_descriptor_;
 }
 
-const CommandToggleTextPropertyArchive& CommandToggleTextPropertyArchive::default_instance() {
+const CommandSetBasePlacesArchive& CommandSetBasePlacesArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandToggleTextPropertyArchive* CommandToggleTextPropertyArchive::default_instance_ = NULL;
+CommandSetBasePlacesArchive* CommandSetBasePlacesArchive::default_instance_ = NULL;
 
-CommandToggleTextPropertyArchive* CommandToggleTextPropertyArchive::New() const {
-  return new CommandToggleTextPropertyArchive;
+CommandSetBasePlacesArchive* CommandSetBasePlacesArchive::New() const {
+  return new CommandSetBasePlacesArchive;
 }
 
-void CommandToggleTextPropertyArchive::Clear() {
+void CommandSetBasePlacesArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    property_ = 0u;
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_default_body_cell()) {
-      if (default_body_cell_ != NULL) default_body_cell_->::TST::Cell::Clear();
-    }
-    if (has_default_hr_cell()) {
-      if (default_hr_cell_ != NULL) default_hr_cell_->::TST::Cell::Clear();
-    }
-    if (has_default_hc_cell()) {
-      if (default_hc_cell_ != NULL) default_hc_cell_->::TST::Cell::Clear();
-    }
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_default_fr_cell()) {
-      if (default_fr_cell_ != NULL) default_fr_cell_->::TST::Cell::Clear();
-    }
-    if (has_text_undo()) {
-      if (text_undo_ != NULL) text_undo_->::TSP::Reference::Clear();
+      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    base_places_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandToggleTextPropertyArchive::MergePartialFromCodedStream(
+bool CommandSetBasePlacesArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -22242,131 +26361,19 @@ bool CommandToggleTextPropertyArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_selection;
+        if (input->ExpectTag(16)) goto parse_base_places;
         break;
       }
 
-      // required .TST.SelectionArchive selection = 2;
+      // required uint32 base_places = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_property;
-        break;
-      }
-
-      // required uint32 property = 3;
-      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_property:
+         parse_base_places:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &property_)));
-          set_has_property();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_undo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive undo_cell_map = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_redo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive redo_cell_map = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_default_body_cell;
-        break;
-      }
-
-      // required .TST.Cell default_body_cell = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_default_body_cell:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_default_body_cell()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_default_hr_cell;
-        break;
-      }
-
-      // required .TST.Cell default_hr_cell = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_default_hr_cell:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_default_hr_cell()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_default_hc_cell;
-        break;
-      }
-
-      // required .TST.Cell default_hc_cell = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_default_hc_cell:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_default_hc_cell()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(74)) goto parse_default_fr_cell;
-        break;
-      }
-
-      // required .TST.Cell default_fr_cell = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_default_fr_cell:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_default_fr_cell()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(82)) goto parse_text_undo;
-        break;
-      }
-
-      // optional .TSP.Reference text_undo = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_text_undo:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_text_undo()));
+                 input, &base_places_)));
+          set_has_base_places();
         } else {
           goto handle_uninterpreted;
         }
@@ -22390,65 +26397,17 @@ bool CommandToggleTextPropertyArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandToggleTextPropertyArchive::SerializeWithCachedSizes(
+void CommandSetBasePlacesArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required uint32 property = 3;
-  if (has_property()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->property(), output);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->undo_cell_map(), output);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->redo_cell_map(), output);
-  }
-
-  // required .TST.Cell default_body_cell = 6;
-  if (has_default_body_cell()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->default_body_cell(), output);
-  }
-
-  // required .TST.Cell default_hr_cell = 7;
-  if (has_default_hr_cell()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->default_hr_cell(), output);
-  }
-
-  // required .TST.Cell default_hc_cell = 8;
-  if (has_default_hc_cell()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->default_hc_cell(), output);
-  }
-
-  // required .TST.Cell default_fr_cell = 9;
-  if (has_default_fr_cell()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->default_fr_cell(), output);
-  }
-
-  // optional .TSP.Reference text_undo = 10;
-  if (has_text_undo()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->text_undo(), output);
+  // required uint32 base_places = 2;
+  if (has_base_places()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->base_places(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -22457,157 +26416,43 @@ void CommandToggleTextPropertyArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandToggleTextPropertyArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetBasePlacesArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required uint32 property = 3;
-  if (has_property()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->property(), target);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->undo_cell_map(), target);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->redo_cell_map(), target);
-  }
-
-  // required .TST.Cell default_body_cell = 6;
-  if (has_default_body_cell()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        6, this->default_body_cell(), target);
-  }
-
-  // required .TST.Cell default_hr_cell = 7;
-  if (has_default_hr_cell()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->default_hr_cell(), target);
-  }
-
-  // required .TST.Cell default_hc_cell = 8;
-  if (has_default_hc_cell()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->default_hc_cell(), target);
-  }
-
-  // required .TST.Cell default_fr_cell = 9;
-  if (has_default_fr_cell()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        9, this->default_fr_cell(), target);
-  }
-
-  // optional .TSP.Reference text_undo = 10;
-  if (has_text_undo()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        10, this->text_undo(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
+  // required uint32 base_places = 2;
+  if (has_base_places()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->base_places(), target);
   }
-  return target;
-}
-
-int CommandToggleTextPropertyArchive::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
-    if (has_super()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // required .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // required uint32 property = 3;
-    if (has_property()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->property());
-    }
-
-    // required .TST.CellMapArchive undo_cell_map = 4;
-    if (has_undo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
-    }
-
-    // required .TST.CellMapArchive redo_cell_map = 5;
-    if (has_redo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
-    }
-
-    // required .TST.Cell default_body_cell = 6;
-    if (has_default_body_cell()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->default_body_cell());
-    }
-
-    // required .TST.Cell default_hr_cell = 7;
-    if (has_default_hr_cell()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->default_hr_cell());
-    }
-
-    // required .TST.Cell default_hc_cell = 8;
-    if (has_default_hc_cell()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->default_hc_cell());
-    }
 
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
   }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // required .TST.Cell default_fr_cell = 9;
-    if (has_default_fr_cell()) {
+  return target;
+}
+
+int CommandSetBasePlacesArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->default_fr_cell());
+          this->super());
     }
 
-    // optional .TSP.Reference text_undo = 10;
-    if (has_text_undo()) {
+    // required uint32 base_places = 2;
+    if (has_base_places()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->text_undo());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->base_places());
     }
 
   }
@@ -22622,10 +26467,10 @@ int CommandToggleTextPropertyArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandToggleTextPropertyArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetBasePlacesArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandToggleTextPropertyArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandToggleTextPropertyArchive*>(
+  const CommandSetBasePlacesArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetBasePlacesArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -22634,113 +26479,55 @@ void CommandToggleTextPropertyArchive::MergeFrom(const ::google::protobuf::Messa
   }
 }
 
-void CommandToggleTextPropertyArchive::MergeFrom(const CommandToggleTextPropertyArchive& from) {
+void CommandSetBasePlacesArchive::MergeFrom(const CommandSetBasePlacesArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_property()) {
-      set_property(from.property());
-    }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
-    }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
-    }
-    if (from.has_default_body_cell()) {
-      mutable_default_body_cell()->::TST::Cell::MergeFrom(from.default_body_cell());
-    }
-    if (from.has_default_hr_cell()) {
-      mutable_default_hr_cell()->::TST::Cell::MergeFrom(from.default_hr_cell());
-    }
-    if (from.has_default_hc_cell()) {
-      mutable_default_hc_cell()->::TST::Cell::MergeFrom(from.default_hc_cell());
-    }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_default_fr_cell()) {
-      mutable_default_fr_cell()->::TST::Cell::MergeFrom(from.default_fr_cell());
+      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_text_undo()) {
-      mutable_text_undo()->::TSP::Reference::MergeFrom(from.text_undo());
+    if (from.has_base_places()) {
+      set_base_places(from.base_places());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandToggleTextPropertyArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetBasePlacesArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandToggleTextPropertyArchive::CopyFrom(const CommandToggleTextPropertyArchive& from) {
+void CommandSetBasePlacesArchive::CopyFrom(const CommandSetBasePlacesArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandToggleTextPropertyArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x000001ff) != 0x000001ff) return false;
+bool CommandSetBasePlacesArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
-  if (has_default_body_cell()) {
-    if (!this->default_body_cell().IsInitialized()) return false;
-  }
-  if (has_default_hr_cell()) {
-    if (!this->default_hr_cell().IsInitialized()) return false;
-  }
-  if (has_default_hc_cell()) {
-    if (!this->default_hc_cell().IsInitialized()) return false;
-  }
-  if (has_default_fr_cell()) {
-    if (!this->default_fr_cell().IsInitialized()) return false;
-  }
-  if (has_text_undo()) {
-    if (!this->text_undo().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandToggleTextPropertyArchive::Swap(CommandToggleTextPropertyArchive* other) {
+void CommandSetBasePlacesArchive::Swap(CommandSetBasePlacesArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(property_, other->property_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
-    std::swap(default_body_cell_, other->default_body_cell_);
-    std::swap(default_hr_cell_, other->default_hr_cell_);
-    std::swap(default_hc_cell_, other->default_hc_cell_);
-    std::swap(default_fr_cell_, other->default_fr_cell_);
-    std::swap(text_undo_, other->text_undo_);
+    std::swap(base_places_, other->base_places_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandToggleTextPropertyArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetBasePlacesArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandToggleTextPropertyArchive_descriptor_;
-  metadata.reflection = CommandToggleTextPropertyArchive_reflection_;
+  metadata.descriptor = CommandSetBasePlacesArchive_descriptor_;
+  metadata.reflection = CommandSetBasePlacesArchive_reflection_;
   return metadata;
 }
 
@@ -22748,99 +26535,81 @@ ::google::protobuf::Metadata CommandToggleTextPropertyArchive::GetMetadata() con
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandResetFillPropertyToDefault::kSuperFieldNumber;
-const int CommandResetFillPropertyToDefault::kSelectionFieldNumber;
-const int CommandResetFillPropertyToDefault::kUndoCellMapFieldNumber;
-const int CommandResetFillPropertyToDefault::kRedoCellMapFieldNumber;
+const int CommandSetBaseUseMinusSignArchive::kSuperFieldNumber;
+const int CommandSetBaseUseMinusSignArchive::kBaseUseMinusSignFieldNumber;
 #endif  // !_MSC_VER
 
-CommandResetFillPropertyToDefault::CommandResetFillPropertyToDefault()
+CommandSetBaseUseMinusSignArchive::CommandSetBaseUseMinusSignArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandResetFillPropertyToDefault::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+void CommandSetBaseUseMinusSignArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandResetFillPropertyToDefault::CommandResetFillPropertyToDefault(const CommandResetFillPropertyToDefault& from)
+CommandSetBaseUseMinusSignArchive::CommandSetBaseUseMinusSignArchive(const CommandSetBaseUseMinusSignArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandResetFillPropertyToDefault::SharedCtor() {
+void CommandSetBaseUseMinusSignArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
+  base_use_minus_sign_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandResetFillPropertyToDefault::~CommandResetFillPropertyToDefault() {
+CommandSetBaseUseMinusSignArchive::~CommandSetBaseUseMinusSignArchive() {
   SharedDtor();
 }
 
-void CommandResetFillPropertyToDefault::SharedDtor() {
+void CommandSetBaseUseMinusSignArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
   }
 }
 
-void CommandResetFillPropertyToDefault::SetCachedSize(int size) const {
+void CommandSetBaseUseMinusSignArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandResetFillPropertyToDefault::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetBaseUseMinusSignArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandResetFillPropertyToDefault_descriptor_;
+  return CommandSetBaseUseMinusSignArchive_descriptor_;
 }
 
-const CommandResetFillPropertyToDefault& CommandResetFillPropertyToDefault::default_instance() {
+const CommandSetBaseUseMinusSignArchive& CommandSetBaseUseMinusSignArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandResetFillPropertyToDefault* CommandResetFillPropertyToDefault::default_instance_ = NULL;
+CommandSetBaseUseMinusSignArchive* CommandSetBaseUseMinusSignArchive::default_instance_ = NULL;
 
-CommandResetFillPropertyToDefault* CommandResetFillPropertyToDefault::New() const {
-  return new CommandResetFillPropertyToDefault;
+CommandSetBaseUseMinusSignArchive* CommandSetBaseUseMinusSignArchive::New() const {
+  return new CommandSetBaseUseMinusSignArchive;
 }
 
-void CommandResetFillPropertyToDefault::Clear() {
+void CommandSetBaseUseMinusSignArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    base_use_minus_sign_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandResetFillPropertyToDefault::MergePartialFromCodedStream(
+bool CommandSetBaseUseMinusSignArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -22849,45 +26618,19 @@ bool CommandResetFillPropertyToDefault::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_selection;
+        if (input->ExpectTag(16)) goto parse_base_use_minus_sign;
         break;
       }
 
-      // required .TST.SelectionArchive selection = 2;
+      // required bool base_use_minus_sign = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_undo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive undo_cell_map = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_redo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive redo_cell_map = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_base_use_minus_sign:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &base_use_minus_sign_)));
+          set_has_base_use_minus_sign();
         } else {
           goto handle_uninterpreted;
         }
@@ -22911,30 +26654,17 @@ bool CommandResetFillPropertyToDefault::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandResetFillPropertyToDefault::SerializeWithCachedSizes(
+void CommandSetBaseUseMinusSignArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->undo_cell_map(), output);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->redo_cell_map(), output);
+  // required bool base_use_minus_sign = 2;
+  if (has_base_use_minus_sign()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->base_use_minus_sign(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -22943,34 +26673,18 @@ void CommandResetFillPropertyToDefault::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandResetFillPropertyToDefault::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetBaseUseMinusSignArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->undo_cell_map(), target);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->redo_cell_map(), target);
+  // required bool base_use_minus_sign = 2;
+  if (has_base_use_minus_sign()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->base_use_minus_sign(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -22980,36 +26694,20 @@ ::google::protobuf::uint8* CommandResetFillPropertyToDefault::SerializeWithCache
   return target;
 }
 
-int CommandResetFillPropertyToDefault::ByteSize() const {
+int CommandSetBaseUseMinusSignArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // required .TST.CellMapArchive undo_cell_map = 4;
-    if (has_undo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
-    }
-
-    // required .TST.CellMapArchive redo_cell_map = 5;
-    if (has_redo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+    // required bool base_use_minus_sign = 2;
+    if (has_base_use_minus_sign()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -23024,10 +26722,10 @@ int CommandResetFillPropertyToDefault::ByteSize() const {
   return total_size;
 }
 
-void CommandResetFillPropertyToDefault::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetBaseUseMinusSignArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandResetFillPropertyToDefault* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandResetFillPropertyToDefault*>(
+  const CommandSetBaseUseMinusSignArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetBaseUseMinusSignArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -23036,72 +26734,55 @@ void CommandResetFillPropertyToDefault::MergeFrom(const ::google::protobuf::Mess
   }
 }
 
-void CommandResetFillPropertyToDefault::MergeFrom(const CommandResetFillPropertyToDefault& from) {
+void CommandSetBaseUseMinusSignArchive::MergeFrom(const CommandSetBaseUseMinusSignArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_base_use_minus_sign()) {
+      set_base_use_minus_sign(from.base_use_minus_sign());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandResetFillPropertyToDefault::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetBaseUseMinusSignArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandResetFillPropertyToDefault::CopyFrom(const CommandResetFillPropertyToDefault& from) {
+void CommandSetBaseUseMinusSignArchive::CopyFrom(const CommandSetBaseUseMinusSignArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandResetFillPropertyToDefault::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandSetBaseUseMinusSignArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandResetFillPropertyToDefault::Swap(CommandResetFillPropertyToDefault* other) {
+void CommandSetBaseUseMinusSignArchive::Swap(CommandSetBaseUseMinusSignArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(base_use_minus_sign_, other->base_use_minus_sign_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandResetFillPropertyToDefault::GetMetadata() const {
+::google::protobuf::Metadata CommandSetBaseUseMinusSignArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandResetFillPropertyToDefault_descriptor_;
-  metadata.reflection = CommandResetFillPropertyToDefault_reflection_;
+  metadata.descriptor = CommandSetBaseUseMinusSignArchive_descriptor_;
+  metadata.reflection = CommandSetBaseUseMinusSignArchive_reflection_;
   return metadata;
 }
 
@@ -23109,99 +26790,84 @@ ::google::protobuf::Metadata CommandResetFillPropertyToDefault::GetMetadata() co
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetSingleNumberFormatParameterArchive::kSuperFieldNumber;
-const int CommandSetSingleNumberFormatParameterArchive::kSelectionFieldNumber;
-const int CommandSetSingleNumberFormatParameterArchive::kUndoCellMapFieldNumber;
-const int CommandSetSingleNumberFormatParameterArchive::kRedoCellMapFieldNumber;
+const int CommandSetControlMinimumArchive::kSuperFieldNumber;
+const int CommandSetControlMinimumArchive::kMinimumFieldNumber;
+const int CommandSetControlMinimumArchive::kFormatTypeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetSingleNumberFormatParameterArchive::CommandSetSingleNumberFormatParameterArchive()
+CommandSetControlMinimumArchive::CommandSetControlMinimumArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetSingleNumberFormatParameterArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+void CommandSetControlMinimumArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetSingleNumberFormatParameterArchive::CommandSetSingleNumberFormatParameterArchive(const CommandSetSingleNumberFormatParameterArchive& from)
+CommandSetControlMinimumArchive::CommandSetControlMinimumArchive(const CommandSetControlMinimumArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetSingleNumberFormatParameterArchive::SharedCtor() {
+void CommandSetControlMinimumArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
+  minimum_ = 0;
+  format_type_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetSingleNumberFormatParameterArchive::~CommandSetSingleNumberFormatParameterArchive() {
+CommandSetControlMinimumArchive::~CommandSetControlMinimumArchive() {
   SharedDtor();
 }
 
-void CommandSetSingleNumberFormatParameterArchive::SharedDtor() {
+void CommandSetControlMinimumArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
   }
 }
 
-void CommandSetSingleNumberFormatParameterArchive::SetCachedSize(int size) const {
+void CommandSetControlMinimumArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetSingleNumberFormatParameterArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetControlMinimumArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetSingleNumberFormatParameterArchive_descriptor_;
+  return CommandSetControlMinimumArchive_descriptor_;
 }
 
-const CommandSetSingleNumberFormatParameterArchive& CommandSetSingleNumberFormatParameterArchive::default_instance() {
+const CommandSetControlMinimumArchive& CommandSetControlMinimumArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetSingleNumberFormatParameterArchive* CommandSetSingleNumberFormatParameterArchive::default_instance_ = NULL;
+CommandSetControlMinimumArchive* CommandSetControlMinimumArchive::default_instance_ = NULL;
 
-CommandSetSingleNumberFormatParameterArchive* CommandSetSingleNumberFormatParameterArchive::New() const {
-  return new CommandSetSingleNumberFormatParameterArchive;
+CommandSetControlMinimumArchive* CommandSetControlMinimumArchive::New() const {
+  return new CommandSetControlMinimumArchive;
 }
 
-void CommandSetSingleNumberFormatParameterArchive::Clear() {
+void CommandSetControlMinimumArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    minimum_ = 0;
+    format_type_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetSingleNumberFormatParameterArchive::MergePartialFromCodedStream(
+bool CommandSetControlMinimumArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -23210,45 +26876,35 @@ bool CommandSetSingleNumberFormatParameterArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_selection;
+        if (input->ExpectTag(17)) goto parse_minimum;
         break;
       }
 
-      // required .TST.SelectionArchive selection = 2;
+      // required double minimum = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_minimum:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &minimum_)));
+          set_has_minimum();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_undo_cell_map;
+        if (input->ExpectTag(24)) goto parse_format_type;
         break;
       }
 
-      // required .TST.CellMapArchive undo_cell_map = 3;
+      // required uint32 format_type = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_redo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive redo_cell_map = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_format_type:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &format_type_)));
+          set_has_format_type();
         } else {
           goto handle_uninterpreted;
         }
@@ -23272,30 +26928,22 @@ bool CommandSetSingleNumberFormatParameterArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetSingleNumberFormatParameterArchive::SerializeWithCachedSizes(
+void CommandSetControlMinimumArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 3;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->undo_cell_map(), output);
+  // required double minimum = 2;
+  if (has_minimum()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->minimum(), output);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->redo_cell_map(), output);
+  // required uint32 format_type = 3;
+  if (has_format_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_type(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -23304,34 +26952,23 @@ void CommandSetSingleNumberFormatParameterArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetSingleNumberFormatParameterArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetControlMinimumArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 3;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->undo_cell_map(), target);
+  // required double minimum = 2;
+  if (has_minimum()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->minimum(), target);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->redo_cell_map(), target);
+  // required uint32 format_type = 3;
+  if (has_format_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_type(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -23341,36 +26978,27 @@ ::google::protobuf::uint8* CommandSetSingleNumberFormatParameterArchive::Seriali
   return target;
 }
 
-int CommandSetSingleNumberFormatParameterArchive::ByteSize() const {
+int CommandSetControlMinimumArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
-    }
-
-    // required .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
+          this->super());
     }
 
-    // required .TST.CellMapArchive undo_cell_map = 3;
-    if (has_undo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+    // required double minimum = 2;
+    if (has_minimum()) {
+      total_size += 1 + 8;
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 4;
-    if (has_redo_cell_map()) {
+    // required uint32 format_type = 3;
+    if (has_format_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->format_type());
     }
 
   }
@@ -23385,10 +27013,10 @@ int CommandSetSingleNumberFormatParameterArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetSingleNumberFormatParameterArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetControlMinimumArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetSingleNumberFormatParameterArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSingleNumberFormatParameterArchive*>(
+  const CommandSetControlMinimumArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetControlMinimumArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -23397,72 +27025,59 @@ void CommandSetSingleNumberFormatParameterArchive::MergeFrom(const ::google::pro
   }
 }
 
-void CommandSetSingleNumberFormatParameterArchive::MergeFrom(const CommandSetSingleNumberFormatParameterArchive& from) {
+void CommandSetControlMinimumArchive::MergeFrom(const CommandSetControlMinimumArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    if (from.has_minimum()) {
+      set_minimum(from.minimum());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_format_type()) {
+      set_format_type(from.format_type());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetSingleNumberFormatParameterArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetControlMinimumArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetSingleNumberFormatParameterArchive::CopyFrom(const CommandSetSingleNumberFormatParameterArchive& from) {
+void CommandSetControlMinimumArchive::CopyFrom(const CommandSetControlMinimumArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetSingleNumberFormatParameterArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandSetControlMinimumArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetSingleNumberFormatParameterArchive::Swap(CommandSetSingleNumberFormatParameterArchive* other) {
+void CommandSetControlMinimumArchive::Swap(CommandSetControlMinimumArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(minimum_, other->minimum_);
+    std::swap(format_type_, other->format_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetSingleNumberFormatParameterArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetControlMinimumArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetSingleNumberFormatParameterArchive_descriptor_;
-  metadata.reflection = CommandSetSingleNumberFormatParameterArchive_reflection_;
+  metadata.descriptor = CommandSetControlMinimumArchive_descriptor_;
+  metadata.reflection = CommandSetControlMinimumArchive_reflection_;
   return metadata;
 }
 
@@ -23470,75 +27085,78 @@ ::google::protobuf::Metadata CommandSetSingleNumberFormatParameterArchive::GetMe
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetBaseArchive::kSuperFieldNumber;
-const int CommandSetBaseArchive::kBaseFieldNumber;
+const int CommandSetControlMaximumArchive::kSuperFieldNumber;
+const int CommandSetControlMaximumArchive::kMaximumFieldNumber;
+const int CommandSetControlMaximumArchive::kFormatTypeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetBaseArchive::CommandSetBaseArchive()
+CommandSetControlMaximumArchive::CommandSetControlMaximumArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetBaseArchive::InitAsDefaultInstance() {
+void CommandSetControlMaximumArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetBaseArchive::CommandSetBaseArchive(const CommandSetBaseArchive& from)
+CommandSetControlMaximumArchive::CommandSetControlMaximumArchive(const CommandSetControlMaximumArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetBaseArchive::SharedCtor() {
+void CommandSetControlMaximumArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  base_ = 0u;
+  maximum_ = 0;
+  format_type_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetBaseArchive::~CommandSetBaseArchive() {
+CommandSetControlMaximumArchive::~CommandSetControlMaximumArchive() {
   SharedDtor();
 }
 
-void CommandSetBaseArchive::SharedDtor() {
+void CommandSetControlMaximumArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetBaseArchive::SetCachedSize(int size) const {
+void CommandSetControlMaximumArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetBaseArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetControlMaximumArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetBaseArchive_descriptor_;
+  return CommandSetControlMaximumArchive_descriptor_;
 }
 
-const CommandSetBaseArchive& CommandSetBaseArchive::default_instance() {
+const CommandSetControlMaximumArchive& CommandSetControlMaximumArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetBaseArchive* CommandSetBaseArchive::default_instance_ = NULL;
+CommandSetControlMaximumArchive* CommandSetControlMaximumArchive::default_instance_ = NULL;
 
-CommandSetBaseArchive* CommandSetBaseArchive::New() const {
-  return new CommandSetBaseArchive;
+CommandSetControlMaximumArchive* CommandSetControlMaximumArchive::New() const {
+  return new CommandSetControlMaximumArchive;
 }
 
-void CommandSetBaseArchive::Clear() {
+void CommandSetControlMaximumArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    base_ = 0u;
+    maximum_ = 0;
+    format_type_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetBaseArchive::MergePartialFromCodedStream(
+bool CommandSetControlMaximumArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -23553,19 +27171,35 @@ bool CommandSetBaseArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_base;
+        if (input->ExpectTag(17)) goto parse_maximum;
         break;
       }
 
-      // required uint32 base = 2;
+      // required double maximum = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_maximum:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &maximum_)));
+          set_has_maximum();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_format_type;
+        break;
+      }
+
+      // required uint32 format_type = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_base:
+         parse_format_type:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &base_)));
-          set_has_base();
+                 input, &format_type_)));
+          set_has_format_type();
         } else {
           goto handle_uninterpreted;
         }
@@ -23589,7 +27223,7 @@ bool CommandSetBaseArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetBaseArchive::SerializeWithCachedSizes(
+void CommandSetControlMaximumArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -23597,9 +27231,14 @@ void CommandSetBaseArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 base = 2;
-  if (has_base()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->base(), output);
+  // required double maximum = 2;
+  if (has_maximum()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->maximum(), output);
+  }
+
+  // required uint32 format_type = 3;
+  if (has_format_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_type(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -23608,7 +27247,7 @@ void CommandSetBaseArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetBaseArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetControlMaximumArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -23617,9 +27256,14 @@ ::google::protobuf::uint8* CommandSetBaseArchive::SerializeWithCachedSizesToArra
         1, this->super(), target);
   }
 
-  // required uint32 base = 2;
-  if (has_base()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->base(), target);
+  // required double maximum = 2;
+  if (has_maximum()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->maximum(), target);
+  }
+
+  // required uint32 format_type = 3;
+  if (has_format_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_type(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -23629,7 +27273,7 @@ ::google::protobuf::uint8* CommandSetBaseArchive::SerializeWithCachedSizesToArra
   return target;
 }
 
-int CommandSetBaseArchive::ByteSize() const {
+int CommandSetControlMaximumArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -23640,11 +27284,16 @@ int CommandSetBaseArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 base = 2;
-    if (has_base()) {
+    // required double maximum = 2;
+    if (has_maximum()) {
+      total_size += 1 + 8;
+    }
+
+    // required uint32 format_type = 3;
+    if (has_format_type()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->base());
+          this->format_type());
     }
 
   }
@@ -23659,10 +27308,10 @@ int CommandSetBaseArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetBaseArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetControlMaximumArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetBaseArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetBaseArchive*>(
+  const CommandSetControlMaximumArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetControlMaximumArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -23671,33 +27320,36 @@ void CommandSetBaseArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void CommandSetBaseArchive::MergeFrom(const CommandSetBaseArchive& from) {
+void CommandSetControlMaximumArchive::MergeFrom(const CommandSetControlMaximumArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_base()) {
-      set_base(from.base());
+    if (from.has_maximum()) {
+      set_maximum(from.maximum());
+    }
+    if (from.has_format_type()) {
+      set_format_type(from.format_type());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetBaseArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetControlMaximumArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetBaseArchive::CopyFrom(const CommandSetBaseArchive& from) {
+void CommandSetControlMaximumArchive::CopyFrom(const CommandSetControlMaximumArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetBaseArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetControlMaximumArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -23705,21 +27357,22 @@ bool CommandSetBaseArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetBaseArchive::Swap(CommandSetBaseArchive* other) {
+void CommandSetControlMaximumArchive::Swap(CommandSetControlMaximumArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(base_, other->base_);
+    std::swap(maximum_, other->maximum_);
+    std::swap(format_type_, other->format_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetBaseArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetControlMaximumArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetBaseArchive_descriptor_;
-  metadata.reflection = CommandSetBaseArchive_reflection_;
+  metadata.descriptor = CommandSetControlMaximumArchive_descriptor_;
+  metadata.reflection = CommandSetControlMaximumArchive_reflection_;
   return metadata;
 }
 
@@ -23727,75 +27380,78 @@ ::google::protobuf::Metadata CommandSetBaseArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetBasePlacesArchive::kSuperFieldNumber;
-const int CommandSetBasePlacesArchive::kBasePlacesFieldNumber;
+const int CommandSetControlIncrementArchive::kSuperFieldNumber;
+const int CommandSetControlIncrementArchive::kIncrementFieldNumber;
+const int CommandSetControlIncrementArchive::kFormatTypeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetBasePlacesArchive::CommandSetBasePlacesArchive()
+CommandSetControlIncrementArchive::CommandSetControlIncrementArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetBasePlacesArchive::InitAsDefaultInstance() {
+void CommandSetControlIncrementArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetBasePlacesArchive::CommandSetBasePlacesArchive(const CommandSetBasePlacesArchive& from)
+CommandSetControlIncrementArchive::CommandSetControlIncrementArchive(const CommandSetControlIncrementArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetBasePlacesArchive::SharedCtor() {
+void CommandSetControlIncrementArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  base_places_ = 0u;
+  increment_ = 0;
+  format_type_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetBasePlacesArchive::~CommandSetBasePlacesArchive() {
+CommandSetControlIncrementArchive::~CommandSetControlIncrementArchive() {
   SharedDtor();
 }
 
-void CommandSetBasePlacesArchive::SharedDtor() {
+void CommandSetControlIncrementArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetBasePlacesArchive::SetCachedSize(int size) const {
+void CommandSetControlIncrementArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetBasePlacesArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetControlIncrementArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetBasePlacesArchive_descriptor_;
+  return CommandSetControlIncrementArchive_descriptor_;
 }
 
-const CommandSetBasePlacesArchive& CommandSetBasePlacesArchive::default_instance() {
+const CommandSetControlIncrementArchive& CommandSetControlIncrementArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetBasePlacesArchive* CommandSetBasePlacesArchive::default_instance_ = NULL;
+CommandSetControlIncrementArchive* CommandSetControlIncrementArchive::default_instance_ = NULL;
 
-CommandSetBasePlacesArchive* CommandSetBasePlacesArchive::New() const {
-  return new CommandSetBasePlacesArchive;
+CommandSetControlIncrementArchive* CommandSetControlIncrementArchive::New() const {
+  return new CommandSetControlIncrementArchive;
 }
 
-void CommandSetBasePlacesArchive::Clear() {
+void CommandSetControlIncrementArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    base_places_ = 0u;
+    increment_ = 0;
+    format_type_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetBasePlacesArchive::MergePartialFromCodedStream(
+bool CommandSetControlIncrementArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -23810,19 +27466,35 @@ bool CommandSetBasePlacesArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_base_places;
+        if (input->ExpectTag(17)) goto parse_increment;
         break;
       }
 
-      // required uint32 base_places = 2;
+      // required double increment = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_increment:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &increment_)));
+          set_has_increment();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_format_type;
+        break;
+      }
+
+      // required uint32 format_type = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_base_places:
+         parse_format_type:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &base_places_)));
-          set_has_base_places();
+                 input, &format_type_)));
+          set_has_format_type();
         } else {
           goto handle_uninterpreted;
         }
@@ -23846,7 +27518,7 @@ bool CommandSetBasePlacesArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetBasePlacesArchive::SerializeWithCachedSizes(
+void CommandSetControlIncrementArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -23854,9 +27526,14 @@ void CommandSetBasePlacesArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 base_places = 2;
-  if (has_base_places()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->base_places(), output);
+  // required double increment = 2;
+  if (has_increment()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->increment(), output);
+  }
+
+  // required uint32 format_type = 3;
+  if (has_format_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_type(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -23865,7 +27542,7 @@ void CommandSetBasePlacesArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetBasePlacesArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetControlIncrementArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -23874,9 +27551,14 @@ ::google::protobuf::uint8* CommandSetBasePlacesArchive::SerializeWithCachedSizes
         1, this->super(), target);
   }
 
-  // required uint32 base_places = 2;
-  if (has_base_places()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->base_places(), target);
+  // required double increment = 2;
+  if (has_increment()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->increment(), target);
+  }
+
+  // required uint32 format_type = 3;
+  if (has_format_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_type(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -23886,7 +27568,7 @@ ::google::protobuf::uint8* CommandSetBasePlacesArchive::SerializeWithCachedSizes
   return target;
 }
 
-int CommandSetBasePlacesArchive::ByteSize() const {
+int CommandSetControlIncrementArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -23897,11 +27579,16 @@ int CommandSetBasePlacesArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 base_places = 2;
-    if (has_base_places()) {
+    // required double increment = 2;
+    if (has_increment()) {
+      total_size += 1 + 8;
+    }
+
+    // required uint32 format_type = 3;
+    if (has_format_type()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->base_places());
+          this->format_type());
     }
 
   }
@@ -23916,10 +27603,10 @@ int CommandSetBasePlacesArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetBasePlacesArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetControlIncrementArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetBasePlacesArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetBasePlacesArchive*>(
+  const CommandSetControlIncrementArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetControlIncrementArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -23928,33 +27615,36 @@ void CommandSetBasePlacesArchive::MergeFrom(const ::google::protobuf::Message& f
   }
 }
 
-void CommandSetBasePlacesArchive::MergeFrom(const CommandSetBasePlacesArchive& from) {
+void CommandSetControlIncrementArchive::MergeFrom(const CommandSetControlIncrementArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_base_places()) {
-      set_base_places(from.base_places());
+    if (from.has_increment()) {
+      set_increment(from.increment());
+    }
+    if (from.has_format_type()) {
+      set_format_type(from.format_type());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetBasePlacesArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetControlIncrementArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetBasePlacesArchive::CopyFrom(const CommandSetBasePlacesArchive& from) {
+void CommandSetControlIncrementArchive::CopyFrom(const CommandSetControlIncrementArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetBasePlacesArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetControlIncrementArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -23962,21 +27652,22 @@ bool CommandSetBasePlacesArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetBasePlacesArchive::Swap(CommandSetBasePlacesArchive* other) {
+void CommandSetControlIncrementArchive::Swap(CommandSetControlIncrementArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(base_places_, other->base_places_);
+    std::swap(increment_, other->increment_);
+    std::swap(format_type_, other->format_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetBasePlacesArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetControlIncrementArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetBasePlacesArchive_descriptor_;
-  metadata.reflection = CommandSetBasePlacesArchive_reflection_;
+  metadata.descriptor = CommandSetControlIncrementArchive_descriptor_;
+  metadata.reflection = CommandSetControlIncrementArchive_reflection_;
   return metadata;
 }
 
@@ -23984,75 +27675,82 @@ ::google::protobuf::Metadata CommandSetBasePlacesArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetBaseUseMinusSignArchive::kSuperFieldNumber;
-const int CommandSetBaseUseMinusSignArchive::kBaseUseMinusSignFieldNumber;
+const int CommandSetCurrencyCodeArchive::kSuperFieldNumber;
+const int CommandSetCurrencyCodeArchive::kCurrencyCodeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetBaseUseMinusSignArchive::CommandSetBaseUseMinusSignArchive()
+CommandSetCurrencyCodeArchive::CommandSetCurrencyCodeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetBaseUseMinusSignArchive::InitAsDefaultInstance() {
+void CommandSetCurrencyCodeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetBaseUseMinusSignArchive::CommandSetBaseUseMinusSignArchive(const CommandSetBaseUseMinusSignArchive& from)
+CommandSetCurrencyCodeArchive::CommandSetCurrencyCodeArchive(const CommandSetCurrencyCodeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetBaseUseMinusSignArchive::SharedCtor() {
+void CommandSetCurrencyCodeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  base_use_minus_sign_ = false;
+  currency_code_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetBaseUseMinusSignArchive::~CommandSetBaseUseMinusSignArchive() {
+CommandSetCurrencyCodeArchive::~CommandSetCurrencyCodeArchive() {
   SharedDtor();
 }
 
-void CommandSetBaseUseMinusSignArchive::SharedDtor() {
+void CommandSetCurrencyCodeArchive::SharedDtor() {
+  if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
+    delete currency_code_;
+  }
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetBaseUseMinusSignArchive::SetCachedSize(int size) const {
+void CommandSetCurrencyCodeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetBaseUseMinusSignArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetCurrencyCodeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetBaseUseMinusSignArchive_descriptor_;
+  return CommandSetCurrencyCodeArchive_descriptor_;
 }
 
-const CommandSetBaseUseMinusSignArchive& CommandSetBaseUseMinusSignArchive::default_instance() {
+const CommandSetCurrencyCodeArchive& CommandSetCurrencyCodeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetBaseUseMinusSignArchive* CommandSetBaseUseMinusSignArchive::default_instance_ = NULL;
+CommandSetCurrencyCodeArchive* CommandSetCurrencyCodeArchive::default_instance_ = NULL;
 
-CommandSetBaseUseMinusSignArchive* CommandSetBaseUseMinusSignArchive::New() const {
-  return new CommandSetBaseUseMinusSignArchive;
+CommandSetCurrencyCodeArchive* CommandSetCurrencyCodeArchive::New() const {
+  return new CommandSetCurrencyCodeArchive;
 }
 
-void CommandSetBaseUseMinusSignArchive::Clear() {
+void CommandSetCurrencyCodeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    base_use_minus_sign_ = false;
+    if (has_currency_code()) {
+      if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
+        currency_code_->clear();
+      }
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetBaseUseMinusSignArchive::MergePartialFromCodedStream(
+bool CommandSetCurrencyCodeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -24067,19 +27765,20 @@ bool CommandSetBaseUseMinusSignArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_base_use_minus_sign;
+        if (input->ExpectTag(18)) goto parse_currency_code;
         break;
       }
 
-      // required bool base_use_minus_sign = 2;
+      // required string currency_code = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_base_use_minus_sign:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &base_use_minus_sign_)));
-          set_has_base_use_minus_sign();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_currency_code:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_currency_code()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->currency_code().data(), this->currency_code().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
@@ -24103,7 +27802,7 @@ bool CommandSetBaseUseMinusSignArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetBaseUseMinusSignArchive::SerializeWithCachedSizes(
+void CommandSetCurrencyCodeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24111,9 +27810,13 @@ void CommandSetBaseUseMinusSignArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required bool base_use_minus_sign = 2;
-  if (has_base_use_minus_sign()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->base_use_minus_sign(), output);
+  // required string currency_code = 2;
+  if (has_currency_code()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->currency_code().data(), this->currency_code().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      2, this->currency_code(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -24122,7 +27825,7 @@ void CommandSetBaseUseMinusSignArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetBaseUseMinusSignArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetCurrencyCodeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24131,9 +27834,14 @@ ::google::protobuf::uint8* CommandSetBaseUseMinusSignArchive::SerializeWithCache
         1, this->super(), target);
   }
 
-  // required bool base_use_minus_sign = 2;
-  if (has_base_use_minus_sign()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->base_use_minus_sign(), target);
+  // required string currency_code = 2;
+  if (has_currency_code()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->currency_code().data(), this->currency_code().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->currency_code(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -24143,7 +27851,7 @@ ::google::protobuf::uint8* CommandSetBaseUseMinusSignArchive::SerializeWithCache
   return target;
 }
 
-int CommandSetBaseUseMinusSignArchive::ByteSize() const {
+int CommandSetCurrencyCodeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -24154,9 +27862,11 @@ int CommandSetBaseUseMinusSignArchive::ByteSize() const {
           this->super());
     }
 
-    // required bool base_use_minus_sign = 2;
-    if (has_base_use_minus_sign()) {
-      total_size += 1 + 1;
+    // required string currency_code = 2;
+    if (has_currency_code()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->currency_code());
     }
 
   }
@@ -24171,10 +27881,10 @@ int CommandSetBaseUseMinusSignArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetBaseUseMinusSignArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetCurrencyCodeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetBaseUseMinusSignArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetBaseUseMinusSignArchive*>(
+  const CommandSetCurrencyCodeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetCurrencyCodeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -24183,32 +27893,32 @@ void CommandSetBaseUseMinusSignArchive::MergeFrom(const ::google::protobuf::Mess
   }
 }
 
-void CommandSetBaseUseMinusSignArchive::MergeFrom(const CommandSetBaseUseMinusSignArchive& from) {
+void CommandSetCurrencyCodeArchive::MergeFrom(const CommandSetCurrencyCodeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_base_use_minus_sign()) {
-      set_base_use_minus_sign(from.base_use_minus_sign());
+    if (from.has_currency_code()) {
+      set_currency_code(from.currency_code());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetBaseUseMinusSignArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetCurrencyCodeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetBaseUseMinusSignArchive::CopyFrom(const CommandSetBaseUseMinusSignArchive& from) {
+void CommandSetCurrencyCodeArchive::CopyFrom(const CommandSetCurrencyCodeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetBaseUseMinusSignArchive::IsInitialized() const {
+bool CommandSetCurrencyCodeArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
@@ -24217,21 +27927,21 @@ bool CommandSetBaseUseMinusSignArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetBaseUseMinusSignArchive::Swap(CommandSetBaseUseMinusSignArchive* other) {
+void CommandSetCurrencyCodeArchive::Swap(CommandSetCurrencyCodeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(base_use_minus_sign_, other->base_use_minus_sign_);
+    std::swap(currency_code_, other->currency_code_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetBaseUseMinusSignArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetCurrencyCodeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetBaseUseMinusSignArchive_descriptor_;
-  metadata.reflection = CommandSetBaseUseMinusSignArchive_reflection_;
+  metadata.descriptor = CommandSetCurrencyCodeArchive_descriptor_;
+  metadata.reflection = CommandSetCurrencyCodeArchive_reflection_;
   return metadata;
 }
 
@@ -24239,78 +27949,75 @@ ::google::protobuf::Metadata CommandSetBaseUseMinusSignArchive::GetMetadata() co
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetControlMinimumArchive::kSuperFieldNumber;
-const int CommandSetControlMinimumArchive::kMinimumFieldNumber;
-const int CommandSetControlMinimumArchive::kFormatTypeFieldNumber;
+const int CommandSetFractionAccuracyArchive::kSuperFieldNumber;
+const int CommandSetFractionAccuracyArchive::kFractionAccuracyFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetControlMinimumArchive::CommandSetControlMinimumArchive()
+CommandSetFractionAccuracyArchive::CommandSetFractionAccuracyArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetControlMinimumArchive::InitAsDefaultInstance() {
+void CommandSetFractionAccuracyArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetControlMinimumArchive::CommandSetControlMinimumArchive(const CommandSetControlMinimumArchive& from)
+CommandSetFractionAccuracyArchive::CommandSetFractionAccuracyArchive(const CommandSetFractionAccuracyArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetControlMinimumArchive::SharedCtor() {
+void CommandSetFractionAccuracyArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  minimum_ = 0;
-  format_type_ = 0u;
+  fraction_accuracy_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetControlMinimumArchive::~CommandSetControlMinimumArchive() {
+CommandSetFractionAccuracyArchive::~CommandSetFractionAccuracyArchive() {
   SharedDtor();
 }
 
-void CommandSetControlMinimumArchive::SharedDtor() {
+void CommandSetFractionAccuracyArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetControlMinimumArchive::SetCachedSize(int size) const {
+void CommandSetFractionAccuracyArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetControlMinimumArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetFractionAccuracyArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetControlMinimumArchive_descriptor_;
+  return CommandSetFractionAccuracyArchive_descriptor_;
 }
 
-const CommandSetControlMinimumArchive& CommandSetControlMinimumArchive::default_instance() {
+const CommandSetFractionAccuracyArchive& CommandSetFractionAccuracyArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetControlMinimumArchive* CommandSetControlMinimumArchive::default_instance_ = NULL;
+CommandSetFractionAccuracyArchive* CommandSetFractionAccuracyArchive::default_instance_ = NULL;
 
-CommandSetControlMinimumArchive* CommandSetControlMinimumArchive::New() const {
-  return new CommandSetControlMinimumArchive;
+CommandSetFractionAccuracyArchive* CommandSetFractionAccuracyArchive::New() const {
+  return new CommandSetFractionAccuracyArchive;
 }
 
-void CommandSetControlMinimumArchive::Clear() {
+void CommandSetFractionAccuracyArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    minimum_ = 0;
-    format_type_ = 0u;
+    fraction_accuracy_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetControlMinimumArchive::MergePartialFromCodedStream(
+bool CommandSetFractionAccuracyArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -24325,35 +28032,19 @@ bool CommandSetControlMinimumArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(17)) goto parse_minimum;
+        if (input->ExpectTag(16)) goto parse_fraction_accuracy;
         break;
       }
 
-      // required double minimum = 2;
+      // required uint32 fraction_accuracy = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_minimum:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &minimum_)));
-          set_has_minimum();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_format_type;
-        break;
-      }
-
-      // required uint32 format_type = 3;
-      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_format_type:
+         parse_fraction_accuracy:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &format_type_)));
-          set_has_format_type();
+                 input, &fraction_accuracy_)));
+          set_has_fraction_accuracy();
         } else {
           goto handle_uninterpreted;
         }
@@ -24377,7 +28068,7 @@ bool CommandSetControlMinimumArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetControlMinimumArchive::SerializeWithCachedSizes(
+void CommandSetFractionAccuracyArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24385,14 +28076,9 @@ void CommandSetControlMinimumArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required double minimum = 2;
-  if (has_minimum()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->minimum(), output);
-  }
-
-  // required uint32 format_type = 3;
-  if (has_format_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_type(), output);
+  // required uint32 fraction_accuracy = 2;
+  if (has_fraction_accuracy()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->fraction_accuracy(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -24401,7 +28087,7 @@ void CommandSetControlMinimumArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetControlMinimumArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetFractionAccuracyArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24410,14 +28096,9 @@ ::google::protobuf::uint8* CommandSetControlMinimumArchive::SerializeWithCachedS
         1, this->super(), target);
   }
 
-  // required double minimum = 2;
-  if (has_minimum()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->minimum(), target);
-  }
-
-  // required uint32 format_type = 3;
-  if (has_format_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_type(), target);
+  // required uint32 fraction_accuracy = 2;
+  if (has_fraction_accuracy()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->fraction_accuracy(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -24427,7 +28108,7 @@ ::google::protobuf::uint8* CommandSetControlMinimumArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandSetControlMinimumArchive::ByteSize() const {
+int CommandSetFractionAccuracyArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -24438,16 +28119,11 @@ int CommandSetControlMinimumArchive::ByteSize() const {
           this->super());
     }
 
-    // required double minimum = 2;
-    if (has_minimum()) {
-      total_size += 1 + 8;
-    }
-
-    // required uint32 format_type = 3;
-    if (has_format_type()) {
+    // required uint32 fraction_accuracy = 2;
+    if (has_fraction_accuracy()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->format_type());
+          this->fraction_accuracy());
     }
 
   }
@@ -24462,10 +28138,10 @@ int CommandSetControlMinimumArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetControlMinimumArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetFractionAccuracyArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetControlMinimumArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetControlMinimumArchive*>(
+  const CommandSetFractionAccuracyArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFractionAccuracyArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -24474,36 +28150,33 @@ void CommandSetControlMinimumArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandSetControlMinimumArchive::MergeFrom(const CommandSetControlMinimumArchive& from) {
+void CommandSetFractionAccuracyArchive::MergeFrom(const CommandSetFractionAccuracyArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_minimum()) {
-      set_minimum(from.minimum());
-    }
-    if (from.has_format_type()) {
-      set_format_type(from.format_type());
+    if (from.has_fraction_accuracy()) {
+      set_fraction_accuracy(from.fraction_accuracy());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetControlMinimumArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetFractionAccuracyArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetControlMinimumArchive::CopyFrom(const CommandSetControlMinimumArchive& from) {
+void CommandSetFractionAccuracyArchive::CopyFrom(const CommandSetFractionAccuracyArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetControlMinimumArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetFractionAccuracyArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -24511,22 +28184,21 @@ bool CommandSetControlMinimumArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetControlMinimumArchive::Swap(CommandSetControlMinimumArchive* other) {
+void CommandSetFractionAccuracyArchive::Swap(CommandSetFractionAccuracyArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(minimum_, other->minimum_);
-    std::swap(format_type_, other->format_type_);
+    std::swap(fraction_accuracy_, other->fraction_accuracy_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetControlMinimumArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetFractionAccuracyArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetControlMinimumArchive_descriptor_;
-  metadata.reflection = CommandSetControlMinimumArchive_reflection_;
+  metadata.descriptor = CommandSetFractionAccuracyArchive_descriptor_;
+  metadata.reflection = CommandSetFractionAccuracyArchive_reflection_;
   return metadata;
 }
 
@@ -24534,78 +28206,72 @@ ::google::protobuf::Metadata CommandSetControlMinimumArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetControlMaximumArchive::kSuperFieldNumber;
-const int CommandSetControlMaximumArchive::kMaximumFieldNumber;
-const int CommandSetControlMaximumArchive::kFormatTypeFieldNumber;
+const int CommandSetMultipleChoiceListFormatForEditedItemArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetControlMaximumArchive::CommandSetControlMaximumArchive()
+CommandSetMultipleChoiceListFormatForEditedItemArchive::CommandSetMultipleChoiceListFormatForEditedItemArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetControlMaximumArchive::InitAsDefaultInstance() {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetControlMaximumArchive::CommandSetControlMaximumArchive(const CommandSetControlMaximumArchive& from)
+CommandSetMultipleChoiceListFormatForEditedItemArchive::CommandSetMultipleChoiceListFormatForEditedItemArchive(const CommandSetMultipleChoiceListFormatForEditedItemArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetControlMaximumArchive::SharedCtor() {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  maximum_ = 0;
-  format_type_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetControlMaximumArchive::~CommandSetControlMaximumArchive() {
+CommandSetMultipleChoiceListFormatForEditedItemArchive::~CommandSetMultipleChoiceListFormatForEditedItemArchive() {
   SharedDtor();
 }
 
-void CommandSetControlMaximumArchive::SharedDtor() {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetControlMaximumArchive::SetCachedSize(int size) const {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetControlMaximumArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForEditedItemArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetControlMaximumArchive_descriptor_;
+  return CommandSetMultipleChoiceListFormatForEditedItemArchive_descriptor_;
 }
 
-const CommandSetControlMaximumArchive& CommandSetControlMaximumArchive::default_instance() {
+const CommandSetMultipleChoiceListFormatForEditedItemArchive& CommandSetMultipleChoiceListFormatForEditedItemArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetControlMaximumArchive* CommandSetControlMaximumArchive::default_instance_ = NULL;
+CommandSetMultipleChoiceListFormatForEditedItemArchive* CommandSetMultipleChoiceListFormatForEditedItemArchive::default_instance_ = NULL;
 
-CommandSetControlMaximumArchive* CommandSetControlMaximumArchive::New() const {
-  return new CommandSetControlMaximumArchive;
+CommandSetMultipleChoiceListFormatForEditedItemArchive* CommandSetMultipleChoiceListFormatForEditedItemArchive::New() const {
+  return new CommandSetMultipleChoiceListFormatForEditedItemArchive;
 }
 
-void CommandSetControlMaximumArchive::Clear() {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    maximum_ = 0;
-    format_type_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetControlMaximumArchive::MergePartialFromCodedStream(
+bool CommandSetMultipleChoiceListFormatForEditedItemArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -24620,38 +28286,6 @@ bool CommandSetControlMaximumArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(17)) goto parse_maximum;
-        break;
-      }
-
-      // required double maximum = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_maximum:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &maximum_)));
-          set_has_maximum();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_format_type;
-        break;
-      }
-
-      // required uint32 format_type = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_format_type:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &format_type_)));
-          set_has_format_type();
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -24672,7 +28306,7 @@ bool CommandSetControlMaximumArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetControlMaximumArchive::SerializeWithCachedSizes(
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24680,23 +28314,13 @@ void CommandSetControlMaximumArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required double maximum = 2;
-  if (has_maximum()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->maximum(), output);
-  }
-
-  // required uint32 format_type = 3;
-  if (has_format_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_type(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetControlMaximumArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForEditedItemArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24705,16 +28329,6 @@ ::google::protobuf::uint8* CommandSetControlMaximumArchive::SerializeWithCachedS
         1, this->super(), target);
   }
 
-  // required double maximum = 2;
-  if (has_maximum()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->maximum(), target);
-  }
-
-  // required uint32 format_type = 3;
-  if (has_format_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_type(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -24722,7 +28336,7 @@ ::google::protobuf::uint8* CommandSetControlMaximumArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandSetControlMaximumArchive::ByteSize() const {
+int CommandSetMultipleChoiceListFormatForEditedItemArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -24733,18 +28347,6 @@ int CommandSetControlMaximumArchive::ByteSize() const {
           this->super());
     }
 
-    // required double maximum = 2;
-    if (has_maximum()) {
-      total_size += 1 + 8;
-    }
-
-    // required uint32 format_type = 3;
-    if (has_format_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->format_type());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -24757,10 +28359,10 @@ int CommandSetControlMaximumArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetControlMaximumArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetControlMaximumArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetControlMaximumArchive*>(
+  const CommandSetMultipleChoiceListFormatForEditedItemArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForEditedItemArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -24769,36 +28371,30 @@ void CommandSetControlMaximumArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandSetControlMaximumArchive::MergeFrom(const CommandSetControlMaximumArchive& from) {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForEditedItemArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_maximum()) {
-      set_maximum(from.maximum());
-    }
-    if (from.has_format_type()) {
-      set_format_type(from.format_type());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetControlMaximumArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetControlMaximumArchive::CopyFrom(const CommandSetControlMaximumArchive& from) {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForEditedItemArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetControlMaximumArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetMultipleChoiceListFormatForEditedItemArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -24806,22 +28402,20 @@ bool CommandSetControlMaximumArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetControlMaximumArchive::Swap(CommandSetControlMaximumArchive* other) {
+void CommandSetMultipleChoiceListFormatForEditedItemArchive::Swap(CommandSetMultipleChoiceListFormatForEditedItemArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(maximum_, other->maximum_);
-    std::swap(format_type_, other->format_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetControlMaximumArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForEditedItemArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetControlMaximumArchive_descriptor_;
-  metadata.reflection = CommandSetControlMaximumArchive_reflection_;
+  metadata.descriptor = CommandSetMultipleChoiceListFormatForEditedItemArchive_descriptor_;
+  metadata.reflection = CommandSetMultipleChoiceListFormatForEditedItemArchive_reflection_;
   return metadata;
 }
 
@@ -24829,78 +28423,72 @@ ::google::protobuf::Metadata CommandSetControlMaximumArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetControlIncrementArchive::kSuperFieldNumber;
-const int CommandSetControlIncrementArchive::kIncrementFieldNumber;
-const int CommandSetControlIncrementArchive::kFormatTypeFieldNumber;
+const int CommandSetMultipleChoiceListFormatForDeleteItemArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetControlIncrementArchive::CommandSetControlIncrementArchive()
+CommandSetMultipleChoiceListFormatForDeleteItemArchive::CommandSetMultipleChoiceListFormatForDeleteItemArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetControlIncrementArchive::InitAsDefaultInstance() {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetControlIncrementArchive::CommandSetControlIncrementArchive(const CommandSetControlIncrementArchive& from)
+CommandSetMultipleChoiceListFormatForDeleteItemArchive::CommandSetMultipleChoiceListFormatForDeleteItemArchive(const CommandSetMultipleChoiceListFormatForDeleteItemArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetControlIncrementArchive::SharedCtor() {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  increment_ = 0;
-  format_type_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetControlIncrementArchive::~CommandSetControlIncrementArchive() {
+CommandSetMultipleChoiceListFormatForDeleteItemArchive::~CommandSetMultipleChoiceListFormatForDeleteItemArchive() {
   SharedDtor();
 }
 
-void CommandSetControlIncrementArchive::SharedDtor() {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetControlIncrementArchive::SetCachedSize(int size) const {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetControlIncrementArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForDeleteItemArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetControlIncrementArchive_descriptor_;
+  return CommandSetMultipleChoiceListFormatForDeleteItemArchive_descriptor_;
 }
 
-const CommandSetControlIncrementArchive& CommandSetControlIncrementArchive::default_instance() {
+const CommandSetMultipleChoiceListFormatForDeleteItemArchive& CommandSetMultipleChoiceListFormatForDeleteItemArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetControlIncrementArchive* CommandSetControlIncrementArchive::default_instance_ = NULL;
+CommandSetMultipleChoiceListFormatForDeleteItemArchive* CommandSetMultipleChoiceListFormatForDeleteItemArchive::default_instance_ = NULL;
 
-CommandSetControlIncrementArchive* CommandSetControlIncrementArchive::New() const {
-  return new CommandSetControlIncrementArchive;
+CommandSetMultipleChoiceListFormatForDeleteItemArchive* CommandSetMultipleChoiceListFormatForDeleteItemArchive::New() const {
+  return new CommandSetMultipleChoiceListFormatForDeleteItemArchive;
 }
 
-void CommandSetControlIncrementArchive::Clear() {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    increment_ = 0;
-    format_type_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetControlIncrementArchive::MergePartialFromCodedStream(
+bool CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -24915,38 +28503,6 @@ bool CommandSetControlIncrementArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(17)) goto parse_increment;
-        break;
-      }
-
-      // required double increment = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
-         parse_increment:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &increment_)));
-          set_has_increment();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_format_type;
-        break;
-      }
-
-      // required uint32 format_type = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_format_type:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &format_type_)));
-          set_has_format_type();
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -24967,7 +28523,7 @@ bool CommandSetControlIncrementArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetControlIncrementArchive::SerializeWithCachedSizes(
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -24975,23 +28531,13 @@ void CommandSetControlIncrementArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required double increment = 2;
-  if (has_increment()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(2, this->increment(), output);
-  }
-
-  // required uint32 format_type = 3;
-  if (has_format_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->format_type(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetControlIncrementArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForDeleteItemArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25000,16 +28546,6 @@ ::google::protobuf::uint8* CommandSetControlIncrementArchive::SerializeWithCache
         1, this->super(), target);
   }
 
-  // required double increment = 2;
-  if (has_increment()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(2, this->increment(), target);
-  }
-
-  // required uint32 format_type = 3;
-  if (has_format_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->format_type(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -25017,7 +28553,7 @@ ::google::protobuf::uint8* CommandSetControlIncrementArchive::SerializeWithCache
   return target;
 }
 
-int CommandSetControlIncrementArchive::ByteSize() const {
+int CommandSetMultipleChoiceListFormatForDeleteItemArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -25028,18 +28564,6 @@ int CommandSetControlIncrementArchive::ByteSize() const {
           this->super());
     }
 
-    // required double increment = 2;
-    if (has_increment()) {
-      total_size += 1 + 8;
-    }
-
-    // required uint32 format_type = 3;
-    if (has_format_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->format_type());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -25052,10 +28576,10 @@ int CommandSetControlIncrementArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetControlIncrementArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetControlIncrementArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetControlIncrementArchive*>(
+  const CommandSetMultipleChoiceListFormatForDeleteItemArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForDeleteItemArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -25064,36 +28588,30 @@ void CommandSetControlIncrementArchive::MergeFrom(const ::google::protobuf::Mess
   }
 }
 
-void CommandSetControlIncrementArchive::MergeFrom(const CommandSetControlIncrementArchive& from) {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForDeleteItemArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_increment()) {
-      set_increment(from.increment());
-    }
-    if (from.has_format_type()) {
-      set_format_type(from.format_type());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetControlIncrementArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetControlIncrementArchive::CopyFrom(const CommandSetControlIncrementArchive& from) {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForDeleteItemArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetControlIncrementArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetMultipleChoiceListFormatForDeleteItemArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -25101,22 +28619,20 @@ bool CommandSetControlIncrementArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetControlIncrementArchive::Swap(CommandSetControlIncrementArchive* other) {
+void CommandSetMultipleChoiceListFormatForDeleteItemArchive::Swap(CommandSetMultipleChoiceListFormatForDeleteItemArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(increment_, other->increment_);
-    std::swap(format_type_, other->format_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetControlIncrementArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForDeleteItemArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetControlIncrementArchive_descriptor_;
-  metadata.reflection = CommandSetControlIncrementArchive_reflection_;
+  metadata.descriptor = CommandSetMultipleChoiceListFormatForDeleteItemArchive_descriptor_;
+  metadata.reflection = CommandSetMultipleChoiceListFormatForDeleteItemArchive_reflection_;
   return metadata;
 }
 
@@ -25124,82 +28640,72 @@ ::google::protobuf::Metadata CommandSetControlIncrementArchive::GetMetadata() co
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetCurrencyCodeArchive::kSuperFieldNumber;
-const int CommandSetCurrencyCodeArchive::kCurrencyCodeFieldNumber;
+const int CommandSetMultipleChoiceListFormatForReorderItemArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetCurrencyCodeArchive::CommandSetCurrencyCodeArchive()
+CommandSetMultipleChoiceListFormatForReorderItemArchive::CommandSetMultipleChoiceListFormatForReorderItemArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetCurrencyCodeArchive::InitAsDefaultInstance() {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetCurrencyCodeArchive::CommandSetCurrencyCodeArchive(const CommandSetCurrencyCodeArchive& from)
+CommandSetMultipleChoiceListFormatForReorderItemArchive::CommandSetMultipleChoiceListFormatForReorderItemArchive(const CommandSetMultipleChoiceListFormatForReorderItemArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetCurrencyCodeArchive::SharedCtor() {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  currency_code_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetCurrencyCodeArchive::~CommandSetCurrencyCodeArchive() {
+CommandSetMultipleChoiceListFormatForReorderItemArchive::~CommandSetMultipleChoiceListFormatForReorderItemArchive() {
   SharedDtor();
 }
 
-void CommandSetCurrencyCodeArchive::SharedDtor() {
-  if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
-    delete currency_code_;
-  }
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetCurrencyCodeArchive::SetCachedSize(int size) const {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetCurrencyCodeArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForReorderItemArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetCurrencyCodeArchive_descriptor_;
+  return CommandSetMultipleChoiceListFormatForReorderItemArchive_descriptor_;
 }
 
-const CommandSetCurrencyCodeArchive& CommandSetCurrencyCodeArchive::default_instance() {
+const CommandSetMultipleChoiceListFormatForReorderItemArchive& CommandSetMultipleChoiceListFormatForReorderItemArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetCurrencyCodeArchive* CommandSetCurrencyCodeArchive::default_instance_ = NULL;
+CommandSetMultipleChoiceListFormatForReorderItemArchive* CommandSetMultipleChoiceListFormatForReorderItemArchive::default_instance_ = NULL;
 
-CommandSetCurrencyCodeArchive* CommandSetCurrencyCodeArchive::New() const {
-  return new CommandSetCurrencyCodeArchive;
+CommandSetMultipleChoiceListFormatForReorderItemArchive* CommandSetMultipleChoiceListFormatForReorderItemArchive::New() const {
+  return new CommandSetMultipleChoiceListFormatForReorderItemArchive;
 }
 
-void CommandSetCurrencyCodeArchive::Clear() {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    if (has_currency_code()) {
-      if (currency_code_ != &::google::protobuf::internal::kEmptyString) {
-        currency_code_->clear();
-      }
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetCurrencyCodeArchive::MergePartialFromCodedStream(
+bool CommandSetMultipleChoiceListFormatForReorderItemArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -25214,23 +28720,6 @@ bool CommandSetCurrencyCodeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_currency_code;
-        break;
-      }
-
-      // required string currency_code = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_currency_code:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_currency_code()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->currency_code().data(), this->currency_code().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -25251,7 +28740,7 @@ bool CommandSetCurrencyCodeArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetCurrencyCodeArchive::SerializeWithCachedSizes(
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25259,22 +28748,13 @@ void CommandSetCurrencyCodeArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required string currency_code = 2;
-  if (has_currency_code()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->currency_code().data(), this->currency_code().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      2, this->currency_code(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetCurrencyCodeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForReorderItemArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25283,16 +28763,6 @@ ::google::protobuf::uint8* CommandSetCurrencyCodeArchive::SerializeWithCachedSiz
         1, this->super(), target);
   }
 
-  // required string currency_code = 2;
-  if (has_currency_code()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->currency_code().data(), this->currency_code().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->currency_code(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -25300,7 +28770,7 @@ ::google::protobuf::uint8* CommandSetCurrencyCodeArchive::SerializeWithCachedSiz
   return target;
 }
 
-int CommandSetCurrencyCodeArchive::ByteSize() const {
+int CommandSetMultipleChoiceListFormatForReorderItemArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -25311,13 +28781,6 @@ int CommandSetCurrencyCodeArchive::ByteSize() const {
           this->super());
     }
 
-    // required string currency_code = 2;
-    if (has_currency_code()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->currency_code());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -25330,10 +28793,10 @@ int CommandSetCurrencyCodeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetCurrencyCodeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetCurrencyCodeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetCurrencyCodeArchive*>(
+  const CommandSetMultipleChoiceListFormatForReorderItemArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForReorderItemArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -25342,33 +28805,30 @@ void CommandSetCurrencyCodeArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandSetCurrencyCodeArchive::MergeFrom(const CommandSetCurrencyCodeArchive& from) {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForReorderItemArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_currency_code()) {
-      set_currency_code(from.currency_code());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetCurrencyCodeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetCurrencyCodeArchive::CopyFrom(const CommandSetCurrencyCodeArchive& from) {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForReorderItemArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetCurrencyCodeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetMultipleChoiceListFormatForReorderItemArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -25376,21 +28836,20 @@ bool CommandSetCurrencyCodeArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetCurrencyCodeArchive::Swap(CommandSetCurrencyCodeArchive* other) {
+void CommandSetMultipleChoiceListFormatForReorderItemArchive::Swap(CommandSetMultipleChoiceListFormatForReorderItemArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(currency_code_, other->currency_code_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetCurrencyCodeArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForReorderItemArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetCurrencyCodeArchive_descriptor_;
-  metadata.reflection = CommandSetCurrencyCodeArchive_reflection_;
+  metadata.descriptor = CommandSetMultipleChoiceListFormatForReorderItemArchive_descriptor_;
+  metadata.reflection = CommandSetMultipleChoiceListFormatForReorderItemArchive_reflection_;
   return metadata;
 }
 
@@ -25398,75 +28857,72 @@ ::google::protobuf::Metadata CommandSetCurrencyCodeArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetFractionAccuracyArchive::kSuperFieldNumber;
-const int CommandSetFractionAccuracyArchive::kFractionAccuracyFieldNumber;
+const int CommandSetMultipleChoiceListFormatForInitialValueArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetFractionAccuracyArchive::CommandSetFractionAccuracyArchive()
+CommandSetMultipleChoiceListFormatForInitialValueArchive::CommandSetMultipleChoiceListFormatForInitialValueArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetFractionAccuracyArchive::InitAsDefaultInstance() {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetFractionAccuracyArchive::CommandSetFractionAccuracyArchive(const CommandSetFractionAccuracyArchive& from)
+CommandSetMultipleChoiceListFormatForInitialValueArchive::CommandSetMultipleChoiceListFormatForInitialValueArchive(const CommandSetMultipleChoiceListFormatForInitialValueArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetFractionAccuracyArchive::SharedCtor() {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  fraction_accuracy_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetFractionAccuracyArchive::~CommandSetFractionAccuracyArchive() {
+CommandSetMultipleChoiceListFormatForInitialValueArchive::~CommandSetMultipleChoiceListFormatForInitialValueArchive() {
   SharedDtor();
 }
 
-void CommandSetFractionAccuracyArchive::SharedDtor() {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetFractionAccuracyArchive::SetCachedSize(int size) const {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetFractionAccuracyArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForInitialValueArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetFractionAccuracyArchive_descriptor_;
+  return CommandSetMultipleChoiceListFormatForInitialValueArchive_descriptor_;
 }
 
-const CommandSetFractionAccuracyArchive& CommandSetFractionAccuracyArchive::default_instance() {
+const CommandSetMultipleChoiceListFormatForInitialValueArchive& CommandSetMultipleChoiceListFormatForInitialValueArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetFractionAccuracyArchive* CommandSetFractionAccuracyArchive::default_instance_ = NULL;
+CommandSetMultipleChoiceListFormatForInitialValueArchive* CommandSetMultipleChoiceListFormatForInitialValueArchive::default_instance_ = NULL;
 
-CommandSetFractionAccuracyArchive* CommandSetFractionAccuracyArchive::New() const {
-  return new CommandSetFractionAccuracyArchive;
+CommandSetMultipleChoiceListFormatForInitialValueArchive* CommandSetMultipleChoiceListFormatForInitialValueArchive::New() const {
+  return new CommandSetMultipleChoiceListFormatForInitialValueArchive;
 }
 
-void CommandSetFractionAccuracyArchive::Clear() {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    fraction_accuracy_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetFractionAccuracyArchive::MergePartialFromCodedStream(
+bool CommandSetMultipleChoiceListFormatForInitialValueArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -25481,22 +28937,6 @@ bool CommandSetFractionAccuracyArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_fraction_accuracy;
-        break;
-      }
-
-      // required uint32 fraction_accuracy = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_fraction_accuracy:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &fraction_accuracy_)));
-          set_has_fraction_accuracy();
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -25517,7 +28957,7 @@ bool CommandSetFractionAccuracyArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetFractionAccuracyArchive::SerializeWithCachedSizes(
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25525,18 +28965,13 @@ void CommandSetFractionAccuracyArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 fraction_accuracy = 2;
-  if (has_fraction_accuracy()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->fraction_accuracy(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetFractionAccuracyArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForInitialValueArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25545,11 +28980,6 @@ ::google::protobuf::uint8* CommandSetFractionAccuracyArchive::SerializeWithCache
         1, this->super(), target);
   }
 
-  // required uint32 fraction_accuracy = 2;
-  if (has_fraction_accuracy()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->fraction_accuracy(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -25557,7 +28987,7 @@ ::google::protobuf::uint8* CommandSetFractionAccuracyArchive::SerializeWithCache
   return target;
 }
 
-int CommandSetFractionAccuracyArchive::ByteSize() const {
+int CommandSetMultipleChoiceListFormatForInitialValueArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -25568,13 +28998,6 @@ int CommandSetFractionAccuracyArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 fraction_accuracy = 2;
-    if (has_fraction_accuracy()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->fraction_accuracy());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -25587,10 +29010,10 @@ int CommandSetFractionAccuracyArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetFractionAccuracyArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetFractionAccuracyArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFractionAccuracyArchive*>(
+  const CommandSetMultipleChoiceListFormatForInitialValueArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForInitialValueArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -25599,33 +29022,30 @@ void CommandSetFractionAccuracyArchive::MergeFrom(const ::google::protobuf::Mess
   }
 }
 
-void CommandSetFractionAccuracyArchive::MergeFrom(const CommandSetFractionAccuracyArchive& from) {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForInitialValueArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_fraction_accuracy()) {
-      set_fraction_accuracy(from.fraction_accuracy());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetFractionAccuracyArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetFractionAccuracyArchive::CopyFrom(const CommandSetFractionAccuracyArchive& from) {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForInitialValueArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetFractionAccuracyArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetMultipleChoiceListFormatForInitialValueArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -25633,21 +29053,20 @@ bool CommandSetFractionAccuracyArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetFractionAccuracyArchive::Swap(CommandSetFractionAccuracyArchive* other) {
+void CommandSetMultipleChoiceListFormatForInitialValueArchive::Swap(CommandSetMultipleChoiceListFormatForInitialValueArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(fraction_accuracy_, other->fraction_accuracy_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetFractionAccuracyArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForInitialValueArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetFractionAccuracyArchive_descriptor_;
-  metadata.reflection = CommandSetFractionAccuracyArchive_reflection_;
+  metadata.descriptor = CommandSetMultipleChoiceListFormatForInitialValueArchive_descriptor_;
+  metadata.reflection = CommandSetMultipleChoiceListFormatForInitialValueArchive_reflection_;
   return metadata;
 }
 
@@ -25655,72 +29074,75 @@ ::google::protobuf::Metadata CommandSetFractionAccuracyArchive::GetMetadata() co
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetMultipleChoiceListFormatForEditedItemArchive::kSuperFieldNumber;
+const int CommandSetNegativeNumberStyleArchive::kSuperFieldNumber;
+const int CommandSetNegativeNumberStyleArchive::kNegativeNumberStyleFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetMultipleChoiceListFormatForEditedItemArchive::CommandSetMultipleChoiceListFormatForEditedItemArchive()
+CommandSetNegativeNumberStyleArchive::CommandSetNegativeNumberStyleArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::InitAsDefaultInstance() {
+void CommandSetNegativeNumberStyleArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetMultipleChoiceListFormatForEditedItemArchive::CommandSetMultipleChoiceListFormatForEditedItemArchive(const CommandSetMultipleChoiceListFormatForEditedItemArchive& from)
+CommandSetNegativeNumberStyleArchive::CommandSetNegativeNumberStyleArchive(const CommandSetNegativeNumberStyleArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::SharedCtor() {
+void CommandSetNegativeNumberStyleArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  negative_number_style_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetMultipleChoiceListFormatForEditedItemArchive::~CommandSetMultipleChoiceListFormatForEditedItemArchive() {
+CommandSetNegativeNumberStyleArchive::~CommandSetNegativeNumberStyleArchive() {
   SharedDtor();
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::SharedDtor() {
+void CommandSetNegativeNumberStyleArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::SetCachedSize(int size) const {
+void CommandSetNegativeNumberStyleArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForEditedItemArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetNegativeNumberStyleArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetMultipleChoiceListFormatForEditedItemArchive_descriptor_;
+  return CommandSetNegativeNumberStyleArchive_descriptor_;
 }
 
-const CommandSetMultipleChoiceListFormatForEditedItemArchive& CommandSetMultipleChoiceListFormatForEditedItemArchive::default_instance() {
+const CommandSetNegativeNumberStyleArchive& CommandSetNegativeNumberStyleArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetMultipleChoiceListFormatForEditedItemArchive* CommandSetMultipleChoiceListFormatForEditedItemArchive::default_instance_ = NULL;
+CommandSetNegativeNumberStyleArchive* CommandSetNegativeNumberStyleArchive::default_instance_ = NULL;
 
-CommandSetMultipleChoiceListFormatForEditedItemArchive* CommandSetMultipleChoiceListFormatForEditedItemArchive::New() const {
-  return new CommandSetMultipleChoiceListFormatForEditedItemArchive;
+CommandSetNegativeNumberStyleArchive* CommandSetNegativeNumberStyleArchive::New() const {
+  return new CommandSetNegativeNumberStyleArchive;
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::Clear() {
+void CommandSetNegativeNumberStyleArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    negative_number_style_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetMultipleChoiceListFormatForEditedItemArchive::MergePartialFromCodedStream(
+bool CommandSetNegativeNumberStyleArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -25735,6 +29157,22 @@ bool CommandSetMultipleChoiceListFormatForEditedItemArchive::MergePartialFromCod
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(16)) goto parse_negative_number_style;
+        break;
+      }
+
+      // required uint32 negative_number_style = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_negative_number_style:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &negative_number_style_)));
+          set_has_negative_number_style();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -25755,7 +29193,7 @@ bool CommandSetMultipleChoiceListFormatForEditedItemArchive::MergePartialFromCod
 #undef DO_
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::SerializeWithCachedSizes(
+void CommandSetNegativeNumberStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25763,13 +29201,18 @@ void CommandSetMultipleChoiceListFormatForEditedItemArchive::SerializeWithCached
       1, this->super(), output);
   }
 
+  // required uint32 negative_number_style = 2;
+  if (has_negative_number_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->negative_number_style(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForEditedItemArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetNegativeNumberStyleArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -25778,6 +29221,11 @@ ::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForEditedItemArchiv
         1, this->super(), target);
   }
 
+  // required uint32 negative_number_style = 2;
+  if (has_negative_number_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->negative_number_style(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -25785,7 +29233,7 @@ ::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForEditedItemArchiv
   return target;
 }
 
-int CommandSetMultipleChoiceListFormatForEditedItemArchive::ByteSize() const {
+int CommandSetNegativeNumberStyleArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -25796,6 +29244,13 @@ int CommandSetMultipleChoiceListFormatForEditedItemArchive::ByteSize() const {
           this->super());
     }
 
+    // required uint32 negative_number_style = 2;
+    if (has_negative_number_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->negative_number_style());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -25808,10 +29263,10 @@ int CommandSetMultipleChoiceListFormatForEditedItemArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetNegativeNumberStyleArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetMultipleChoiceListFormatForEditedItemArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForEditedItemArchive*>(
+  const CommandSetNegativeNumberStyleArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetNegativeNumberStyleArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -25820,30 +29275,33 @@ void CommandSetMultipleChoiceListFormatForEditedItemArchive::MergeFrom(const ::g
   }
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForEditedItemArchive& from) {
+void CommandSetNegativeNumberStyleArchive::MergeFrom(const CommandSetNegativeNumberStyleArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
+    if (from.has_negative_number_style()) {
+      set_negative_number_style(from.negative_number_style());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetNegativeNumberStyleArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForEditedItemArchive& from) {
+void CommandSetNegativeNumberStyleArchive::CopyFrom(const CommandSetNegativeNumberStyleArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetMultipleChoiceListFormatForEditedItemArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandSetNegativeNumberStyleArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -25851,20 +29309,21 @@ bool CommandSetMultipleChoiceListFormatForEditedItemArchive::IsInitialized() con
   return true;
 }
 
-void CommandSetMultipleChoiceListFormatForEditedItemArchive::Swap(CommandSetMultipleChoiceListFormatForEditedItemArchive* other) {
+void CommandSetNegativeNumberStyleArchive::Swap(CommandSetNegativeNumberStyleArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(negative_number_style_, other->negative_number_style_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForEditedItemArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetNegativeNumberStyleArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetMultipleChoiceListFormatForEditedItemArchive_descriptor_;
-  metadata.reflection = CommandSetMultipleChoiceListFormatForEditedItemArchive_reflection_;
+  metadata.descriptor = CommandSetNegativeNumberStyleArchive_descriptor_;
+  metadata.reflection = CommandSetNegativeNumberStyleArchive_reflection_;
   return metadata;
 }
 
@@ -25872,78 +29331,106 @@ ::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForEditedItemArch
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetMultipleChoiceListFormatForDeleteItemArchive::kSuperFieldNumber;
+const int CommandSetExplicitFormatArchive::kSuperFieldNumber;
+const int CommandSetExplicitFormatArchive::kSelectionFieldNumber;
+const int CommandSetExplicitFormatArchive::kCellFormatFieldNumber;
+const int CommandSetExplicitFormatArchive::kUndoCellMapFieldNumber;
+const int CommandSetExplicitFormatArchive::kRedoCellMapFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetMultipleChoiceListFormatForDeleteItemArchive::CommandSetMultipleChoiceListFormatForDeleteItemArchive()
+CommandSetExplicitFormatArchive::CommandSetExplicitFormatArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
+void CommandSetExplicitFormatArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  cell_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
 }
 
-CommandSetMultipleChoiceListFormatForDeleteItemArchive::CommandSetMultipleChoiceListFormatForDeleteItemArchive(const CommandSetMultipleChoiceListFormatForDeleteItemArchive& from)
+CommandSetExplicitFormatArchive::CommandSetExplicitFormatArchive(const CommandSetExplicitFormatArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SharedCtor() {
+void CommandSetExplicitFormatArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  selection_ = NULL;
+  cell_format_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetMultipleChoiceListFormatForDeleteItemArchive::~CommandSetMultipleChoiceListFormatForDeleteItemArchive() {
+CommandSetExplicitFormatArchive::~CommandSetExplicitFormatArchive() {
   SharedDtor();
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SharedDtor() {
+void CommandSetExplicitFormatArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete selection_;
+    delete cell_format_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
   }
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SetCachedSize(int size) const {
+void CommandSetExplicitFormatArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForDeleteItemArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetExplicitFormatArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetMultipleChoiceListFormatForDeleteItemArchive_descriptor_;
+  return CommandSetExplicitFormatArchive_descriptor_;
 }
 
-const CommandSetMultipleChoiceListFormatForDeleteItemArchive& CommandSetMultipleChoiceListFormatForDeleteItemArchive::default_instance() {
+const CommandSetExplicitFormatArchive& CommandSetExplicitFormatArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetMultipleChoiceListFormatForDeleteItemArchive* CommandSetMultipleChoiceListFormatForDeleteItemArchive::default_instance_ = NULL;
+CommandSetExplicitFormatArchive* CommandSetExplicitFormatArchive::default_instance_ = NULL;
 
-CommandSetMultipleChoiceListFormatForDeleteItemArchive* CommandSetMultipleChoiceListFormatForDeleteItemArchive::New() const {
-  return new CommandSetMultipleChoiceListFormatForDeleteItemArchive;
+CommandSetExplicitFormatArchive* CommandSetExplicitFormatArchive::New() const {
+  return new CommandSetExplicitFormatArchive;
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::Clear() {
+void CommandSetExplicitFormatArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    if (has_cell_format()) {
+      if (cell_format_ != NULL) cell_format_->::TSK::FormatStructArchive::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergePartialFromCodedStream(
+bool CommandSetExplicitFormatArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -25952,6 +29439,62 @@ bool CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergePartialFromCod
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_selection;
+        break;
+      }
+
+      // required .TST.SelectionArchive selection = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_cell_format;
+        break;
+      }
+
+      // required .TSK.FormatStructArchive cell_format = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_format:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cell_format()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_undo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive undo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -25972,29 +29515,81 @@ bool CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergePartialFromCod
 #undef DO_
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::SerializeWithCachedSizes(
+void CommandSetExplicitFormatArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->selection(), output);
+  }
+
+  // required .TSK.FormatStructArchive cell_format = 3;
+  if (has_cell_format()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->cell_format(), output);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->undo_cell_map(), output);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->redo_cell_map(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForDeleteItemArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetExplicitFormatArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->selection(), target);
+  }
+
+  // required .TSK.FormatStructArchive cell_format = 3;
+  if (has_cell_format()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->cell_format(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->undo_cell_map(), target);
+  }
+
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->redo_cell_map(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -26002,17 +29597,45 @@ ::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForDeleteItemArchiv
   return target;
 }
 
-int CommandSetMultipleChoiceListFormatForDeleteItemArchive::ByteSize() const {
+int CommandSetExplicitFormatArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
+    // required .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // required .TSK.FormatStructArchive cell_format = 3;
+    if (has_cell_format()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell_format());
+    }
+
+    // required .TST.CellMapArchive undo_cell_map = 4;
+    if (has_undo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // required .TST.CellMapArchive redo_cell_map = 5;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -26025,10 +29648,10 @@ int CommandSetMultipleChoiceListFormatForDeleteItemArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetExplicitFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetMultipleChoiceListFormatForDeleteItemArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForDeleteItemArchive*>(
+  const CommandSetExplicitFormatArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetExplicitFormatArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -26037,51 +29660,79 @@ void CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergeFrom(const ::g
   }
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForDeleteItemArchive& from) {
+void CommandSetExplicitFormatArchive::MergeFrom(const CommandSetExplicitFormatArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_cell_format()) {
+      mutable_cell_format()->::TSK::FormatStructArchive::MergeFrom(from.cell_format());
+    }
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetExplicitFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForDeleteItemArchive& from) {
+void CommandSetExplicitFormatArchive::CopyFrom(const CommandSetExplicitFormatArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetMultipleChoiceListFormatForDeleteItemArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandSetExplicitFormatArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_cell_format()) {
+    if (!this->cell_format().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetMultipleChoiceListFormatForDeleteItemArchive::Swap(CommandSetMultipleChoiceListFormatForDeleteItemArchive* other) {
+void CommandSetExplicitFormatArchive::Swap(CommandSetExplicitFormatArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(selection_, other->selection_);
+    std::swap(cell_format_, other->cell_format_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForDeleteItemArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetExplicitFormatArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetMultipleChoiceListFormatForDeleteItemArchive_descriptor_;
-  metadata.reflection = CommandSetMultipleChoiceListFormatForDeleteItemArchive_reflection_;
+  metadata.descriptor = CommandSetExplicitFormatArchive_descriptor_;
+  metadata.reflection = CommandSetExplicitFormatArchive_reflection_;
   return metadata;
 }
 
@@ -26089,72 +29740,75 @@ ::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForDeleteItemArch
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetMultipleChoiceListFormatForReorderItemArchive::kSuperFieldNumber;
+const int CommandSetNumberOfDecimalPlacesArchive::kSuperFieldNumber;
+const int CommandSetNumberOfDecimalPlacesArchive::kDecimalPlacesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetMultipleChoiceListFormatForReorderItemArchive::CommandSetMultipleChoiceListFormatForReorderItemArchive()
+CommandSetNumberOfDecimalPlacesArchive::CommandSetNumberOfDecimalPlacesArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::InitAsDefaultInstance() {
+void CommandSetNumberOfDecimalPlacesArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetMultipleChoiceListFormatForReorderItemArchive::CommandSetMultipleChoiceListFormatForReorderItemArchive(const CommandSetMultipleChoiceListFormatForReorderItemArchive& from)
+CommandSetNumberOfDecimalPlacesArchive::CommandSetNumberOfDecimalPlacesArchive(const CommandSetNumberOfDecimalPlacesArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::SharedCtor() {
+void CommandSetNumberOfDecimalPlacesArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  decimal_places_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetMultipleChoiceListFormatForReorderItemArchive::~CommandSetMultipleChoiceListFormatForReorderItemArchive() {
+CommandSetNumberOfDecimalPlacesArchive::~CommandSetNumberOfDecimalPlacesArchive() {
   SharedDtor();
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::SharedDtor() {
+void CommandSetNumberOfDecimalPlacesArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::SetCachedSize(int size) const {
+void CommandSetNumberOfDecimalPlacesArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForReorderItemArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetNumberOfDecimalPlacesArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetMultipleChoiceListFormatForReorderItemArchive_descriptor_;
+  return CommandSetNumberOfDecimalPlacesArchive_descriptor_;
 }
 
-const CommandSetMultipleChoiceListFormatForReorderItemArchive& CommandSetMultipleChoiceListFormatForReorderItemArchive::default_instance() {
+const CommandSetNumberOfDecimalPlacesArchive& CommandSetNumberOfDecimalPlacesArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetMultipleChoiceListFormatForReorderItemArchive* CommandSetMultipleChoiceListFormatForReorderItemArchive::default_instance_ = NULL;
+CommandSetNumberOfDecimalPlacesArchive* CommandSetNumberOfDecimalPlacesArchive::default_instance_ = NULL;
 
-CommandSetMultipleChoiceListFormatForReorderItemArchive* CommandSetMultipleChoiceListFormatForReorderItemArchive::New() const {
-  return new CommandSetMultipleChoiceListFormatForReorderItemArchive;
+CommandSetNumberOfDecimalPlacesArchive* CommandSetNumberOfDecimalPlacesArchive::New() const {
+  return new CommandSetNumberOfDecimalPlacesArchive;
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::Clear() {
+void CommandSetNumberOfDecimalPlacesArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    decimal_places_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetMultipleChoiceListFormatForReorderItemArchive::MergePartialFromCodedStream(
+bool CommandSetNumberOfDecimalPlacesArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -26169,6 +29823,22 @@ bool CommandSetMultipleChoiceListFormatForReorderItemArchive::MergePartialFromCo
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(16)) goto parse_decimal_places;
+        break;
+      }
+
+      // required uint32 decimal_places = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_decimal_places:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &decimal_places_)));
+          set_has_decimal_places();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -26189,7 +29859,7 @@ bool CommandSetMultipleChoiceListFormatForReorderItemArchive::MergePartialFromCo
 #undef DO_
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::SerializeWithCachedSizes(
+void CommandSetNumberOfDecimalPlacesArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -26197,13 +29867,18 @@ void CommandSetMultipleChoiceListFormatForReorderItemArchive::SerializeWithCache
       1, this->super(), output);
   }
 
+  // required uint32 decimal_places = 2;
+  if (has_decimal_places()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->decimal_places(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForReorderItemArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetNumberOfDecimalPlacesArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -26212,6 +29887,11 @@ ::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForReorderItemArchi
         1, this->super(), target);
   }
 
+  // required uint32 decimal_places = 2;
+  if (has_decimal_places()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->decimal_places(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -26219,7 +29899,7 @@ ::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForReorderItemArchi
   return target;
 }
 
-int CommandSetMultipleChoiceListFormatForReorderItemArchive::ByteSize() const {
+int CommandSetNumberOfDecimalPlacesArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -26230,6 +29910,13 @@ int CommandSetMultipleChoiceListFormatForReorderItemArchive::ByteSize() const {
           this->super());
     }
 
+    // required uint32 decimal_places = 2;
+    if (has_decimal_places()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->decimal_places());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -26242,10 +29929,10 @@ int CommandSetMultipleChoiceListFormatForReorderItemArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetNumberOfDecimalPlacesArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetMultipleChoiceListFormatForReorderItemArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForReorderItemArchive*>(
+  const CommandSetNumberOfDecimalPlacesArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetNumberOfDecimalPlacesArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -26254,30 +29941,33 @@ void CommandSetMultipleChoiceListFormatForReorderItemArchive::MergeFrom(const ::
   }
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForReorderItemArchive& from) {
+void CommandSetNumberOfDecimalPlacesArchive::MergeFrom(const CommandSetNumberOfDecimalPlacesArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
+    if (from.has_decimal_places()) {
+      set_decimal_places(from.decimal_places());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetNumberOfDecimalPlacesArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForReorderItemArchive& from) {
+void CommandSetNumberOfDecimalPlacesArchive::CopyFrom(const CommandSetNumberOfDecimalPlacesArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetMultipleChoiceListFormatForReorderItemArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandSetNumberOfDecimalPlacesArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -26285,20 +29975,21 @@ bool CommandSetMultipleChoiceListFormatForReorderItemArchive::IsInitialized() co
   return true;
 }
 
-void CommandSetMultipleChoiceListFormatForReorderItemArchive::Swap(CommandSetMultipleChoiceListFormatForReorderItemArchive* other) {
+void CommandSetNumberOfDecimalPlacesArchive::Swap(CommandSetNumberOfDecimalPlacesArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(decimal_places_, other->decimal_places_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForReorderItemArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetNumberOfDecimalPlacesArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetMultipleChoiceListFormatForReorderItemArchive_descriptor_;
-  metadata.reflection = CommandSetMultipleChoiceListFormatForReorderItemArchive_reflection_;
+  metadata.descriptor = CommandSetNumberOfDecimalPlacesArchive_descriptor_;
+  metadata.reflection = CommandSetNumberOfDecimalPlacesArchive_reflection_;
   return metadata;
 }
 
@@ -26306,62 +29997,62 @@ ::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForReorderItemArc
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetMultipleChoiceListFormatForInitialValueArchive::kSuperFieldNumber;
+const int CommandSetDateTimeFormatArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetMultipleChoiceListFormatForInitialValueArchive::CommandSetMultipleChoiceListFormatForInitialValueArchive()
+CommandSetDateTimeFormatArchive::CommandSetDateTimeFormatArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::InitAsDefaultInstance() {
+void CommandSetDateTimeFormatArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetMultipleChoiceListFormatForInitialValueArchive::CommandSetMultipleChoiceListFormatForInitialValueArchive(const CommandSetMultipleChoiceListFormatForInitialValueArchive& from)
+CommandSetDateTimeFormatArchive::CommandSetDateTimeFormatArchive(const CommandSetDateTimeFormatArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::SharedCtor() {
+void CommandSetDateTimeFormatArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetMultipleChoiceListFormatForInitialValueArchive::~CommandSetMultipleChoiceListFormatForInitialValueArchive() {
+CommandSetDateTimeFormatArchive::~CommandSetDateTimeFormatArchive() {
   SharedDtor();
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::SharedDtor() {
+void CommandSetDateTimeFormatArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::SetCachedSize(int size) const {
+void CommandSetDateTimeFormatArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetMultipleChoiceListFormatForInitialValueArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetDateTimeFormatArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetMultipleChoiceListFormatForInitialValueArchive_descriptor_;
+  return CommandSetDateTimeFormatArchive_descriptor_;
 }
 
-const CommandSetMultipleChoiceListFormatForInitialValueArchive& CommandSetMultipleChoiceListFormatForInitialValueArchive::default_instance() {
+const CommandSetDateTimeFormatArchive& CommandSetDateTimeFormatArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetMultipleChoiceListFormatForInitialValueArchive* CommandSetMultipleChoiceListFormatForInitialValueArchive::default_instance_ = NULL;
+CommandSetDateTimeFormatArchive* CommandSetDateTimeFormatArchive::default_instance_ = NULL;
 
-CommandSetMultipleChoiceListFormatForInitialValueArchive* CommandSetMultipleChoiceListFormatForInitialValueArchive::New() const {
-  return new CommandSetMultipleChoiceListFormatForInitialValueArchive;
+CommandSetDateTimeFormatArchive* CommandSetDateTimeFormatArchive::New() const {
+  return new CommandSetDateTimeFormatArchive;
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::Clear() {
+void CommandSetDateTimeFormatArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
@@ -26371,7 +30062,7 @@ void CommandSetMultipleChoiceListFormatForInitialValueArchive::Clear() {
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetMultipleChoiceListFormatForInitialValueArchive::MergePartialFromCodedStream(
+bool CommandSetDateTimeFormatArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -26406,7 +30097,7 @@ bool CommandSetMultipleChoiceListFormatForInitialValueArchive::MergePartialFromC
 #undef DO_
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::SerializeWithCachedSizes(
+void CommandSetDateTimeFormatArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -26420,7 +30111,7 @@ void CommandSetMultipleChoiceListFormatForInitialValueArchive::SerializeWithCach
   }
 }
 
-::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForInitialValueArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetDateTimeFormatArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -26436,7 +30127,7 @@ ::google::protobuf::uint8* CommandSetMultipleChoiceListFormatForInitialValueArch
   return target;
 }
 
-int CommandSetMultipleChoiceListFormatForInitialValueArchive::ByteSize() const {
+int CommandSetDateTimeFormatArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -26459,10 +30150,10 @@ int CommandSetMultipleChoiceListFormatForInitialValueArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetDateTimeFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetMultipleChoiceListFormatForInitialValueArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetMultipleChoiceListFormatForInitialValueArchive*>(
+  const CommandSetDateTimeFormatArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetDateTimeFormatArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -26471,7 +30162,7 @@ void CommandSetMultipleChoiceListFormatForInitialValueArchive::MergeFrom(const :
   }
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::MergeFrom(const CommandSetMultipleChoiceListFormatForInitialValueArchive& from) {
+void CommandSetDateTimeFormatArchive::MergeFrom(const CommandSetDateTimeFormatArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
@@ -26481,19 +30172,19 @@ void CommandSetMultipleChoiceListFormatForInitialValueArchive::MergeFrom(const C
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetDateTimeFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::CopyFrom(const CommandSetMultipleChoiceListFormatForInitialValueArchive& from) {
+void CommandSetDateTimeFormatArchive::CopyFrom(const CommandSetDateTimeFormatArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetMultipleChoiceListFormatForInitialValueArchive::IsInitialized() const {
+bool CommandSetDateTimeFormatArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
@@ -26502,7 +30193,7 @@ bool CommandSetMultipleChoiceListFormatForInitialValueArchive::IsInitialized() c
   return true;
 }
 
-void CommandSetMultipleChoiceListFormatForInitialValueArchive::Swap(CommandSetMultipleChoiceListFormatForInitialValueArchive* other) {
+void CommandSetDateTimeFormatArchive::Swap(CommandSetDateTimeFormatArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
@@ -26511,11 +30202,11 @@ void CommandSetMultipleChoiceListFormatForInitialValueArchive::Swap(CommandSetMu
   }
 }
 
-::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForInitialValueArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetDateTimeFormatArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetMultipleChoiceListFormatForInitialValueArchive_descriptor_;
-  metadata.reflection = CommandSetMultipleChoiceListFormatForInitialValueArchive_reflection_;
+  metadata.descriptor = CommandSetDateTimeFormatArchive_descriptor_;
+  metadata.reflection = CommandSetDateTimeFormatArchive_reflection_;
   return metadata;
 }
 
@@ -26523,75 +30214,75 @@ ::google::protobuf::Metadata CommandSetMultipleChoiceListFormatForInitialValueAr
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetNegativeNumberStyleArchive::kSuperFieldNumber;
-const int CommandSetNegativeNumberStyleArchive::kNegativeNumberStyleFieldNumber;
+const int CommandSetShowThousandsSeparatorArchive::kSuperFieldNumber;
+const int CommandSetShowThousandsSeparatorArchive::kShowThousandsSeparatorFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetNegativeNumberStyleArchive::CommandSetNegativeNumberStyleArchive()
+CommandSetShowThousandsSeparatorArchive::CommandSetShowThousandsSeparatorArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetNegativeNumberStyleArchive::InitAsDefaultInstance() {
+void CommandSetShowThousandsSeparatorArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetNegativeNumberStyleArchive::CommandSetNegativeNumberStyleArchive(const CommandSetNegativeNumberStyleArchive& from)
+CommandSetShowThousandsSeparatorArchive::CommandSetShowThousandsSeparatorArchive(const CommandSetShowThousandsSeparatorArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetNegativeNumberStyleArchive::SharedCtor() {
+void CommandSetShowThousandsSeparatorArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  negative_number_style_ = 0u;
+  show_thousands_separator_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetNegativeNumberStyleArchive::~CommandSetNegativeNumberStyleArchive() {
+CommandSetShowThousandsSeparatorArchive::~CommandSetShowThousandsSeparatorArchive() {
   SharedDtor();
 }
 
-void CommandSetNegativeNumberStyleArchive::SharedDtor() {
+void CommandSetShowThousandsSeparatorArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetNegativeNumberStyleArchive::SetCachedSize(int size) const {
+void CommandSetShowThousandsSeparatorArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetNegativeNumberStyleArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetShowThousandsSeparatorArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetNegativeNumberStyleArchive_descriptor_;
+  return CommandSetShowThousandsSeparatorArchive_descriptor_;
 }
 
-const CommandSetNegativeNumberStyleArchive& CommandSetNegativeNumberStyleArchive::default_instance() {
+const CommandSetShowThousandsSeparatorArchive& CommandSetShowThousandsSeparatorArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetNegativeNumberStyleArchive* CommandSetNegativeNumberStyleArchive::default_instance_ = NULL;
+CommandSetShowThousandsSeparatorArchive* CommandSetShowThousandsSeparatorArchive::default_instance_ = NULL;
 
-CommandSetNegativeNumberStyleArchive* CommandSetNegativeNumberStyleArchive::New() const {
-  return new CommandSetNegativeNumberStyleArchive;
+CommandSetShowThousandsSeparatorArchive* CommandSetShowThousandsSeparatorArchive::New() const {
+  return new CommandSetShowThousandsSeparatorArchive;
 }
 
-void CommandSetNegativeNumberStyleArchive::Clear() {
+void CommandSetShowThousandsSeparatorArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
-    negative_number_style_ = 0u;
+    show_thousands_separator_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetNegativeNumberStyleArchive::MergePartialFromCodedStream(
+bool CommandSetShowThousandsSeparatorArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -26606,19 +30297,19 @@ bool CommandSetNegativeNumberStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_negative_number_style;
+        if (input->ExpectTag(16)) goto parse_show_thousands_separator;
         break;
       }
 
-      // required uint32 negative_number_style = 2;
+      // required bool show_thousands_separator = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_negative_number_style:
+         parse_show_thousands_separator:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &negative_number_style_)));
-          set_has_negative_number_style();
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &show_thousands_separator_)));
+          set_has_show_thousands_separator();
         } else {
           goto handle_uninterpreted;
         }
@@ -26642,7 +30333,7 @@ bool CommandSetNegativeNumberStyleArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetNegativeNumberStyleArchive::SerializeWithCachedSizes(
+void CommandSetShowThousandsSeparatorArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -26650,9 +30341,9 @@ void CommandSetNegativeNumberStyleArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 negative_number_style = 2;
-  if (has_negative_number_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->negative_number_style(), output);
+  // required bool show_thousands_separator = 2;
+  if (has_show_thousands_separator()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->show_thousands_separator(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -26661,7 +30352,7 @@ void CommandSetNegativeNumberStyleArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetNegativeNumberStyleArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetShowThousandsSeparatorArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
@@ -26670,9 +30361,9 @@ ::google::protobuf::uint8* CommandSetNegativeNumberStyleArchive::SerializeWithCa
         1, this->super(), target);
   }
 
-  // required uint32 negative_number_style = 2;
-  if (has_negative_number_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->negative_number_style(), target);
+  // required bool show_thousands_separator = 2;
+  if (has_show_thousands_separator()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->show_thousands_separator(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -26682,7 +30373,7 @@ ::google::protobuf::uint8* CommandSetNegativeNumberStyleArchive::SerializeWithCa
   return target;
 }
 
-int CommandSetNegativeNumberStyleArchive::ByteSize() const {
+int CommandSetShowThousandsSeparatorArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -26693,11 +30384,9 @@ int CommandSetNegativeNumberStyleArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 negative_number_style = 2;
-    if (has_negative_number_style()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->negative_number_style());
+    // required bool show_thousands_separator = 2;
+    if (has_show_thousands_separator()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -26712,10 +30401,10 @@ int CommandSetNegativeNumberStyleArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetNegativeNumberStyleArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetShowThousandsSeparatorArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetNegativeNumberStyleArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetNegativeNumberStyleArchive*>(
+  const CommandSetShowThousandsSeparatorArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetShowThousandsSeparatorArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -26724,32 +30413,32 @@ void CommandSetNegativeNumberStyleArchive::MergeFrom(const ::google::protobuf::M
   }
 }
 
-void CommandSetNegativeNumberStyleArchive::MergeFrom(const CommandSetNegativeNumberStyleArchive& from) {
+void CommandSetShowThousandsSeparatorArchive::MergeFrom(const CommandSetShowThousandsSeparatorArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_negative_number_style()) {
-      set_negative_number_style(from.negative_number_style());
+    if (from.has_show_thousands_separator()) {
+      set_show_thousands_separator(from.show_thousands_separator());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetNegativeNumberStyleArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetShowThousandsSeparatorArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetNegativeNumberStyleArchive::CopyFrom(const CommandSetNegativeNumberStyleArchive& from) {
+void CommandSetShowThousandsSeparatorArchive::CopyFrom(const CommandSetShowThousandsSeparatorArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetNegativeNumberStyleArchive::IsInitialized() const {
+bool CommandSetShowThousandsSeparatorArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
@@ -26758,21 +30447,21 @@ bool CommandSetNegativeNumberStyleArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetNegativeNumberStyleArchive::Swap(CommandSetNegativeNumberStyleArchive* other) {
+void CommandSetShowThousandsSeparatorArchive::Swap(CommandSetShowThousandsSeparatorArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(negative_number_style_, other->negative_number_style_);
+    std::swap(show_thousands_separator_, other->show_thousands_separator_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetNegativeNumberStyleArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetShowThousandsSeparatorArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetNegativeNumberStyleArchive_descriptor_;
-  metadata.reflection = CommandSetNegativeNumberStyleArchive_reflection_;
+  metadata.descriptor = CommandSetShowThousandsSeparatorArchive_descriptor_;
+  metadata.reflection = CommandSetShowThousandsSeparatorArchive_reflection_;
   return metadata;
 }
 
@@ -26780,106 +30469,81 @@ ::google::protobuf::Metadata CommandSetNegativeNumberStyleArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetExplicitFormatArchive::kSuperFieldNumber;
-const int CommandSetExplicitFormatArchive::kSelectionFieldNumber;
-const int CommandSetExplicitFormatArchive::kCellFormatFieldNumber;
-const int CommandSetExplicitFormatArchive::kUndoCellMapFieldNumber;
-const int CommandSetExplicitFormatArchive::kRedoCellMapFieldNumber;
+const int CommandSetUseAccountingStyleArchive::kSuperFieldNumber;
+const int CommandSetUseAccountingStyleArchive::kUseAccountingStyleFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetExplicitFormatArchive::CommandSetExplicitFormatArchive()
+CommandSetUseAccountingStyleArchive::CommandSetUseAccountingStyleArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetExplicitFormatArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  cell_format_ = const_cast< ::TSK::FormatStructArchive*>(&::TSK::FormatStructArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+void CommandSetUseAccountingStyleArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
 }
 
-CommandSetExplicitFormatArchive::CommandSetExplicitFormatArchive(const CommandSetExplicitFormatArchive& from)
+CommandSetUseAccountingStyleArchive::CommandSetUseAccountingStyleArchive(const CommandSetUseAccountingStyleArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetExplicitFormatArchive::SharedCtor() {
+void CommandSetUseAccountingStyleArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  cell_format_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
+  use_accounting_style_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetExplicitFormatArchive::~CommandSetExplicitFormatArchive() {
+CommandSetUseAccountingStyleArchive::~CommandSetUseAccountingStyleArchive() {
   SharedDtor();
 }
 
-void CommandSetExplicitFormatArchive::SharedDtor() {
+void CommandSetUseAccountingStyleArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete cell_format_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
   }
 }
 
-void CommandSetExplicitFormatArchive::SetCachedSize(int size) const {
+void CommandSetUseAccountingStyleArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetExplicitFormatArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetUseAccountingStyleArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetExplicitFormatArchive_descriptor_;
+  return CommandSetUseAccountingStyleArchive_descriptor_;
 }
 
-const CommandSetExplicitFormatArchive& CommandSetExplicitFormatArchive::default_instance() {
+const CommandSetUseAccountingStyleArchive& CommandSetUseAccountingStyleArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetExplicitFormatArchive* CommandSetExplicitFormatArchive::default_instance_ = NULL;
+CommandSetUseAccountingStyleArchive* CommandSetUseAccountingStyleArchive::default_instance_ = NULL;
 
-CommandSetExplicitFormatArchive* CommandSetExplicitFormatArchive::New() const {
-  return new CommandSetExplicitFormatArchive;
+CommandSetUseAccountingStyleArchive* CommandSetUseAccountingStyleArchive::New() const {
+  return new CommandSetUseAccountingStyleArchive;
 }
 
-void CommandSetExplicitFormatArchive::Clear() {
+void CommandSetUseAccountingStyleArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_cell_format()) {
-      if (cell_format_ != NULL) cell_format_->::TSK::FormatStructArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
     }
+    use_accounting_style_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetExplicitFormatArchive::MergePartialFromCodedStream(
+bool CommandSetUseAccountingStyleArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -26888,59 +30552,19 @@ bool CommandSetExplicitFormatArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_selection;
+        if (input->ExpectTag(16)) goto parse_use_accounting_style;
         break;
       }
 
-      // required .TST.SelectionArchive selection = 2;
+      // required bool use_accounting_style = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_cell_format;
-        break;
-      }
-
-      // required .TSK.FormatStructArchive cell_format = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_format:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cell_format()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_undo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive undo_cell_map = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_redo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive redo_cell_map = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_use_accounting_style:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &use_accounting_style_)));
+          set_has_use_accounting_style();
         } else {
           goto handle_uninterpreted;
         }
@@ -26964,36 +30588,17 @@ bool CommandSetExplicitFormatArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetExplicitFormatArchive::SerializeWithCachedSizes(
+void CommandSetUseAccountingStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required .TSK.FormatStructArchive cell_format = 3;
-  if (has_cell_format()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->cell_format(), output);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->undo_cell_map(), output);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->redo_cell_map(), output);
+  // required bool use_accounting_style = 2;
+  if (has_use_accounting_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->use_accounting_style(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -27002,41 +30607,18 @@ void CommandSetExplicitFormatArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetExplicitFormatArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetUseAccountingStyleArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required .TSK.FormatStructArchive cell_format = 3;
-  if (has_cell_format()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->cell_format(), target);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->undo_cell_map(), target);
-  }
-
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->redo_cell_map(), target);
+  // required bool use_accounting_style = 2;
+  if (has_use_accounting_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->use_accounting_style(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -27046,43 +30628,20 @@ ::google::protobuf::uint8* CommandSetExplicitFormatArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandSetExplicitFormatArchive::ByteSize() const {
+int CommandSetUseAccountingStyleArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // required .TSK.FormatStructArchive cell_format = 3;
-    if (has_cell_format()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cell_format());
-    }
-
-    // required .TST.CellMapArchive undo_cell_map = 4;
-    if (has_undo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
-    }
-
-    // required .TST.CellMapArchive redo_cell_map = 5;
-    if (has_redo_cell_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+    // required bool use_accounting_style = 2;
+    if (has_use_accounting_style()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -27097,10 +30656,10 @@ int CommandSetExplicitFormatArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetExplicitFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetUseAccountingStyleArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetExplicitFormatArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetExplicitFormatArchive*>(
+  const CommandSetUseAccountingStyleArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetUseAccountingStyleArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -27109,79 +30668,55 @@ void CommandSetExplicitFormatArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandSetExplicitFormatArchive::MergeFrom(const CommandSetExplicitFormatArchive& from) {
+void CommandSetUseAccountingStyleArchive::MergeFrom(const CommandSetUseAccountingStyleArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_cell_format()) {
-      mutable_cell_format()->::TSK::FormatStructArchive::MergeFrom(from.cell_format());
-    }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_use_accounting_style()) {
+      set_use_accounting_style(from.use_accounting_style());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetExplicitFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetUseAccountingStyleArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetExplicitFormatArchive::CopyFrom(const CommandSetExplicitFormatArchive& from) {
+void CommandSetUseAccountingStyleArchive::CopyFrom(const CommandSetUseAccountingStyleArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetExplicitFormatArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool CommandSetUseAccountingStyleArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_cell_format()) {
-    if (!this->cell_format().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetExplicitFormatArchive::Swap(CommandSetExplicitFormatArchive* other) {
+void CommandSetUseAccountingStyleArchive::Swap(CommandSetUseAccountingStyleArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(cell_format_, other->cell_format_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(use_accounting_style_, other->use_accounting_style_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetExplicitFormatArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetUseAccountingStyleArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetExplicitFormatArchive_descriptor_;
-  metadata.reflection = CommandSetExplicitFormatArchive_reflection_;
+  metadata.descriptor = CommandSetUseAccountingStyleArchive_descriptor_;
+  metadata.reflection = CommandSetUseAccountingStyleArchive_reflection_;
   return metadata;
 }
 
@@ -27189,81 +30724,115 @@ ::google::protobuf::Metadata CommandSetExplicitFormatArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetNumberOfDecimalPlacesArchive::kSuperFieldNumber;
-const int CommandSetNumberOfDecimalPlacesArchive::kDecimalPlacesFieldNumber;
+const int CommandMoveRowsArchive::kSuperFieldNumber;
+const int CommandMoveRowsArchive::kSelectionFieldNumber;
+const int CommandMoveRowsArchive::kStartRowIndexFieldNumber;
+const int CommandMoveRowsArchive::kDestRowIndexFieldNumber;
+const int CommandMoveRowsArchive::kNumberOfRowsFieldNumber;
+const int CommandMoveRowsArchive::kFormulaRewriteCommandFieldNumber;
+const int CommandMoveRowsArchive::kShowCommandFieldNumber;
+const int CommandMoveRowsArchive::kUnmergeInvalidRangesCommandFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetNumberOfDecimalPlacesArchive::CommandSetNumberOfDecimalPlacesArchive()
+CommandMoveRowsArchive::CommandMoveRowsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
+void CommandMoveRowsArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  show_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  unmerge_invalid_ranges_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSetNumberOfDecimalPlacesArchive::CommandSetNumberOfDecimalPlacesArchive(const CommandSetNumberOfDecimalPlacesArchive& from)
+CommandMoveRowsArchive::CommandMoveRowsArchive(const CommandMoveRowsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::SharedCtor() {
+void CommandMoveRowsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  decimal_places_ = 0u;
+  selection_ = NULL;
+  start_row_index_ = 0u;
+  dest_row_index_ = 0u;
+  number_of_rows_ = 0u;
+  formula_rewrite_command_ = NULL;
+  show_command_ = NULL;
+  unmerge_invalid_ranges_command_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetNumberOfDecimalPlacesArchive::~CommandSetNumberOfDecimalPlacesArchive() {
+CommandMoveRowsArchive::~CommandMoveRowsArchive() {
   SharedDtor();
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::SharedDtor() {
+void CommandMoveRowsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete selection_;
+    delete formula_rewrite_command_;
+    delete show_command_;
+    delete unmerge_invalid_ranges_command_;
   }
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::SetCachedSize(int size) const {
+void CommandMoveRowsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetNumberOfDecimalPlacesArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMoveRowsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetNumberOfDecimalPlacesArchive_descriptor_;
+  return CommandMoveRowsArchive_descriptor_;
 }
 
-const CommandSetNumberOfDecimalPlacesArchive& CommandSetNumberOfDecimalPlacesArchive::default_instance() {
+const CommandMoveRowsArchive& CommandMoveRowsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetNumberOfDecimalPlacesArchive* CommandSetNumberOfDecimalPlacesArchive::default_instance_ = NULL;
+CommandMoveRowsArchive* CommandMoveRowsArchive::default_instance_ = NULL;
 
-CommandSetNumberOfDecimalPlacesArchive* CommandSetNumberOfDecimalPlacesArchive::New() const {
-  return new CommandSetNumberOfDecimalPlacesArchive;
+CommandMoveRowsArchive* CommandMoveRowsArchive::New() const {
+  return new CommandMoveRowsArchive;
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::Clear() {
+void CommandMoveRowsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    start_row_index_ = 0u;
+    dest_row_index_ = 0u;
+    number_of_rows_ = 0u;
+    if (has_formula_rewrite_command()) {
+      if (formula_rewrite_command_ != NULL) formula_rewrite_command_->::TSP::Reference::Clear();
+    }
+    if (has_show_command()) {
+      if (show_command_ != NULL) show_command_->::TSP::Reference::Clear();
+    }
+    if (has_unmerge_invalid_ranges_command()) {
+      if (unmerge_invalid_ranges_command_ != NULL) unmerge_invalid_ranges_command_->::TSP::Reference::Clear();
     }
-    decimal_places_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetNumberOfDecimalPlacesArchive::MergePartialFromCodedStream(
+bool CommandMoveRowsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -27272,19 +30841,107 @@ bool CommandSetNumberOfDecimalPlacesArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_decimal_places;
+        if (input->ExpectTag(18)) goto parse_selection;
         break;
       }
 
-      // required uint32 decimal_places = 2;
+      // optional .TST.SelectionArchive selection = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_start_row_index;
+        break;
+      }
+
+      // required uint32 start_row_index = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_decimal_places:
+         parse_start_row_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &decimal_places_)));
-          set_has_decimal_places();
+                 input, &start_row_index_)));
+          set_has_start_row_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_dest_row_index;
+        break;
+      }
+
+      // required uint32 dest_row_index = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_dest_row_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &dest_row_index_)));
+          set_has_dest_row_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_number_of_rows;
+        break;
+      }
+
+      // required uint32 number_of_rows = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_rows:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_rows_)));
+          set_has_number_of_rows();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_formula_rewrite_command;
+        break;
+      }
+
+      // optional .TSP.Reference formula_rewrite_command = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formula_rewrite_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formula_rewrite_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_show_command;
+        break;
+      }
+
+      // optional .TSP.Reference show_command = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_show_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_show_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_unmerge_invalid_ranges_command;
+        break;
+      }
+
+      // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_unmerge_invalid_ranges_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_unmerge_invalid_ranges_command()));
         } else {
           goto handle_uninterpreted;
         }
@@ -27308,17 +30965,51 @@ bool CommandSetNumberOfDecimalPlacesArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::SerializeWithCachedSizes(
+void CommandMoveRowsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required uint32 decimal_places = 2;
-  if (has_decimal_places()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->decimal_places(), output);
+  // optional .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->selection(), output);
+  }
+
+  // required uint32 start_row_index = 3;
+  if (has_start_row_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->start_row_index(), output);
+  }
+
+  // required uint32 dest_row_index = 4;
+  if (has_dest_row_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->dest_row_index(), output);
+  }
+
+  // required uint32 number_of_rows = 5;
+  if (has_number_of_rows()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->number_of_rows(), output);
+  }
+
+  // optional .TSP.Reference formula_rewrite_command = 7;
+  if (has_formula_rewrite_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->formula_rewrite_command(), output);
+  }
+
+  // optional .TSP.Reference show_command = 8;
+  if (has_show_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->show_command(), output);
+  }
+
+  // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
+  if (has_unmerge_invalid_ranges_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->unmerge_invalid_ranges_command(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -27327,43 +31018,123 @@ void CommandSetNumberOfDecimalPlacesArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetNumberOfDecimalPlacesArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMoveRowsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required uint32 decimal_places = 2;
-  if (has_decimal_places()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->decimal_places(), target);
+  // optional .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->selection(), target);
+  }
+
+  // required uint32 start_row_index = 3;
+  if (has_start_row_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->start_row_index(), target);
+  }
+
+  // required uint32 dest_row_index = 4;
+  if (has_dest_row_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->dest_row_index(), target);
+  }
+
+  // required uint32 number_of_rows = 5;
+  if (has_number_of_rows()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->number_of_rows(), target);
+  }
+
+  // optional .TSP.Reference formula_rewrite_command = 7;
+  if (has_formula_rewrite_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->formula_rewrite_command(), target);
+  }
+
+  // optional .TSP.Reference show_command = 8;
+  if (has_show_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->show_command(), target);
+  }
+
+  // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
+  if (has_unmerge_invalid_ranges_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->unmerge_invalid_ranges_command(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
   }
+  return target;
+}
+
+int CommandMoveRowsArchive::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
+    }
+
+    // optional .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // required uint32 start_row_index = 3;
+    if (has_start_row_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->start_row_index());
+    }
 
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
+    // required uint32 dest_row_index = 4;
+    if (has_dest_row_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->dest_row_index());
+    }
 
-int CommandSetNumberOfDecimalPlacesArchive::ByteSize() const {
-  int total_size = 0;
+    // required uint32 number_of_rows = 5;
+    if (has_number_of_rows()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_rows());
+    }
 
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
-    if (has_super()) {
+    // optional .TSP.Reference formula_rewrite_command = 7;
+    if (has_formula_rewrite_command()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+          this->formula_rewrite_command());
     }
 
-    // required uint32 decimal_places = 2;
-    if (has_decimal_places()) {
+    // optional .TSP.Reference show_command = 8;
+    if (has_show_command()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->decimal_places());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->show_command());
+    }
+
+    // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
+    if (has_unmerge_invalid_ranges_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->unmerge_invalid_ranges_command());
     }
 
   }
@@ -27378,10 +31149,10 @@ int CommandSetNumberOfDecimalPlacesArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMoveRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetNumberOfDecimalPlacesArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetNumberOfDecimalPlacesArchive*>(
+  const CommandMoveRowsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveRowsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -27390,55 +31161,91 @@ void CommandSetNumberOfDecimalPlacesArchive::MergeFrom(const ::google::protobuf:
   }
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::MergeFrom(const CommandSetNumberOfDecimalPlacesArchive& from) {
+void CommandMoveRowsArchive::MergeFrom(const CommandMoveRowsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_decimal_places()) {
-      set_decimal_places(from.decimal_places());
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_start_row_index()) {
+      set_start_row_index(from.start_row_index());
+    }
+    if (from.has_dest_row_index()) {
+      set_dest_row_index(from.dest_row_index());
+    }
+    if (from.has_number_of_rows()) {
+      set_number_of_rows(from.number_of_rows());
+    }
+    if (from.has_formula_rewrite_command()) {
+      mutable_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.formula_rewrite_command());
+    }
+    if (from.has_show_command()) {
+      mutable_show_command()->::TSP::Reference::MergeFrom(from.show_command());
+    }
+    if (from.has_unmerge_invalid_ranges_command()) {
+      mutable_unmerge_invalid_ranges_command()->::TSP::Reference::MergeFrom(from.unmerge_invalid_ranges_command());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMoveRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::CopyFrom(const CommandSetNumberOfDecimalPlacesArchive& from) {
+void CommandMoveRowsArchive::CopyFrom(const CommandMoveRowsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetNumberOfDecimalPlacesArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandMoveRowsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001d) != 0x0000001d) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_formula_rewrite_command()) {
+    if (!this->formula_rewrite_command().IsInitialized()) return false;
+  }
+  if (has_show_command()) {
+    if (!this->show_command().IsInitialized()) return false;
+  }
+  if (has_unmerge_invalid_ranges_command()) {
+    if (!this->unmerge_invalid_ranges_command().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetNumberOfDecimalPlacesArchive::Swap(CommandSetNumberOfDecimalPlacesArchive* other) {
+void CommandMoveRowsArchive::Swap(CommandMoveRowsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(decimal_places_, other->decimal_places_);
+    std::swap(selection_, other->selection_);
+    std::swap(start_row_index_, other->start_row_index_);
+    std::swap(dest_row_index_, other->dest_row_index_);
+    std::swap(number_of_rows_, other->number_of_rows_);
+    std::swap(formula_rewrite_command_, other->formula_rewrite_command_);
+    std::swap(show_command_, other->show_command_);
+    std::swap(unmerge_invalid_ranges_command_, other->unmerge_invalid_ranges_command_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetNumberOfDecimalPlacesArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMoveRowsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetNumberOfDecimalPlacesArchive_descriptor_;
-  metadata.reflection = CommandSetNumberOfDecimalPlacesArchive_reflection_;
+  metadata.descriptor = CommandMoveRowsArchive_descriptor_;
+  metadata.reflection = CommandMoveRowsArchive_reflection_;
   return metadata;
 }
 
@@ -27446,78 +31253,108 @@ ::google::protobuf::Metadata CommandSetNumberOfDecimalPlacesArchive::GetMetadata
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetDateTimeFormatArchive::kSuperFieldNumber;
+const int CommandMoveColumnsArchive::kSuperFieldNumber;
+const int CommandMoveColumnsArchive::kSelectionFieldNumber;
+const int CommandMoveColumnsArchive::kStartColumnIndexFieldNumber;
+const int CommandMoveColumnsArchive::kDestColumnIndexFieldNumber;
+const int CommandMoveColumnsArchive::kNumberOfColumnsFieldNumber;
+const int CommandMoveColumnsArchive::kFormulaRewriteCommandFieldNumber;
+const int CommandMoveColumnsArchive::kShowCommandFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetDateTimeFormatArchive::CommandSetDateTimeFormatArchive()
+CommandMoveColumnsArchive::CommandMoveColumnsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetDateTimeFormatArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
+void CommandMoveColumnsArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  show_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSetDateTimeFormatArchive::CommandSetDateTimeFormatArchive(const CommandSetDateTimeFormatArchive& from)
+CommandMoveColumnsArchive::CommandMoveColumnsArchive(const CommandMoveColumnsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetDateTimeFormatArchive::SharedCtor() {
+void CommandMoveColumnsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  selection_ = NULL;
+  start_column_index_ = 0u;
+  dest_column_index_ = 0u;
+  number_of_columns_ = 0u;
+  formula_rewrite_command_ = NULL;
+  show_command_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetDateTimeFormatArchive::~CommandSetDateTimeFormatArchive() {
+CommandMoveColumnsArchive::~CommandMoveColumnsArchive() {
   SharedDtor();
 }
 
-void CommandSetDateTimeFormatArchive::SharedDtor() {
+void CommandMoveColumnsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete selection_;
+    delete formula_rewrite_command_;
+    delete show_command_;
   }
 }
 
-void CommandSetDateTimeFormatArchive::SetCachedSize(int size) const {
+void CommandMoveColumnsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetDateTimeFormatArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMoveColumnsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetDateTimeFormatArchive_descriptor_;
+  return CommandMoveColumnsArchive_descriptor_;
 }
 
-const CommandSetDateTimeFormatArchive& CommandSetDateTimeFormatArchive::default_instance() {
+const CommandMoveColumnsArchive& CommandMoveColumnsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetDateTimeFormatArchive* CommandSetDateTimeFormatArchive::default_instance_ = NULL;
+CommandMoveColumnsArchive* CommandMoveColumnsArchive::default_instance_ = NULL;
 
-CommandSetDateTimeFormatArchive* CommandSetDateTimeFormatArchive::New() const {
-  return new CommandSetDateTimeFormatArchive;
+CommandMoveColumnsArchive* CommandMoveColumnsArchive::New() const {
+  return new CommandMoveColumnsArchive;
 }
 
-void CommandSetDateTimeFormatArchive::Clear() {
+void CommandMoveColumnsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
+    start_column_index_ = 0u;
+    dest_column_index_ = 0u;
+    number_of_columns_ = 0u;
+    if (has_formula_rewrite_command()) {
+      if (formula_rewrite_command_ != NULL) formula_rewrite_command_->::TSP::Reference::Clear();
+    }
+    if (has_show_command()) {
+      if (show_command_ != NULL) show_command_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetDateTimeFormatArchive::MergePartialFromCodedStream(
+bool CommandMoveColumnsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -27526,6 +31363,96 @@ bool CommandSetDateTimeFormatArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_selection;
+        break;
+      }
+
+      // optional .TST.SelectionArchive selection = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_start_column_index;
+        break;
+      }
+
+      // required uint32 start_column_index = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_start_column_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &start_column_index_)));
+          set_has_start_column_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_dest_column_index;
+        break;
+      }
+
+      // required uint32 dest_column_index = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_dest_column_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &dest_column_index_)));
+          set_has_dest_column_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_number_of_columns;
+        break;
+      }
+
+      // required uint32 number_of_columns = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_number_of_columns:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &number_of_columns_)));
+          set_has_number_of_columns();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_formula_rewrite_command;
+        break;
+      }
+
+      // optional .TSP.Reference formula_rewrite_command = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formula_rewrite_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formula_rewrite_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_show_command;
+        break;
+      }
+
+      // optional .TSP.Reference show_command = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_show_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_show_command()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -27546,29 +31473,98 @@ bool CommandSetDateTimeFormatArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetDateTimeFormatArchive::SerializeWithCachedSizes(
+void CommandMoveColumnsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
+  // optional .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->selection(), output);
+  }
+
+  // required uint32 start_column_index = 3;
+  if (has_start_column_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->start_column_index(), output);
+  }
+
+  // required uint32 dest_column_index = 4;
+  if (has_dest_column_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->dest_column_index(), output);
+  }
+
+  // required uint32 number_of_columns = 5;
+  if (has_number_of_columns()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->number_of_columns(), output);
+  }
+
+  // optional .TSP.Reference formula_rewrite_command = 7;
+  if (has_formula_rewrite_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->formula_rewrite_command(), output);
+  }
+
+  // optional .TSP.Reference show_command = 8;
+  if (has_show_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->show_command(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandSetDateTimeFormatArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMoveColumnsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
+  // optional .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->selection(), target);
+  }
+
+  // required uint32 start_column_index = 3;
+  if (has_start_column_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->start_column_index(), target);
+  }
+
+  // required uint32 dest_column_index = 4;
+  if (has_dest_column_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->dest_column_index(), target);
+  }
+
+  // required uint32 number_of_columns = 5;
+  if (has_number_of_columns()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->number_of_columns(), target);
+  }
+
+  // optional .TSP.Reference formula_rewrite_command = 7;
+  if (has_formula_rewrite_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->formula_rewrite_command(), target);
+  }
+
+  // optional .TSP.Reference show_command = 8;
+  if (has_show_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->show_command(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -27576,17 +31572,59 @@ ::google::protobuf::uint8* CommandSetDateTimeFormatArchive::SerializeWithCachedS
   return target;
 }
 
-int CommandSetDateTimeFormatArchive::ByteSize() const {
+int CommandMoveColumnsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
+    // optional .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
+    }
+
+    // required uint32 start_column_index = 3;
+    if (has_start_column_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->start_column_index());
+    }
+
+    // required uint32 dest_column_index = 4;
+    if (has_dest_column_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->dest_column_index());
+    }
+
+    // required uint32 number_of_columns = 5;
+    if (has_number_of_columns()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->number_of_columns());
+    }
+
+    // optional .TSP.Reference formula_rewrite_command = 7;
+    if (has_formula_rewrite_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->formula_rewrite_command());
+    }
+
+    // optional .TSP.Reference show_command = 8;
+    if (has_show_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->show_command());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -27599,10 +31637,10 @@ int CommandSetDateTimeFormatArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetDateTimeFormatArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMoveColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetDateTimeFormatArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetDateTimeFormatArchive*>(
+  const CommandMoveColumnsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveColumnsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -27611,51 +31649,84 @@ void CommandSetDateTimeFormatArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void CommandSetDateTimeFormatArchive::MergeFrom(const CommandSetDateTimeFormatArchive& from) {
+void CommandMoveColumnsArchive::MergeFrom(const CommandMoveColumnsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    }
+    if (from.has_start_column_index()) {
+      set_start_column_index(from.start_column_index());
+    }
+    if (from.has_dest_column_index()) {
+      set_dest_column_index(from.dest_column_index());
+    }
+    if (from.has_number_of_columns()) {
+      set_number_of_columns(from.number_of_columns());
+    }
+    if (from.has_formula_rewrite_command()) {
+      mutable_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.formula_rewrite_command());
+    }
+    if (from.has_show_command()) {
+      mutable_show_command()->::TSP::Reference::MergeFrom(from.show_command());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetDateTimeFormatArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMoveColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetDateTimeFormatArchive::CopyFrom(const CommandSetDateTimeFormatArchive& from) {
+void CommandMoveColumnsArchive::CopyFrom(const CommandMoveColumnsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetDateTimeFormatArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandMoveColumnsArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001d) != 0x0000001d) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
+  if (has_formula_rewrite_command()) {
+    if (!this->formula_rewrite_command().IsInitialized()) return false;
+  }
+  if (has_show_command()) {
+    if (!this->show_command().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetDateTimeFormatArchive::Swap(CommandSetDateTimeFormatArchive* other) {
+void CommandMoveColumnsArchive::Swap(CommandMoveColumnsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(selection_, other->selection_);
+    std::swap(start_column_index_, other->start_column_index_);
+    std::swap(dest_column_index_, other->dest_column_index_);
+    std::swap(number_of_columns_, other->number_of_columns_);
+    std::swap(formula_rewrite_command_, other->formula_rewrite_command_);
+    std::swap(show_command_, other->show_command_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetDateTimeFormatArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMoveColumnsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetDateTimeFormatArchive_descriptor_;
-  metadata.reflection = CommandSetDateTimeFormatArchive_reflection_;
+  metadata.descriptor = CommandMoveColumnsArchive_descriptor_;
+  metadata.reflection = CommandMoveColumnsArchive_reflection_;
   return metadata;
 }
 
@@ -27663,102 +31734,125 @@ ::google::protobuf::Metadata CommandSetDateTimeFormatArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetShowThousandsSeparatorArchive::kSuperFieldNumber;
-const int CommandSetShowThousandsSeparatorArchive::kShowThousandsSeparatorFieldNumber;
+const int CommandSortArchive::kSuperFieldNumber;
+const int CommandSortArchive::kMappingFieldNumber;
+const int CommandSortArchive::kFormulaRewriteCommandFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetShowThousandsSeparatorArchive::CommandSetShowThousandsSeparatorArchive()
+CommandSortArchive::CommandSortArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetShowThousandsSeparatorArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
+void CommandSortArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
+  formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSetShowThousandsSeparatorArchive::CommandSetShowThousandsSeparatorArchive(const CommandSetShowThousandsSeparatorArchive& from)
+CommandSortArchive::CommandSortArchive(const CommandSortArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetShowThousandsSeparatorArchive::SharedCtor() {
+void CommandSortArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  show_thousands_separator_ = false;
+  mapping_ = NULL;
+  formula_rewrite_command_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetShowThousandsSeparatorArchive::~CommandSetShowThousandsSeparatorArchive() {
+CommandSortArchive::~CommandSortArchive() {
   SharedDtor();
 }
 
-void CommandSetShowThousandsSeparatorArchive::SharedDtor() {
+void CommandSortArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete mapping_;
+    delete formula_rewrite_command_;
   }
 }
 
-void CommandSetShowThousandsSeparatorArchive::SetCachedSize(int size) const {
+void CommandSortArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetShowThousandsSeparatorArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSortArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetShowThousandsSeparatorArchive_descriptor_;
+  return CommandSortArchive_descriptor_;
 }
 
-const CommandSetShowThousandsSeparatorArchive& CommandSetShowThousandsSeparatorArchive::default_instance() {
+const CommandSortArchive& CommandSortArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetShowThousandsSeparatorArchive* CommandSetShowThousandsSeparatorArchive::default_instance_ = NULL;
+CommandSortArchive* CommandSortArchive::default_instance_ = NULL;
 
-CommandSetShowThousandsSeparatorArchive* CommandSetShowThousandsSeparatorArchive::New() const {
-  return new CommandSetShowThousandsSeparatorArchive;
+CommandSortArchive* CommandSortArchive::New() const {
+  return new CommandSortArchive;
 }
 
-void CommandSetShowThousandsSeparatorArchive::Clear() {
+void CommandSortArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_mapping()) {
+      if (mapping_ != NULL) mapping_->::TSK::ShuffleMappingArchive::Clear();
+    }
+    if (has_formula_rewrite_command()) {
+      if (formula_rewrite_command_ != NULL) formula_rewrite_command_->::TSP::Reference::Clear();
     }
-    show_thousands_separator_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetShowThousandsSeparatorArchive::MergePartialFromCodedStream(
+bool CommandSortArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_super()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_mapping;
+        break;
+      }
+
+      // required .TSK.ShuffleMappingArchive mapping = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_mapping:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_mapping()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_show_thousands_separator;
+        if (input->ExpectTag(58)) goto parse_formula_rewrite_command;
         break;
       }
 
-      // required bool show_thousands_separator = 2;
-      case 2: {
+      // optional .TSP.Reference formula_rewrite_command = 7;
+      case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_show_thousands_separator:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &show_thousands_separator_)));
-          set_has_show_thousands_separator();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formula_rewrite_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formula_rewrite_command()));
         } else {
           goto handle_uninterpreted;
         }
@@ -27782,17 +31876,24 @@ bool CommandSetShowThousandsSeparatorArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetShowThousandsSeparatorArchive::SerializeWithCachedSizes(
+void CommandSortArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required bool show_thousands_separator = 2;
-  if (has_show_thousands_separator()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->show_thousands_separator(), output);
+  // required .TSK.ShuffleMappingArchive mapping = 5;
+  if (has_mapping()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->mapping(), output);
+  }
+
+  // optional .TSP.Reference formula_rewrite_command = 7;
+  if (has_formula_rewrite_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->formula_rewrite_command(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -27801,18 +31902,27 @@ void CommandSetShowThousandsSeparatorArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetShowThousandsSeparatorArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSortArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required bool show_thousands_separator = 2;
-  if (has_show_thousands_separator()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->show_thousands_separator(), target);
+  // required .TSK.ShuffleMappingArchive mapping = 5;
+  if (has_mapping()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->mapping(), target);
+  }
+
+  // optional .TSP.Reference formula_rewrite_command = 7;
+  if (has_formula_rewrite_command()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->formula_rewrite_command(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -27822,20 +31932,29 @@ ::google::protobuf::uint8* CommandSetShowThousandsSeparatorArchive::SerializeWit
   return target;
 }
 
-int CommandSetShowThousandsSeparatorArchive::ByteSize() const {
+int CommandSortArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required bool show_thousands_separator = 2;
-    if (has_show_thousands_separator()) {
-      total_size += 1 + 1;
+    // required .TSK.ShuffleMappingArchive mapping = 5;
+    if (has_mapping()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->mapping());
+    }
+
+    // optional .TSP.Reference formula_rewrite_command = 7;
+    if (has_formula_rewrite_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->formula_rewrite_command());
     }
 
   }
@@ -27850,10 +31969,10 @@ int CommandSetShowThousandsSeparatorArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetShowThousandsSeparatorArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetShowThousandsSeparatorArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetShowThousandsSeparatorArchive*>(
+  const CommandSortArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSortArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -27862,55 +31981,65 @@ void CommandSetShowThousandsSeparatorArchive::MergeFrom(const ::google::protobuf
   }
 }
 
-void CommandSetShowThousandsSeparatorArchive::MergeFrom(const CommandSetShowThousandsSeparatorArchive& from) {
+void CommandSortArchive::MergeFrom(const CommandSortArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_show_thousands_separator()) {
-      set_show_thousands_separator(from.show_thousands_separator());
+    if (from.has_mapping()) {
+      mutable_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.mapping());
+    }
+    if (from.has_formula_rewrite_command()) {
+      mutable_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.formula_rewrite_command());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetShowThousandsSeparatorArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetShowThousandsSeparatorArchive::CopyFrom(const CommandSetShowThousandsSeparatorArchive& from) {
+void CommandSortArchive::CopyFrom(const CommandSortArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetShowThousandsSeparatorArchive::IsInitialized() const {
+bool CommandSortArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_mapping()) {
+    if (!this->mapping().IsInitialized()) return false;
+  }
+  if (has_formula_rewrite_command()) {
+    if (!this->formula_rewrite_command().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetShowThousandsSeparatorArchive::Swap(CommandSetShowThousandsSeparatorArchive* other) {
+void CommandSortArchive::Swap(CommandSortArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(show_thousands_separator_, other->show_thousands_separator_);
+    std::swap(mapping_, other->mapping_);
+    std::swap(formula_rewrite_command_, other->formula_rewrite_command_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetShowThousandsSeparatorArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSortArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetShowThousandsSeparatorArchive_descriptor_;
-  metadata.reflection = CommandSetShowThousandsSeparatorArchive_reflection_;
+  metadata.descriptor = CommandSortArchive_descriptor_;
+  metadata.reflection = CommandSortArchive_reflection_;
   return metadata;
 }
 
@@ -27918,81 +32047,102 @@ ::google::protobuf::Metadata CommandSetShowThousandsSeparatorArchive::GetMetadat
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetUseAccountingStyleArchive::kSuperFieldNumber;
-const int CommandSetUseAccountingStyleArchive::kUseAccountingStyleFieldNumber;
+const int CommandRewriteFormulasForSortArchive::kSuperFieldNumber;
+const int CommandRewriteFormulasForSortArchive::kFormulaMapFieldNumber;
+const int CommandRewriteFormulasForSortArchive::kSortMappingFieldNumber;
+const int CommandRewriteFormulasForSortArchive::kSortedTableIdFieldNumber;
+const int CommandRewriteFormulasForSortArchive::kExplodeRangesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetUseAccountingStyleArchive::CommandSetUseAccountingStyleArchive()
+CommandRewriteFormulasForSortArchive::CommandRewriteFormulasForSortArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetUseAccountingStyleArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::CommandSetSingleNumberFormatParameterArchive*>(&::TST::CommandSetSingleNumberFormatParameterArchive::default_instance());
+void CommandRewriteFormulasForSortArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
+  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
+  sorted_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
 }
 
-CommandSetUseAccountingStyleArchive::CommandSetUseAccountingStyleArchive(const CommandSetUseAccountingStyleArchive& from)
+CommandRewriteFormulasForSortArchive::CommandRewriteFormulasForSortArchive(const CommandRewriteFormulasForSortArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetUseAccountingStyleArchive::SharedCtor() {
+void CommandRewriteFormulasForSortArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  use_accounting_style_ = false;
+  formula_map_ = NULL;
+  sort_mapping_ = NULL;
+  sorted_table_id_ = NULL;
+  explode_ranges_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetUseAccountingStyleArchive::~CommandSetUseAccountingStyleArchive() {
+CommandRewriteFormulasForSortArchive::~CommandRewriteFormulasForSortArchive() {
   SharedDtor();
 }
 
-void CommandSetUseAccountingStyleArchive::SharedDtor() {
+void CommandRewriteFormulasForSortArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete formula_map_;
+    delete sort_mapping_;
+    delete sorted_table_id_;
   }
 }
 
-void CommandSetUseAccountingStyleArchive::SetCachedSize(int size) const {
+void CommandRewriteFormulasForSortArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetUseAccountingStyleArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFormulasForSortArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetUseAccountingStyleArchive_descriptor_;
+  return CommandRewriteFormulasForSortArchive_descriptor_;
 }
 
-const CommandSetUseAccountingStyleArchive& CommandSetUseAccountingStyleArchive::default_instance() {
+const CommandRewriteFormulasForSortArchive& CommandRewriteFormulasForSortArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetUseAccountingStyleArchive* CommandSetUseAccountingStyleArchive::default_instance_ = NULL;
+CommandRewriteFormulasForSortArchive* CommandRewriteFormulasForSortArchive::default_instance_ = NULL;
 
-CommandSetUseAccountingStyleArchive* CommandSetUseAccountingStyleArchive::New() const {
-  return new CommandSetUseAccountingStyleArchive;
+CommandRewriteFormulasForSortArchive* CommandRewriteFormulasForSortArchive::New() const {
+  return new CommandRewriteFormulasForSortArchive;
 }
 
-void CommandSetUseAccountingStyleArchive::Clear() {
+void CommandRewriteFormulasForSortArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::CommandSetSingleNumberFormatParameterArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    use_accounting_style_ = false;
+    if (has_formula_map()) {
+      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
+    }
+    if (has_sort_mapping()) {
+      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
+    }
+    if (has_sorted_table_id()) {
+      if (sorted_table_id_ != NULL) sorted_table_id_->::TSCE::CFUUIDArchive::Clear();
+    }
+    explode_ranges_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetUseAccountingStyleArchive::MergePartialFromCodedStream(
+bool CommandRewriteFormulasForSortArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -28001,19 +32151,61 @@ bool CommandSetUseAccountingStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_use_accounting_style;
+        if (input->ExpectTag(18)) goto parse_formula_map;
         break;
       }
 
-      // required bool use_accounting_style = 2;
+      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
       case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_formula_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_formula_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_sort_mapping;
+        break;
+      }
+
+      // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sort_mapping:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sort_mapping()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_sorted_table_id;
+        break;
+      }
+
+      // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sorted_table_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sorted_table_id()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_explode_ranges;
+        break;
+      }
+
+      // required bool explode_ranges = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_use_accounting_style:
+         parse_explode_ranges:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &use_accounting_style_)));
-          set_has_use_accounting_style();
+                 input, &explode_ranges_)));
+          set_has_explode_ranges();
         } else {
           goto handle_uninterpreted;
         }
@@ -28037,17 +32229,35 @@ bool CommandSetUseAccountingStyleArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetUseAccountingStyleArchive::SerializeWithCachedSizes(
+void CommandRewriteFormulasForSortArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required bool use_accounting_style = 2;
-  if (has_use_accounting_style()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->use_accounting_style(), output);
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->formula_map(), output);
+  }
+
+  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+  if (has_sort_mapping()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->sort_mapping(), output);
+  }
+
+  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+  if (has_sorted_table_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->sorted_table_id(), output);
+  }
+
+  // required bool explode_ranges = 5;
+  if (has_explode_ranges()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->explode_ranges(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -28056,18 +32266,39 @@ void CommandSetUseAccountingStyleArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetUseAccountingStyleArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFormulasForSortArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required bool use_accounting_style = 2;
-  if (has_use_accounting_style()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->use_accounting_style(), target);
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->formula_map(), target);
+  }
+
+  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+  if (has_sort_mapping()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->sort_mapping(), target);
+  }
+
+  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+  if (has_sorted_table_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->sorted_table_id(), target);
+  }
+
+  // required bool explode_ranges = 5;
+  if (has_explode_ranges()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->explode_ranges(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -28077,19 +32308,40 @@ ::google::protobuf::uint8* CommandSetUseAccountingStyleArchive::SerializeWithCac
   return target;
 }
 
-int CommandSetUseAccountingStyleArchive::ByteSize() const {
+int CommandRewriteFormulasForSortArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required bool use_accounting_style = 2;
-    if (has_use_accounting_style()) {
+    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+    if (has_formula_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->formula_map());
+    }
+
+    // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+    if (has_sort_mapping()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sort_mapping());
+    }
+
+    // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+    if (has_sorted_table_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sorted_table_id());
+    }
+
+    // required bool explode_ranges = 5;
+    if (has_explode_ranges()) {
       total_size += 1 + 1;
     }
 
@@ -28105,10 +32357,10 @@ int CommandSetUseAccountingStyleArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetUseAccountingStyleArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetUseAccountingStyleArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetUseAccountingStyleArchive*>(
+  const CommandRewriteFormulasForSortArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForSortArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -28117,55 +32369,73 @@ void CommandSetUseAccountingStyleArchive::MergeFrom(const ::google::protobuf::Me
   }
 }
 
-void CommandSetUseAccountingStyleArchive::MergeFrom(const CommandSetUseAccountingStyleArchive& from) {
+void CommandRewriteFormulasForSortArchive::MergeFrom(const CommandRewriteFormulasForSortArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::CommandSetSingleNumberFormatParameterArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_use_accounting_style()) {
-      set_use_accounting_style(from.use_accounting_style());
+    if (from.has_formula_map()) {
+      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
+    }
+    if (from.has_sort_mapping()) {
+      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
+    }
+    if (from.has_sorted_table_id()) {
+      mutable_sorted_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.sorted_table_id());
+    }
+    if (from.has_explode_ranges()) {
+      set_explode_ranges(from.explode_ranges());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetUseAccountingStyleArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetUseAccountingStyleArchive::CopyFrom(const CommandSetUseAccountingStyleArchive& from) {
+void CommandRewriteFormulasForSortArchive::CopyFrom(const CommandRewriteFormulasForSortArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetUseAccountingStyleArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandRewriteFormulasForSortArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_formula_map()) {
+    if (!this->formula_map().IsInitialized()) return false;
+  }
+  if (has_sort_mapping()) {
+    if (!this->sort_mapping().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetUseAccountingStyleArchive::Swap(CommandSetUseAccountingStyleArchive* other) {
+void CommandRewriteFormulasForSortArchive::Swap(CommandRewriteFormulasForSortArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(use_accounting_style_, other->use_accounting_style_);
+    std::swap(formula_map_, other->formula_map_);
+    std::swap(sort_mapping_, other->sort_mapping_);
+    std::swap(sorted_table_id_, other->sorted_table_id_);
+    std::swap(explode_ranges_, other->explode_ranges_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetUseAccountingStyleArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFormulasForSortArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetUseAccountingStyleArchive_descriptor_;
-  metadata.reflection = CommandSetUseAccountingStyleArchive_reflection_;
+  metadata.descriptor = CommandRewriteFormulasForSortArchive_descriptor_;
+  metadata.reflection = CommandRewriteFormulasForSortArchive_reflection_;
   return metadata;
 }
 
@@ -28173,224 +32443,125 @@ ::google::protobuf::Metadata CommandSetUseAccountingStyleArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandMoveRowsArchive::kSuperFieldNumber;
-const int CommandMoveRowsArchive::kSelectionFieldNumber;
-const int CommandMoveRowsArchive::kStartRowIndexFieldNumber;
-const int CommandMoveRowsArchive::kDestRowIndexFieldNumber;
-const int CommandMoveRowsArchive::kNumberOfRowsFieldNumber;
-const int CommandMoveRowsArchive::kFormulaRewriteCommandFieldNumber;
-const int CommandMoveRowsArchive::kShowCommandFieldNumber;
-const int CommandMoveRowsArchive::kUnmergeInvalidRangesCommandFieldNumber;
+const int CommandRewriteFormulasForTectonicShiftArchive::kSuperFieldNumber;
+const int CommandRewriteFormulasForTectonicShiftArchive::kFormulaMapFieldNumber;
+const int CommandRewriteFormulasForTectonicShiftArchive::kTectonicShiftFieldNumber;
 #endif  // !_MSC_VER
 
-CommandMoveRowsArchive::CommandMoveRowsArchive()
+CommandRewriteFormulasForTectonicShiftArchive::CommandRewriteFormulasForTectonicShiftArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandMoveRowsArchive::InitAsDefaultInstance() {
+void CommandRewriteFormulasForTectonicShiftArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  show_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  unmerge_invalid_ranges_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
+  tectonic_shift_ = const_cast< ::TSCE::TectonicShiftArchive*>(&::TSCE::TectonicShiftArchive::default_instance());
 }
 
-CommandMoveRowsArchive::CommandMoveRowsArchive(const CommandMoveRowsArchive& from)
+CommandRewriteFormulasForTectonicShiftArchive::CommandRewriteFormulasForTectonicShiftArchive(const CommandRewriteFormulasForTectonicShiftArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandMoveRowsArchive::SharedCtor() {
+void CommandRewriteFormulasForTectonicShiftArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  start_row_index_ = 0u;
-  dest_row_index_ = 0u;
-  number_of_rows_ = 0u;
-  formula_rewrite_command_ = NULL;
-  show_command_ = NULL;
-  unmerge_invalid_ranges_command_ = NULL;
+  formula_map_ = NULL;
+  tectonic_shift_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandMoveRowsArchive::~CommandMoveRowsArchive() {
+CommandRewriteFormulasForTectonicShiftArchive::~CommandRewriteFormulasForTectonicShiftArchive() {
   SharedDtor();
 }
 
-void CommandMoveRowsArchive::SharedDtor() {
+void CommandRewriteFormulasForTectonicShiftArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete formula_rewrite_command_;
-    delete show_command_;
-    delete unmerge_invalid_ranges_command_;
+    delete formula_map_;
+    delete tectonic_shift_;
   }
 }
 
-void CommandMoveRowsArchive::SetCachedSize(int size) const {
+void CommandRewriteFormulasForTectonicShiftArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandMoveRowsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFormulasForTectonicShiftArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandMoveRowsArchive_descriptor_;
-}
-
-const CommandMoveRowsArchive& CommandMoveRowsArchive::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
-  return *default_instance_;
-}
-
-CommandMoveRowsArchive* CommandMoveRowsArchive::default_instance_ = NULL;
-
-CommandMoveRowsArchive* CommandMoveRowsArchive::New() const {
-  return new CommandMoveRowsArchive;
-}
-
-void CommandMoveRowsArchive::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    start_row_index_ = 0u;
-    dest_row_index_ = 0u;
-    number_of_rows_ = 0u;
-    if (has_formula_rewrite_command()) {
-      if (formula_rewrite_command_ != NULL) formula_rewrite_command_->::TSP::Reference::Clear();
-    }
-    if (has_show_command()) {
-      if (show_command_ != NULL) show_command_->::TSP::Reference::Clear();
-    }
-    if (has_unmerge_invalid_ranges_command()) {
-      if (unmerge_invalid_ranges_command_ != NULL) unmerge_invalid_ranges_command_->::TSP::Reference::Clear();
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
+  return CommandRewriteFormulasForTectonicShiftArchive_descriptor_;
 }
 
-bool CommandMoveRowsArchive::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_selection;
-        break;
-      }
-
-      // optional .TST.SelectionArchive selection = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_start_row_index;
-        break;
-      }
-
-      // required uint32 start_row_index = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_start_row_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &start_row_index_)));
-          set_has_start_row_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_dest_row_index;
-        break;
-      }
-
-      // required uint32 dest_row_index = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_dest_row_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &dest_row_index_)));
-          set_has_dest_row_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_number_of_rows;
-        break;
-      }
+const CommandRewriteFormulasForTectonicShiftArchive& CommandRewriteFormulasForTectonicShiftArchive::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
+  return *default_instance_;
+}
 
-      // required uint32 number_of_rows = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_rows:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_rows_)));
-          set_has_number_of_rows();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(58)) goto parse_formula_rewrite_command;
-        break;
-      }
+CommandRewriteFormulasForTectonicShiftArchive* CommandRewriteFormulasForTectonicShiftArchive::default_instance_ = NULL;
 
-      // optional .TSP.Reference formula_rewrite_command = 7;
-      case 7: {
+CommandRewriteFormulasForTectonicShiftArchive* CommandRewriteFormulasForTectonicShiftArchive::New() const {
+  return new CommandRewriteFormulasForTectonicShiftArchive;
+}
+
+void CommandRewriteFormulasForTectonicShiftArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_formula_map()) {
+      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
+    }
+    if (has_tectonic_shift()) {
+      if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
+    }
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool CommandRewriteFormulasForTectonicShiftArchive::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_rewrite_command:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_rewrite_command()));
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_show_command;
+        if (input->ExpectTag(18)) goto parse_formula_map;
         break;
       }
 
-      // optional .TSP.Reference show_command = 8;
-      case 8: {
+      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_show_command:
+         parse_formula_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_show_command()));
+               input, mutable_formula_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(74)) goto parse_unmerge_invalid_ranges_command;
+        if (input->ExpectTag(26)) goto parse_tectonic_shift;
         break;
       }
 
-      // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
-      case 9: {
+      // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_unmerge_invalid_ranges_command:
+         parse_tectonic_shift:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_unmerge_invalid_ranges_command()));
+               input, mutable_tectonic_shift()));
         } else {
           goto handle_uninterpreted;
         }
@@ -28414,7 +32585,7 @@ bool CommandMoveRowsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandMoveRowsArchive::SerializeWithCachedSizes(
+void CommandRewriteFormulasForTectonicShiftArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -28422,43 +32593,16 @@ void CommandMoveRowsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // optional .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required uint32 start_row_index = 3;
-  if (has_start_row_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->start_row_index(), output);
-  }
-
-  // required uint32 dest_row_index = 4;
-  if (has_dest_row_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->dest_row_index(), output);
-  }
-
-  // required uint32 number_of_rows = 5;
-  if (has_number_of_rows()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->number_of_rows(), output);
-  }
-
-  // optional .TSP.Reference formula_rewrite_command = 7;
-  if (has_formula_rewrite_command()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->formula_rewrite_command(), output);
-  }
-
-  // optional .TSP.Reference show_command = 8;
-  if (has_show_command()) {
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->show_command(), output);
+      2, this->formula_map(), output);
   }
 
-  // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
-  if (has_unmerge_invalid_ranges_command()) {
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
+  if (has_tectonic_shift()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->unmerge_invalid_ranges_command(), output);
+      3, this->tectonic_shift(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -28467,7 +32611,7 @@ void CommandMoveRowsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandMoveRowsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFormulasForTectonicShiftArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -28476,47 +32620,18 @@ ::google::protobuf::uint8* CommandMoveRowsArchive::SerializeWithCachedSizesToArr
         1, this->super(), target);
   }
 
-  // optional .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required uint32 start_row_index = 3;
-  if (has_start_row_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->start_row_index(), target);
-  }
-
-  // required uint32 dest_row_index = 4;
-  if (has_dest_row_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->dest_row_index(), target);
-  }
-
-  // required uint32 number_of_rows = 5;
-  if (has_number_of_rows()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->number_of_rows(), target);
-  }
-
-  // optional .TSP.Reference formula_rewrite_command = 7;
-  if (has_formula_rewrite_command()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        7, this->formula_rewrite_command(), target);
-  }
-
-  // optional .TSP.Reference show_command = 8;
-  if (has_show_command()) {
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        8, this->show_command(), target);
+        2, this->formula_map(), target);
   }
 
-  // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
-  if (has_unmerge_invalid_ranges_command()) {
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
+  if (has_tectonic_shift()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        9, this->unmerge_invalid_ranges_command(), target);
+        3, this->tectonic_shift(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -28526,7 +32641,7 @@ ::google::protobuf::uint8* CommandMoveRowsArchive::SerializeWithCachedSizesToArr
   return target;
 }
 
-int CommandMoveRowsArchive::ByteSize() const {
+int CommandRewriteFormulasForTectonicShiftArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -28537,53 +32652,18 @@ int CommandMoveRowsArchive::ByteSize() const {
           this->super());
     }
 
-    // optional .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // required uint32 start_row_index = 3;
-    if (has_start_row_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->start_row_index());
-    }
-
-    // required uint32 dest_row_index = 4;
-    if (has_dest_row_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->dest_row_index());
-    }
-
-    // required uint32 number_of_rows = 5;
-    if (has_number_of_rows()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_rows());
-    }
-
-    // optional .TSP.Reference formula_rewrite_command = 7;
-    if (has_formula_rewrite_command()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_rewrite_command());
-    }
-
-    // optional .TSP.Reference show_command = 8;
-    if (has_show_command()) {
+    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+    if (has_formula_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->show_command());
+          this->formula_map());
     }
 
-    // optional .TSP.Reference unmerge_invalid_ranges_command = 9;
-    if (has_unmerge_invalid_ranges_command()) {
+    // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
+    if (has_tectonic_shift()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->unmerge_invalid_ranges_command());
+          this->tectonic_shift());
     }
 
   }
@@ -28598,10 +32678,10 @@ int CommandMoveRowsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandMoveRowsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandMoveRowsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveRowsArchive*>(
+  const CommandRewriteFormulasForTectonicShiftArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForTectonicShiftArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -28610,91 +32690,65 @@ void CommandMoveRowsArchive::MergeFrom(const ::google::protobuf::Message& from)
   }
 }
 
-void CommandMoveRowsArchive::MergeFrom(const CommandMoveRowsArchive& from) {
+void CommandRewriteFormulasForTectonicShiftArchive::MergeFrom(const CommandRewriteFormulasForTectonicShiftArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_start_row_index()) {
-      set_start_row_index(from.start_row_index());
-    }
-    if (from.has_dest_row_index()) {
-      set_dest_row_index(from.dest_row_index());
-    }
-    if (from.has_number_of_rows()) {
-      set_number_of_rows(from.number_of_rows());
-    }
-    if (from.has_formula_rewrite_command()) {
-      mutable_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.formula_rewrite_command());
-    }
-    if (from.has_show_command()) {
-      mutable_show_command()->::TSP::Reference::MergeFrom(from.show_command());
+    if (from.has_formula_map()) {
+      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
     }
-    if (from.has_unmerge_invalid_ranges_command()) {
-      mutable_unmerge_invalid_ranges_command()->::TSP::Reference::MergeFrom(from.unmerge_invalid_ranges_command());
+    if (from.has_tectonic_shift()) {
+      mutable_tectonic_shift()->::TSCE::TectonicShiftArchive::MergeFrom(from.tectonic_shift());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandMoveRowsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandMoveRowsArchive::CopyFrom(const CommandMoveRowsArchive& from) {
+void CommandRewriteFormulasForTectonicShiftArchive::CopyFrom(const CommandRewriteFormulasForTectonicShiftArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandMoveRowsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001d) != 0x0000001d) return false;
+bool CommandRewriteFormulasForTectonicShiftArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_formula_rewrite_command()) {
-    if (!this->formula_rewrite_command().IsInitialized()) return false;
-  }
-  if (has_show_command()) {
-    if (!this->show_command().IsInitialized()) return false;
+  if (has_formula_map()) {
+    if (!this->formula_map().IsInitialized()) return false;
   }
-  if (has_unmerge_invalid_ranges_command()) {
-    if (!this->unmerge_invalid_ranges_command().IsInitialized()) return false;
+  if (has_tectonic_shift()) {
+    if (!this->tectonic_shift().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandMoveRowsArchive::Swap(CommandMoveRowsArchive* other) {
+void CommandRewriteFormulasForTectonicShiftArchive::Swap(CommandRewriteFormulasForTectonicShiftArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(start_row_index_, other->start_row_index_);
-    std::swap(dest_row_index_, other->dest_row_index_);
-    std::swap(number_of_rows_, other->number_of_rows_);
-    std::swap(formula_rewrite_command_, other->formula_rewrite_command_);
-    std::swap(show_command_, other->show_command_);
-    std::swap(unmerge_invalid_ranges_command_, other->unmerge_invalid_ranges_command_);
+    std::swap(formula_map_, other->formula_map_);
+    std::swap(tectonic_shift_, other->tectonic_shift_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandMoveRowsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFormulasForTectonicShiftArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandMoveRowsArchive_descriptor_;
-  metadata.reflection = CommandMoveRowsArchive_reflection_;
+  metadata.descriptor = CommandRewriteFormulasForTectonicShiftArchive_descriptor_;
+  metadata.reflection = CommandRewriteFormulasForTectonicShiftArchive_reflection_;
   return metadata;
 }
 
@@ -28702,102 +32756,93 @@ ::google::protobuf::Metadata CommandMoveRowsArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandMoveColumnsArchive::kSuperFieldNumber;
-const int CommandMoveColumnsArchive::kSelectionFieldNumber;
-const int CommandMoveColumnsArchive::kStartColumnIndexFieldNumber;
-const int CommandMoveColumnsArchive::kDestColumnIndexFieldNumber;
-const int CommandMoveColumnsArchive::kNumberOfColumnsFieldNumber;
-const int CommandMoveColumnsArchive::kFormulaRewriteCommandFieldNumber;
-const int CommandMoveColumnsArchive::kShowCommandFieldNumber;
+const int CommandRewriteFormulasForMoveArchive::kSuperFieldNumber;
+const int CommandRewriteFormulasForMoveArchive::kFormulaMapFieldNumber;
+const int CommandRewriteFormulasForMoveArchive::kFromReferenceFieldNumber;
+const int CommandRewriteFormulasForMoveArchive::kToReferenceFieldNumber;
 #endif  // !_MSC_VER
 
-CommandMoveColumnsArchive::CommandMoveColumnsArchive()
+CommandRewriteFormulasForMoveArchive::CommandRewriteFormulasForMoveArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandMoveColumnsArchive::InitAsDefaultInstance() {
+void CommandRewriteFormulasForMoveArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  show_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
+  from_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
+  to_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
 }
 
-CommandMoveColumnsArchive::CommandMoveColumnsArchive(const CommandMoveColumnsArchive& from)
+CommandRewriteFormulasForMoveArchive::CommandRewriteFormulasForMoveArchive(const CommandRewriteFormulasForMoveArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandMoveColumnsArchive::SharedCtor() {
+void CommandRewriteFormulasForMoveArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  start_column_index_ = 0u;
-  dest_column_index_ = 0u;
-  number_of_columns_ = 0u;
-  formula_rewrite_command_ = NULL;
-  show_command_ = NULL;
+  formula_map_ = NULL;
+  from_reference_ = NULL;
+  to_reference_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandMoveColumnsArchive::~CommandMoveColumnsArchive() {
+CommandRewriteFormulasForMoveArchive::~CommandRewriteFormulasForMoveArchive() {
   SharedDtor();
 }
 
-void CommandMoveColumnsArchive::SharedDtor() {
+void CommandRewriteFormulasForMoveArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete formula_rewrite_command_;
-    delete show_command_;
+    delete formula_map_;
+    delete from_reference_;
+    delete to_reference_;
   }
 }
 
-void CommandMoveColumnsArchive::SetCachedSize(int size) const {
+void CommandRewriteFormulasForMoveArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandMoveColumnsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFormulasForMoveArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandMoveColumnsArchive_descriptor_;
+  return CommandRewriteFormulasForMoveArchive_descriptor_;
 }
 
-const CommandMoveColumnsArchive& CommandMoveColumnsArchive::default_instance() {
+const CommandRewriteFormulasForMoveArchive& CommandRewriteFormulasForMoveArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandMoveColumnsArchive* CommandMoveColumnsArchive::default_instance_ = NULL;
+CommandRewriteFormulasForMoveArchive* CommandRewriteFormulasForMoveArchive::default_instance_ = NULL;
 
-CommandMoveColumnsArchive* CommandMoveColumnsArchive::New() const {
-  return new CommandMoveColumnsArchive;
+CommandRewriteFormulasForMoveArchive* CommandRewriteFormulasForMoveArchive::New() const {
+  return new CommandRewriteFormulasForMoveArchive;
 }
 
-void CommandMoveColumnsArchive::Clear() {
+void CommandRewriteFormulasForMoveArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    if (has_formula_map()) {
+      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
     }
-    start_column_index_ = 0u;
-    dest_column_index_ = 0u;
-    number_of_columns_ = 0u;
-    if (has_formula_rewrite_command()) {
-      if (formula_rewrite_command_ != NULL) formula_rewrite_command_->::TSP::Reference::Clear();
+    if (has_from_reference()) {
+      if (from_reference_ != NULL) from_reference_->::TSCE::RangeReferenceArchive::Clear();
     }
-    if (has_show_command()) {
-      if (show_command_ != NULL) show_command_->::TSP::Reference::Clear();
+    if (has_to_reference()) {
+      if (to_reference_ != NULL) to_reference_->::TSCE::RangeReferenceArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandMoveColumnsArchive::MergePartialFromCodedStream(
+bool CommandRewriteFormulasForMoveArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -28812,93 +32857,45 @@ bool CommandMoveColumnsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_selection;
+        if (input->ExpectTag(18)) goto parse_formula_map;
         break;
       }
 
-      // optional .TST.SelectionArchive selection = 2;
+      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
+         parse_formula_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_start_column_index;
-        break;
-      }
-
-      // required uint32 start_column_index = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_start_column_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &start_column_index_)));
-          set_has_start_column_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_dest_column_index;
-        break;
-      }
-
-      // required uint32 dest_column_index = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_dest_column_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &dest_column_index_)));
-          set_has_dest_column_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_number_of_columns;
-        break;
-      }
-
-      // required uint32 number_of_columns = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_number_of_columns:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &number_of_columns_)));
-          set_has_number_of_columns();
+               input, mutable_formula_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_formula_rewrite_command;
+        if (input->ExpectTag(50)) goto parse_from_reference;
         break;
       }
 
-      // optional .TSP.Reference formula_rewrite_command = 7;
-      case 7: {
+      // required .TSCE.RangeReferenceArchive from_reference = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_rewrite_command:
+         parse_from_reference:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_rewrite_command()));
+               input, mutable_from_reference()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_show_command;
+        if (input->ExpectTag(58)) goto parse_to_reference;
         break;
       }
 
-      // optional .TSP.Reference show_command = 8;
-      case 8: {
+      // required .TSCE.RangeReferenceArchive to_reference = 7;
+      case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_show_command:
+         parse_to_reference:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_show_command()));
+               input, mutable_to_reference()));
         } else {
           goto handle_uninterpreted;
         }
@@ -28922,7 +32919,7 @@ bool CommandMoveColumnsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandMoveColumnsArchive::SerializeWithCachedSizes(
+void CommandRewriteFormulasForMoveArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -28930,37 +32927,22 @@ void CommandMoveColumnsArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // optional .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required uint32 start_column_index = 3;
-  if (has_start_column_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->start_column_index(), output);
-  }
-
-  // required uint32 dest_column_index = 4;
-  if (has_dest_column_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->dest_column_index(), output);
-  }
-
-  // required uint32 number_of_columns = 5;
-  if (has_number_of_columns()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->number_of_columns(), output);
+      2, this->formula_map(), output);
   }
 
-  // optional .TSP.Reference formula_rewrite_command = 7;
-  if (has_formula_rewrite_command()) {
+  // required .TSCE.RangeReferenceArchive from_reference = 6;
+  if (has_from_reference()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->formula_rewrite_command(), output);
+      6, this->from_reference(), output);
   }
 
-  // optional .TSP.Reference show_command = 8;
-  if (has_show_command()) {
+  // required .TSCE.RangeReferenceArchive to_reference = 7;
+  if (has_to_reference()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->show_command(), output);
+      7, this->to_reference(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -28969,7 +32951,7 @@ void CommandMoveColumnsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandMoveColumnsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFormulasForMoveArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -28978,40 +32960,25 @@ ::google::protobuf::uint8* CommandMoveColumnsArchive::SerializeWithCachedSizesTo
         1, this->super(), target);
   }
 
-  // optional .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required uint32 start_column_index = 3;
-  if (has_start_column_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->start_column_index(), target);
-  }
-
-  // required uint32 dest_column_index = 4;
-  if (has_dest_column_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->dest_column_index(), target);
-  }
-
-  // required uint32 number_of_columns = 5;
-  if (has_number_of_columns()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->number_of_columns(), target);
+        2, this->formula_map(), target);
   }
 
-  // optional .TSP.Reference formula_rewrite_command = 7;
-  if (has_formula_rewrite_command()) {
+  // required .TSCE.RangeReferenceArchive from_reference = 6;
+  if (has_from_reference()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->formula_rewrite_command(), target);
+        6, this->from_reference(), target);
   }
 
-  // optional .TSP.Reference show_command = 8;
-  if (has_show_command()) {
+  // required .TSCE.RangeReferenceArchive to_reference = 7;
+  if (has_to_reference()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        8, this->show_command(), target);
+        7, this->to_reference(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -29021,7 +32988,7 @@ ::google::protobuf::uint8* CommandMoveColumnsArchive::SerializeWithCachedSizesTo
   return target;
 }
 
-int CommandMoveColumnsArchive::ByteSize() const {
+int CommandRewriteFormulasForMoveArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -29032,46 +32999,25 @@ int CommandMoveColumnsArchive::ByteSize() const {
           this->super());
     }
 
-    // optional .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
+    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+    if (has_formula_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // required uint32 start_column_index = 3;
-    if (has_start_column_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->start_column_index());
-    }
-
-    // required uint32 dest_column_index = 4;
-    if (has_dest_column_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->dest_column_index());
-    }
-
-    // required uint32 number_of_columns = 5;
-    if (has_number_of_columns()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->number_of_columns());
+          this->formula_map());
     }
 
-    // optional .TSP.Reference formula_rewrite_command = 7;
-    if (has_formula_rewrite_command()) {
+    // required .TSCE.RangeReferenceArchive from_reference = 6;
+    if (has_from_reference()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_rewrite_command());
+          this->from_reference());
     }
 
-    // optional .TSP.Reference show_command = 8;
-    if (has_show_command()) {
+    // required .TSCE.RangeReferenceArchive to_reference = 7;
+    if (has_to_reference()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->show_command());
+          this->to_reference());
     }
 
   }
@@ -29086,10 +33032,10 @@ int CommandMoveColumnsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandMoveColumnsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForMoveArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandMoveColumnsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMoveColumnsArchive*>(
+  const CommandRewriteFormulasForMoveArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForMoveArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -29098,84 +33044,72 @@ void CommandMoveColumnsArchive::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void CommandMoveColumnsArchive::MergeFrom(const CommandMoveColumnsArchive& from) {
+void CommandRewriteFormulasForMoveArchive::MergeFrom(const CommandRewriteFormulasForMoveArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_start_column_index()) {
-      set_start_column_index(from.start_column_index());
-    }
-    if (from.has_dest_column_index()) {
-      set_dest_column_index(from.dest_column_index());
-    }
-    if (from.has_number_of_columns()) {
-      set_number_of_columns(from.number_of_columns());
+    if (from.has_formula_map()) {
+      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
     }
-    if (from.has_formula_rewrite_command()) {
-      mutable_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.formula_rewrite_command());
+    if (from.has_from_reference()) {
+      mutable_from_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.from_reference());
     }
-    if (from.has_show_command()) {
-      mutable_show_command()->::TSP::Reference::MergeFrom(from.show_command());
+    if (from.has_to_reference()) {
+      mutable_to_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.to_reference());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandMoveColumnsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForMoveArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandMoveColumnsArchive::CopyFrom(const CommandMoveColumnsArchive& from) {
+void CommandRewriteFormulasForMoveArchive::CopyFrom(const CommandRewriteFormulasForMoveArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandMoveColumnsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001d) != 0x0000001d) return false;
+bool CommandRewriteFormulasForMoveArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
+  if (has_formula_map()) {
+    if (!this->formula_map().IsInitialized()) return false;
   }
-  if (has_formula_rewrite_command()) {
-    if (!this->formula_rewrite_command().IsInitialized()) return false;
+  if (has_from_reference()) {
+    if (!this->from_reference().IsInitialized()) return false;
   }
-  if (has_show_command()) {
-    if (!this->show_command().IsInitialized()) return false;
+  if (has_to_reference()) {
+    if (!this->to_reference().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandMoveColumnsArchive::Swap(CommandMoveColumnsArchive* other) {
+void CommandRewriteFormulasForMoveArchive::Swap(CommandRewriteFormulasForMoveArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(start_column_index_, other->start_column_index_);
-    std::swap(dest_column_index_, other->dest_column_index_);
-    std::swap(number_of_columns_, other->number_of_columns_);
-    std::swap(formula_rewrite_command_, other->formula_rewrite_command_);
-    std::swap(show_command_, other->show_command_);
+    std::swap(formula_map_, other->formula_map_);
+    std::swap(from_reference_, other->from_reference_);
+    std::swap(to_reference_, other->to_reference_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandMoveColumnsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFormulasForMoveArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandMoveColumnsArchive_descriptor_;
-  metadata.reflection = CommandMoveColumnsArchive_reflection_;
+  metadata.descriptor = CommandRewriteFormulasForMoveArchive_descriptor_;
+  metadata.reflection = CommandRewriteFormulasForMoveArchive_reflection_;
   return metadata;
 }
 
@@ -29183,86 +33117,93 @@ ::google::protobuf::Metadata CommandMoveColumnsArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSortArchive::kSuperFieldNumber;
-const int CommandSortArchive::kMappingFieldNumber;
-const int CommandSortArchive::kFormulaRewriteCommandFieldNumber;
+const int CommandRewriteFormulasForCellMergeArchive::kSuperFieldNumber;
+const int CommandRewriteFormulasForCellMergeArchive::kFormulaMapFieldNumber;
+const int CommandRewriteFormulasForCellMergeArchive::kMergedRangeFieldNumber;
+const int CommandRewriteFormulasForCellMergeArchive::kTableIdFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSortArchive::CommandSortArchive()
+CommandRewriteFormulasForCellMergeArchive::CommandRewriteFormulasForCellMergeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSortArchive::InitAsDefaultInstance() {
+void CommandRewriteFormulasForCellMergeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
-  formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
+  merged_range_ = const_cast< ::TSCE::RangeCoordinateArchive*>(&::TSCE::RangeCoordinateArchive::default_instance());
+  table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
 }
 
-CommandSortArchive::CommandSortArchive(const CommandSortArchive& from)
+CommandRewriteFormulasForCellMergeArchive::CommandRewriteFormulasForCellMergeArchive(const CommandRewriteFormulasForCellMergeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSortArchive::SharedCtor() {
+void CommandRewriteFormulasForCellMergeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  mapping_ = NULL;
-  formula_rewrite_command_ = NULL;
+  formula_map_ = NULL;
+  merged_range_ = NULL;
+  table_id_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSortArchive::~CommandSortArchive() {
+CommandRewriteFormulasForCellMergeArchive::~CommandRewriteFormulasForCellMergeArchive() {
   SharedDtor();
 }
 
-void CommandSortArchive::SharedDtor() {
+void CommandRewriteFormulasForCellMergeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete mapping_;
-    delete formula_rewrite_command_;
+    delete formula_map_;
+    delete merged_range_;
+    delete table_id_;
   }
 }
 
-void CommandSortArchive::SetCachedSize(int size) const {
+void CommandRewriteFormulasForCellMergeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSortArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFormulasForCellMergeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSortArchive_descriptor_;
+  return CommandRewriteFormulasForCellMergeArchive_descriptor_;
 }
 
-const CommandSortArchive& CommandSortArchive::default_instance() {
+const CommandRewriteFormulasForCellMergeArchive& CommandRewriteFormulasForCellMergeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSortArchive* CommandSortArchive::default_instance_ = NULL;
+CommandRewriteFormulasForCellMergeArchive* CommandRewriteFormulasForCellMergeArchive::default_instance_ = NULL;
 
-CommandSortArchive* CommandSortArchive::New() const {
-  return new CommandSortArchive;
+CommandRewriteFormulasForCellMergeArchive* CommandRewriteFormulasForCellMergeArchive::New() const {
+  return new CommandRewriteFormulasForCellMergeArchive;
 }
 
-void CommandSortArchive::Clear() {
+void CommandRewriteFormulasForCellMergeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_mapping()) {
-      if (mapping_ != NULL) mapping_->::TSK::ShuffleMappingArchive::Clear();
+    if (has_formula_map()) {
+      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
     }
-    if (has_formula_rewrite_command()) {
-      if (formula_rewrite_command_ != NULL) formula_rewrite_command_->::TSP::Reference::Clear();
+    if (has_merged_range()) {
+      if (merged_range_ != NULL) merged_range_->::TSCE::RangeCoordinateArchive::Clear();
+    }
+    if (has_table_id()) {
+      if (table_id_ != NULL) table_id_->::TSCE::CFUUIDArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSortArchive::MergePartialFromCodedStream(
+bool CommandRewriteFormulasForCellMergeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -29277,31 +33218,45 @@ bool CommandSortArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_mapping;
+        if (input->ExpectTag(18)) goto parse_formula_map;
         break;
       }
 
-      // required .TSK.ShuffleMappingArchive mapping = 5;
-      case 5: {
+      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_mapping:
+         parse_formula_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_mapping()));
+               input, mutable_formula_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_formula_rewrite_command;
+        if (input->ExpectTag(26)) goto parse_merged_range;
         break;
       }
 
-      // optional .TSP.Reference formula_rewrite_command = 7;
-      case 7: {
+      // required .TSCE.RangeCoordinateArchive merged_range = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_rewrite_command:
+         parse_merged_range:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_rewrite_command()));
+               input, mutable_merged_range()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_table_id;
+        break;
+      }
+
+      // required .TSCE.CFUUIDArchive table_id = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_id()));
         } else {
           goto handle_uninterpreted;
         }
@@ -29325,7 +33280,7 @@ bool CommandSortArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSortArchive::SerializeWithCachedSizes(
+void CommandRewriteFormulasForCellMergeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -29333,16 +33288,22 @@ void CommandSortArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSK.ShuffleMappingArchive mapping = 5;
-  if (has_mapping()) {
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->mapping(), output);
+      2, this->formula_map(), output);
   }
 
-  // optional .TSP.Reference formula_rewrite_command = 7;
-  if (has_formula_rewrite_command()) {
+  // required .TSCE.RangeCoordinateArchive merged_range = 3;
+  if (has_merged_range()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->formula_rewrite_command(), output);
+      3, this->merged_range(), output);
+  }
+
+  // required .TSCE.CFUUIDArchive table_id = 4;
+  if (has_table_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->table_id(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -29351,7 +33312,7 @@ void CommandSortArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSortArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFormulasForCellMergeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -29360,18 +33321,25 @@ ::google::protobuf::uint8* CommandSortArchive::SerializeWithCachedSizesToArray(
         1, this->super(), target);
   }
 
-  // required .TSK.ShuffleMappingArchive mapping = 5;
-  if (has_mapping()) {
+  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+  if (has_formula_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->mapping(), target);
+        2, this->formula_map(), target);
   }
 
-  // optional .TSP.Reference formula_rewrite_command = 7;
-  if (has_formula_rewrite_command()) {
+  // required .TSCE.RangeCoordinateArchive merged_range = 3;
+  if (has_merged_range()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->formula_rewrite_command(), target);
+        3, this->merged_range(), target);
+  }
+
+  // required .TSCE.CFUUIDArchive table_id = 4;
+  if (has_table_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->table_id(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -29381,7 +33349,7 @@ ::google::protobuf::uint8* CommandSortArchive::SerializeWithCachedSizesToArray(
   return target;
 }
 
-int CommandSortArchive::ByteSize() const {
+int CommandRewriteFormulasForCellMergeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -29392,18 +33360,25 @@ int CommandSortArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSK.ShuffleMappingArchive mapping = 5;
-    if (has_mapping()) {
+    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+    if (has_formula_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->mapping());
+          this->formula_map());
     }
 
-    // optional .TSP.Reference formula_rewrite_command = 7;
-    if (has_formula_rewrite_command()) {
+    // required .TSCE.RangeCoordinateArchive merged_range = 3;
+    if (has_merged_range()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_rewrite_command());
+          this->merged_range());
+    }
+
+    // required .TSCE.CFUUIDArchive table_id = 4;
+    if (has_table_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_id());
     }
 
   }
@@ -29418,10 +33393,10 @@ int CommandSortArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForCellMergeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSortArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSortArchive*>(
+  const CommandRewriteFormulasForCellMergeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForCellMergeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -29430,65 +33405,69 @@ void CommandSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
   }
 }
 
-void CommandSortArchive::MergeFrom(const CommandSortArchive& from) {
+void CommandRewriteFormulasForCellMergeArchive::MergeFrom(const CommandRewriteFormulasForCellMergeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_mapping()) {
-      mutable_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.mapping());
+    if (from.has_formula_map()) {
+      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
     }
-    if (from.has_formula_rewrite_command()) {
-      mutable_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.formula_rewrite_command());
+    if (from.has_merged_range()) {
+      mutable_merged_range()->::TSCE::RangeCoordinateArchive::MergeFrom(from.merged_range());
+    }
+    if (from.has_table_id()) {
+      mutable_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.table_id());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFormulasForCellMergeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSortArchive::CopyFrom(const CommandSortArchive& from) {
+void CommandRewriteFormulasForCellMergeArchive::CopyFrom(const CommandRewriteFormulasForCellMergeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSortArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandRewriteFormulasForCellMergeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_mapping()) {
-    if (!this->mapping().IsInitialized()) return false;
+  if (has_formula_map()) {
+    if (!this->formula_map().IsInitialized()) return false;
   }
-  if (has_formula_rewrite_command()) {
-    if (!this->formula_rewrite_command().IsInitialized()) return false;
+  if (has_merged_range()) {
+    if (!this->merged_range().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSortArchive::Swap(CommandSortArchive* other) {
+void CommandRewriteFormulasForCellMergeArchive::Swap(CommandRewriteFormulasForCellMergeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(mapping_, other->mapping_);
-    std::swap(formula_rewrite_command_, other->formula_rewrite_command_);
+    std::swap(formula_map_, other->formula_map_);
+    std::swap(merged_range_, other->merged_range_);
+    std::swap(table_id_, other->table_id_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSortArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFormulasForCellMergeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSortArchive_descriptor_;
-  metadata.reflection = CommandSortArchive_reflection_;
+  metadata.descriptor = CommandRewriteFormulasForCellMergeArchive_descriptor_;
+  metadata.reflection = CommandRewriteFormulasForCellMergeArchive_reflection_;
   return metadata;
 }
 
@@ -29496,96 +33475,72 @@ ::google::protobuf::Metadata CommandSortArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFormulasForSortArchive::kSuperFieldNumber;
-const int CommandRewriteFormulasForSortArchive::kFormulaMapFieldNumber;
-const int CommandRewriteFormulasForSortArchive::kSortMappingFieldNumber;
-const int CommandRewriteFormulasForSortArchive::kSortedTableIdFieldNumber;
-const int CommandRewriteFormulasForSortArchive::kExplodeRangesFieldNumber;
+const int CommandRewriteFilterFormulasForTableResizeArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFormulasForSortArchive::CommandRewriteFormulasForSortArchive()
+CommandRewriteFilterFormulasForTableResizeArchive::CommandRewriteFilterFormulasForTableResizeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFormulasForSortArchive::InitAsDefaultInstance() {
+void CommandRewriteFilterFormulasForTableResizeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
-  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
-  sorted_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
 }
 
-CommandRewriteFormulasForSortArchive::CommandRewriteFormulasForSortArchive(const CommandRewriteFormulasForSortArchive& from)
+CommandRewriteFilterFormulasForTableResizeArchive::CommandRewriteFilterFormulasForTableResizeArchive(const CommandRewriteFilterFormulasForTableResizeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForSortArchive::SharedCtor() {
+void CommandRewriteFilterFormulasForTableResizeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  formula_map_ = NULL;
-  sort_mapping_ = NULL;
-  sorted_table_id_ = NULL;
-  explode_ranges_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFormulasForSortArchive::~CommandRewriteFormulasForSortArchive() {
+CommandRewriteFilterFormulasForTableResizeArchive::~CommandRewriteFilterFormulasForTableResizeArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFormulasForSortArchive::SharedDtor() {
+void CommandRewriteFilterFormulasForTableResizeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete formula_map_;
-    delete sort_mapping_;
-    delete sorted_table_id_;
   }
 }
 
-void CommandRewriteFormulasForSortArchive::SetCachedSize(int size) const {
+void CommandRewriteFilterFormulasForTableResizeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFormulasForSortArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFilterFormulasForTableResizeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFormulasForSortArchive_descriptor_;
+  return CommandRewriteFilterFormulasForTableResizeArchive_descriptor_;
 }
 
-const CommandRewriteFormulasForSortArchive& CommandRewriteFormulasForSortArchive::default_instance() {
+const CommandRewriteFilterFormulasForTableResizeArchive& CommandRewriteFilterFormulasForTableResizeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFormulasForSortArchive* CommandRewriteFormulasForSortArchive::default_instance_ = NULL;
+CommandRewriteFilterFormulasForTableResizeArchive* CommandRewriteFilterFormulasForTableResizeArchive::default_instance_ = NULL;
 
-CommandRewriteFormulasForSortArchive* CommandRewriteFormulasForSortArchive::New() const {
-  return new CommandRewriteFormulasForSortArchive;
+CommandRewriteFilterFormulasForTableResizeArchive* CommandRewriteFilterFormulasForTableResizeArchive::New() const {
+  return new CommandRewriteFilterFormulasForTableResizeArchive;
 }
 
-void CommandRewriteFormulasForSortArchive::Clear() {
+void CommandRewriteFilterFormulasForTableResizeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_formula_map()) {
-      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
-    }
-    if (has_sort_mapping()) {
-      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
-    }
-    if (has_sorted_table_id()) {
-      if (sorted_table_id_ != NULL) sorted_table_id_->::TSCE::CFUUIDArchive::Clear();
-    }
-    explode_ranges_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFormulasForSortArchive::MergePartialFromCodedStream(
+bool CommandRewriteFilterFormulasForTableResizeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -29600,64 +33555,6 @@ bool CommandRewriteFormulasForSortArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_formula_map;
-        break;
-      }
-
-      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_sort_mapping;
-        break;
-      }
-
-      // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_sort_mapping:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_sort_mapping()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_sorted_table_id;
-        break;
-      }
-
-      // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_sorted_table_id:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_sorted_table_id()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_explode_ranges;
-        break;
-      }
-
-      // required bool explode_ranges = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_explode_ranges:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &explode_ranges_)));
-          set_has_explode_ranges();
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -29678,7 +33575,7 @@ bool CommandRewriteFormulasForSortArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandRewriteFormulasForSortArchive::SerializeWithCachedSizes(
+void CommandRewriteFilterFormulasForTableResizeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -29686,36 +33583,13 @@ void CommandRewriteFormulasForSortArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->formula_map(), output);
-  }
-
-  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-  if (has_sort_mapping()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->sort_mapping(), output);
-  }
-
-  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-  if (has_sorted_table_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->sorted_table_id(), output);
-  }
-
-  // required bool explode_ranges = 5;
-  if (has_explode_ranges()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->explode_ranges(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFormulasForSortArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFilterFormulasForTableResizeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -29724,32 +33598,6 @@ ::google::protobuf::uint8* CommandRewriteFormulasForSortArchive::SerializeWithCa
         1, this->super(), target);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->formula_map(), target);
-  }
-
-  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-  if (has_sort_mapping()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->sort_mapping(), target);
-  }
-
-  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-  if (has_sorted_table_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->sorted_table_id(), target);
-  }
-
-  // required bool explode_ranges = 5;
-  if (has_explode_ranges()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->explode_ranges(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -29757,7 +33605,7 @@ ::google::protobuf::uint8* CommandRewriteFormulasForSortArchive::SerializeWithCa
   return target;
 }
 
-int CommandRewriteFormulasForSortArchive::ByteSize() const {
+int CommandRewriteFilterFormulasForTableResizeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -29768,32 +33616,6 @@ int CommandRewriteFormulasForSortArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-    if (has_formula_map()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_map());
-    }
-
-    // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-    if (has_sort_mapping()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->sort_mapping());
-    }
-
-    // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-    if (has_sorted_table_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->sorted_table_id());
-    }
-
-    // required bool explode_ranges = 5;
-    if (has_explode_ranges()) {
-      total_size += 1 + 1;
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -29806,10 +33628,10 @@ int CommandRewriteFormulasForSortArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFormulasForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFilterFormulasForTableResizeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFormulasForSortArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForSortArchive*>(
+  const CommandRewriteFilterFormulasForTableResizeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFilterFormulasForTableResizeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -29818,73 +33640,51 @@ void CommandRewriteFormulasForSortArchive::MergeFrom(const ::google::protobuf::M
   }
 }
 
-void CommandRewriteFormulasForSortArchive::MergeFrom(const CommandRewriteFormulasForSortArchive& from) {
+void CommandRewriteFilterFormulasForTableResizeArchive::MergeFrom(const CommandRewriteFilterFormulasForTableResizeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_formula_map()) {
-      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
-    }
-    if (from.has_sort_mapping()) {
-      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
-    }
-    if (from.has_sorted_table_id()) {
-      mutable_sorted_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.sorted_table_id());
-    }
-    if (from.has_explode_ranges()) {
-      set_explode_ranges(from.explode_ranges());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFormulasForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFilterFormulasForTableResizeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForSortArchive::CopyFrom(const CommandRewriteFormulasForSortArchive& from) {
+void CommandRewriteFilterFormulasForTableResizeArchive::CopyFrom(const CommandRewriteFilterFormulasForTableResizeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFormulasForSortArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool CommandRewriteFilterFormulasForTableResizeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_formula_map()) {
-    if (!this->formula_map().IsInitialized()) return false;
-  }
-  if (has_sort_mapping()) {
-    if (!this->sort_mapping().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandRewriteFormulasForSortArchive::Swap(CommandRewriteFormulasForSortArchive* other) {
+void CommandRewriteFilterFormulasForTableResizeArchive::Swap(CommandRewriteFilterFormulasForTableResizeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(formula_map_, other->formula_map_);
-    std::swap(sort_mapping_, other->sort_mapping_);
-    std::swap(sorted_table_id_, other->sorted_table_id_);
-    std::swap(explode_ranges_, other->explode_ranges_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFormulasForSortArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFilterFormulasForTableResizeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFormulasForSortArchive_descriptor_;
-  metadata.reflection = CommandRewriteFormulasForSortArchive_reflection_;
+  metadata.descriptor = CommandRewriteFilterFormulasForTableResizeArchive_descriptor_;
+  metadata.reflection = CommandRewriteFilterFormulasForTableResizeArchive_reflection_;
   return metadata;
 }
 
@@ -29892,76 +33692,76 @@ ::google::protobuf::Metadata CommandRewriteFormulasForSortArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFormulasForTectonicShiftArchive::kSuperFieldNumber;
-const int CommandRewriteFormulasForTectonicShiftArchive::kFormulaMapFieldNumber;
-const int CommandRewriteFormulasForTectonicShiftArchive::kTectonicShiftFieldNumber;
+const int CommandRewriteFilterFormulasForTectonicShiftArchive::kSuperFieldNumber;
+const int CommandRewriteFilterFormulasForTectonicShiftArchive::kFilterSetFieldNumber;
+const int CommandRewriteFilterFormulasForTectonicShiftArchive::kTectonicShiftFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFormulasForTectonicShiftArchive::CommandRewriteFormulasForTectonicShiftArchive()
+CommandRewriteFilterFormulasForTectonicShiftArchive::CommandRewriteFilterFormulasForTectonicShiftArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::InitAsDefaultInstance() {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
+  filter_set_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
   tectonic_shift_ = const_cast< ::TSCE::TectonicShiftArchive*>(&::TSCE::TectonicShiftArchive::default_instance());
 }
 
-CommandRewriteFormulasForTectonicShiftArchive::CommandRewriteFormulasForTectonicShiftArchive(const CommandRewriteFormulasForTectonicShiftArchive& from)
+CommandRewriteFilterFormulasForTectonicShiftArchive::CommandRewriteFilterFormulasForTectonicShiftArchive(const CommandRewriteFilterFormulasForTectonicShiftArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::SharedCtor() {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  formula_map_ = NULL;
+  filter_set_ = NULL;
   tectonic_shift_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFormulasForTectonicShiftArchive::~CommandRewriteFormulasForTectonicShiftArchive() {
+CommandRewriteFilterFormulasForTectonicShiftArchive::~CommandRewriteFilterFormulasForTectonicShiftArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::SharedDtor() {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete formula_map_;
+    delete filter_set_;
     delete tectonic_shift_;
   }
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::SetCachedSize(int size) const {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFormulasForTectonicShiftArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFilterFormulasForTectonicShiftArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFormulasForTectonicShiftArchive_descriptor_;
+  return CommandRewriteFilterFormulasForTectonicShiftArchive_descriptor_;
 }
 
-const CommandRewriteFormulasForTectonicShiftArchive& CommandRewriteFormulasForTectonicShiftArchive::default_instance() {
+const CommandRewriteFilterFormulasForTectonicShiftArchive& CommandRewriteFilterFormulasForTectonicShiftArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFormulasForTectonicShiftArchive* CommandRewriteFormulasForTectonicShiftArchive::default_instance_ = NULL;
+CommandRewriteFilterFormulasForTectonicShiftArchive* CommandRewriteFilterFormulasForTectonicShiftArchive::default_instance_ = NULL;
 
-CommandRewriteFormulasForTectonicShiftArchive* CommandRewriteFormulasForTectonicShiftArchive::New() const {
-  return new CommandRewriteFormulasForTectonicShiftArchive;
+CommandRewriteFilterFormulasForTectonicShiftArchive* CommandRewriteFilterFormulasForTectonicShiftArchive::New() const {
+  return new CommandRewriteFilterFormulasForTectonicShiftArchive;
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::Clear() {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_formula_map()) {
-      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
+    if (has_filter_set()) {
+      if (filter_set_ != NULL) filter_set_->::TSP::Reference::Clear();
     }
     if (has_tectonic_shift()) {
       if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
@@ -29971,7 +33771,7 @@ void CommandRewriteFormulasForTectonicShiftArchive::Clear() {
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFormulasForTectonicShiftArchive::MergePartialFromCodedStream(
+bool CommandRewriteFilterFormulasForTectonicShiftArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -29986,17 +33786,17 @@ bool CommandRewriteFormulasForTectonicShiftArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_formula_map;
+        if (input->ExpectTag(18)) goto parse_filter_set;
         break;
       }
 
-      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+      // required .TSP.Reference filter_set = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_map:
+         parse_filter_set:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_map()));
+               input, mutable_filter_set()));
         } else {
           goto handle_uninterpreted;
         }
@@ -30034,7 +33834,7 @@ bool CommandRewriteFormulasForTectonicShiftArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::SerializeWithCachedSizes(
+void CommandRewriteFilterFormulasForTectonicShiftArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -30042,10 +33842,10 @@ void CommandRewriteFormulasForTectonicShiftArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
+  // required .TSP.Reference filter_set = 2;
+  if (has_filter_set()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->formula_map(), output);
+      2, this->filter_set(), output);
   }
 
   // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
@@ -30060,7 +33860,7 @@ void CommandRewriteFormulasForTectonicShiftArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFormulasForTectonicShiftArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFilterFormulasForTectonicShiftArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -30069,11 +33869,11 @@ ::google::protobuf::uint8* CommandRewriteFormulasForTectonicShiftArchive::Serial
         1, this->super(), target);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
+  // required .TSP.Reference filter_set = 2;
+  if (has_filter_set()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->formula_map(), target);
+        2, this->filter_set(), target);
   }
 
   // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
@@ -30090,7 +33890,7 @@ ::google::protobuf::uint8* CommandRewriteFormulasForTectonicShiftArchive::Serial
   return target;
 }
 
-int CommandRewriteFormulasForTectonicShiftArchive::ByteSize() const {
+int CommandRewriteFilterFormulasForTectonicShiftArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -30101,11 +33901,11 @@ int CommandRewriteFormulasForTectonicShiftArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-    if (has_formula_map()) {
+    // required .TSP.Reference filter_set = 2;
+    if (has_filter_set()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_map());
+          this->filter_set());
     }
 
     // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
@@ -30127,10 +33927,10 @@ int CommandRewriteFormulasForTectonicShiftArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFormulasForTectonicShiftArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForTectonicShiftArchive*>(
+  const CommandRewriteFilterFormulasForTectonicShiftArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFilterFormulasForTectonicShiftArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -30139,14 +33939,14 @@ void CommandRewriteFormulasForTectonicShiftArchive::MergeFrom(const ::google::pr
   }
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::MergeFrom(const CommandRewriteFormulasForTectonicShiftArchive& from) {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::MergeFrom(const CommandRewriteFilterFormulasForTectonicShiftArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_formula_map()) {
-      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
+    if (from.has_filter_set()) {
+      mutable_filter_set()->::TSP::Reference::MergeFrom(from.filter_set());
     }
     if (from.has_tectonic_shift()) {
       mutable_tectonic_shift()->::TSCE::TectonicShiftArchive::MergeFrom(from.tectonic_shift());
@@ -30155,26 +33955,26 @@ void CommandRewriteFormulasForTectonicShiftArchive::MergeFrom(const CommandRewri
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::CopyFrom(const CommandRewriteFormulasForTectonicShiftArchive& from) {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::CopyFrom(const CommandRewriteFilterFormulasForTectonicShiftArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFormulasForTectonicShiftArchive::IsInitialized() const {
+bool CommandRewriteFilterFormulasForTectonicShiftArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_formula_map()) {
-    if (!this->formula_map().IsInitialized()) return false;
+  if (has_filter_set()) {
+    if (!this->filter_set().IsInitialized()) return false;
   }
   if (has_tectonic_shift()) {
     if (!this->tectonic_shift().IsInitialized()) return false;
@@ -30182,10 +33982,10 @@ bool CommandRewriteFormulasForTectonicShiftArchive::IsInitialized() const {
   return true;
 }
 
-void CommandRewriteFormulasForTectonicShiftArchive::Swap(CommandRewriteFormulasForTectonicShiftArchive* other) {
+void CommandRewriteFilterFormulasForTectonicShiftArchive::Swap(CommandRewriteFilterFormulasForTectonicShiftArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(formula_map_, other->formula_map_);
+    std::swap(filter_set_, other->filter_set_);
     std::swap(tectonic_shift_, other->tectonic_shift_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -30193,11 +33993,11 @@ void CommandRewriteFormulasForTectonicShiftArchive::Swap(CommandRewriteFormulasF
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFormulasForTectonicShiftArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFilterFormulasForTectonicShiftArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFormulasForTectonicShiftArchive_descriptor_;
-  metadata.reflection = CommandRewriteFormulasForTectonicShiftArchive_reflection_;
+  metadata.descriptor = CommandRewriteFilterFormulasForTectonicShiftArchive_descriptor_;
+  metadata.reflection = CommandRewriteFilterFormulasForTectonicShiftArchive_reflection_;
   return metadata;
 }
 
@@ -30205,93 +34005,93 @@ ::google::protobuf::Metadata CommandRewriteFormulasForTectonicShiftArchive::GetM
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFormulasForMoveArchive::kSuperFieldNumber;
-const int CommandRewriteFormulasForMoveArchive::kFormulaMapFieldNumber;
-const int CommandRewriteFormulasForMoveArchive::kFromReferenceFieldNumber;
-const int CommandRewriteFormulasForMoveArchive::kToReferenceFieldNumber;
+const int CommandRewriteFilterFormulasForSortArchive::kSuperFieldNumber;
+const int CommandRewriteFilterFormulasForSortArchive::kFilterSetFieldNumber;
+const int CommandRewriteFilterFormulasForSortArchive::kSortMappingFieldNumber;
+const int CommandRewriteFilterFormulasForSortArchive::kSortedTableIdFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFormulasForMoveArchive::CommandRewriteFormulasForMoveArchive()
+CommandRewriteFilterFormulasForSortArchive::CommandRewriteFilterFormulasForSortArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFormulasForMoveArchive::InitAsDefaultInstance() {
+void CommandRewriteFilterFormulasForSortArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
-  from_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
-  to_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
+  filter_set_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
+  sorted_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
 }
 
-CommandRewriteFormulasForMoveArchive::CommandRewriteFormulasForMoveArchive(const CommandRewriteFormulasForMoveArchive& from)
+CommandRewriteFilterFormulasForSortArchive::CommandRewriteFilterFormulasForSortArchive(const CommandRewriteFilterFormulasForSortArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForMoveArchive::SharedCtor() {
+void CommandRewriteFilterFormulasForSortArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  formula_map_ = NULL;
-  from_reference_ = NULL;
-  to_reference_ = NULL;
+  filter_set_ = NULL;
+  sort_mapping_ = NULL;
+  sorted_table_id_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFormulasForMoveArchive::~CommandRewriteFormulasForMoveArchive() {
+CommandRewriteFilterFormulasForSortArchive::~CommandRewriteFilterFormulasForSortArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFormulasForMoveArchive::SharedDtor() {
+void CommandRewriteFilterFormulasForSortArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete formula_map_;
-    delete from_reference_;
-    delete to_reference_;
+    delete filter_set_;
+    delete sort_mapping_;
+    delete sorted_table_id_;
   }
 }
 
-void CommandRewriteFormulasForMoveArchive::SetCachedSize(int size) const {
+void CommandRewriteFilterFormulasForSortArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFormulasForMoveArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteFilterFormulasForSortArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFormulasForMoveArchive_descriptor_;
+  return CommandRewriteFilterFormulasForSortArchive_descriptor_;
 }
 
-const CommandRewriteFormulasForMoveArchive& CommandRewriteFormulasForMoveArchive::default_instance() {
+const CommandRewriteFilterFormulasForSortArchive& CommandRewriteFilterFormulasForSortArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFormulasForMoveArchive* CommandRewriteFormulasForMoveArchive::default_instance_ = NULL;
+CommandRewriteFilterFormulasForSortArchive* CommandRewriteFilterFormulasForSortArchive::default_instance_ = NULL;
 
-CommandRewriteFormulasForMoveArchive* CommandRewriteFormulasForMoveArchive::New() const {
-  return new CommandRewriteFormulasForMoveArchive;
+CommandRewriteFilterFormulasForSortArchive* CommandRewriteFilterFormulasForSortArchive::New() const {
+  return new CommandRewriteFilterFormulasForSortArchive;
 }
 
-void CommandRewriteFormulasForMoveArchive::Clear() {
+void CommandRewriteFilterFormulasForSortArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_formula_map()) {
-      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
+    if (has_filter_set()) {
+      if (filter_set_ != NULL) filter_set_->::TSP::Reference::Clear();
     }
-    if (has_from_reference()) {
-      if (from_reference_ != NULL) from_reference_->::TSCE::RangeReferenceArchive::Clear();
+    if (has_sort_mapping()) {
+      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
     }
-    if (has_to_reference()) {
-      if (to_reference_ != NULL) to_reference_->::TSCE::RangeReferenceArchive::Clear();
+    if (has_sorted_table_id()) {
+      if (sorted_table_id_ != NULL) sorted_table_id_->::TSCE::CFUUIDArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFormulasForMoveArchive::MergePartialFromCodedStream(
+bool CommandRewriteFilterFormulasForSortArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -30306,45 +34106,45 @@ bool CommandRewriteFormulasForMoveArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_formula_map;
+        if (input->ExpectTag(18)) goto parse_filter_set;
         break;
       }
 
-      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+      // required .TSP.Reference filter_set = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_map:
+         parse_filter_set:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_map()));
+               input, mutable_filter_set()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_from_reference;
+        if (input->ExpectTag(26)) goto parse_sort_mapping;
         break;
       }
 
-      // required .TSCE.RangeReferenceArchive from_reference = 6;
-      case 6: {
+      // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_from_reference:
+         parse_sort_mapping:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_from_reference()));
+               input, mutable_sort_mapping()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_to_reference;
+        if (input->ExpectTag(34)) goto parse_sorted_table_id;
         break;
       }
 
-      // required .TSCE.RangeReferenceArchive to_reference = 7;
-      case 7: {
+      // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_to_reference:
+         parse_sorted_table_id:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_to_reference()));
+               input, mutable_sorted_table_id()));
         } else {
           goto handle_uninterpreted;
         }
@@ -30368,7 +34168,7 @@ bool CommandRewriteFormulasForMoveArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandRewriteFormulasForMoveArchive::SerializeWithCachedSizes(
+void CommandRewriteFilterFormulasForSortArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -30376,22 +34176,22 @@ void CommandRewriteFormulasForMoveArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
+  // required .TSP.Reference filter_set = 2;
+  if (has_filter_set()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->formula_map(), output);
+      2, this->filter_set(), output);
   }
 
-  // required .TSCE.RangeReferenceArchive from_reference = 6;
-  if (has_from_reference()) {
+  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+  if (has_sort_mapping()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->from_reference(), output);
+      3, this->sort_mapping(), output);
   }
 
-  // required .TSCE.RangeReferenceArchive to_reference = 7;
-  if (has_to_reference()) {
+  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+  if (has_sorted_table_id()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->to_reference(), output);
+      4, this->sorted_table_id(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -30400,7 +34200,7 @@ void CommandRewriteFormulasForMoveArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFormulasForMoveArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteFilterFormulasForSortArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -30409,25 +34209,25 @@ ::google::protobuf::uint8* CommandRewriteFormulasForMoveArchive::SerializeWithCa
         1, this->super(), target);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
+  // required .TSP.Reference filter_set = 2;
+  if (has_filter_set()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->formula_map(), target);
+        2, this->filter_set(), target);
   }
 
-  // required .TSCE.RangeReferenceArchive from_reference = 6;
-  if (has_from_reference()) {
+  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+  if (has_sort_mapping()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->from_reference(), target);
+        3, this->sort_mapping(), target);
   }
 
-  // required .TSCE.RangeReferenceArchive to_reference = 7;
-  if (has_to_reference()) {
+  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+  if (has_sorted_table_id()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->to_reference(), target);
+        4, this->sorted_table_id(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -30437,7 +34237,7 @@ ::google::protobuf::uint8* CommandRewriteFormulasForMoveArchive::SerializeWithCa
   return target;
 }
 
-int CommandRewriteFormulasForMoveArchive::ByteSize() const {
+int CommandRewriteFilterFormulasForSortArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -30448,25 +34248,25 @@ int CommandRewriteFormulasForMoveArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-    if (has_formula_map()) {
+    // required .TSP.Reference filter_set = 2;
+    if (has_filter_set()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_map());
+          this->filter_set());
     }
 
-    // required .TSCE.RangeReferenceArchive from_reference = 6;
-    if (has_from_reference()) {
+    // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+    if (has_sort_mapping()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->from_reference());
+          this->sort_mapping());
     }
 
-    // required .TSCE.RangeReferenceArchive to_reference = 7;
-    if (has_to_reference()) {
+    // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+    if (has_sorted_table_id()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->to_reference());
+          this->sorted_table_id());
     }
 
   }
@@ -30481,10 +34281,10 @@ int CommandRewriteFormulasForMoveArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFormulasForMoveArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFilterFormulasForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFormulasForMoveArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForMoveArchive*>(
+  const CommandRewriteFilterFormulasForSortArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFilterFormulasForSortArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -30493,72 +34293,69 @@ void CommandRewriteFormulasForMoveArchive::MergeFrom(const ::google::protobuf::M
   }
 }
 
-void CommandRewriteFormulasForMoveArchive::MergeFrom(const CommandRewriteFormulasForMoveArchive& from) {
+void CommandRewriteFilterFormulasForSortArchive::MergeFrom(const CommandRewriteFilterFormulasForSortArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_formula_map()) {
-      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
+    if (from.has_filter_set()) {
+      mutable_filter_set()->::TSP::Reference::MergeFrom(from.filter_set());
     }
-    if (from.has_from_reference()) {
-      mutable_from_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.from_reference());
+    if (from.has_sort_mapping()) {
+      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
     }
-    if (from.has_to_reference()) {
-      mutable_to_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.to_reference());
+    if (from.has_sorted_table_id()) {
+      mutable_sorted_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.sorted_table_id());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFormulasForMoveArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteFilterFormulasForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForMoveArchive::CopyFrom(const CommandRewriteFormulasForMoveArchive& from) {
+void CommandRewriteFilterFormulasForSortArchive::CopyFrom(const CommandRewriteFilterFormulasForSortArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFormulasForMoveArchive::IsInitialized() const {
+bool CommandRewriteFilterFormulasForSortArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_formula_map()) {
-    if (!this->formula_map().IsInitialized()) return false;
-  }
-  if (has_from_reference()) {
-    if (!this->from_reference().IsInitialized()) return false;
+  if (has_filter_set()) {
+    if (!this->filter_set().IsInitialized()) return false;
   }
-  if (has_to_reference()) {
-    if (!this->to_reference().IsInitialized()) return false;
+  if (has_sort_mapping()) {
+    if (!this->sort_mapping().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteFormulasForMoveArchive::Swap(CommandRewriteFormulasForMoveArchive* other) {
+void CommandRewriteFilterFormulasForSortArchive::Swap(CommandRewriteFilterFormulasForSortArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(formula_map_, other->formula_map_);
-    std::swap(from_reference_, other->from_reference_);
-    std::swap(to_reference_, other->to_reference_);
+    std::swap(filter_set_, other->filter_set_);
+    std::swap(sort_mapping_, other->sort_mapping_);
+    std::swap(sorted_table_id_, other->sorted_table_id_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFormulasForMoveArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteFilterFormulasForSortArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFormulasForMoveArchive_descriptor_;
-  metadata.reflection = CommandRewriteFormulasForMoveArchive_reflection_;
+  metadata.descriptor = CommandRewriteFilterFormulasForSortArchive_descriptor_;
+  metadata.reflection = CommandRewriteFilterFormulasForSortArchive_reflection_;
   return metadata;
 }
 
@@ -30566,93 +34363,93 @@ ::google::protobuf::Metadata CommandRewriteFormulasForMoveArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFormulasForCellMergeArchive::kSuperFieldNumber;
-const int CommandRewriteFormulasForCellMergeArchive::kFormulaMapFieldNumber;
-const int CommandRewriteFormulasForCellMergeArchive::kMergedRangeFieldNumber;
-const int CommandRewriteFormulasForCellMergeArchive::kTableIdFieldNumber;
+const int CommandRewriteConditionalStylesForTectonicShiftArchive::kSuperFieldNumber;
+const int CommandRewriteConditionalStylesForTectonicShiftArchive::kTectonicShiftFieldNumber;
+const int CommandRewriteConditionalStylesForTectonicShiftArchive::kCellsToRewriteFieldNumber;
+const int CommandRewriteConditionalStylesForTectonicShiftArchive::kConditionalStyleSetsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFormulasForCellMergeArchive::CommandRewriteFormulasForCellMergeArchive()
+CommandRewriteConditionalStylesForTectonicShiftArchive::CommandRewriteConditionalStylesForTectonicShiftArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFormulasForCellMergeArchive::InitAsDefaultInstance() {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  formula_map_ = const_cast< ::TSCE::OwnerFormulaMapArchive*>(&::TSCE::OwnerFormulaMapArchive::default_instance());
-  merged_range_ = const_cast< ::TSCE::RangeCoordinateArchive*>(&::TSCE::RangeCoordinateArchive::default_instance());
-  table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
+  tectonic_shift_ = const_cast< ::TSCE::TectonicShiftArchive*>(&::TSCE::TectonicShiftArchive::default_instance());
+  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
+  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
 }
 
-CommandRewriteFormulasForCellMergeArchive::CommandRewriteFormulasForCellMergeArchive(const CommandRewriteFormulasForCellMergeArchive& from)
+CommandRewriteConditionalStylesForTectonicShiftArchive::CommandRewriteConditionalStylesForTectonicShiftArchive(const CommandRewriteConditionalStylesForTectonicShiftArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForCellMergeArchive::SharedCtor() {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  formula_map_ = NULL;
-  merged_range_ = NULL;
-  table_id_ = NULL;
+  tectonic_shift_ = NULL;
+  cells_to_rewrite_ = NULL;
+  conditional_style_sets_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFormulasForCellMergeArchive::~CommandRewriteFormulasForCellMergeArchive() {
+CommandRewriteConditionalStylesForTectonicShiftArchive::~CommandRewriteConditionalStylesForTectonicShiftArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFormulasForCellMergeArchive::SharedDtor() {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete formula_map_;
-    delete merged_range_;
-    delete table_id_;
+    delete tectonic_shift_;
+    delete cells_to_rewrite_;
+    delete conditional_style_sets_;
   }
 }
 
-void CommandRewriteFormulasForCellMergeArchive::SetCachedSize(int size) const {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFormulasForCellMergeArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForTectonicShiftArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFormulasForCellMergeArchive_descriptor_;
+  return CommandRewriteConditionalStylesForTectonicShiftArchive_descriptor_;
 }
 
-const CommandRewriteFormulasForCellMergeArchive& CommandRewriteFormulasForCellMergeArchive::default_instance() {
+const CommandRewriteConditionalStylesForTectonicShiftArchive& CommandRewriteConditionalStylesForTectonicShiftArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFormulasForCellMergeArchive* CommandRewriteFormulasForCellMergeArchive::default_instance_ = NULL;
+CommandRewriteConditionalStylesForTectonicShiftArchive* CommandRewriteConditionalStylesForTectonicShiftArchive::default_instance_ = NULL;
 
-CommandRewriteFormulasForCellMergeArchive* CommandRewriteFormulasForCellMergeArchive::New() const {
-  return new CommandRewriteFormulasForCellMergeArchive;
+CommandRewriteConditionalStylesForTectonicShiftArchive* CommandRewriteConditionalStylesForTectonicShiftArchive::New() const {
+  return new CommandRewriteConditionalStylesForTectonicShiftArchive;
 }
 
-void CommandRewriteFormulasForCellMergeArchive::Clear() {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_formula_map()) {
-      if (formula_map_ != NULL) formula_map_->::TSCE::OwnerFormulaMapArchive::Clear();
+    if (has_tectonic_shift()) {
+      if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
     }
-    if (has_merged_range()) {
-      if (merged_range_ != NULL) merged_range_->::TSCE::RangeCoordinateArchive::Clear();
+    if (has_cells_to_rewrite()) {
+      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
     }
-    if (has_table_id()) {
-      if (table_id_ != NULL) table_id_->::TSCE::CFUUIDArchive::Clear();
+    if (has_conditional_style_sets()) {
+      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFormulasForCellMergeArchive::MergePartialFromCodedStream(
+bool CommandRewriteConditionalStylesForTectonicShiftArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -30667,45 +34464,45 @@ bool CommandRewriteFormulasForCellMergeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_formula_map;
+        if (input->ExpectTag(18)) goto parse_tectonic_shift;
         break;
       }
 
-      // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
+      // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_formula_map:
+         parse_tectonic_shift:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_formula_map()));
+               input, mutable_tectonic_shift()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_merged_range;
+        if (input->ExpectTag(26)) goto parse_cells_to_rewrite;
         break;
       }
 
-      // required .TSCE.RangeCoordinateArchive merged_range = 3;
+      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_merged_range:
+         parse_cells_to_rewrite:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_merged_range()));
+               input, mutable_cells_to_rewrite()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_table_id;
+        if (input->ExpectTag(34)) goto parse_conditional_style_sets;
         break;
       }
 
-      // required .TSCE.CFUUIDArchive table_id = 4;
+      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_id:
+         parse_conditional_style_sets:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_id()));
+               input, mutable_conditional_style_sets()));
         } else {
           goto handle_uninterpreted;
         }
@@ -30729,7 +34526,7 @@ bool CommandRewriteFormulasForCellMergeArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandRewriteFormulasForCellMergeArchive::SerializeWithCachedSizes(
+void CommandRewriteConditionalStylesForTectonicShiftArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -30737,22 +34534,22 @@ void CommandRewriteFormulasForCellMergeArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+  if (has_tectonic_shift()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->formula_map(), output);
+      2, this->tectonic_shift(), output);
   }
 
-  // required .TSCE.RangeCoordinateArchive merged_range = 3;
-  if (has_merged_range()) {
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
+  if (has_cells_to_rewrite()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->merged_range(), output);
+      3, this->cells_to_rewrite(), output);
   }
 
-  // required .TSCE.CFUUIDArchive table_id = 4;
-  if (has_table_id()) {
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
+  if (has_conditional_style_sets()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->table_id(), output);
+      4, this->conditional_style_sets(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -30761,7 +34558,7 @@ void CommandRewriteFormulasForCellMergeArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFormulasForCellMergeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteConditionalStylesForTectonicShiftArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -30770,25 +34567,25 @@ ::google::protobuf::uint8* CommandRewriteFormulasForCellMergeArchive::SerializeW
         1, this->super(), target);
   }
 
-  // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-  if (has_formula_map()) {
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+  if (has_tectonic_shift()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->formula_map(), target);
+        2, this->tectonic_shift(), target);
   }
 
-  // required .TSCE.RangeCoordinateArchive merged_range = 3;
-  if (has_merged_range()) {
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
+  if (has_cells_to_rewrite()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->merged_range(), target);
+        3, this->cells_to_rewrite(), target);
   }
 
-  // required .TSCE.CFUUIDArchive table_id = 4;
-  if (has_table_id()) {
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
+  if (has_conditional_style_sets()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->table_id(), target);
+        4, this->conditional_style_sets(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -30798,7 +34595,7 @@ ::google::protobuf::uint8* CommandRewriteFormulasForCellMergeArchive::SerializeW
   return target;
 }
 
-int CommandRewriteFormulasForCellMergeArchive::ByteSize() const {
+int CommandRewriteConditionalStylesForTectonicShiftArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -30809,25 +34606,25 @@ int CommandRewriteFormulasForCellMergeArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSCE.OwnerFormulaMapArchive formula_map = 2;
-    if (has_formula_map()) {
+    // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+    if (has_tectonic_shift()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->formula_map());
+          this->tectonic_shift());
     }
 
-    // required .TSCE.RangeCoordinateArchive merged_range = 3;
-    if (has_merged_range()) {
+    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
+    if (has_cells_to_rewrite()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->merged_range());
+          this->cells_to_rewrite());
     }
 
-    // required .TSCE.CFUUIDArchive table_id = 4;
-    if (has_table_id()) {
+    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
+    if (has_conditional_style_sets()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_id());
+          this->conditional_style_sets());
     }
 
   }
@@ -30842,10 +34639,10 @@ int CommandRewriteFormulasForCellMergeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFormulasForCellMergeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFormulasForCellMergeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFormulasForCellMergeArchive*>(
+  const CommandRewriteConditionalStylesForTectonicShiftArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForTectonicShiftArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -30854,69 +34651,69 @@ void CommandRewriteFormulasForCellMergeArchive::MergeFrom(const ::google::protob
   }
 }
 
-void CommandRewriteFormulasForCellMergeArchive::MergeFrom(const CommandRewriteFormulasForCellMergeArchive& from) {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::MergeFrom(const CommandRewriteConditionalStylesForTectonicShiftArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_formula_map()) {
-      mutable_formula_map()->::TSCE::OwnerFormulaMapArchive::MergeFrom(from.formula_map());
+    if (from.has_tectonic_shift()) {
+      mutable_tectonic_shift()->::TSCE::TectonicShiftArchive::MergeFrom(from.tectonic_shift());
     }
-    if (from.has_merged_range()) {
-      mutable_merged_range()->::TSCE::RangeCoordinateArchive::MergeFrom(from.merged_range());
+    if (from.has_cells_to_rewrite()) {
+      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
     }
-    if (from.has_table_id()) {
-      mutable_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.table_id());
+    if (from.has_conditional_style_sets()) {
+      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFormulasForCellMergeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFormulasForCellMergeArchive::CopyFrom(const CommandRewriteFormulasForCellMergeArchive& from) {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::CopyFrom(const CommandRewriteConditionalStylesForTectonicShiftArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFormulasForCellMergeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandRewriteConditionalStylesForTectonicShiftArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_formula_map()) {
-    if (!this->formula_map().IsInitialized()) return false;
+  if (has_tectonic_shift()) {
+    if (!this->tectonic_shift().IsInitialized()) return false;
   }
-  if (has_merged_range()) {
-    if (!this->merged_range().IsInitialized()) return false;
+  if (has_conditional_style_sets()) {
+    if (!this->conditional_style_sets().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteFormulasForCellMergeArchive::Swap(CommandRewriteFormulasForCellMergeArchive* other) {
+void CommandRewriteConditionalStylesForTectonicShiftArchive::Swap(CommandRewriteConditionalStylesForTectonicShiftArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(formula_map_, other->formula_map_);
-    std::swap(merged_range_, other->merged_range_);
-    std::swap(table_id_, other->table_id_);
+    std::swap(tectonic_shift_, other->tectonic_shift_);
+    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
+    std::swap(conditional_style_sets_, other->conditional_style_sets_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFormulasForCellMergeArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteConditionalStylesForTectonicShiftArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFormulasForCellMergeArchive_descriptor_;
-  metadata.reflection = CommandRewriteFormulasForCellMergeArchive_reflection_;
+  metadata.descriptor = CommandRewriteConditionalStylesForTectonicShiftArchive_descriptor_;
+  metadata.reflection = CommandRewriteConditionalStylesForTectonicShiftArchive_reflection_;
   return metadata;
 }
 
@@ -30924,72 +34721,100 @@ ::google::protobuf::Metadata CommandRewriteFormulasForCellMergeArchive::GetMetad
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFilterFormulasForTableResizeArchive::kSuperFieldNumber;
+const int CommandRewriteConditionalStylesForSortArchive::kSuperFieldNumber;
+const int CommandRewriteConditionalStylesForSortArchive::kSortMappingFieldNumber;
+const int CommandRewriteConditionalStylesForSortArchive::kSortedTableIdFieldNumber;
+const int CommandRewriteConditionalStylesForSortArchive::kCellsToRewriteFieldNumber;
+const int CommandRewriteConditionalStylesForSortArchive::kConditionalStyleSetsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFilterFormulasForTableResizeArchive::CommandRewriteFilterFormulasForTableResizeArchive()
+CommandRewriteConditionalStylesForSortArchive::CommandRewriteConditionalStylesForSortArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::InitAsDefaultInstance() {
+void CommandRewriteConditionalStylesForSortArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
+  sorted_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
+  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
+  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
 }
 
-CommandRewriteFilterFormulasForTableResizeArchive::CommandRewriteFilterFormulasForTableResizeArchive(const CommandRewriteFilterFormulasForTableResizeArchive& from)
+CommandRewriteConditionalStylesForSortArchive::CommandRewriteConditionalStylesForSortArchive(const CommandRewriteConditionalStylesForSortArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::SharedCtor() {
+void CommandRewriteConditionalStylesForSortArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  sort_mapping_ = NULL;
+  sorted_table_id_ = NULL;
+  cells_to_rewrite_ = NULL;
+  conditional_style_sets_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFilterFormulasForTableResizeArchive::~CommandRewriteFilterFormulasForTableResizeArchive() {
+CommandRewriteConditionalStylesForSortArchive::~CommandRewriteConditionalStylesForSortArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::SharedDtor() {
+void CommandRewriteConditionalStylesForSortArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete sort_mapping_;
+    delete sorted_table_id_;
+    delete cells_to_rewrite_;
+    delete conditional_style_sets_;
   }
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::SetCachedSize(int size) const {
+void CommandRewriteConditionalStylesForSortArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFilterFormulasForTableResizeArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForSortArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFilterFormulasForTableResizeArchive_descriptor_;
+  return CommandRewriteConditionalStylesForSortArchive_descriptor_;
 }
 
-const CommandRewriteFilterFormulasForTableResizeArchive& CommandRewriteFilterFormulasForTableResizeArchive::default_instance() {
+const CommandRewriteConditionalStylesForSortArchive& CommandRewriteConditionalStylesForSortArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFilterFormulasForTableResizeArchive* CommandRewriteFilterFormulasForTableResizeArchive::default_instance_ = NULL;
+CommandRewriteConditionalStylesForSortArchive* CommandRewriteConditionalStylesForSortArchive::default_instance_ = NULL;
 
-CommandRewriteFilterFormulasForTableResizeArchive* CommandRewriteFilterFormulasForTableResizeArchive::New() const {
-  return new CommandRewriteFilterFormulasForTableResizeArchive;
+CommandRewriteConditionalStylesForSortArchive* CommandRewriteConditionalStylesForSortArchive::New() const {
+  return new CommandRewriteConditionalStylesForSortArchive;
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::Clear() {
+void CommandRewriteConditionalStylesForSortArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
+    if (has_sort_mapping()) {
+      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
+    }
+    if (has_sorted_table_id()) {
+      if (sorted_table_id_ != NULL) sorted_table_id_->::TSCE::CFUUIDArchive::Clear();
+    }
+    if (has_cells_to_rewrite()) {
+      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
+    }
+    if (has_conditional_style_sets()) {
+      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFilterFormulasForTableResizeArchive::MergePartialFromCodedStream(
+bool CommandRewriteConditionalStylesForSortArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -31004,6 +34829,62 @@ bool CommandRewriteFilterFormulasForTableResizeArchive::MergePartialFromCodedStr
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_sort_mapping;
+        break;
+      }
+
+      // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sort_mapping:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sort_mapping()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_sorted_table_id;
+        break;
+      }
+
+      // required .TSCE.CFUUIDArchive sorted_table_id = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sorted_table_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sorted_table_id()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_cells_to_rewrite;
+        break;
+      }
+
+      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cells_to_rewrite:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cells_to_rewrite()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_conditional_style_sets;
+        break;
+      }
+
+      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_conditional_style_sets:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_conditional_style_sets()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -31024,7 +34905,7 @@ bool CommandRewriteFilterFormulasForTableResizeArchive::MergePartialFromCodedStr
 #undef DO_
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::SerializeWithCachedSizes(
+void CommandRewriteConditionalStylesForSortArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31032,13 +34913,37 @@ void CommandRewriteFilterFormulasForTableResizeArchive::SerializeWithCachedSizes
       1, this->super(), output);
   }
 
+  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+  if (has_sort_mapping()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->sort_mapping(), output);
+  }
+
+  // required .TSCE.CFUUIDArchive sorted_table_id = 3;
+  if (has_sorted_table_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->sorted_table_id(), output);
+  }
+
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+  if (has_cells_to_rewrite()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->cells_to_rewrite(), output);
+  }
+
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+  if (has_conditional_style_sets()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->conditional_style_sets(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFilterFormulasForTableResizeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteConditionalStylesForSortArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31047,6 +34952,34 @@ ::google::protobuf::uint8* CommandRewriteFilterFormulasForTableResizeArchive::Se
         1, this->super(), target);
   }
 
+  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+  if (has_sort_mapping()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->sort_mapping(), target);
+  }
+
+  // required .TSCE.CFUUIDArchive sorted_table_id = 3;
+  if (has_sorted_table_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->sorted_table_id(), target);
+  }
+
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+  if (has_cells_to_rewrite()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->cells_to_rewrite(), target);
+  }
+
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+  if (has_conditional_style_sets()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->conditional_style_sets(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -31054,7 +34987,7 @@ ::google::protobuf::uint8* CommandRewriteFilterFormulasForTableResizeArchive::Se
   return target;
 }
 
-int CommandRewriteFilterFormulasForTableResizeArchive::ByteSize() const {
+int CommandRewriteConditionalStylesForSortArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -31065,6 +34998,34 @@ int CommandRewriteFilterFormulasForTableResizeArchive::ByteSize() const {
           this->super());
     }
 
+    // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+    if (has_sort_mapping()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sort_mapping());
+    }
+
+    // required .TSCE.CFUUIDArchive sorted_table_id = 3;
+    if (has_sorted_table_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sorted_table_id());
+    }
+
+    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+    if (has_cells_to_rewrite()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cells_to_rewrite());
+    }
+
+    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+    if (has_conditional_style_sets()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->conditional_style_sets());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -31077,10 +35038,10 @@ int CommandRewriteFilterFormulasForTableResizeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFilterFormulasForTableResizeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFilterFormulasForTableResizeArchive*>(
+  const CommandRewriteConditionalStylesForSortArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForSortArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -31089,51 +35050,73 @@ void CommandRewriteFilterFormulasForTableResizeArchive::MergeFrom(const ::google
   }
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::MergeFrom(const CommandRewriteFilterFormulasForTableResizeArchive& from) {
+void CommandRewriteConditionalStylesForSortArchive::MergeFrom(const CommandRewriteConditionalStylesForSortArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
+    if (from.has_sort_mapping()) {
+      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
+    }
+    if (from.has_sorted_table_id()) {
+      mutable_sorted_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.sorted_table_id());
+    }
+    if (from.has_cells_to_rewrite()) {
+      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
+    }
+    if (from.has_conditional_style_sets()) {
+      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::CopyFrom(const CommandRewriteFilterFormulasForTableResizeArchive& from) {
+void CommandRewriteConditionalStylesForSortArchive::CopyFrom(const CommandRewriteConditionalStylesForSortArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFilterFormulasForTableResizeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandRewriteConditionalStylesForSortArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_sort_mapping()) {
+    if (!this->sort_mapping().IsInitialized()) return false;
+  }
+  if (has_conditional_style_sets()) {
+    if (!this->conditional_style_sets().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandRewriteFilterFormulasForTableResizeArchive::Swap(CommandRewriteFilterFormulasForTableResizeArchive* other) {
+void CommandRewriteConditionalStylesForSortArchive::Swap(CommandRewriteConditionalStylesForSortArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(sort_mapping_, other->sort_mapping_);
+    std::swap(sorted_table_id_, other->sorted_table_id_);
+    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
+    std::swap(conditional_style_sets_, other->conditional_style_sets_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFilterFormulasForTableResizeArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteConditionalStylesForSortArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFilterFormulasForTableResizeArchive_descriptor_;
-  metadata.reflection = CommandRewriteFilterFormulasForTableResizeArchive_reflection_;
+  metadata.descriptor = CommandRewriteConditionalStylesForSortArchive_descriptor_;
+  metadata.reflection = CommandRewriteConditionalStylesForSortArchive_reflection_;
   return metadata;
 }
 
@@ -31141,86 +35124,100 @@ ::google::protobuf::Metadata CommandRewriteFilterFormulasForTableResizeArchive::
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFilterFormulasForTectonicShiftArchive::kSuperFieldNumber;
-const int CommandRewriteFilterFormulasForTectonicShiftArchive::kFilterSetFieldNumber;
-const int CommandRewriteFilterFormulasForTectonicShiftArchive::kTectonicShiftFieldNumber;
+const int CommandRewriteConditionalStylesForRangeMoveArchive::kSuperFieldNumber;
+const int CommandRewriteConditionalStylesForRangeMoveArchive::kFromRangeReferenceFieldNumber;
+const int CommandRewriteConditionalStylesForRangeMoveArchive::kToRangeReferenceFieldNumber;
+const int CommandRewriteConditionalStylesForRangeMoveArchive::kCellsToRewriteFieldNumber;
+const int CommandRewriteConditionalStylesForRangeMoveArchive::kConditionalStyleSetsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFilterFormulasForTectonicShiftArchive::CommandRewriteFilterFormulasForTectonicShiftArchive()
+CommandRewriteConditionalStylesForRangeMoveArchive::CommandRewriteConditionalStylesForRangeMoveArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::InitAsDefaultInstance() {
+void CommandRewriteConditionalStylesForRangeMoveArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  filter_set_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  tectonic_shift_ = const_cast< ::TSCE::TectonicShiftArchive*>(&::TSCE::TectonicShiftArchive::default_instance());
+  from_range_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
+  to_range_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
+  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
+  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
 }
 
-CommandRewriteFilterFormulasForTectonicShiftArchive::CommandRewriteFilterFormulasForTectonicShiftArchive(const CommandRewriteFilterFormulasForTectonicShiftArchive& from)
+CommandRewriteConditionalStylesForRangeMoveArchive::CommandRewriteConditionalStylesForRangeMoveArchive(const CommandRewriteConditionalStylesForRangeMoveArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::SharedCtor() {
+void CommandRewriteConditionalStylesForRangeMoveArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  filter_set_ = NULL;
-  tectonic_shift_ = NULL;
+  from_range_reference_ = NULL;
+  to_range_reference_ = NULL;
+  cells_to_rewrite_ = NULL;
+  conditional_style_sets_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFilterFormulasForTectonicShiftArchive::~CommandRewriteFilterFormulasForTectonicShiftArchive() {
+CommandRewriteConditionalStylesForRangeMoveArchive::~CommandRewriteConditionalStylesForRangeMoveArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::SharedDtor() {
+void CommandRewriteConditionalStylesForRangeMoveArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete filter_set_;
-    delete tectonic_shift_;
+    delete from_range_reference_;
+    delete to_range_reference_;
+    delete cells_to_rewrite_;
+    delete conditional_style_sets_;
   }
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::SetCachedSize(int size) const {
+void CommandRewriteConditionalStylesForRangeMoveArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFilterFormulasForTectonicShiftArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForRangeMoveArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFilterFormulasForTectonicShiftArchive_descriptor_;
+  return CommandRewriteConditionalStylesForRangeMoveArchive_descriptor_;
 }
 
-const CommandRewriteFilterFormulasForTectonicShiftArchive& CommandRewriteFilterFormulasForTectonicShiftArchive::default_instance() {
+const CommandRewriteConditionalStylesForRangeMoveArchive& CommandRewriteConditionalStylesForRangeMoveArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFilterFormulasForTectonicShiftArchive* CommandRewriteFilterFormulasForTectonicShiftArchive::default_instance_ = NULL;
+CommandRewriteConditionalStylesForRangeMoveArchive* CommandRewriteConditionalStylesForRangeMoveArchive::default_instance_ = NULL;
 
-CommandRewriteFilterFormulasForTectonicShiftArchive* CommandRewriteFilterFormulasForTectonicShiftArchive::New() const {
-  return new CommandRewriteFilterFormulasForTectonicShiftArchive;
+CommandRewriteConditionalStylesForRangeMoveArchive* CommandRewriteConditionalStylesForRangeMoveArchive::New() const {
+  return new CommandRewriteConditionalStylesForRangeMoveArchive;
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::Clear() {
+void CommandRewriteConditionalStylesForRangeMoveArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_filter_set()) {
-      if (filter_set_ != NULL) filter_set_->::TSP::Reference::Clear();
+    if (has_from_range_reference()) {
+      if (from_range_reference_ != NULL) from_range_reference_->::TSCE::RangeReferenceArchive::Clear();
     }
-    if (has_tectonic_shift()) {
-      if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
+    if (has_to_range_reference()) {
+      if (to_range_reference_ != NULL) to_range_reference_->::TSCE::RangeReferenceArchive::Clear();
+    }
+    if (has_cells_to_rewrite()) {
+      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
+    }
+    if (has_conditional_style_sets()) {
+      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFilterFormulasForTectonicShiftArchive::MergePartialFromCodedStream(
+bool CommandRewriteConditionalStylesForRangeMoveArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -31235,31 +35232,59 @@ bool CommandRewriteFilterFormulasForTectonicShiftArchive::MergePartialFromCodedS
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_filter_set;
+        if (input->ExpectTag(42)) goto parse_cells_to_rewrite;
         break;
       }
 
-      // required .TSP.Reference filter_set = 2;
-      case 2: {
+      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_filter_set:
+         parse_cells_to_rewrite:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_filter_set()));
+               input, mutable_cells_to_rewrite()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_tectonic_shift;
+        if (input->ExpectTag(50)) goto parse_conditional_style_sets;
         break;
       }
 
-      // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
-      case 3: {
+      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tectonic_shift:
+         parse_conditional_style_sets:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tectonic_shift()));
+               input, mutable_conditional_style_sets()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(58)) goto parse_from_range_reference;
+        break;
+      }
+
+      // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_from_range_reference:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_from_range_reference()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_to_range_reference;
+        break;
+      }
+
+      // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_to_range_reference:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_to_range_reference()));
         } else {
           goto handle_uninterpreted;
         }
@@ -31283,7 +35308,7 @@ bool CommandRewriteFilterFormulasForTectonicShiftArchive::MergePartialFromCodedS
 #undef DO_
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::SerializeWithCachedSizes(
+void CommandRewriteConditionalStylesForRangeMoveArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31291,16 +35316,28 @@ void CommandRewriteFilterFormulasForTectonicShiftArchive::SerializeWithCachedSiz
       1, this->super(), output);
   }
 
-  // required .TSP.Reference filter_set = 2;
-  if (has_filter_set()) {
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
+  if (has_cells_to_rewrite()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->filter_set(), output);
+      5, this->cells_to_rewrite(), output);
   }
 
-  // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
-  if (has_tectonic_shift()) {
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
+  if (has_conditional_style_sets()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->tectonic_shift(), output);
+      6, this->conditional_style_sets(), output);
+  }
+
+  // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
+  if (has_from_range_reference()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->from_range_reference(), output);
+  }
+
+  // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
+  if (has_to_range_reference()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->to_range_reference(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -31309,7 +35346,7 @@ void CommandRewriteFilterFormulasForTectonicShiftArchive::SerializeWithCachedSiz
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFilterFormulasForTectonicShiftArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteConditionalStylesForRangeMoveArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31318,18 +35355,32 @@ ::google::protobuf::uint8* CommandRewriteFilterFormulasForTectonicShiftArchive::
         1, this->super(), target);
   }
 
-  // required .TSP.Reference filter_set = 2;
-  if (has_filter_set()) {
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
+  if (has_cells_to_rewrite()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->filter_set(), target);
+        5, this->cells_to_rewrite(), target);
   }
 
-  // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
-  if (has_tectonic_shift()) {
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
+  if (has_conditional_style_sets()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->tectonic_shift(), target);
+        6, this->conditional_style_sets(), target);
+  }
+
+  // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
+  if (has_from_range_reference()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->from_range_reference(), target);
+  }
+
+  // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
+  if (has_to_range_reference()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->to_range_reference(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -31339,7 +35390,7 @@ ::google::protobuf::uint8* CommandRewriteFilterFormulasForTectonicShiftArchive::
   return target;
 }
 
-int CommandRewriteFilterFormulasForTectonicShiftArchive::ByteSize() const {
+int CommandRewriteConditionalStylesForRangeMoveArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -31350,18 +35401,32 @@ int CommandRewriteFilterFormulasForTectonicShiftArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSP.Reference filter_set = 2;
-    if (has_filter_set()) {
+    // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
+    if (has_from_range_reference()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->filter_set());
+          this->from_range_reference());
     }
 
-    // required .TSCE.TectonicShiftArchive tectonic_shift = 3;
-    if (has_tectonic_shift()) {
+    // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
+    if (has_to_range_reference()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->tectonic_shift());
+          this->to_range_reference());
+    }
+
+    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
+    if (has_cells_to_rewrite()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cells_to_rewrite());
+    }
+
+    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
+    if (has_conditional_style_sets()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->conditional_style_sets());
     }
 
   }
@@ -31376,10 +35441,10 @@ int CommandRewriteFilterFormulasForTectonicShiftArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForRangeMoveArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFilterFormulasForTectonicShiftArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFilterFormulasForTectonicShiftArchive*>(
+  const CommandRewriteConditionalStylesForRangeMoveArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForRangeMoveArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -31388,65 +35453,76 @@ void CommandRewriteFilterFormulasForTectonicShiftArchive::MergeFrom(const ::goog
   }
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::MergeFrom(const CommandRewriteFilterFormulasForTectonicShiftArchive& from) {
+void CommandRewriteConditionalStylesForRangeMoveArchive::MergeFrom(const CommandRewriteConditionalStylesForRangeMoveArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_filter_set()) {
-      mutable_filter_set()->::TSP::Reference::MergeFrom(from.filter_set());
+    if (from.has_from_range_reference()) {
+      mutable_from_range_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.from_range_reference());
+    }
+    if (from.has_to_range_reference()) {
+      mutable_to_range_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.to_range_reference());
+    }
+    if (from.has_cells_to_rewrite()) {
+      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
     }
-    if (from.has_tectonic_shift()) {
-      mutable_tectonic_shift()->::TSCE::TectonicShiftArchive::MergeFrom(from.tectonic_shift());
+    if (from.has_conditional_style_sets()) {
+      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForRangeMoveArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::CopyFrom(const CommandRewriteFilterFormulasForTectonicShiftArchive& from) {
+void CommandRewriteConditionalStylesForRangeMoveArchive::CopyFrom(const CommandRewriteConditionalStylesForRangeMoveArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFilterFormulasForTectonicShiftArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandRewriteConditionalStylesForRangeMoveArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_filter_set()) {
-    if (!this->filter_set().IsInitialized()) return false;
+  if (has_from_range_reference()) {
+    if (!this->from_range_reference().IsInitialized()) return false;
   }
-  if (has_tectonic_shift()) {
-    if (!this->tectonic_shift().IsInitialized()) return false;
+  if (has_to_range_reference()) {
+    if (!this->to_range_reference().IsInitialized()) return false;
+  }
+  if (has_conditional_style_sets()) {
+    if (!this->conditional_style_sets().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteFilterFormulasForTectonicShiftArchive::Swap(CommandRewriteFilterFormulasForTectonicShiftArchive* other) {
+void CommandRewriteConditionalStylesForRangeMoveArchive::Swap(CommandRewriteConditionalStylesForRangeMoveArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(filter_set_, other->filter_set_);
-    std::swap(tectonic_shift_, other->tectonic_shift_);
+    std::swap(from_range_reference_, other->from_range_reference_);
+    std::swap(to_range_reference_, other->to_range_reference_);
+    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
+    std::swap(conditional_style_sets_, other->conditional_style_sets_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFilterFormulasForTectonicShiftArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteConditionalStylesForRangeMoveArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFilterFormulasForTectonicShiftArchive_descriptor_;
-  metadata.reflection = CommandRewriteFilterFormulasForTectonicShiftArchive_reflection_;
+  metadata.descriptor = CommandRewriteConditionalStylesForRangeMoveArchive_descriptor_;
+  metadata.reflection = CommandRewriteConditionalStylesForRangeMoveArchive_reflection_;
   return metadata;
 }
 
@@ -31454,93 +35530,100 @@ ::google::protobuf::Metadata CommandRewriteFilterFormulasForTectonicShiftArchive
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteFilterFormulasForSortArchive::kSuperFieldNumber;
-const int CommandRewriteFilterFormulasForSortArchive::kFilterSetFieldNumber;
-const int CommandRewriteFilterFormulasForSortArchive::kSortMappingFieldNumber;
-const int CommandRewriteFilterFormulasForSortArchive::kSortedTableIdFieldNumber;
+const int CommandRewriteConditionalStylesForCellMergeArchive::kSuperFieldNumber;
+const int CommandRewriteConditionalStylesForCellMergeArchive::kMergedTableIdFieldNumber;
+const int CommandRewriteConditionalStylesForCellMergeArchive::kMergedRangeFieldNumber;
+const int CommandRewriteConditionalStylesForCellMergeArchive::kCellsToRewriteFieldNumber;
+const int CommandRewriteConditionalStylesForCellMergeArchive::kConditionalStyleSetsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteFilterFormulasForSortArchive::CommandRewriteFilterFormulasForSortArchive()
+CommandRewriteConditionalStylesForCellMergeArchive::CommandRewriteConditionalStylesForCellMergeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteFilterFormulasForSortArchive::InitAsDefaultInstance() {
+void CommandRewriteConditionalStylesForCellMergeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  filter_set_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
-  sorted_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
+  merged_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
+  merged_range_ = const_cast< ::TSCE::RangeCoordinateArchive*>(&::TSCE::RangeCoordinateArchive::default_instance());
+  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
+  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
 }
 
-CommandRewriteFilterFormulasForSortArchive::CommandRewriteFilterFormulasForSortArchive(const CommandRewriteFilterFormulasForSortArchive& from)
+CommandRewriteConditionalStylesForCellMergeArchive::CommandRewriteConditionalStylesForCellMergeArchive(const CommandRewriteConditionalStylesForCellMergeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteFilterFormulasForSortArchive::SharedCtor() {
+void CommandRewriteConditionalStylesForCellMergeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  filter_set_ = NULL;
-  sort_mapping_ = NULL;
-  sorted_table_id_ = NULL;
+  merged_table_id_ = NULL;
+  merged_range_ = NULL;
+  cells_to_rewrite_ = NULL;
+  conditional_style_sets_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteFilterFormulasForSortArchive::~CommandRewriteFilterFormulasForSortArchive() {
+CommandRewriteConditionalStylesForCellMergeArchive::~CommandRewriteConditionalStylesForCellMergeArchive() {
   SharedDtor();
 }
 
-void CommandRewriteFilterFormulasForSortArchive::SharedDtor() {
+void CommandRewriteConditionalStylesForCellMergeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete filter_set_;
-    delete sort_mapping_;
-    delete sorted_table_id_;
+    delete merged_table_id_;
+    delete merged_range_;
+    delete cells_to_rewrite_;
+    delete conditional_style_sets_;
   }
 }
 
-void CommandRewriteFilterFormulasForSortArchive::SetCachedSize(int size) const {
+void CommandRewriteConditionalStylesForCellMergeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteFilterFormulasForSortArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForCellMergeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteFilterFormulasForSortArchive_descriptor_;
+  return CommandRewriteConditionalStylesForCellMergeArchive_descriptor_;
 }
 
-const CommandRewriteFilterFormulasForSortArchive& CommandRewriteFilterFormulasForSortArchive::default_instance() {
+const CommandRewriteConditionalStylesForCellMergeArchive& CommandRewriteConditionalStylesForCellMergeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteFilterFormulasForSortArchive* CommandRewriteFilterFormulasForSortArchive::default_instance_ = NULL;
+CommandRewriteConditionalStylesForCellMergeArchive* CommandRewriteConditionalStylesForCellMergeArchive::default_instance_ = NULL;
 
-CommandRewriteFilterFormulasForSortArchive* CommandRewriteFilterFormulasForSortArchive::New() const {
-  return new CommandRewriteFilterFormulasForSortArchive;
+CommandRewriteConditionalStylesForCellMergeArchive* CommandRewriteConditionalStylesForCellMergeArchive::New() const {
+  return new CommandRewriteConditionalStylesForCellMergeArchive;
 }
 
-void CommandRewriteFilterFormulasForSortArchive::Clear() {
+void CommandRewriteConditionalStylesForCellMergeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_filter_set()) {
-      if (filter_set_ != NULL) filter_set_->::TSP::Reference::Clear();
+    if (has_merged_table_id()) {
+      if (merged_table_id_ != NULL) merged_table_id_->::TSCE::CFUUIDArchive::Clear();
     }
-    if (has_sort_mapping()) {
-      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
+    if (has_merged_range()) {
+      if (merged_range_ != NULL) merged_range_->::TSCE::RangeCoordinateArchive::Clear();
     }
-    if (has_sorted_table_id()) {
-      if (sorted_table_id_ != NULL) sorted_table_id_->::TSCE::CFUUIDArchive::Clear();
+    if (has_cells_to_rewrite()) {
+      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
+    }
+    if (has_conditional_style_sets()) {
+      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteFilterFormulasForSortArchive::MergePartialFromCodedStream(
+bool CommandRewriteConditionalStylesForCellMergeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -31555,45 +35638,59 @@ bool CommandRewriteFilterFormulasForSortArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_filter_set;
+        if (input->ExpectTag(18)) goto parse_merged_table_id;
         break;
       }
 
-      // required .TSP.Reference filter_set = 2;
+      // required .TSCE.CFUUIDArchive merged_table_id = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_filter_set:
+         parse_merged_table_id:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_filter_set()));
+               input, mutable_merged_table_id()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_sort_mapping;
+        if (input->ExpectTag(26)) goto parse_merged_range;
         break;
       }
 
-      // required .TSK.ShuffleMappingArchive sort_mapping = 3;
+      // required .TSCE.RangeCoordinateArchive merged_range = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_sort_mapping:
+         parse_merged_range:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_sort_mapping()));
+               input, mutable_merged_range()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_sorted_table_id;
+        if (input->ExpectTag(34)) goto parse_cells_to_rewrite;
         break;
       }
 
-      // required .TSCE.CFUUIDArchive sorted_table_id = 4;
+      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_sorted_table_id:
+         parse_cells_to_rewrite:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_sorted_table_id()));
+               input, mutable_cells_to_rewrite()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_conditional_style_sets;
+        break;
+      }
+
+      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_conditional_style_sets:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_conditional_style_sets()));
         } else {
           goto handle_uninterpreted;
         }
@@ -31617,7 +35714,7 @@ bool CommandRewriteFilterFormulasForSortArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandRewriteFilterFormulasForSortArchive::SerializeWithCachedSizes(
+void CommandRewriteConditionalStylesForCellMergeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31625,22 +35722,28 @@ void CommandRewriteFilterFormulasForSortArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference filter_set = 2;
-  if (has_filter_set()) {
+  // required .TSCE.CFUUIDArchive merged_table_id = 2;
+  if (has_merged_table_id()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->filter_set(), output);
+      2, this->merged_table_id(), output);
   }
 
-  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-  if (has_sort_mapping()) {
+  // required .TSCE.RangeCoordinateArchive merged_range = 3;
+  if (has_merged_range()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->sort_mapping(), output);
+      3, this->merged_range(), output);
   }
 
-  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-  if (has_sorted_table_id()) {
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+  if (has_cells_to_rewrite()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->sorted_table_id(), output);
+      4, this->cells_to_rewrite(), output);
+  }
+
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+  if (has_conditional_style_sets()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->conditional_style_sets(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -31649,7 +35752,7 @@ void CommandRewriteFilterFormulasForSortArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandRewriteFilterFormulasForSortArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteConditionalStylesForCellMergeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31658,25 +35761,32 @@ ::google::protobuf::uint8* CommandRewriteFilterFormulasForSortArchive::Serialize
         1, this->super(), target);
   }
 
-  // required .TSP.Reference filter_set = 2;
-  if (has_filter_set()) {
+  // required .TSCE.CFUUIDArchive merged_table_id = 2;
+  if (has_merged_table_id()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->filter_set(), target);
+        2, this->merged_table_id(), target);
   }
 
-  // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-  if (has_sort_mapping()) {
+  // required .TSCE.RangeCoordinateArchive merged_range = 3;
+  if (has_merged_range()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->sort_mapping(), target);
+        3, this->merged_range(), target);
   }
 
-  // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-  if (has_sorted_table_id()) {
+  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+  if (has_cells_to_rewrite()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->sorted_table_id(), target);
+        4, this->cells_to_rewrite(), target);
+  }
+
+  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+  if (has_conditional_style_sets()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->conditional_style_sets(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -31686,7 +35796,7 @@ ::google::protobuf::uint8* CommandRewriteFilterFormulasForSortArchive::Serialize
   return target;
 }
 
-int CommandRewriteFilterFormulasForSortArchive::ByteSize() const {
+int CommandRewriteConditionalStylesForCellMergeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -31697,25 +35807,32 @@ int CommandRewriteFilterFormulasForSortArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSP.Reference filter_set = 2;
-    if (has_filter_set()) {
+    // required .TSCE.CFUUIDArchive merged_table_id = 2;
+    if (has_merged_table_id()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->filter_set());
+          this->merged_table_id());
     }
 
-    // required .TSK.ShuffleMappingArchive sort_mapping = 3;
-    if (has_sort_mapping()) {
+    // required .TSCE.RangeCoordinateArchive merged_range = 3;
+    if (has_merged_range()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->sort_mapping());
+          this->merged_range());
     }
 
-    // required .TSCE.CFUUIDArchive sorted_table_id = 4;
-    if (has_sorted_table_id()) {
+    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+    if (has_cells_to_rewrite()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->sorted_table_id());
+          this->cells_to_rewrite());
+    }
+
+    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+    if (has_conditional_style_sets()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->conditional_style_sets());
     }
 
   }
@@ -31730,10 +35847,10 @@ int CommandRewriteFilterFormulasForSortArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteFilterFormulasForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForCellMergeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteFilterFormulasForSortArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteFilterFormulasForSortArchive*>(
+  const CommandRewriteConditionalStylesForCellMergeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForCellMergeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -31742,69 +35859,73 @@ void CommandRewriteFilterFormulasForSortArchive::MergeFrom(const ::google::proto
   }
 }
 
-void CommandRewriteFilterFormulasForSortArchive::MergeFrom(const CommandRewriteFilterFormulasForSortArchive& from) {
+void CommandRewriteConditionalStylesForCellMergeArchive::MergeFrom(const CommandRewriteConditionalStylesForCellMergeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_filter_set()) {
-      mutable_filter_set()->::TSP::Reference::MergeFrom(from.filter_set());
+    if (from.has_merged_table_id()) {
+      mutable_merged_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.merged_table_id());
     }
-    if (from.has_sort_mapping()) {
-      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
+    if (from.has_merged_range()) {
+      mutable_merged_range()->::TSCE::RangeCoordinateArchive::MergeFrom(from.merged_range());
     }
-    if (from.has_sorted_table_id()) {
-      mutable_sorted_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.sorted_table_id());
+    if (from.has_cells_to_rewrite()) {
+      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
+    }
+    if (from.has_conditional_style_sets()) {
+      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteFilterFormulasForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteConditionalStylesForCellMergeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteFilterFormulasForSortArchive::CopyFrom(const CommandRewriteFilterFormulasForSortArchive& from) {
+void CommandRewriteConditionalStylesForCellMergeArchive::CopyFrom(const CommandRewriteConditionalStylesForCellMergeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteFilterFormulasForSortArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandRewriteConditionalStylesForCellMergeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_filter_set()) {
-    if (!this->filter_set().IsInitialized()) return false;
+  if (has_merged_range()) {
+    if (!this->merged_range().IsInitialized()) return false;
   }
-  if (has_sort_mapping()) {
-    if (!this->sort_mapping().IsInitialized()) return false;
+  if (has_conditional_style_sets()) {
+    if (!this->conditional_style_sets().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteFilterFormulasForSortArchive::Swap(CommandRewriteFilterFormulasForSortArchive* other) {
+void CommandRewriteConditionalStylesForCellMergeArchive::Swap(CommandRewriteConditionalStylesForCellMergeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(filter_set_, other->filter_set_);
-    std::swap(sort_mapping_, other->sort_mapping_);
-    std::swap(sorted_table_id_, other->sorted_table_id_);
+    std::swap(merged_table_id_, other->merged_table_id_);
+    std::swap(merged_range_, other->merged_range_);
+    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
+    std::swap(conditional_style_sets_, other->conditional_style_sets_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteFilterFormulasForSortArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteConditionalStylesForCellMergeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteFilterFormulasForSortArchive_descriptor_;
-  metadata.reflection = CommandRewriteFilterFormulasForSortArchive_reflection_;
+  metadata.descriptor = CommandRewriteConditionalStylesForCellMergeArchive_descriptor_;
+  metadata.reflection = CommandRewriteConditionalStylesForCellMergeArchive_reflection_;
   return metadata;
 }
 
@@ -31812,93 +35933,110 @@ ::google::protobuf::Metadata CommandRewriteFilterFormulasForSortArchive::GetMeta
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteConditionalStylesForTectonicShiftArchive::kSuperFieldNumber;
-const int CommandRewriteConditionalStylesForTectonicShiftArchive::kTectonicShiftFieldNumber;
-const int CommandRewriteConditionalStylesForTectonicShiftArchive::kCellsToRewriteFieldNumber;
-const int CommandRewriteConditionalStylesForTectonicShiftArchive::kConditionalStyleSetsFieldNumber;
+const int CommandMergeUnmergeArchive::kSuperFieldNumber;
+const int CommandMergeUnmergeArchive::kMergeActionFieldNumber;
+const int CommandMergeUnmergeArchive::kSelectionFieldNumber;
+const int CommandMergeUnmergeArchive::kUndoCellMapFieldNumber;
+const int CommandMergeUnmergeArchive::kRedoCellMapFieldNumber;
+const int CommandMergeUnmergeArchive::kOldMergeRangesFieldNumber;
+const int CommandMergeUnmergeArchive::kUndoFormulaRewriteCommandFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteConditionalStylesForTectonicShiftArchive::CommandRewriteConditionalStylesForTectonicShiftArchive()
+CommandMergeUnmergeArchive::CommandMergeUnmergeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::InitAsDefaultInstance() {
+void CommandMergeUnmergeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  tectonic_shift_ = const_cast< ::TSCE::TectonicShiftArchive*>(&::TSCE::TectonicShiftArchive::default_instance());
-  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
-  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  old_merge_ranges_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  undo_formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandRewriteConditionalStylesForTectonicShiftArchive::CommandRewriteConditionalStylesForTectonicShiftArchive(const CommandRewriteConditionalStylesForTectonicShiftArchive& from)
+CommandMergeUnmergeArchive::CommandMergeUnmergeArchive(const CommandMergeUnmergeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::SharedCtor() {
+void CommandMergeUnmergeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  tectonic_shift_ = NULL;
-  cells_to_rewrite_ = NULL;
-  conditional_style_sets_ = NULL;
+  merge_action_ = 0;
+  selection_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  old_merge_ranges_ = NULL;
+  undo_formula_rewrite_command_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteConditionalStylesForTectonicShiftArchive::~CommandRewriteConditionalStylesForTectonicShiftArchive() {
+CommandMergeUnmergeArchive::~CommandMergeUnmergeArchive() {
   SharedDtor();
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::SharedDtor() {
+void CommandMergeUnmergeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete tectonic_shift_;
-    delete cells_to_rewrite_;
-    delete conditional_style_sets_;
+    delete selection_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+    delete old_merge_ranges_;
+    delete undo_formula_rewrite_command_;
   }
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::SetCachedSize(int size) const {
+void CommandMergeUnmergeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForTectonicShiftArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMergeUnmergeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteConditionalStylesForTectonicShiftArchive_descriptor_;
+  return CommandMergeUnmergeArchive_descriptor_;
 }
 
-const CommandRewriteConditionalStylesForTectonicShiftArchive& CommandRewriteConditionalStylesForTectonicShiftArchive::default_instance() {
+const CommandMergeUnmergeArchive& CommandMergeUnmergeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteConditionalStylesForTectonicShiftArchive* CommandRewriteConditionalStylesForTectonicShiftArchive::default_instance_ = NULL;
+CommandMergeUnmergeArchive* CommandMergeUnmergeArchive::default_instance_ = NULL;
 
-CommandRewriteConditionalStylesForTectonicShiftArchive* CommandRewriteConditionalStylesForTectonicShiftArchive::New() const {
-  return new CommandRewriteConditionalStylesForTectonicShiftArchive;
+CommandMergeUnmergeArchive* CommandMergeUnmergeArchive::New() const {
+  return new CommandMergeUnmergeArchive;
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::Clear() {
+void CommandMergeUnmergeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_tectonic_shift()) {
-      if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
+    merge_action_ = 0;
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
     }
-    if (has_cells_to_rewrite()) {
-      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
     }
-    if (has_conditional_style_sets()) {
-      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_old_merge_ranges()) {
+      if (old_merge_ranges_ != NULL) old_merge_ranges_->::TSP::Reference::Clear();
+    }
+    if (has_undo_formula_rewrite_command()) {
+      if (undo_formula_rewrite_command_ != NULL) undo_formula_rewrite_command_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteConditionalStylesForTectonicShiftArchive::MergePartialFromCodedStream(
+bool CommandMergeUnmergeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -31913,45 +36051,94 @@ bool CommandRewriteConditionalStylesForTectonicShiftArchive::MergePartialFromCod
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_tectonic_shift;
+        if (input->ExpectTag(16)) goto parse_merge_action;
         break;
       }
 
-      // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+      // required .TST.MergeActionArchive merge_action = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_tectonic_shift:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_tectonic_shift()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_merge_action:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::MergeActionArchive_IsValid(value)) {
+            set_merge_action(static_cast< ::TST::MergeActionArchive >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_cells_to_rewrite;
+        if (input->ExpectTag(26)) goto parse_selection;
         break;
       }
 
-      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
+      // required .TST.SelectionArchive selection = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cells_to_rewrite:
+         parse_selection:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cells_to_rewrite()));
+               input, mutable_selection()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_conditional_style_sets;
+        if (input->ExpectTag(34)) goto parse_undo_cell_map;
         break;
       }
 
-      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
+      // required .TST.CellMapArchive undo_cell_map = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditional_style_sets:
+         parse_undo_cell_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditional_style_sets()));
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // required .TST.CellMapArchive redo_cell_map = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_old_merge_ranges;
+        break;
+      }
+
+      // optional .TSP.Reference old_merge_ranges = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_merge_ranges:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_merge_ranges()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_undo_formula_rewrite_command;
+        break;
+      }
+
+      // optional .TSP.Reference undo_formula_rewrite_command = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_formula_rewrite_command:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_formula_rewrite_command()));
         } else {
           goto handle_uninterpreted;
         }
@@ -31975,7 +36162,7 @@ bool CommandRewriteConditionalStylesForTectonicShiftArchive::MergePartialFromCod
 #undef DO_
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::SerializeWithCachedSizes(
+void CommandMergeUnmergeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -31983,22 +36170,40 @@ void CommandRewriteConditionalStylesForTectonicShiftArchive::SerializeWithCached
       1, this->super(), output);
   }
 
-  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
-  if (has_tectonic_shift()) {
+  // required .TST.MergeActionArchive merge_action = 2;
+  if (has_merge_action()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->merge_action(), output);
+  }
+
+  // required .TST.SelectionArchive selection = 3;
+  if (has_selection()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->tectonic_shift(), output);
+      3, this->selection(), output);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
-  if (has_cells_to_rewrite()) {
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->cells_to_rewrite(), output);
+      4, this->undo_cell_map(), output);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
-  if (has_conditional_style_sets()) {
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->conditional_style_sets(), output);
+      5, this->redo_cell_map(), output);
+  }
+
+  // optional .TSP.Reference old_merge_ranges = 8;
+  if (has_old_merge_ranges()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->old_merge_ranges(), output);
+  }
+
+  // optional .TSP.Reference undo_formula_rewrite_command = 9;
+  if (has_undo_formula_rewrite_command()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->undo_formula_rewrite_command(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -32007,34 +36212,54 @@ void CommandRewriteConditionalStylesForTectonicShiftArchive::SerializeWithCached
   }
 }
 
-::google::protobuf::uint8* CommandRewriteConditionalStylesForTectonicShiftArchive::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
+::google::protobuf::uint8* CommandMergeUnmergeArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
+  }
+
+  // required .TST.MergeActionArchive merge_action = 2;
+  if (has_merge_action()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->merge_action(), target);
+  }
+
+  // required .TST.SelectionArchive selection = 3;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->selection(), target);
+  }
+
+  // required .TST.CellMapArchive undo_cell_map = 4;
+  if (has_undo_cell_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+        4, this->undo_cell_map(), target);
   }
 
-  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
-  if (has_tectonic_shift()) {
+  // required .TST.CellMapArchive redo_cell_map = 5;
+  if (has_redo_cell_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->tectonic_shift(), target);
+        5, this->redo_cell_map(), target);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
-  if (has_cells_to_rewrite()) {
+  // optional .TSP.Reference old_merge_ranges = 8;
+  if (has_old_merge_ranges()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->cells_to_rewrite(), target);
+        8, this->old_merge_ranges(), target);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
-  if (has_conditional_style_sets()) {
+  // optional .TSP.Reference undo_formula_rewrite_command = 9;
+  if (has_undo_formula_rewrite_command()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->conditional_style_sets(), target);
+        9, this->undo_formula_rewrite_command(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -32044,7 +36269,7 @@ ::google::protobuf::uint8* CommandRewriteConditionalStylesForTectonicShiftArchiv
   return target;
 }
 
-int CommandRewriteConditionalStylesForTectonicShiftArchive::ByteSize() const {
+int CommandMergeUnmergeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -32055,25 +36280,45 @@ int CommandRewriteConditionalStylesForTectonicShiftArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
-    if (has_tectonic_shift()) {
+    // required .TST.MergeActionArchive merge_action = 2;
+    if (has_merge_action()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->merge_action());
+    }
+
+    // required .TST.SelectionArchive selection = 3;
+    if (has_selection()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->tectonic_shift());
+          this->selection());
     }
 
-    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 3;
-    if (has_cells_to_rewrite()) {
+    // required .TST.CellMapArchive undo_cell_map = 4;
+    if (has_undo_cell_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cells_to_rewrite());
+          this->undo_cell_map());
     }
 
-    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 4;
-    if (has_conditional_style_sets()) {
+    // required .TST.CellMapArchive redo_cell_map = 5;
+    if (has_redo_cell_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditional_style_sets());
+          this->redo_cell_map());
+    }
+
+    // optional .TSP.Reference old_merge_ranges = 8;
+    if (has_old_merge_ranges()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_merge_ranges());
+    }
+
+    // optional .TSP.Reference undo_formula_rewrite_command = 9;
+    if (has_undo_formula_rewrite_command()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_formula_rewrite_command());
     }
 
   }
@@ -32088,10 +36333,10 @@ int CommandRewriteConditionalStylesForTectonicShiftArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMergeUnmergeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteConditionalStylesForTectonicShiftArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForTectonicShiftArchive*>(
+  const CommandMergeUnmergeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMergeUnmergeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -32100,69 +36345,90 @@ void CommandRewriteConditionalStylesForTectonicShiftArchive::MergeFrom(const ::g
   }
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::MergeFrom(const CommandRewriteConditionalStylesForTectonicShiftArchive& from) {
+void CommandMergeUnmergeArchive::MergeFrom(const CommandMergeUnmergeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_tectonic_shift()) {
-      mutable_tectonic_shift()->::TSCE::TectonicShiftArchive::MergeFrom(from.tectonic_shift());
+    if (from.has_merge_action()) {
+      set_merge_action(from.merge_action());
     }
-    if (from.has_cells_to_rewrite()) {
-      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
     }
-    if (from.has_conditional_style_sets()) {
-      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+    if (from.has_old_merge_ranges()) {
+      mutable_old_merge_ranges()->::TSP::Reference::MergeFrom(from.old_merge_ranges());
+    }
+    if (from.has_undo_formula_rewrite_command()) {
+      mutable_undo_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.undo_formula_rewrite_command());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMergeUnmergeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::CopyFrom(const CommandRewriteConditionalStylesForTectonicShiftArchive& from) {
+void CommandMergeUnmergeArchive::CopyFrom(const CommandMergeUnmergeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteConditionalStylesForTectonicShiftArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandMergeUnmergeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_tectonic_shift()) {
-    if (!this->tectonic_shift().IsInitialized()) return false;
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
   }
-  if (has_conditional_style_sets()) {
-    if (!this->conditional_style_sets().IsInitialized()) return false;
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  if (has_old_merge_ranges()) {
+    if (!this->old_merge_ranges().IsInitialized()) return false;
+  }
+  if (has_undo_formula_rewrite_command()) {
+    if (!this->undo_formula_rewrite_command().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteConditionalStylesForTectonicShiftArchive::Swap(CommandRewriteConditionalStylesForTectonicShiftArchive* other) {
+void CommandMergeUnmergeArchive::Swap(CommandMergeUnmergeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(tectonic_shift_, other->tectonic_shift_);
-    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
-    std::swap(conditional_style_sets_, other->conditional_style_sets_);
+    std::swap(merge_action_, other->merge_action_);
+    std::swap(selection_, other->selection_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(old_merge_ranges_, other->old_merge_ranges_);
+    std::swap(undo_formula_rewrite_command_, other->undo_formula_rewrite_command_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteConditionalStylesForTectonicShiftArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMergeUnmergeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteConditionalStylesForTectonicShiftArchive_descriptor_;
-  metadata.reflection = CommandRewriteConditionalStylesForTectonicShiftArchive_reflection_;
+  metadata.descriptor = CommandMergeUnmergeArchive_descriptor_;
+  metadata.reflection = CommandMergeUnmergeArchive_reflection_;
   return metadata;
 }
 
@@ -32170,100 +36436,90 @@ ::google::protobuf::Metadata CommandRewriteConditionalStylesForTectonicShiftArch
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteConditionalStylesForSortArchive::kSuperFieldNumber;
-const int CommandRewriteConditionalStylesForSortArchive::kSortMappingFieldNumber;
-const int CommandRewriteConditionalStylesForSortArchive::kSortedTableIdFieldNumber;
-const int CommandRewriteConditionalStylesForSortArchive::kCellsToRewriteFieldNumber;
-const int CommandRewriteConditionalStylesForSortArchive::kConditionalStyleSetsFieldNumber;
+const int CommandHideShowArchive::kSuperFieldNumber;
+const int CommandHideShowArchive::kDirectionFieldNumber;
+const int CommandHideShowArchive::kHideShowActionFieldNumber;
+const int CommandHideShowArchive::kHidingActionFieldNumber;
+const int CommandHideShowArchive::kElementsAffectedFieldNumber;
+const int CommandHideShowArchive::kOldHidingStatesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteConditionalStylesForSortArchive::CommandRewriteConditionalStylesForSortArchive()
+CommandHideShowArchive::CommandHideShowArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteConditionalStylesForSortArchive::InitAsDefaultInstance() {
+void CommandHideShowArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
-  sorted_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
-  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
-  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
+  elements_affected_ = const_cast< ::TSP::IndexSet*>(&::TSP::IndexSet::default_instance());
 }
 
-CommandRewriteConditionalStylesForSortArchive::CommandRewriteConditionalStylesForSortArchive(const CommandRewriteConditionalStylesForSortArchive& from)
+CommandHideShowArchive::CommandHideShowArchive(const CommandHideShowArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForSortArchive::SharedCtor() {
+void CommandHideShowArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  sort_mapping_ = NULL;
-  sorted_table_id_ = NULL;
-  cells_to_rewrite_ = NULL;
-  conditional_style_sets_ = NULL;
+  direction_ = 0;
+  hide_show_action_ = 0;
+  hiding_action_ = 0u;
+  elements_affected_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteConditionalStylesForSortArchive::~CommandRewriteConditionalStylesForSortArchive() {
+CommandHideShowArchive::~CommandHideShowArchive() {
   SharedDtor();
 }
 
-void CommandRewriteConditionalStylesForSortArchive::SharedDtor() {
+void CommandHideShowArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete sort_mapping_;
-    delete sorted_table_id_;
-    delete cells_to_rewrite_;
-    delete conditional_style_sets_;
+    delete elements_affected_;
   }
 }
 
-void CommandRewriteConditionalStylesForSortArchive::SetCachedSize(int size) const {
+void CommandHideShowArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForSortArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandHideShowArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteConditionalStylesForSortArchive_descriptor_;
+  return CommandHideShowArchive_descriptor_;
 }
 
-const CommandRewriteConditionalStylesForSortArchive& CommandRewriteConditionalStylesForSortArchive::default_instance() {
+const CommandHideShowArchive& CommandHideShowArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteConditionalStylesForSortArchive* CommandRewriteConditionalStylesForSortArchive::default_instance_ = NULL;
+CommandHideShowArchive* CommandHideShowArchive::default_instance_ = NULL;
 
-CommandRewriteConditionalStylesForSortArchive* CommandRewriteConditionalStylesForSortArchive::New() const {
-  return new CommandRewriteConditionalStylesForSortArchive;
+CommandHideShowArchive* CommandHideShowArchive::New() const {
+  return new CommandHideShowArchive;
 }
 
-void CommandRewriteConditionalStylesForSortArchive::Clear() {
+void CommandHideShowArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_sort_mapping()) {
-      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
-    }
-    if (has_sorted_table_id()) {
-      if (sorted_table_id_ != NULL) sorted_table_id_->::TSCE::CFUUIDArchive::Clear();
-    }
-    if (has_cells_to_rewrite()) {
-      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
-    }
-    if (has_conditional_style_sets()) {
-      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
+    direction_ = 0;
+    hide_show_action_ = 0;
+    hiding_action_ = 0u;
+    if (has_elements_affected()) {
+      if (elements_affected_ != NULL) elements_affected_->::TSP::IndexSet::Clear();
     }
   }
+  old_hiding_states_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteConditionalStylesForSortArchive::MergePartialFromCodedStream(
+bool CommandHideShowArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -32278,62 +36534,100 @@ bool CommandRewriteConditionalStylesForSortArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_sort_mapping;
+        if (input->ExpectTag(16)) goto parse_direction;
         break;
       }
 
-      // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+      // required .TST.CommandDirectionArchive direction = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_sort_mapping:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_sort_mapping()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_direction:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::CommandDirectionArchive_IsValid(value)) {
+            set_direction(static_cast< ::TST::CommandDirectionArchive >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_sorted_table_id;
+        if (input->ExpectTag(24)) goto parse_hide_show_action;
         break;
       }
 
-      // required .TSCE.CFUUIDArchive sorted_table_id = 3;
+      // required .TST.HideShowActionArchive hide_show_action = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_sorted_table_id:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_sorted_table_id()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_hide_show_action:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::HideShowActionArchive_IsValid(value)) {
+            set_hide_show_action(static_cast< ::TST::HideShowActionArchive >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(3, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_cells_to_rewrite;
+        if (input->ExpectTag(32)) goto parse_hiding_action;
         break;
       }
 
-      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
+      // required uint32 hiding_action = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cells_to_rewrite:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cells_to_rewrite()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_hiding_action:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &hiding_action_)));
+          set_has_hiding_action();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_conditional_style_sets;
+        if (input->ExpectTag(42)) goto parse_elements_affected;
         break;
       }
 
-      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
+      // required .TSP.IndexSet elements_affected = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditional_style_sets:
+         parse_elements_affected:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditional_style_sets()));
+               input, mutable_elements_affected()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_old_hiding_states;
+        break;
+      }
+
+      // repeated uint32 old_hiding_states = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_old_hiding_states:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 1, 56, input, this->mutable_old_hiding_states())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_old_hiding_states())));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(56)) goto parse_old_hiding_states;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -32354,7 +36648,7 @@ bool CommandRewriteConditionalStylesForSortArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandRewriteConditionalStylesForSortArchive::SerializeWithCachedSizes(
+void CommandHideShowArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -32362,28 +36656,33 @@ void CommandRewriteConditionalStylesForSortArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
-  if (has_sort_mapping()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->sort_mapping(), output);
+  // required .TST.CommandDirectionArchive direction = 2;
+  if (has_direction()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->direction(), output);
   }
 
-  // required .TSCE.CFUUIDArchive sorted_table_id = 3;
-  if (has_sorted_table_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->sorted_table_id(), output);
+  // required .TST.HideShowActionArchive hide_show_action = 3;
+  if (has_hide_show_action()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      3, this->hide_show_action(), output);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-  if (has_cells_to_rewrite()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->cells_to_rewrite(), output);
+  // required uint32 hiding_action = 4;
+  if (has_hiding_action()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->hiding_action(), output);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-  if (has_conditional_style_sets()) {
+  // required .TSP.IndexSet elements_affected = 5;
+  if (has_elements_affected()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->conditional_style_sets(), output);
+      5, this->elements_affected(), output);
+  }
+
+  // repeated uint32 old_hiding_states = 7;
+  for (int i = 0; i < this->old_hiding_states_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
+      7, this->old_hiding_states(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -32392,7 +36691,7 @@ void CommandRewriteConditionalStylesForSortArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandRewriteConditionalStylesForSortArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandHideShowArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -32401,32 +36700,34 @@ ::google::protobuf::uint8* CommandRewriteConditionalStylesForSortArchive::Serial
         1, this->super(), target);
   }
 
-  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
-  if (has_sort_mapping()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->sort_mapping(), target);
+  // required .TST.CommandDirectionArchive direction = 2;
+  if (has_direction()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->direction(), target);
   }
 
-  // required .TSCE.CFUUIDArchive sorted_table_id = 3;
-  if (has_sorted_table_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->sorted_table_id(), target);
+  // required .TST.HideShowActionArchive hide_show_action = 3;
+  if (has_hide_show_action()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      3, this->hide_show_action(), target);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-  if (has_cells_to_rewrite()) {
+  // required uint32 hiding_action = 4;
+  if (has_hiding_action()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->hiding_action(), target);
+  }
+
+  // required .TSP.IndexSet elements_affected = 5;
+  if (has_elements_affected()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->cells_to_rewrite(), target);
+        5, this->elements_affected(), target);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-  if (has_conditional_style_sets()) {
+  // repeated uint32 old_hiding_states = 7;
+  for (int i = 0; i < this->old_hiding_states_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->conditional_style_sets(), target);
+      WriteUInt32ToArray(7, this->old_hiding_states(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -32436,7 +36737,7 @@ ::google::protobuf::uint8* CommandRewriteConditionalStylesForSortArchive::Serial
   return target;
 }
 
-int CommandRewriteConditionalStylesForSortArchive::ByteSize() const {
+int CommandHideShowArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -32447,35 +36748,43 @@ int CommandRewriteConditionalStylesForSortArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TSK.ShuffleMappingArchive sort_mapping = 2;
-    if (has_sort_mapping()) {
+    // required .TST.CommandDirectionArchive direction = 2;
+    if (has_direction()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->sort_mapping());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->direction());
     }
 
-    // required .TSCE.CFUUIDArchive sorted_table_id = 3;
-    if (has_sorted_table_id()) {
+    // required .TST.HideShowActionArchive hide_show_action = 3;
+    if (has_hide_show_action()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->sorted_table_id());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->hide_show_action());
     }
 
-    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-    if (has_cells_to_rewrite()) {
+    // required uint32 hiding_action = 4;
+    if (has_hiding_action()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cells_to_rewrite());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->hiding_action());
     }
 
-    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-    if (has_conditional_style_sets()) {
+    // required .TSP.IndexSet elements_affected = 5;
+    if (has_elements_affected()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditional_style_sets());
+          this->elements_affected());
     }
 
   }
+  // repeated uint32 old_hiding_states = 7;
+  {
+    int data_size = 0;
+    for (int i = 0; i < this->old_hiding_states_size(); i++) {
+      data_size += ::google::protobuf::internal::WireFormatLite::
+        UInt32Size(this->old_hiding_states(i));
+    }
+    total_size += 1 * this->old_hiding_states_size() + data_size;
+  }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -32487,10 +36796,10 @@ int CommandRewriteConditionalStylesForSortArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteConditionalStylesForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandHideShowArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteConditionalStylesForSortArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForSortArchive*>(
+  const CommandHideShowArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandHideShowArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -32499,73 +36808,72 @@ void CommandRewriteConditionalStylesForSortArchive::MergeFrom(const ::google::pr
   }
 }
 
-void CommandRewriteConditionalStylesForSortArchive::MergeFrom(const CommandRewriteConditionalStylesForSortArchive& from) {
+void CommandHideShowArchive::MergeFrom(const CommandHideShowArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  old_hiding_states_.MergeFrom(from.old_hiding_states_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_sort_mapping()) {
-      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
+    if (from.has_direction()) {
+      set_direction(from.direction());
     }
-    if (from.has_sorted_table_id()) {
-      mutable_sorted_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.sorted_table_id());
+    if (from.has_hide_show_action()) {
+      set_hide_show_action(from.hide_show_action());
     }
-    if (from.has_cells_to_rewrite()) {
-      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
+    if (from.has_hiding_action()) {
+      set_hiding_action(from.hiding_action());
     }
-    if (from.has_conditional_style_sets()) {
-      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
+    if (from.has_elements_affected()) {
+      mutable_elements_affected()->::TSP::IndexSet::MergeFrom(from.elements_affected());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteConditionalStylesForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandHideShowArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForSortArchive::CopyFrom(const CommandRewriteConditionalStylesForSortArchive& from) {
+void CommandHideShowArchive::CopyFrom(const CommandHideShowArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteConditionalStylesForSortArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandHideShowArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_sort_mapping()) {
-    if (!this->sort_mapping().IsInitialized()) return false;
-  }
-  if (has_conditional_style_sets()) {
-    if (!this->conditional_style_sets().IsInitialized()) return false;
+  if (has_elements_affected()) {
+    if (!this->elements_affected().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteConditionalStylesForSortArchive::Swap(CommandRewriteConditionalStylesForSortArchive* other) {
+void CommandHideShowArchive::Swap(CommandHideShowArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(sort_mapping_, other->sort_mapping_);
-    std::swap(sorted_table_id_, other->sorted_table_id_);
-    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
-    std::swap(conditional_style_sets_, other->conditional_style_sets_);
+    std::swap(direction_, other->direction_);
+    std::swap(hide_show_action_, other->hide_show_action_);
+    std::swap(hiding_action_, other->hiding_action_);
+    std::swap(elements_affected_, other->elements_affected_);
+    old_hiding_states_.Swap(&other->old_hiding_states_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteConditionalStylesForSortArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandHideShowArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteConditionalStylesForSortArchive_descriptor_;
-  metadata.reflection = CommandRewriteConditionalStylesForSortArchive_reflection_;
+  metadata.descriptor = CommandHideShowArchive_descriptor_;
+  metadata.reflection = CommandHideShowArchive_reflection_;
   return metadata;
 }
 
@@ -32573,106 +36881,115 @@ ::google::protobuf::Metadata CommandRewriteConditionalStylesForSortArchive::GetM
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteConditionalStylesForRangeMoveArchive::kSuperFieldNumber;
-const int CommandRewriteConditionalStylesForRangeMoveArchive::kFromRangeReferenceFieldNumber;
-const int CommandRewriteConditionalStylesForRangeMoveArchive::kToRangeReferenceFieldNumber;
-const int CommandRewriteConditionalStylesForRangeMoveArchive::kCellsToRewriteFieldNumber;
-const int CommandRewriteConditionalStylesForRangeMoveArchive::kConditionalStyleSetsFieldNumber;
+const int TableInfoGeometryCommandArchive::kSuperFieldNumber;
+const int TableInfoGeometryCommandArchive::kScaleFactorFieldNumber;
+const int TableInfoGeometryCommandArchive::kTableInfoFieldNumber;
+const int TableInfoGeometryCommandArchive::kNewGeometryFieldNumber;
+const int TableInfoGeometryCommandArchive::kOldGeometryFieldNumber;
+const int TableInfoGeometryCommandArchive::kTurnOffAutoResizeFieldNumber;
+const int TableInfoGeometryCommandArchive::kShouldClearObjectPlaceholderFlagFieldNumber;
+const int TableInfoGeometryCommandArchive::kDidMatchObjectPlaceholderGeometryFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteConditionalStylesForRangeMoveArchive::CommandRewriteConditionalStylesForRangeMoveArchive()
+TableInfoGeometryCommandArchive::TableInfoGeometryCommandArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  from_range_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
-  to_range_reference_ = const_cast< ::TSCE::RangeReferenceArchive*>(&::TSCE::RangeReferenceArchive::default_instance());
-  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
-  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
+void TableInfoGeometryCommandArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  scale_factor_ = const_cast< ::TSP::Size*>(&::TSP::Size::default_instance());
+  table_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  new_geometry_ = const_cast< ::TSD::GeometryArchive*>(&::TSD::GeometryArchive::default_instance());
+  old_geometry_ = const_cast< ::TSD::GeometryArchive*>(&::TSD::GeometryArchive::default_instance());
 }
 
-CommandRewriteConditionalStylesForRangeMoveArchive::CommandRewriteConditionalStylesForRangeMoveArchive(const CommandRewriteConditionalStylesForRangeMoveArchive& from)
+TableInfoGeometryCommandArchive::TableInfoGeometryCommandArchive(const TableInfoGeometryCommandArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::SharedCtor() {
+void TableInfoGeometryCommandArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  from_range_reference_ = NULL;
-  to_range_reference_ = NULL;
-  cells_to_rewrite_ = NULL;
-  conditional_style_sets_ = NULL;
+  scale_factor_ = NULL;
+  table_info_ = NULL;
+  new_geometry_ = NULL;
+  old_geometry_ = NULL;
+  turn_off_auto_resize_ = false;
+  should_clear_object_placeholder_flag_ = false;
+  did_match_object_placeholder_geometry_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteConditionalStylesForRangeMoveArchive::~CommandRewriteConditionalStylesForRangeMoveArchive() {
+TableInfoGeometryCommandArchive::~TableInfoGeometryCommandArchive() {
   SharedDtor();
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::SharedDtor() {
+void TableInfoGeometryCommandArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete from_range_reference_;
-    delete to_range_reference_;
-    delete cells_to_rewrite_;
-    delete conditional_style_sets_;
+    delete scale_factor_;
+    delete table_info_;
+    delete new_geometry_;
+    delete old_geometry_;
   }
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::SetCachedSize(int size) const {
+void TableInfoGeometryCommandArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForRangeMoveArchive::descriptor() {
+const ::google::protobuf::Descriptor* TableInfoGeometryCommandArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteConditionalStylesForRangeMoveArchive_descriptor_;
+  return TableInfoGeometryCommandArchive_descriptor_;
 }
 
-const CommandRewriteConditionalStylesForRangeMoveArchive& CommandRewriteConditionalStylesForRangeMoveArchive::default_instance() {
+const TableInfoGeometryCommandArchive& TableInfoGeometryCommandArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteConditionalStylesForRangeMoveArchive* CommandRewriteConditionalStylesForRangeMoveArchive::default_instance_ = NULL;
+TableInfoGeometryCommandArchive* TableInfoGeometryCommandArchive::default_instance_ = NULL;
 
-CommandRewriteConditionalStylesForRangeMoveArchive* CommandRewriteConditionalStylesForRangeMoveArchive::New() const {
-  return new CommandRewriteConditionalStylesForRangeMoveArchive;
+TableInfoGeometryCommandArchive* TableInfoGeometryCommandArchive::New() const {
+  return new TableInfoGeometryCommandArchive;
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::Clear() {
+void TableInfoGeometryCommandArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_from_range_reference()) {
-      if (from_range_reference_ != NULL) from_range_reference_->::TSCE::RangeReferenceArchive::Clear();
+    if (has_scale_factor()) {
+      if (scale_factor_ != NULL) scale_factor_->::TSP::Size::Clear();
     }
-    if (has_to_range_reference()) {
-      if (to_range_reference_ != NULL) to_range_reference_->::TSCE::RangeReferenceArchive::Clear();
+    if (has_table_info()) {
+      if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
     }
-    if (has_cells_to_rewrite()) {
-      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
+    if (has_new_geometry()) {
+      if (new_geometry_ != NULL) new_geometry_->::TSD::GeometryArchive::Clear();
     }
-    if (has_conditional_style_sets()) {
-      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
+    if (has_old_geometry()) {
+      if (old_geometry_ != NULL) old_geometry_->::TSD::GeometryArchive::Clear();
     }
+    turn_off_auto_resize_ = false;
+    should_clear_object_placeholder_flag_ = false;
+    did_match_object_placeholder_geometry_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteConditionalStylesForRangeMoveArchive::MergePartialFromCodedStream(
+bool TableInfoGeometryCommandArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -32681,59 +36998,107 @@ bool CommandRewriteConditionalStylesForRangeMoveArchive::MergePartialFromCodedSt
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_cells_to_rewrite;
+        if (input->ExpectTag(18)) goto parse_scale_factor;
         break;
       }
 
-      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
-      case 5: {
+      // required .TSP.Size scale_factor = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cells_to_rewrite:
+         parse_scale_factor:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cells_to_rewrite()));
+               input, mutable_scale_factor()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_conditional_style_sets;
+        if (input->ExpectTag(26)) goto parse_table_info;
         break;
       }
 
-      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
-      case 6: {
+      // optional .TSP.Reference table_info = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditional_style_sets:
+         parse_table_info:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditional_style_sets()));
+               input, mutable_table_info()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_from_range_reference;
+        if (input->ExpectTag(34)) goto parse_new_geometry;
         break;
       }
 
-      // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
-      case 7: {
+      // optional .TSD.GeometryArchive new_geometry = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_from_range_reference:
+         parse_new_geometry:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_from_range_reference()));
+               input, mutable_new_geometry()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_to_range_reference;
+        if (input->ExpectTag(42)) goto parse_old_geometry;
         break;
       }
 
-      // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
-      case 8: {
+      // optional .TSD.GeometryArchive old_geometry = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_to_range_reference:
+         parse_old_geometry:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_to_range_reference()));
+               input, mutable_old_geometry()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_turn_off_auto_resize;
+        break;
+      }
+
+      // optional bool turn_off_auto_resize = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_turn_off_auto_resize:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &turn_off_auto_resize_)));
+          set_has_turn_off_auto_resize();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_should_clear_object_placeholder_flag;
+        break;
+      }
+
+      // optional bool should_clear_object_placeholder_flag = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_should_clear_object_placeholder_flag:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &should_clear_object_placeholder_flag_)));
+          set_has_should_clear_object_placeholder_flag();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_did_match_object_placeholder_geometry;
+        break;
+      }
+
+      // optional bool did_match_object_placeholder_geometry = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_did_match_object_placeholder_geometry:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &did_match_object_placeholder_geometry_)));
+          set_has_did_match_object_placeholder_geometry();
         } else {
           goto handle_uninterpreted;
         }
@@ -32757,36 +37122,51 @@ bool CommandRewriteConditionalStylesForRangeMoveArchive::MergePartialFromCodedSt
 #undef DO_
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::SerializeWithCachedSizes(
+void TableInfoGeometryCommandArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
-  if (has_cells_to_rewrite()) {
+  // required .TSP.Size scale_factor = 2;
+  if (has_scale_factor()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->cells_to_rewrite(), output);
+      2, this->scale_factor(), output);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
-  if (has_conditional_style_sets()) {
+  // optional .TSP.Reference table_info = 3;
+  if (has_table_info()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->conditional_style_sets(), output);
+      3, this->table_info(), output);
   }
 
-  // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
-  if (has_from_range_reference()) {
+  // optional .TSD.GeometryArchive new_geometry = 4;
+  if (has_new_geometry()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->from_range_reference(), output);
+      4, this->new_geometry(), output);
   }
 
-  // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
-  if (has_to_range_reference()) {
+  // optional .TSD.GeometryArchive old_geometry = 5;
+  if (has_old_geometry()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->to_range_reference(), output);
+      5, this->old_geometry(), output);
+  }
+
+  // optional bool turn_off_auto_resize = 6;
+  if (has_turn_off_auto_resize()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->turn_off_auto_resize(), output);
+  }
+
+  // optional bool should_clear_object_placeholder_flag = 7;
+  if (has_should_clear_object_placeholder_flag()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->should_clear_object_placeholder_flag(), output);
+  }
+
+  // optional bool did_match_object_placeholder_geometry = 8;
+  if (has_did_match_object_placeholder_geometry()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->did_match_object_placeholder_geometry(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -32795,41 +37175,56 @@ void CommandRewriteConditionalStylesForRangeMoveArchive::SerializeWithCachedSize
   }
 }
 
-::google::protobuf::uint8* CommandRewriteConditionalStylesForRangeMoveArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* TableInfoGeometryCommandArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
-  if (has_cells_to_rewrite()) {
+  // required .TSP.Size scale_factor = 2;
+  if (has_scale_factor()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->cells_to_rewrite(), target);
+        2, this->scale_factor(), target);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
-  if (has_conditional_style_sets()) {
+  // optional .TSP.Reference table_info = 3;
+  if (has_table_info()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->conditional_style_sets(), target);
+        3, this->table_info(), target);
   }
 
-  // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
-  if (has_from_range_reference()) {
+  // optional .TSD.GeometryArchive new_geometry = 4;
+  if (has_new_geometry()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->from_range_reference(), target);
+        4, this->new_geometry(), target);
   }
 
-  // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
-  if (has_to_range_reference()) {
+  // optional .TSD.GeometryArchive old_geometry = 5;
+  if (has_old_geometry()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        8, this->to_range_reference(), target);
+        5, this->old_geometry(), target);
+  }
+
+  // optional bool turn_off_auto_resize = 6;
+  if (has_turn_off_auto_resize()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->turn_off_auto_resize(), target);
+  }
+
+  // optional bool should_clear_object_placeholder_flag = 7;
+  if (has_should_clear_object_placeholder_flag()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->should_clear_object_placeholder_flag(), target);
+  }
+
+  // optional bool did_match_object_placeholder_geometry = 8;
+  if (has_did_match_object_placeholder_geometry()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->did_match_object_placeholder_geometry(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -32839,43 +37234,58 @@ ::google::protobuf::uint8* CommandRewriteConditionalStylesForRangeMoveArchive::S
   return target;
 }
 
-int CommandRewriteConditionalStylesForRangeMoveArchive::ByteSize() const {
+int TableInfoGeometryCommandArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TSK.CommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // optional .TSCE.RangeReferenceArchive from_range_reference = 7;
-    if (has_from_range_reference()) {
+    // required .TSP.Size scale_factor = 2;
+    if (has_scale_factor()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->from_range_reference());
+          this->scale_factor());
     }
 
-    // optional .TSCE.RangeReferenceArchive to_range_reference = 8;
-    if (has_to_range_reference()) {
+    // optional .TSP.Reference table_info = 3;
+    if (has_table_info()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->to_range_reference());
+          this->table_info());
     }
 
-    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 5;
-    if (has_cells_to_rewrite()) {
+    // optional .TSD.GeometryArchive new_geometry = 4;
+    if (has_new_geometry()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cells_to_rewrite());
+          this->new_geometry());
     }
 
-    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 6;
-    if (has_conditional_style_sets()) {
+    // optional .TSD.GeometryArchive old_geometry = 5;
+    if (has_old_geometry()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditional_style_sets());
+          this->old_geometry());
+    }
+
+    // optional bool turn_off_auto_resize = 6;
+    if (has_turn_off_auto_resize()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool should_clear_object_placeholder_flag = 7;
+    if (has_should_clear_object_placeholder_flag()) {
+      total_size += 1 + 1;
+    }
+
+    // optional bool did_match_object_placeholder_geometry = 8;
+    if (has_did_match_object_placeholder_geometry()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -32890,10 +37300,10 @@ int CommandRewriteConditionalStylesForRangeMoveArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void TableInfoGeometryCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteConditionalStylesForRangeMoveArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForRangeMoveArchive*>(
+  const TableInfoGeometryCommandArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableInfoGeometryCommandArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -32902,76 +37312,91 @@ void CommandRewriteConditionalStylesForRangeMoveArchive::MergeFrom(const ::googl
   }
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::MergeFrom(const CommandRewriteConditionalStylesForRangeMoveArchive& from) {
+void TableInfoGeometryCommandArchive::MergeFrom(const TableInfoGeometryCommandArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_from_range_reference()) {
-      mutable_from_range_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.from_range_reference());
+    if (from.has_scale_factor()) {
+      mutable_scale_factor()->::TSP::Size::MergeFrom(from.scale_factor());
     }
-    if (from.has_to_range_reference()) {
-      mutable_to_range_reference()->::TSCE::RangeReferenceArchive::MergeFrom(from.to_range_reference());
+    if (from.has_table_info()) {
+      mutable_table_info()->::TSP::Reference::MergeFrom(from.table_info());
     }
-    if (from.has_cells_to_rewrite()) {
-      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
+    if (from.has_new_geometry()) {
+      mutable_new_geometry()->::TSD::GeometryArchive::MergeFrom(from.new_geometry());
     }
-    if (from.has_conditional_style_sets()) {
-      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
+    if (from.has_old_geometry()) {
+      mutable_old_geometry()->::TSD::GeometryArchive::MergeFrom(from.old_geometry());
+    }
+    if (from.has_turn_off_auto_resize()) {
+      set_turn_off_auto_resize(from.turn_off_auto_resize());
+    }
+    if (from.has_should_clear_object_placeholder_flag()) {
+      set_should_clear_object_placeholder_flag(from.should_clear_object_placeholder_flag());
+    }
+    if (from.has_did_match_object_placeholder_geometry()) {
+      set_did_match_object_placeholder_geometry(from.did_match_object_placeholder_geometry());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void TableInfoGeometryCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::CopyFrom(const CommandRewriteConditionalStylesForRangeMoveArchive& from) {
+void TableInfoGeometryCommandArchive::CopyFrom(const TableInfoGeometryCommandArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteConditionalStylesForRangeMoveArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool TableInfoGeometryCommandArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_from_range_reference()) {
-    if (!this->from_range_reference().IsInitialized()) return false;
+  if (has_scale_factor()) {
+    if (!this->scale_factor().IsInitialized()) return false;
   }
-  if (has_to_range_reference()) {
-    if (!this->to_range_reference().IsInitialized()) return false;
+  if (has_table_info()) {
+    if (!this->table_info().IsInitialized()) return false;
   }
-  if (has_conditional_style_sets()) {
-    if (!this->conditional_style_sets().IsInitialized()) return false;
+  if (has_new_geometry()) {
+    if (!this->new_geometry().IsInitialized()) return false;
+  }
+  if (has_old_geometry()) {
+    if (!this->old_geometry().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandRewriteConditionalStylesForRangeMoveArchive::Swap(CommandRewriteConditionalStylesForRangeMoveArchive* other) {
+void TableInfoGeometryCommandArchive::Swap(TableInfoGeometryCommandArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(from_range_reference_, other->from_range_reference_);
-    std::swap(to_range_reference_, other->to_range_reference_);
-    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
-    std::swap(conditional_style_sets_, other->conditional_style_sets_);
+    std::swap(scale_factor_, other->scale_factor_);
+    std::swap(table_info_, other->table_info_);
+    std::swap(new_geometry_, other->new_geometry_);
+    std::swap(old_geometry_, other->old_geometry_);
+    std::swap(turn_off_auto_resize_, other->turn_off_auto_resize_);
+    std::swap(should_clear_object_placeholder_flag_, other->should_clear_object_placeholder_flag_);
+    std::swap(did_match_object_placeholder_geometry_, other->did_match_object_placeholder_geometry_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteConditionalStylesForRangeMoveArchive::GetMetadata() const {
+::google::protobuf::Metadata TableInfoGeometryCommandArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteConditionalStylesForRangeMoveArchive_descriptor_;
-  metadata.reflection = CommandRewriteConditionalStylesForRangeMoveArchive_reflection_;
+  metadata.descriptor = TableInfoGeometryCommandArchive_descriptor_;
+  metadata.reflection = TableInfoGeometryCommandArchive_reflection_;
   return metadata;
 }
 
@@ -32979,106 +37404,104 @@ ::google::protobuf::Metadata CommandRewriteConditionalStylesForRangeMoveArchive:
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandRewriteConditionalStylesForCellMergeArchive::kSuperFieldNumber;
-const int CommandRewriteConditionalStylesForCellMergeArchive::kMergedTableIdFieldNumber;
-const int CommandRewriteConditionalStylesForCellMergeArchive::kMergedRangeFieldNumber;
-const int CommandRewriteConditionalStylesForCellMergeArchive::kCellsToRewriteFieldNumber;
-const int CommandRewriteConditionalStylesForCellMergeArchive::kConditionalStyleSetsFieldNumber;
+const int FormulaEditingCommandGroupArchive::kSuperFieldNumber;
+const int FormulaEditingCommandGroupArchive::kUndoSelectionValidFieldNumber;
+const int FormulaEditingCommandGroupArchive::kUndoSelectionStartFieldNumber;
+const int FormulaEditingCommandGroupArchive::kUndoSelectionLengthFieldNumber;
+const int FormulaEditingCommandGroupArchive::kUndoActiveTokenFieldNumber;
+const int FormulaEditingCommandGroupArchive::kRedoSelectionValidFieldNumber;
+const int FormulaEditingCommandGroupArchive::kRedoSelectionStartFieldNumber;
+const int FormulaEditingCommandGroupArchive::kRedoSelectionLengthFieldNumber;
+const int FormulaEditingCommandGroupArchive::kRedoActiveTokenFieldNumber;
 #endif  // !_MSC_VER
 
-CommandRewriteConditionalStylesForCellMergeArchive::CommandRewriteConditionalStylesForCellMergeArchive()
+FormulaEditingCommandGroupArchive::FormulaEditingCommandGroupArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  merged_table_id_ = const_cast< ::TSCE::CFUUIDArchive*>(&::TSCE::CFUUIDArchive::default_instance());
-  merged_range_ = const_cast< ::TSCE::RangeCoordinateArchive*>(&::TSCE::RangeCoordinateArchive::default_instance());
-  cells_to_rewrite_ = const_cast< ::TSCE::CellCoordinateVectorArchive*>(&::TSCE::CellCoordinateVectorArchive::default_instance());
-  conditional_style_sets_ = const_cast< ::TSCE::CellCoordinateObjectMapArchive*>(&::TSCE::CellCoordinateObjectMapArchive::default_instance());
+void FormulaEditingCommandGroupArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::ProgressiveCommandGroupArchive*>(&::TSK::ProgressiveCommandGroupArchive::default_instance());
 }
 
-CommandRewriteConditionalStylesForCellMergeArchive::CommandRewriteConditionalStylesForCellMergeArchive(const CommandRewriteConditionalStylesForCellMergeArchive& from)
+FormulaEditingCommandGroupArchive::FormulaEditingCommandGroupArchive(const FormulaEditingCommandGroupArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::SharedCtor() {
+void FormulaEditingCommandGroupArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  merged_table_id_ = NULL;
-  merged_range_ = NULL;
-  cells_to_rewrite_ = NULL;
-  conditional_style_sets_ = NULL;
+  undoselectionvalid_ = false;
+  undoselectionstart_ = 0u;
+  undoselectionlength_ = 0u;
+  undoactivetoken_ = 0u;
+  redoselectionvalid_ = false;
+  redoselectionstart_ = 0u;
+  redoselectionlength_ = 0u;
+  redoactivetoken_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandRewriteConditionalStylesForCellMergeArchive::~CommandRewriteConditionalStylesForCellMergeArchive() {
+FormulaEditingCommandGroupArchive::~FormulaEditingCommandGroupArchive() {
   SharedDtor();
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::SharedDtor() {
+void FormulaEditingCommandGroupArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete merged_table_id_;
-    delete merged_range_;
-    delete cells_to_rewrite_;
-    delete conditional_style_sets_;
   }
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::SetCachedSize(int size) const {
+void FormulaEditingCommandGroupArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandRewriteConditionalStylesForCellMergeArchive::descriptor() {
+const ::google::protobuf::Descriptor* FormulaEditingCommandGroupArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandRewriteConditionalStylesForCellMergeArchive_descriptor_;
+  return FormulaEditingCommandGroupArchive_descriptor_;
 }
 
-const CommandRewriteConditionalStylesForCellMergeArchive& CommandRewriteConditionalStylesForCellMergeArchive::default_instance() {
+const FormulaEditingCommandGroupArchive& FormulaEditingCommandGroupArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandRewriteConditionalStylesForCellMergeArchive* CommandRewriteConditionalStylesForCellMergeArchive::default_instance_ = NULL;
+FormulaEditingCommandGroupArchive* FormulaEditingCommandGroupArchive::default_instance_ = NULL;
 
-CommandRewriteConditionalStylesForCellMergeArchive* CommandRewriteConditionalStylesForCellMergeArchive::New() const {
-  return new CommandRewriteConditionalStylesForCellMergeArchive;
+FormulaEditingCommandGroupArchive* FormulaEditingCommandGroupArchive::New() const {
+  return new FormulaEditingCommandGroupArchive;
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::Clear() {
+void FormulaEditingCommandGroupArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    if (has_merged_table_id()) {
-      if (merged_table_id_ != NULL) merged_table_id_->::TSCE::CFUUIDArchive::Clear();
-    }
-    if (has_merged_range()) {
-      if (merged_range_ != NULL) merged_range_->::TSCE::RangeCoordinateArchive::Clear();
-    }
-    if (has_cells_to_rewrite()) {
-      if (cells_to_rewrite_ != NULL) cells_to_rewrite_->::TSCE::CellCoordinateVectorArchive::Clear();
-    }
-    if (has_conditional_style_sets()) {
-      if (conditional_style_sets_ != NULL) conditional_style_sets_->::TSCE::CellCoordinateObjectMapArchive::Clear();
+      if (super_ != NULL) super_->::TSK::ProgressiveCommandGroupArchive::Clear();
     }
+    undoselectionvalid_ = false;
+    undoselectionstart_ = 0u;
+    undoselectionlength_ = 0u;
+    undoactivetoken_ = 0u;
+    redoselectionvalid_ = false;
+    redoselectionstart_ = 0u;
+    redoselectionlength_ = 0u;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    redoactivetoken_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandRewriteConditionalStylesForCellMergeArchive::MergePartialFromCodedStream(
+bool FormulaEditingCommandGroupArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TSK.ProgressiveCommandGroupArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -33087,59 +37510,131 @@ bool CommandRewriteConditionalStylesForCellMergeArchive::MergePartialFromCodedSt
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_merged_table_id;
+        if (input->ExpectTag(16)) goto parse_undoSelectionValid;
         break;
       }
 
-      // required .TSCE.CFUUIDArchive merged_table_id = 2;
+      // required bool undoSelectionValid = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_merged_table_id:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_merged_table_id()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_undoSelectionValid:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &undoselectionvalid_)));
+          set_has_undoselectionvalid();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_undoSelectionStart;
+        break;
+      }
+
+      // required uint32 undoSelectionStart = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_undoSelectionStart:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &undoselectionstart_)));
+          set_has_undoselectionstart();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_undoSelectionLength;
+        break;
+      }
+
+      // required uint32 undoSelectionLength = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_undoSelectionLength:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &undoselectionlength_)));
+          set_has_undoselectionlength();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_undoActiveToken;
+        break;
+      }
+
+      // required uint32 undoActiveToken = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_undoActiveToken:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &undoactivetoken_)));
+          set_has_undoactivetoken();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_redoSelectionValid;
+        break;
+      }
+
+      // required bool redoSelectionValid = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoSelectionValid:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &redoselectionvalid_)));
+          set_has_redoselectionvalid();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_merged_range;
+        if (input->ExpectTag(56)) goto parse_redoSelectionStart;
         break;
       }
 
-      // required .TSCE.RangeCoordinateArchive merged_range = 3;
-      case 3: {
+      // required uint32 redoSelectionStart = 7;
+      case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_merged_range:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_merged_range()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoSelectionStart:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &redoselectionstart_)));
+          set_has_redoselectionstart();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_cells_to_rewrite;
+        if (input->ExpectTag(64)) goto parse_redoSelectionLength;
         break;
       }
 
-      // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-      case 4: {
+      // required uint32 redoSelectionLength = 8;
+      case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cells_to_rewrite:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cells_to_rewrite()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoSelectionLength:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &redoselectionlength_)));
+          set_has_redoselectionlength();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_conditional_style_sets;
+        if (input->ExpectTag(72)) goto parse_redoActiveToken;
         break;
       }
 
-      // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-      case 5: {
+      // required uint32 redoActiveToken = 9;
+      case 9: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_conditional_style_sets:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_conditional_style_sets()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoActiveToken:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &redoactivetoken_)));
+          set_has_redoactivetoken();
         } else {
           goto handle_uninterpreted;
         }
@@ -33163,36 +37658,52 @@ bool CommandRewriteConditionalStylesForCellMergeArchive::MergePartialFromCodedSt
 #undef DO_
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::SerializeWithCachedSizes(
+void FormulaEditingCommandGroupArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.ProgressiveCommandGroupArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSCE.CFUUIDArchive merged_table_id = 2;
-  if (has_merged_table_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->merged_table_id(), output);
+  // required bool undoSelectionValid = 2;
+  if (has_undoselectionvalid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->undoselectionvalid(), output);
   }
 
-  // required .TSCE.RangeCoordinateArchive merged_range = 3;
-  if (has_merged_range()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->merged_range(), output);
+  // required uint32 undoSelectionStart = 3;
+  if (has_undoselectionstart()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->undoselectionstart(), output);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-  if (has_cells_to_rewrite()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->cells_to_rewrite(), output);
+  // required uint32 undoSelectionLength = 4;
+  if (has_undoselectionlength()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->undoselectionlength(), output);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-  if (has_conditional_style_sets()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->conditional_style_sets(), output);
+  // required uint32 undoActiveToken = 5;
+  if (has_undoactivetoken()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->undoactivetoken(), output);
+  }
+
+  // required bool redoSelectionValid = 6;
+  if (has_redoselectionvalid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->redoselectionvalid(), output);
+  }
+
+  // required uint32 redoSelectionStart = 7;
+  if (has_redoselectionstart()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->redoselectionstart(), output);
+  }
+
+  // required uint32 redoSelectionLength = 8;
+  if (has_redoselectionlength()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->redoselectionlength(), output);
+  }
+
+  // required uint32 redoActiveToken = 9;
+  if (has_redoactivetoken()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(9, this->redoactivetoken(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -33201,41 +37712,53 @@ void CommandRewriteConditionalStylesForCellMergeArchive::SerializeWithCachedSize
   }
 }
 
-::google::protobuf::uint8* CommandRewriteConditionalStylesForCellMergeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* FormulaEditingCommandGroupArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.ProgressiveCommandGroupArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSCE.CFUUIDArchive merged_table_id = 2;
-  if (has_merged_table_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->merged_table_id(), target);
+  // required bool undoSelectionValid = 2;
+  if (has_undoselectionvalid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->undoselectionvalid(), target);
   }
 
-  // required .TSCE.RangeCoordinateArchive merged_range = 3;
-  if (has_merged_range()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->merged_range(), target);
+  // required uint32 undoSelectionStart = 3;
+  if (has_undoselectionstart()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->undoselectionstart(), target);
   }
 
-  // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-  if (has_cells_to_rewrite()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->cells_to_rewrite(), target);
+  // required uint32 undoSelectionLength = 4;
+  if (has_undoselectionlength()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->undoselectionlength(), target);
   }
 
-  // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-  if (has_conditional_style_sets()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->conditional_style_sets(), target);
+  // required uint32 undoActiveToken = 5;
+  if (has_undoactivetoken()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->undoactivetoken(), target);
+  }
+
+  // required bool redoSelectionValid = 6;
+  if (has_redoselectionvalid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->redoselectionvalid(), target);
+  }
+
+  // required uint32 redoSelectionStart = 7;
+  if (has_redoselectionstart()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->redoselectionstart(), target);
+  }
+
+  // required uint32 redoSelectionLength = 8;
+  if (has_redoselectionlength()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->redoselectionlength(), target);
+  }
+
+  // required uint32 redoActiveToken = 9;
+  if (has_redoactivetoken()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(9, this->redoactivetoken(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -33245,43 +37768,69 @@ ::google::protobuf::uint8* CommandRewriteConditionalStylesForCellMergeArchive::S
   return target;
 }
 
-int CommandRewriteConditionalStylesForCellMergeArchive::ByteSize() const {
+int FormulaEditingCommandGroupArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TSK.ProgressiveCommandGroupArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSCE.CFUUIDArchive merged_table_id = 2;
-    if (has_merged_table_id()) {
+    // required bool undoSelectionValid = 2;
+    if (has_undoselectionvalid()) {
+      total_size += 1 + 1;
+    }
+
+    // required uint32 undoSelectionStart = 3;
+    if (has_undoselectionstart()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->merged_table_id());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->undoselectionstart());
     }
 
-    // required .TSCE.RangeCoordinateArchive merged_range = 3;
-    if (has_merged_range()) {
+    // required uint32 undoSelectionLength = 4;
+    if (has_undoselectionlength()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->merged_range());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->undoselectionlength());
     }
 
-    // optional .TSCE.CellCoordinateVectorArchive cells_to_rewrite = 4;
-    if (has_cells_to_rewrite()) {
+    // required uint32 undoActiveToken = 5;
+    if (has_undoactivetoken()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cells_to_rewrite());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->undoactivetoken());
     }
 
-    // optional .TSCE.CellCoordinateObjectMapArchive conditional_style_sets = 5;
-    if (has_conditional_style_sets()) {
+    // required bool redoSelectionValid = 6;
+    if (has_redoselectionvalid()) {
+      total_size += 1 + 1;
+    }
+
+    // required uint32 redoSelectionStart = 7;
+    if (has_redoselectionstart()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->conditional_style_sets());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->redoselectionstart());
+    }
+
+    // required uint32 redoSelectionLength = 8;
+    if (has_redoselectionlength()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->redoselectionlength());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // required uint32 redoActiveToken = 9;
+    if (has_redoactivetoken()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->redoactivetoken());
     }
 
   }
@@ -33296,10 +37845,10 @@ int CommandRewriteConditionalStylesForCellMergeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void FormulaEditingCommandGroupArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandRewriteConditionalStylesForCellMergeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteConditionalStylesForCellMergeArchive*>(
+  const FormulaEditingCommandGroupArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const FormulaEditingCommandGroupArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -33308,73 +37857,85 @@ void CommandRewriteConditionalStylesForCellMergeArchive::MergeFrom(const ::googl
   }
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::MergeFrom(const CommandRewriteConditionalStylesForCellMergeArchive& from) {
+void FormulaEditingCommandGroupArchive::MergeFrom(const FormulaEditingCommandGroupArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSK::ProgressiveCommandGroupArchive::MergeFrom(from.super());
     }
-    if (from.has_merged_table_id()) {
-      mutable_merged_table_id()->::TSCE::CFUUIDArchive::MergeFrom(from.merged_table_id());
+    if (from.has_undoselectionvalid()) {
+      set_undoselectionvalid(from.undoselectionvalid());
     }
-    if (from.has_merged_range()) {
-      mutable_merged_range()->::TSCE::RangeCoordinateArchive::MergeFrom(from.merged_range());
+    if (from.has_undoselectionstart()) {
+      set_undoselectionstart(from.undoselectionstart());
     }
-    if (from.has_cells_to_rewrite()) {
-      mutable_cells_to_rewrite()->::TSCE::CellCoordinateVectorArchive::MergeFrom(from.cells_to_rewrite());
+    if (from.has_undoselectionlength()) {
+      set_undoselectionlength(from.undoselectionlength());
     }
-    if (from.has_conditional_style_sets()) {
-      mutable_conditional_style_sets()->::TSCE::CellCoordinateObjectMapArchive::MergeFrom(from.conditional_style_sets());
+    if (from.has_undoactivetoken()) {
+      set_undoactivetoken(from.undoactivetoken());
+    }
+    if (from.has_redoselectionvalid()) {
+      set_redoselectionvalid(from.redoselectionvalid());
+    }
+    if (from.has_redoselectionstart()) {
+      set_redoselectionstart(from.redoselectionstart());
+    }
+    if (from.has_redoselectionlength()) {
+      set_redoselectionlength(from.redoselectionlength());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_redoactivetoken()) {
+      set_redoactivetoken(from.redoactivetoken());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void FormulaEditingCommandGroupArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::CopyFrom(const CommandRewriteConditionalStylesForCellMergeArchive& from) {
+void FormulaEditingCommandGroupArchive::CopyFrom(const FormulaEditingCommandGroupArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandRewriteConditionalStylesForCellMergeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool FormulaEditingCommandGroupArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x000001ff) != 0x000001ff) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_merged_range()) {
-    if (!this->merged_range().IsInitialized()) return false;
-  }
-  if (has_conditional_style_sets()) {
-    if (!this->conditional_style_sets().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandRewriteConditionalStylesForCellMergeArchive::Swap(CommandRewriteConditionalStylesForCellMergeArchive* other) {
+void FormulaEditingCommandGroupArchive::Swap(FormulaEditingCommandGroupArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(merged_table_id_, other->merged_table_id_);
-    std::swap(merged_range_, other->merged_range_);
-    std::swap(cells_to_rewrite_, other->cells_to_rewrite_);
-    std::swap(conditional_style_sets_, other->conditional_style_sets_);
+    std::swap(undoselectionvalid_, other->undoselectionvalid_);
+    std::swap(undoselectionstart_, other->undoselectionstart_);
+    std::swap(undoselectionlength_, other->undoselectionlength_);
+    std::swap(undoactivetoken_, other->undoactivetoken_);
+    std::swap(redoselectionvalid_, other->redoselectionvalid_);
+    std::swap(redoselectionstart_, other->redoselectionstart_);
+    std::swap(redoselectionlength_, other->redoselectionlength_);
+    std::swap(redoactivetoken_, other->redoactivetoken_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandRewriteConditionalStylesForCellMergeArchive::GetMetadata() const {
+::google::protobuf::Metadata FormulaEditingCommandGroupArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandRewriteConditionalStylesForCellMergeArchive_descriptor_;
-  metadata.reflection = CommandRewriteConditionalStylesForCellMergeArchive_reflection_;
+  metadata.descriptor = FormulaEditingCommandGroupArchive_descriptor_;
+  metadata.reflection = FormulaEditingCommandGroupArchive_reflection_;
   return metadata;
 }
 
@@ -33382,212 +37943,237 @@ ::google::protobuf::Metadata CommandRewriteConditionalStylesForCellMergeArchive:
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandMergeUnmergeArchive::kSuperFieldNumber;
-const int CommandMergeUnmergeArchive::kMergeActionFieldNumber;
-const int CommandMergeUnmergeArchive::kSelectionFieldNumber;
-const int CommandMergeUnmergeArchive::kUndoCellMapFieldNumber;
-const int CommandMergeUnmergeArchive::kRedoCellMapFieldNumber;
-const int CommandMergeUnmergeArchive::kOldMergeRangesFieldNumber;
-const int CommandMergeUnmergeArchive::kUndoFormulaRewriteCommandFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kUndoSelectionValidFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kUndoSelectionStartFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kUndoSelectionLengthFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kUndoActiveTokenFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kRedoSelectionValidFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kRedoSelectionStartFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kRedoSelectionLengthFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kRedoActiveTokenFieldNumber;
+const int FormulaEditingCommandSelectionBehaviorArchive::kStorageFieldNumber;
 #endif  // !_MSC_VER
 
-CommandMergeUnmergeArchive::CommandMergeUnmergeArchive()
+FormulaEditingCommandSelectionBehaviorArchive::FormulaEditingCommandSelectionBehaviorArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandMergeUnmergeArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  old_merge_ranges_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  undo_formula_rewrite_command_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void FormulaEditingCommandSelectionBehaviorArchive::InitAsDefaultInstance() {
+  storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandMergeUnmergeArchive::CommandMergeUnmergeArchive(const CommandMergeUnmergeArchive& from)
+FormulaEditingCommandSelectionBehaviorArchive::FormulaEditingCommandSelectionBehaviorArchive(const FormulaEditingCommandSelectionBehaviorArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandMergeUnmergeArchive::SharedCtor() {
+void FormulaEditingCommandSelectionBehaviorArchive::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  merge_action_ = 0;
-  selection_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
-  old_merge_ranges_ = NULL;
-  undo_formula_rewrite_command_ = NULL;
+  undoselectionvalid_ = false;
+  undoselectionstart_ = 0u;
+  undoselectionlength_ = 0u;
+  undoactivetoken_ = 0u;
+  redoselectionvalid_ = false;
+  redoselectionstart_ = 0u;
+  redoselectionlength_ = 0u;
+  redoactivetoken_ = 0u;
+  storage_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandMergeUnmergeArchive::~CommandMergeUnmergeArchive() {
+FormulaEditingCommandSelectionBehaviorArchive::~FormulaEditingCommandSelectionBehaviorArchive() {
   SharedDtor();
 }
 
-void CommandMergeUnmergeArchive::SharedDtor() {
+void FormulaEditingCommandSelectionBehaviorArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete selection_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
-    delete old_merge_ranges_;
-    delete undo_formula_rewrite_command_;
+    delete storage_;
   }
 }
 
-void CommandMergeUnmergeArchive::SetCachedSize(int size) const {
+void FormulaEditingCommandSelectionBehaviorArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandMergeUnmergeArchive::descriptor() {
+const ::google::protobuf::Descriptor* FormulaEditingCommandSelectionBehaviorArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandMergeUnmergeArchive_descriptor_;
+  return FormulaEditingCommandSelectionBehaviorArchive_descriptor_;
 }
 
-const CommandMergeUnmergeArchive& CommandMergeUnmergeArchive::default_instance() {
+const FormulaEditingCommandSelectionBehaviorArchive& FormulaEditingCommandSelectionBehaviorArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandMergeUnmergeArchive* CommandMergeUnmergeArchive::default_instance_ = NULL;
+FormulaEditingCommandSelectionBehaviorArchive* FormulaEditingCommandSelectionBehaviorArchive::default_instance_ = NULL;
 
-CommandMergeUnmergeArchive* CommandMergeUnmergeArchive::New() const {
-  return new CommandMergeUnmergeArchive;
+FormulaEditingCommandSelectionBehaviorArchive* FormulaEditingCommandSelectionBehaviorArchive::New() const {
+  return new FormulaEditingCommandSelectionBehaviorArchive;
 }
 
-void CommandMergeUnmergeArchive::Clear() {
+void FormulaEditingCommandSelectionBehaviorArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-    }
-    merge_action_ = 0;
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_old_merge_ranges()) {
-      if (old_merge_ranges_ != NULL) old_merge_ranges_->::TSP::Reference::Clear();
-    }
-    if (has_undo_formula_rewrite_command()) {
-      if (undo_formula_rewrite_command_ != NULL) undo_formula_rewrite_command_->::TSP::Reference::Clear();
+    undoselectionvalid_ = false;
+    undoselectionstart_ = 0u;
+    undoselectionlength_ = 0u;
+    undoactivetoken_ = 0u;
+    redoselectionvalid_ = false;
+    redoselectionstart_ = 0u;
+    redoselectionlength_ = 0u;
+    redoactivetoken_ = 0u;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (has_storage()) {
+      if (storage_ != NULL) storage_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandMergeUnmergeArchive::MergePartialFromCodedStream(
+bool FormulaEditingCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
-      case 1: {
+      // optional bool undoSelectionValid = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &undoselectionvalid_)));
+          set_has_undoselectionvalid();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_merge_action;
+        if (input->ExpectTag(24)) goto parse_undoSelectionStart;
         break;
       }
 
-      // required .TST.MergeActionArchive merge_action = 2;
-      case 2: {
+      // optional uint32 undoSelectionStart = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_merge_action:
-          int value;
+         parse_undoSelectionStart:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::MergeActionArchive_IsValid(value)) {
-            set_merge_action(static_cast< ::TST::MergeActionArchive >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &undoselectionstart_)));
+          set_has_undoselectionstart();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_selection;
+        if (input->ExpectTag(32)) goto parse_undoSelectionLength;
         break;
       }
 
-      // required .TST.SelectionArchive selection = 3;
-      case 3: {
+      // optional uint32 undoSelectionLength = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_undoSelectionLength:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &undoselectionlength_)));
+          set_has_undoselectionlength();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_undo_cell_map;
+        if (input->ExpectTag(40)) goto parse_undoActiveToken;
         break;
       }
 
-      // required .TST.CellMapArchive undo_cell_map = 4;
-      case 4: {
+      // optional uint32 undoActiveToken = 5;
+      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_undoActiveToken:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &undoactivetoken_)));
+          set_has_undoactivetoken();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_redo_cell_map;
+        if (input->ExpectTag(48)) goto parse_redoSelectionValid;
         break;
       }
 
-      // required .TST.CellMapArchive redo_cell_map = 5;
-      case 5: {
+      // optional bool redoSelectionValid = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoSelectionValid:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &redoselectionvalid_)));
+          set_has_redoselectionvalid();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(66)) goto parse_old_merge_ranges;
+        if (input->ExpectTag(56)) goto parse_redoSelectionStart;
+        break;
+      }
+
+      // optional uint32 redoSelectionStart = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoSelectionStart:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &redoselectionstart_)));
+          set_has_redoselectionstart();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_redoSelectionLength;
+        break;
+      }
+
+      // optional uint32 redoSelectionLength = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoSelectionLength:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &redoselectionlength_)));
+          set_has_redoselectionlength();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_redoActiveToken;
         break;
       }
 
-      // optional .TSP.Reference old_merge_ranges = 8;
-      case 8: {
+      // optional uint32 redoActiveToken = 9;
+      case 9: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_merge_ranges:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_merge_ranges()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_redoActiveToken:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &redoactivetoken_)));
+          set_has_redoactivetoken();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(74)) goto parse_undo_formula_rewrite_command;
+        if (input->ExpectTag(82)) goto parse_storage;
         break;
       }
 
-      // optional .TSP.Reference undo_formula_rewrite_command = 9;
-      case 9: {
+      // optional .TSP.Reference storage = 10;
+      case 10: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_formula_rewrite_command:
+         parse_storage:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_formula_rewrite_command()));
+               input, mutable_storage()));
         } else {
           goto handle_uninterpreted;
         }
@@ -33611,48 +38197,52 @@ bool CommandMergeUnmergeArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandMergeUnmergeArchive::SerializeWithCachedSizes(
+void FormulaEditingCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+  // optional bool undoSelectionValid = 2;
+  if (has_undoselectionvalid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->undoselectionvalid(), output);
   }
 
-  // required .TST.MergeActionArchive merge_action = 2;
-  if (has_merge_action()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->merge_action(), output);
+  // optional uint32 undoSelectionStart = 3;
+  if (has_undoselectionstart()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->undoselectionstart(), output);
   }
 
-  // required .TST.SelectionArchive selection = 3;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->selection(), output);
+  // optional uint32 undoSelectionLength = 4;
+  if (has_undoselectionlength()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->undoselectionlength(), output);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->undo_cell_map(), output);
+  // optional uint32 undoActiveToken = 5;
+  if (has_undoactivetoken()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->undoactivetoken(), output);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->redo_cell_map(), output);
+  // optional bool redoSelectionValid = 6;
+  if (has_redoselectionvalid()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->redoselectionvalid(), output);
   }
 
-  // optional .TSP.Reference old_merge_ranges = 8;
-  if (has_old_merge_ranges()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->old_merge_ranges(), output);
+  // optional uint32 redoSelectionStart = 7;
+  if (has_redoselectionstart()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->redoselectionstart(), output);
   }
 
-  // optional .TSP.Reference undo_formula_rewrite_command = 9;
-  if (has_undo_formula_rewrite_command()) {
+  // optional uint32 redoSelectionLength = 8;
+  if (has_redoselectionlength()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->redoselectionlength(), output);
+  }
+
+  // optional uint32 redoActiveToken = 9;
+  if (has_redoactivetoken()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(9, this->redoactivetoken(), output);
+  }
+
+  // optional .TSP.Reference storage = 10;
+  if (has_storage()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->undo_formula_rewrite_command(), output);
+      10, this->storage(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -33661,54 +38251,53 @@ void CommandMergeUnmergeArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandMergeUnmergeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* FormulaEditingCommandSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+  // optional bool undoSelectionValid = 2;
+  if (has_undoselectionvalid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->undoselectionvalid(), target);
   }
 
-  // required .TST.MergeActionArchive merge_action = 2;
-  if (has_merge_action()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->merge_action(), target);
+  // optional uint32 undoSelectionStart = 3;
+  if (has_undoselectionstart()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->undoselectionstart(), target);
   }
 
-  // required .TST.SelectionArchive selection = 3;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->selection(), target);
+  // optional uint32 undoSelectionLength = 4;
+  if (has_undoselectionlength()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->undoselectionlength(), target);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 4;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->undo_cell_map(), target);
+  // optional uint32 undoActiveToken = 5;
+  if (has_undoactivetoken()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->undoactivetoken(), target);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 5;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->redo_cell_map(), target);
+  // optional bool redoSelectionValid = 6;
+  if (has_redoselectionvalid()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->redoselectionvalid(), target);
   }
 
-  // optional .TSP.Reference old_merge_ranges = 8;
-  if (has_old_merge_ranges()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->old_merge_ranges(), target);
+  // optional uint32 redoSelectionStart = 7;
+  if (has_redoselectionstart()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->redoselectionstart(), target);
   }
 
-  // optional .TSP.Reference undo_formula_rewrite_command = 9;
-  if (has_undo_formula_rewrite_command()) {
+  // optional uint32 redoSelectionLength = 8;
+  if (has_redoselectionlength()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->redoselectionlength(), target);
+  }
+
+  // optional uint32 redoActiveToken = 9;
+  if (has_redoactivetoken()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(9, this->redoactivetoken(), target);
+  }
+
+  // optional .TSP.Reference storage = 10;
+  if (has_storage()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        9, this->undo_formula_rewrite_command(), target);
+        10, this->storage(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -33718,56 +38307,69 @@ ::google::protobuf::uint8* CommandMergeUnmergeArchive::SerializeWithCachedSizesT
   return target;
 }
 
-int CommandMergeUnmergeArchive::ByteSize() const {
+int FormulaEditingCommandSelectionBehaviorArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
-    if (has_super()) {
+    // optional bool undoSelectionValid = 2;
+    if (has_undoselectionvalid()) {
+      total_size += 1 + 1;
+    }
+
+    // optional uint32 undoSelectionStart = 3;
+    if (has_undoselectionstart()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->undoselectionstart());
     }
 
-    // required .TST.MergeActionArchive merge_action = 2;
-    if (has_merge_action()) {
+    // optional uint32 undoSelectionLength = 4;
+    if (has_undoselectionlength()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->merge_action());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->undoselectionlength());
     }
 
-    // required .TST.SelectionArchive selection = 3;
-    if (has_selection()) {
+    // optional uint32 undoActiveToken = 5;
+    if (has_undoactivetoken()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->undoactivetoken());
     }
 
-    // required .TST.CellMapArchive undo_cell_map = 4;
-    if (has_undo_cell_map()) {
+    // optional bool redoSelectionValid = 6;
+    if (has_redoselectionvalid()) {
+      total_size += 1 + 1;
+    }
+
+    // optional uint32 redoSelectionStart = 7;
+    if (has_redoselectionstart()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->redoselectionstart());
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 5;
-    if (has_redo_cell_map()) {
+    // optional uint32 redoSelectionLength = 8;
+    if (has_redoselectionlength()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->redoselectionlength());
     }
 
-    // optional .TSP.Reference old_merge_ranges = 8;
-    if (has_old_merge_ranges()) {
+    // optional uint32 redoActiveToken = 9;
+    if (has_redoactivetoken()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_merge_ranges());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->redoactivetoken());
     }
 
-    // optional .TSP.Reference undo_formula_rewrite_command = 9;
-    if (has_undo_formula_rewrite_command()) {
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional .TSP.Reference storage = 10;
+    if (has_storage()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_formula_rewrite_command());
+          this->storage());
     }
 
   }
@@ -33782,10 +38384,10 @@ int CommandMergeUnmergeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandMergeUnmergeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void FormulaEditingCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandMergeUnmergeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMergeUnmergeArchive*>(
+  const FormulaEditingCommandSelectionBehaviorArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const FormulaEditingCommandSelectionBehaviorArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -33794,90 +38396,84 @@ void CommandMergeUnmergeArchive::MergeFrom(const ::google::protobuf::Message& fr
   }
 }
 
-void CommandMergeUnmergeArchive::MergeFrom(const CommandMergeUnmergeArchive& from) {
+void FormulaEditingCommandSelectionBehaviorArchive::MergeFrom(const FormulaEditingCommandSelectionBehaviorArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    if (from.has_undoselectionvalid()) {
+      set_undoselectionvalid(from.undoselectionvalid());
     }
-    if (from.has_merge_action()) {
-      set_merge_action(from.merge_action());
+    if (from.has_undoselectionstart()) {
+      set_undoselectionstart(from.undoselectionstart());
     }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    if (from.has_undoselectionlength()) {
+      set_undoselectionlength(from.undoselectionlength());
     }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    if (from.has_undoactivetoken()) {
+      set_undoactivetoken(from.undoactivetoken());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_redoselectionvalid()) {
+      set_redoselectionvalid(from.redoselectionvalid());
     }
-    if (from.has_old_merge_ranges()) {
-      mutable_old_merge_ranges()->::TSP::Reference::MergeFrom(from.old_merge_ranges());
+    if (from.has_redoselectionstart()) {
+      set_redoselectionstart(from.redoselectionstart());
     }
-    if (from.has_undo_formula_rewrite_command()) {
-      mutable_undo_formula_rewrite_command()->::TSP::Reference::MergeFrom(from.undo_formula_rewrite_command());
+    if (from.has_redoselectionlength()) {
+      set_redoselectionlength(from.redoselectionlength());
+    }
+    if (from.has_redoactivetoken()) {
+      set_redoactivetoken(from.redoactivetoken());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_storage()) {
+      mutable_storage()->::TSP::Reference::MergeFrom(from.storage());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandMergeUnmergeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void FormulaEditingCommandSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandMergeUnmergeArchive::CopyFrom(const CommandMergeUnmergeArchive& from) {
+void FormulaEditingCommandSelectionBehaviorArchive::CopyFrom(const FormulaEditingCommandSelectionBehaviorArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandMergeUnmergeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool FormulaEditingCommandSelectionBehaviorArchive::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
-  }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
-  if (has_old_merge_ranges()) {
-    if (!this->old_merge_ranges().IsInitialized()) return false;
-  }
-  if (has_undo_formula_rewrite_command()) {
-    if (!this->undo_formula_rewrite_command().IsInitialized()) return false;
+  if (has_storage()) {
+    if (!this->storage().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandMergeUnmergeArchive::Swap(CommandMergeUnmergeArchive* other) {
+void FormulaEditingCommandSelectionBehaviorArchive::Swap(FormulaEditingCommandSelectionBehaviorArchive* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(merge_action_, other->merge_action_);
-    std::swap(selection_, other->selection_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
-    std::swap(old_merge_ranges_, other->old_merge_ranges_);
-    std::swap(undo_formula_rewrite_command_, other->undo_formula_rewrite_command_);
+    std::swap(undoselectionvalid_, other->undoselectionvalid_);
+    std::swap(undoselectionstart_, other->undoselectionstart_);
+    std::swap(undoselectionlength_, other->undoselectionlength_);
+    std::swap(undoactivetoken_, other->undoactivetoken_);
+    std::swap(redoselectionvalid_, other->redoselectionvalid_);
+    std::swap(redoselectionstart_, other->redoselectionstart_);
+    std::swap(redoselectionlength_, other->redoselectionlength_);
+    std::swap(redoactivetoken_, other->redoactivetoken_);
+    std::swap(storage_, other->storage_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandMergeUnmergeArchive::GetMetadata() const {
+::google::protobuf::Metadata FormulaEditingCommandSelectionBehaviorArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandMergeUnmergeArchive_descriptor_;
-  metadata.reflection = CommandMergeUnmergeArchive_reflection_;
+  metadata.descriptor = FormulaEditingCommandSelectionBehaviorArchive_descriptor_;
+  metadata.reflection = FormulaEditingCommandSelectionBehaviorArchive_reflection_;
   return metadata;
 }
 
@@ -33885,198 +38481,170 @@ ::google::protobuf::Metadata CommandMergeUnmergeArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandHideShowArchive::kSuperFieldNumber;
-const int CommandHideShowArchive::kDirectionFieldNumber;
-const int CommandHideShowArchive::kHideShowActionFieldNumber;
-const int CommandHideShowArchive::kHidingActionFieldNumber;
-const int CommandHideShowArchive::kElementsAffectedFieldNumber;
-const int CommandHideShowArchive::kOldHidingStatesFieldNumber;
+const int UndoRedoStateCommandSelectionBehaviorArchive::kBeforeUndoRedoStateFieldNumber;
+const int UndoRedoStateCommandSelectionBehaviorArchive::kAfterUndoRedoStateFieldNumber;
+const int UndoRedoStateCommandSelectionBehaviorArchive::kTableInfoFieldNumber;
+const int UndoRedoStateCommandSelectionBehaviorArchive::kBeforeTableSelectionFieldNumber;
+const int UndoRedoStateCommandSelectionBehaviorArchive::kAfterTableSelectionFieldNumber;
 #endif  // !_MSC_VER
 
-CommandHideShowArchive::CommandHideShowArchive()
+UndoRedoStateCommandSelectionBehaviorArchive::UndoRedoStateCommandSelectionBehaviorArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandHideShowArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  elements_affected_ = const_cast< ::TSP::IndexSet*>(&::TSP::IndexSet::default_instance());
+void UndoRedoStateCommandSelectionBehaviorArchive::InitAsDefaultInstance() {
+  before_undo_redo_state_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  after_undo_redo_state_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  table_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  before_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  after_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
 }
 
-CommandHideShowArchive::CommandHideShowArchive(const CommandHideShowArchive& from)
+UndoRedoStateCommandSelectionBehaviorArchive::UndoRedoStateCommandSelectionBehaviorArchive(const UndoRedoStateCommandSelectionBehaviorArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandHideShowArchive::SharedCtor() {
+void UndoRedoStateCommandSelectionBehaviorArchive::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  direction_ = 0;
-  hide_show_action_ = 0;
-  hiding_action_ = 0u;
-  elements_affected_ = NULL;
+  before_undo_redo_state_ = NULL;
+  after_undo_redo_state_ = NULL;
+  table_info_ = NULL;
+  before_table_selection_ = NULL;
+  after_table_selection_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandHideShowArchive::~CommandHideShowArchive() {
+UndoRedoStateCommandSelectionBehaviorArchive::~UndoRedoStateCommandSelectionBehaviorArchive() {
   SharedDtor();
 }
 
-void CommandHideShowArchive::SharedDtor() {
+void UndoRedoStateCommandSelectionBehaviorArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete elements_affected_;
+    delete before_undo_redo_state_;
+    delete after_undo_redo_state_;
+    delete table_info_;
+    delete before_table_selection_;
+    delete after_table_selection_;
   }
 }
 
-void CommandHideShowArchive::SetCachedSize(int size) const {
+void UndoRedoStateCommandSelectionBehaviorArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandHideShowArchive::descriptor() {
+const ::google::protobuf::Descriptor* UndoRedoStateCommandSelectionBehaviorArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandHideShowArchive_descriptor_;
+  return UndoRedoStateCommandSelectionBehaviorArchive_descriptor_;
 }
 
-const CommandHideShowArchive& CommandHideShowArchive::default_instance() {
+const UndoRedoStateCommandSelectionBehaviorArchive& UndoRedoStateCommandSelectionBehaviorArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandHideShowArchive* CommandHideShowArchive::default_instance_ = NULL;
+UndoRedoStateCommandSelectionBehaviorArchive* UndoRedoStateCommandSelectionBehaviorArchive::default_instance_ = NULL;
 
-CommandHideShowArchive* CommandHideShowArchive::New() const {
-  return new CommandHideShowArchive;
+UndoRedoStateCommandSelectionBehaviorArchive* UndoRedoStateCommandSelectionBehaviorArchive::New() const {
+  return new UndoRedoStateCommandSelectionBehaviorArchive;
 }
 
-void CommandHideShowArchive::Clear() {
+void UndoRedoStateCommandSelectionBehaviorArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    if (has_before_undo_redo_state()) {
+      if (before_undo_redo_state_ != NULL) before_undo_redo_state_->::TSP::Reference::Clear();
     }
-    direction_ = 0;
-    hide_show_action_ = 0;
-    hiding_action_ = 0u;
-    if (has_elements_affected()) {
-      if (elements_affected_ != NULL) elements_affected_->::TSP::IndexSet::Clear();
+    if (has_after_undo_redo_state()) {
+      if (after_undo_redo_state_ != NULL) after_undo_redo_state_->::TSP::Reference::Clear();
+    }
+    if (has_table_info()) {
+      if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
+    }
+    if (has_before_table_selection()) {
+      if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
+    }
+    if (has_after_table_selection()) {
+      if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
     }
   }
-  old_hiding_states_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandHideShowArchive::MergePartialFromCodedStream(
+bool UndoRedoStateCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_before_undo_redo_state()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_direction;
+        if (input->ExpectTag(18)) goto parse_after_undo_redo_state;
         break;
       }
 
-      // required .TST.CommandDirectionArchive direction = 2;
+      // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_direction:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::CommandDirectionArchive_IsValid(value)) {
-            set_direction(static_cast< ::TST::CommandDirectionArchive >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_after_undo_redo_state:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_after_undo_redo_state()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_hide_show_action;
+        if (input->ExpectTag(26)) goto parse_table_info;
         break;
       }
 
-      // required .TST.HideShowActionArchive hide_show_action = 3;
+      // optional .TSP.Reference table_info = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_hide_show_action:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::HideShowActionArchive_IsValid(value)) {
-            set_hide_show_action(static_cast< ::TST::HideShowActionArchive >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(3, value);
-          }
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_table_info:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_table_info()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(32)) goto parse_hiding_action;
+        if (input->ExpectTag(34)) goto parse_before_table_selection;
         break;
       }
 
-      // required uint32 hiding_action = 4;
+      // optional .TST.SelectionArchive before_table_selection = 4;
       case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_hiding_action:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &hiding_action_)));
-          set_has_hiding_action();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_elements_affected;
-        break;
-      }
-
-      // required .TSP.IndexSet elements_affected = 5;
-      case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_elements_affected:
+         parse_before_table_selection:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_elements_affected()));
+               input, mutable_before_table_selection()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(56)) goto parse_old_hiding_states;
+        if (input->ExpectTag(50)) goto parse_after_table_selection;
         break;
       }
 
-      // repeated uint32 old_hiding_states = 7;
-      case 7: {
+      // optional .TST.SelectionArchive after_table_selection = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_old_hiding_states:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 1, 56, input, this->mutable_old_hiding_states())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_LENGTH_DELIMITED) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, this->mutable_old_hiding_states())));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_after_table_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_after_table_selection()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(56)) goto parse_old_hiding_states;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -34097,41 +38665,36 @@ bool CommandHideShowArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandHideShowArchive::SerializeWithCachedSizes(
+void UndoRedoStateCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
+  // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
+  if (has_before_undo_redo_state()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
-  }
-
-  // required .TST.CommandDirectionArchive direction = 2;
-  if (has_direction()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->direction(), output);
-  }
-
-  // required .TST.HideShowActionArchive hide_show_action = 3;
-  if (has_hide_show_action()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->hide_show_action(), output);
+      1, this->before_undo_redo_state(), output);
   }
 
-  // required uint32 hiding_action = 4;
-  if (has_hiding_action()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->hiding_action(), output);
+  // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
+  if (has_after_undo_redo_state()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->after_undo_redo_state(), output);
   }
 
-  // required .TSP.IndexSet elements_affected = 5;
-  if (has_elements_affected()) {
+  // optional .TSP.Reference table_info = 3;
+  if (has_table_info()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->elements_affected(), output);
+      3, this->table_info(), output);
   }
 
-  // repeated uint32 old_hiding_states = 7;
-  for (int i = 0; i < this->old_hiding_states_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
-      7, this->old_hiding_states(i), output);
+  // optional .TST.SelectionArchive before_table_selection = 4;
+  if (has_before_table_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->before_table_selection(), output);
+  }
+
+  // optional .TST.SelectionArchive after_table_selection = 6;
+  if (has_after_table_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->after_table_selection(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -34140,43 +38703,41 @@ void CommandHideShowArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandHideShowArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* UndoRedoStateCommandSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
+  // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
+  if (has_before_undo_redo_state()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required .TST.CommandDirectionArchive direction = 2;
-  if (has_direction()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->direction(), target);
+        1, this->before_undo_redo_state(), target);
   }
 
-  // required .TST.HideShowActionArchive hide_show_action = 3;
-  if (has_hide_show_action()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->hide_show_action(), target);
+  // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
+  if (has_after_undo_redo_state()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->after_undo_redo_state(), target);
   }
 
-  // required uint32 hiding_action = 4;
-  if (has_hiding_action()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->hiding_action(), target);
+  // optional .TSP.Reference table_info = 3;
+  if (has_table_info()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->table_info(), target);
   }
 
-  // required .TSP.IndexSet elements_affected = 5;
-  if (has_elements_affected()) {
+  // optional .TST.SelectionArchive before_table_selection = 4;
+  if (has_before_table_selection()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->elements_affected(), target);
+        4, this->before_table_selection(), target);
   }
 
-  // repeated uint32 old_hiding_states = 7;
-  for (int i = 0; i < this->old_hiding_states_size(); i++) {
+  // optional .TST.SelectionArchive after_table_selection = 6;
+  if (has_after_table_selection()) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteUInt32ToArray(7, this->old_hiding_states(i), target);
+      WriteMessageNoVirtualToArray(
+        6, this->after_table_selection(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -34186,54 +38747,46 @@ ::google::protobuf::uint8* CommandHideShowArchive::SerializeWithCachedSizesToArr
   return target;
 }
 
-int CommandHideShowArchive::ByteSize() const {
+int UndoRedoStateCommandSelectionBehaviorArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
-    if (has_super()) {
+    // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
+    if (has_before_undo_redo_state()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+          this->before_undo_redo_state());
     }
 
-    // required .TST.CommandDirectionArchive direction = 2;
-    if (has_direction()) {
+    // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
+    if (has_after_undo_redo_state()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->direction());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->after_undo_redo_state());
     }
 
-    // required .TST.HideShowActionArchive hide_show_action = 3;
-    if (has_hide_show_action()) {
+    // optional .TSP.Reference table_info = 3;
+    if (has_table_info()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->hide_show_action());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->table_info());
     }
 
-    // required uint32 hiding_action = 4;
-    if (has_hiding_action()) {
+    // optional .TST.SelectionArchive before_table_selection = 4;
+    if (has_before_table_selection()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->hiding_action());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->before_table_selection());
     }
 
-    // required .TSP.IndexSet elements_affected = 5;
-    if (has_elements_affected()) {
+    // optional .TST.SelectionArchive after_table_selection = 6;
+    if (has_after_table_selection()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->elements_affected());
+          this->after_table_selection());
     }
 
   }
-  // repeated uint32 old_hiding_states = 7;
-  {
-    int data_size = 0;
-    for (int i = 0; i < this->old_hiding_states_size(); i++) {
-      data_size += ::google::protobuf::internal::WireFormatLite::
-        UInt32Size(this->old_hiding_states(i));
-    }
-    total_size += 1 * this->old_hiding_states_size() + data_size;
-  }
-
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -34245,10 +38798,10 @@ int CommandHideShowArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandHideShowArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void UndoRedoStateCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandHideShowArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandHideShowArchive*>(
+  const UndoRedoStateCommandSelectionBehaviorArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const UndoRedoStateCommandSelectionBehaviorArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -34257,72 +38810,78 @@ void CommandHideShowArchive::MergeFrom(const ::google::protobuf::Message& from)
   }
 }
 
-void CommandHideShowArchive::MergeFrom(const CommandHideShowArchive& from) {
+void UndoRedoStateCommandSelectionBehaviorArchive::MergeFrom(const UndoRedoStateCommandSelectionBehaviorArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  old_hiding_states_.MergeFrom(from.old_hiding_states_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    if (from.has_before_undo_redo_state()) {
+      mutable_before_undo_redo_state()->::TSP::Reference::MergeFrom(from.before_undo_redo_state());
     }
-    if (from.has_direction()) {
-      set_direction(from.direction());
+    if (from.has_after_undo_redo_state()) {
+      mutable_after_undo_redo_state()->::TSP::Reference::MergeFrom(from.after_undo_redo_state());
     }
-    if (from.has_hide_show_action()) {
-      set_hide_show_action(from.hide_show_action());
+    if (from.has_table_info()) {
+      mutable_table_info()->::TSP::Reference::MergeFrom(from.table_info());
     }
-    if (from.has_hiding_action()) {
-      set_hiding_action(from.hiding_action());
+    if (from.has_before_table_selection()) {
+      mutable_before_table_selection()->::TST::SelectionArchive::MergeFrom(from.before_table_selection());
     }
-    if (from.has_elements_affected()) {
-      mutable_elements_affected()->::TSP::IndexSet::MergeFrom(from.elements_affected());
+    if (from.has_after_table_selection()) {
+      mutable_after_table_selection()->::TST::SelectionArchive::MergeFrom(from.after_table_selection());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandHideShowArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void UndoRedoStateCommandSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandHideShowArchive::CopyFrom(const CommandHideShowArchive& from) {
+void UndoRedoStateCommandSelectionBehaviorArchive::CopyFrom(const UndoRedoStateCommandSelectionBehaviorArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandHideShowArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool UndoRedoStateCommandSelectionBehaviorArchive::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_before_undo_redo_state()) {
+    if (!this->before_undo_redo_state().IsInitialized()) return false;
   }
-  if (has_elements_affected()) {
-    if (!this->elements_affected().IsInitialized()) return false;
+  if (has_after_undo_redo_state()) {
+    if (!this->after_undo_redo_state().IsInitialized()) return false;
+  }
+  if (has_table_info()) {
+    if (!this->table_info().IsInitialized()) return false;
+  }
+  if (has_before_table_selection()) {
+    if (!this->before_table_selection().IsInitialized()) return false;
+  }
+  if (has_after_table_selection()) {
+    if (!this->after_table_selection().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandHideShowArchive::Swap(CommandHideShowArchive* other) {
+void UndoRedoStateCommandSelectionBehaviorArchive::Swap(UndoRedoStateCommandSelectionBehaviorArchive* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(direction_, other->direction_);
-    std::swap(hide_show_action_, other->hide_show_action_);
-    std::swap(hiding_action_, other->hiding_action_);
-    std::swap(elements_affected_, other->elements_affected_);
-    old_hiding_states_.Swap(&other->old_hiding_states_);
+    std::swap(before_undo_redo_state_, other->before_undo_redo_state_);
+    std::swap(after_undo_redo_state_, other->after_undo_redo_state_);
+    std::swap(table_info_, other->table_info_);
+    std::swap(before_table_selection_, other->before_table_selection_);
+    std::swap(after_table_selection_, other->after_table_selection_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandHideShowArchive::GetMetadata() const {
+::google::protobuf::Metadata UndoRedoStateCommandSelectionBehaviorArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandHideShowArchive_descriptor_;
-  metadata.reflection = CommandHideShowArchive_reflection_;
+  metadata.descriptor = UndoRedoStateCommandSelectionBehaviorArchive_descriptor_;
+  metadata.reflection = UndoRedoStateCommandSelectionBehaviorArchive_reflection_;
   return metadata;
 }
 
@@ -34330,134 +38889,114 @@ ::google::protobuf::Metadata CommandHideShowArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int TableInfoGeometryCommandArchive::kSuperFieldNumber;
-const int TableInfoGeometryCommandArchive::kScaleFactorFieldNumber;
-const int TableInfoGeometryCommandArchive::kTableInfoFieldNumber;
-const int TableInfoGeometryCommandArchive::kNewGeometryFieldNumber;
-const int TableInfoGeometryCommandArchive::kOldGeometryFieldNumber;
-const int TableInfoGeometryCommandArchive::kTurnOffAutoResizeFieldNumber;
-const int TableInfoGeometryCommandArchive::kShouldClearObjectPlaceholderFlagFieldNumber;
-const int TableInfoGeometryCommandArchive::kDidMatchObjectPlaceholderGeometryFieldNumber;
+const int TableCommandSelectionBehaviorArchive::kBeforeTableSelectionFieldNumber;
+const int TableCommandSelectionBehaviorArchive::kAfterTableSelectionFieldNumber;
+const int TableCommandSelectionBehaviorArchive::kTableInfoFieldNumber;
+const int TableCommandSelectionBehaviorArchive::kLastColumnHitByTapFieldNumber;
 #endif  // !_MSC_VER
 
-TableInfoGeometryCommandArchive::TableInfoGeometryCommandArchive()
+TableCommandSelectionBehaviorArchive::TableCommandSelectionBehaviorArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableInfoGeometryCommandArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  scale_factor_ = const_cast< ::TSP::Size*>(&::TSP::Size::default_instance());
+void TableCommandSelectionBehaviorArchive::InitAsDefaultInstance() {
+  before_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  after_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
   table_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  new_geometry_ = const_cast< ::TSD::GeometryArchive*>(&::TSD::GeometryArchive::default_instance());
-  old_geometry_ = const_cast< ::TSD::GeometryArchive*>(&::TSD::GeometryArchive::default_instance());
 }
 
-TableInfoGeometryCommandArchive::TableInfoGeometryCommandArchive(const TableInfoGeometryCommandArchive& from)
+TableCommandSelectionBehaviorArchive::TableCommandSelectionBehaviorArchive(const TableCommandSelectionBehaviorArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableInfoGeometryCommandArchive::SharedCtor() {
+void TableCommandSelectionBehaviorArchive::SharedCtor() {
   _cached_size_ = 0;
-  super_ = NULL;
-  scale_factor_ = NULL;
+  before_table_selection_ = NULL;
+  after_table_selection_ = NULL;
   table_info_ = NULL;
-  new_geometry_ = NULL;
-  old_geometry_ = NULL;
-  turn_off_auto_resize_ = false;
-  should_clear_object_placeholder_flag_ = false;
-  did_match_object_placeholder_geometry_ = false;
+  last_column_hit_by_tap_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableInfoGeometryCommandArchive::~TableInfoGeometryCommandArchive() {
+TableCommandSelectionBehaviorArchive::~TableCommandSelectionBehaviorArchive() {
   SharedDtor();
 }
 
-void TableInfoGeometryCommandArchive::SharedDtor() {
+void TableCommandSelectionBehaviorArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete super_;
-    delete scale_factor_;
+    delete before_table_selection_;
+    delete after_table_selection_;
     delete table_info_;
-    delete new_geometry_;
-    delete old_geometry_;
   }
 }
 
-void TableInfoGeometryCommandArchive::SetCachedSize(int size) const {
+void TableCommandSelectionBehaviorArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableInfoGeometryCommandArchive::descriptor() {
+const ::google::protobuf::Descriptor* TableCommandSelectionBehaviorArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableInfoGeometryCommandArchive_descriptor_;
+  return TableCommandSelectionBehaviorArchive_descriptor_;
 }
 
-const TableInfoGeometryCommandArchive& TableInfoGeometryCommandArchive::default_instance() {
+const TableCommandSelectionBehaviorArchive& TableCommandSelectionBehaviorArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-TableInfoGeometryCommandArchive* TableInfoGeometryCommandArchive::default_instance_ = NULL;
+TableCommandSelectionBehaviorArchive* TableCommandSelectionBehaviorArchive::default_instance_ = NULL;
 
-TableInfoGeometryCommandArchive* TableInfoGeometryCommandArchive::New() const {
-  return new TableInfoGeometryCommandArchive;
+TableCommandSelectionBehaviorArchive* TableCommandSelectionBehaviorArchive::New() const {
+  return new TableCommandSelectionBehaviorArchive;
 }
 
-void TableInfoGeometryCommandArchive::Clear() {
+void TableCommandSelectionBehaviorArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+    if (has_before_table_selection()) {
+      if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
     }
-    if (has_scale_factor()) {
-      if (scale_factor_ != NULL) scale_factor_->::TSP::Size::Clear();
+    if (has_after_table_selection()) {
+      if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
     }
     if (has_table_info()) {
       if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
     }
-    if (has_new_geometry()) {
-      if (new_geometry_ != NULL) new_geometry_->::TSD::GeometryArchive::Clear();
-    }
-    if (has_old_geometry()) {
-      if (old_geometry_ != NULL) old_geometry_->::TSD::GeometryArchive::Clear();
-    }
-    turn_off_auto_resize_ = false;
-    should_clear_object_placeholder_flag_ = false;
-    did_match_object_placeholder_geometry_ = false;
+    last_column_hit_by_tap_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableInfoGeometryCommandArchive::MergePartialFromCodedStream(
+bool TableCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // optional .TST.SelectionArchive before_table_selection = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_super()));
+               input, mutable_before_table_selection()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_scale_factor;
+        if (input->ExpectTag(18)) goto parse_after_table_selection;
         break;
       }
 
-      // required .TSP.Size scale_factor = 2;
+      // optional .TST.SelectionArchive after_table_selection = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_scale_factor:
+         parse_after_table_selection:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_scale_factor()));
+               input, mutable_after_table_selection()));
         } else {
           goto handle_uninterpreted;
         }
@@ -34475,79 +39014,19 @@ bool TableInfoGeometryCommandArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_new_geometry;
+        if (input->ExpectTag(32)) goto parse_last_column_hit_by_tap;
         break;
       }
 
-      // optional .TSD.GeometryArchive new_geometry = 4;
+      // optional uint32 last_column_hit_by_tap = 4;
       case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_geometry:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_geometry()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_old_geometry;
-        break;
-      }
-
-      // optional .TSD.GeometryArchive old_geometry = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_geometry:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_geometry()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(48)) goto parse_turn_off_auto_resize;
-        break;
-      }
-
-      // optional bool turn_off_auto_resize = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_turn_off_auto_resize:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &turn_off_auto_resize_)));
-          set_has_turn_off_auto_resize();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_should_clear_object_placeholder_flag;
-        break;
-      }
-
-      // optional bool should_clear_object_placeholder_flag = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_should_clear_object_placeholder_flag:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &should_clear_object_placeholder_flag_)));
-          set_has_should_clear_object_placeholder_flag();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(64)) goto parse_did_match_object_placeholder_geometry;
-        break;
-      }
-
-      // optional bool did_match_object_placeholder_geometry = 8;
-      case 8: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_did_match_object_placeholder_geometry:
+         parse_last_column_hit_by_tap:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &did_match_object_placeholder_geometry_)));
-          set_has_did_match_object_placeholder_geometry();
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &last_column_hit_by_tap_)));
+          set_has_last_column_hit_by_tap();
         } else {
           goto handle_uninterpreted;
         }
@@ -34571,18 +39050,18 @@ bool TableInfoGeometryCommandArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void TableInfoGeometryCommandArchive::SerializeWithCachedSizes(
+void TableCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
-  if (has_super()) {
+  // optional .TST.SelectionArchive before_table_selection = 1;
+  if (has_before_table_selection()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->super(), output);
+      1, this->before_table_selection(), output);
   }
 
-  // required .TSP.Size scale_factor = 2;
-  if (has_scale_factor()) {
+  // optional .TST.SelectionArchive after_table_selection = 2;
+  if (has_after_table_selection()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->scale_factor(), output);
+      2, this->after_table_selection(), output);
   }
 
   // optional .TSP.Reference table_info = 3;
@@ -34591,31 +39070,9 @@ void TableInfoGeometryCommandArchive::SerializeWithCachedSizes(
       3, this->table_info(), output);
   }
 
-  // optional .TSD.GeometryArchive new_geometry = 4;
-  if (has_new_geometry()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->new_geometry(), output);
-  }
-
-  // optional .TSD.GeometryArchive old_geometry = 5;
-  if (has_old_geometry()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->old_geometry(), output);
-  }
-
-  // optional bool turn_off_auto_resize = 6;
-  if (has_turn_off_auto_resize()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->turn_off_auto_resize(), output);
-  }
-
-  // optional bool should_clear_object_placeholder_flag = 7;
-  if (has_should_clear_object_placeholder_flag()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(7, this->should_clear_object_placeholder_flag(), output);
-  }
-
-  // optional bool did_match_object_placeholder_geometry = 8;
-  if (has_did_match_object_placeholder_geometry()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(8, this->did_match_object_placeholder_geometry(), output);
+  // optional uint32 last_column_hit_by_tap = 4;
+  if (has_last_column_hit_by_tap()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->last_column_hit_by_tap(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -34624,20 +39081,20 @@ void TableInfoGeometryCommandArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* TableInfoGeometryCommandArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* TableCommandSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
-  if (has_super()) {
+  // optional .TST.SelectionArchive before_table_selection = 1;
+  if (has_before_table_selection()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        1, this->super(), target);
+        1, this->before_table_selection(), target);
   }
 
-  // required .TSP.Size scale_factor = 2;
-  if (has_scale_factor()) {
+  // optional .TST.SelectionArchive after_table_selection = 2;
+  if (has_after_table_selection()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->scale_factor(), target);
+        2, this->after_table_selection(), target);
   }
 
   // optional .TSP.Reference table_info = 3;
@@ -34647,33 +39104,9 @@ ::google::protobuf::uint8* TableInfoGeometryCommandArchive::SerializeWithCachedS
         3, this->table_info(), target);
   }
 
-  // optional .TSD.GeometryArchive new_geometry = 4;
-  if (has_new_geometry()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->new_geometry(), target);
-  }
-
-  // optional .TSD.GeometryArchive old_geometry = 5;
-  if (has_old_geometry()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->old_geometry(), target);
-  }
-
-  // optional bool turn_off_auto_resize = 6;
-  if (has_turn_off_auto_resize()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->turn_off_auto_resize(), target);
-  }
-
-  // optional bool should_clear_object_placeholder_flag = 7;
-  if (has_should_clear_object_placeholder_flag()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(7, this->should_clear_object_placeholder_flag(), target);
-  }
-
-  // optional bool did_match_object_placeholder_geometry = 8;
-  if (has_did_match_object_placeholder_geometry()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(8, this->did_match_object_placeholder_geometry(), target);
+  // optional uint32 last_column_hit_by_tap = 4;
+  if (has_last_column_hit_by_tap()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->last_column_hit_by_tap(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -34683,22 +39116,22 @@ ::google::protobuf::uint8* TableInfoGeometryCommandArchive::SerializeWithCachedS
   return target;
 }
 
-int TableInfoGeometryCommandArchive::ByteSize() const {
+int TableCommandSelectionBehaviorArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
-    if (has_super()) {
+    // optional .TST.SelectionArchive before_table_selection = 1;
+    if (has_before_table_selection()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->super());
+          this->before_table_selection());
     }
 
-    // required .TSP.Size scale_factor = 2;
-    if (has_scale_factor()) {
+    // optional .TST.SelectionArchive after_table_selection = 2;
+    if (has_after_table_selection()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->scale_factor());
+          this->after_table_selection());
     }
 
     // optional .TSP.Reference table_info = 3;
@@ -34708,33 +39141,11 @@ int TableInfoGeometryCommandArchive::ByteSize() const {
           this->table_info());
     }
 
-    // optional .TSD.GeometryArchive new_geometry = 4;
-    if (has_new_geometry()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_geometry());
-    }
-
-    // optional .TSD.GeometryArchive old_geometry = 5;
-    if (has_old_geometry()) {
+    // optional uint32 last_column_hit_by_tap = 4;
+    if (has_last_column_hit_by_tap()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_geometry());
-    }
-
-    // optional bool turn_off_auto_resize = 6;
-    if (has_turn_off_auto_resize()) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool should_clear_object_placeholder_flag = 7;
-    if (has_should_clear_object_placeholder_flag()) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool did_match_object_placeholder_geometry = 8;
-    if (has_did_match_object_placeholder_geometry()) {
-      total_size += 1 + 1;
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->last_column_hit_by_tap());
     }
 
   }
@@ -34749,10 +39160,10 @@ int TableInfoGeometryCommandArchive::ByteSize() const {
   return total_size;
 }
 
-void TableInfoGeometryCommandArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void TableCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const TableInfoGeometryCommandArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableInfoGeometryCommandArchive*>(
+  const TableCommandSelectionBehaviorArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const TableCommandSelectionBehaviorArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -34761,91 +39172,68 @@ void TableInfoGeometryCommandArchive::MergeFrom(const ::google::protobuf::Messag
   }
 }
 
-void TableInfoGeometryCommandArchive::MergeFrom(const TableInfoGeometryCommandArchive& from) {
+void TableCommandSelectionBehaviorArchive::MergeFrom(const TableCommandSelectionBehaviorArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+    if (from.has_before_table_selection()) {
+      mutable_before_table_selection()->::TST::SelectionArchive::MergeFrom(from.before_table_selection());
     }
-    if (from.has_scale_factor()) {
-      mutable_scale_factor()->::TSP::Size::MergeFrom(from.scale_factor());
+    if (from.has_after_table_selection()) {
+      mutable_after_table_selection()->::TST::SelectionArchive::MergeFrom(from.after_table_selection());
     }
     if (from.has_table_info()) {
       mutable_table_info()->::TSP::Reference::MergeFrom(from.table_info());
     }
-    if (from.has_new_geometry()) {
-      mutable_new_geometry()->::TSD::GeometryArchive::MergeFrom(from.new_geometry());
-    }
-    if (from.has_old_geometry()) {
-      mutable_old_geometry()->::TSD::GeometryArchive::MergeFrom(from.old_geometry());
-    }
-    if (from.has_turn_off_auto_resize()) {
-      set_turn_off_auto_resize(from.turn_off_auto_resize());
-    }
-    if (from.has_should_clear_object_placeholder_flag()) {
-      set_should_clear_object_placeholder_flag(from.should_clear_object_placeholder_flag());
-    }
-    if (from.has_did_match_object_placeholder_geometry()) {
-      set_did_match_object_placeholder_geometry(from.did_match_object_placeholder_geometry());
+    if (from.has_last_column_hit_by_tap()) {
+      set_last_column_hit_by_tap(from.last_column_hit_by_tap());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void TableInfoGeometryCommandArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void TableCommandSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableInfoGeometryCommandArchive::CopyFrom(const TableInfoGeometryCommandArchive& from) {
+void TableCommandSelectionBehaviorArchive::CopyFrom(const TableCommandSelectionBehaviorArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableInfoGeometryCommandArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool TableCommandSelectionBehaviorArchive::IsInitialized() const {
 
-  if (has_super()) {
-    if (!this->super().IsInitialized()) return false;
+  if (has_before_table_selection()) {
+    if (!this->before_table_selection().IsInitialized()) return false;
   }
-  if (has_scale_factor()) {
-    if (!this->scale_factor().IsInitialized()) return false;
+  if (has_after_table_selection()) {
+    if (!this->after_table_selection().IsInitialized()) return false;
   }
   if (has_table_info()) {
     if (!this->table_info().IsInitialized()) return false;
   }
-  if (has_new_geometry()) {
-    if (!this->new_geometry().IsInitialized()) return false;
-  }
-  if (has_old_geometry()) {
-    if (!this->old_geometry().IsInitialized()) return false;
-  }
   return true;
 }
 
-void TableInfoGeometryCommandArchive::Swap(TableInfoGeometryCommandArchive* other) {
+void TableCommandSelectionBehaviorArchive::Swap(TableCommandSelectionBehaviorArchive* other) {
   if (other != this) {
-    std::swap(super_, other->super_);
-    std::swap(scale_factor_, other->scale_factor_);
+    std::swap(before_table_selection_, other->before_table_selection_);
+    std::swap(after_table_selection_, other->after_table_selection_);
     std::swap(table_info_, other->table_info_);
-    std::swap(new_geometry_, other->new_geometry_);
-    std::swap(old_geometry_, other->old_geometry_);
-    std::swap(turn_off_auto_resize_, other->turn_off_auto_resize_);
-    std::swap(should_clear_object_placeholder_flag_, other->should_clear_object_placeholder_flag_);
-    std::swap(did_match_object_placeholder_geometry_, other->did_match_object_placeholder_geometry_);
+    std::swap(last_column_hit_by_tap_, other->last_column_hit_by_tap_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableInfoGeometryCommandArchive::GetMetadata() const {
+::google::protobuf::Metadata TableCommandSelectionBehaviorArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableInfoGeometryCommandArchive_descriptor_;
-  metadata.reflection = TableInfoGeometryCommandArchive_reflection_;
+  metadata.descriptor = TableCommandSelectionBehaviorArchive_descriptor_;
+  metadata.reflection = TableCommandSelectionBehaviorArchive_reflection_;
   return metadata;
 }
 
@@ -34853,104 +39241,78 @@ ::google::protobuf::Metadata TableInfoGeometryCommandArchive::GetMetadata() cons
 // ===================================================================
 
 #ifndef _MSC_VER
-const int FormulaEditingCommandGroupArchive::kSuperFieldNumber;
-const int FormulaEditingCommandGroupArchive::kUndoSelectionValidFieldNumber;
-const int FormulaEditingCommandGroupArchive::kUndoSelectionStartFieldNumber;
-const int FormulaEditingCommandGroupArchive::kUndoSelectionLengthFieldNumber;
-const int FormulaEditingCommandGroupArchive::kUndoActiveTokenFieldNumber;
-const int FormulaEditingCommandGroupArchive::kRedoSelectionValidFieldNumber;
-const int FormulaEditingCommandGroupArchive::kRedoSelectionStartFieldNumber;
-const int FormulaEditingCommandGroupArchive::kRedoSelectionLengthFieldNumber;
-const int FormulaEditingCommandGroupArchive::kRedoActiveTokenFieldNumber;
+const int DisableTableNameSelectionBehaviorArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-FormulaEditingCommandGroupArchive::FormulaEditingCommandGroupArchive()
+DisableTableNameSelectionBehaviorArchive::DisableTableNameSelectionBehaviorArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void FormulaEditingCommandGroupArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::ProgressiveCommandGroupArchive*>(&::TSK::ProgressiveCommandGroupArchive::default_instance());
+void DisableTableNameSelectionBehaviorArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandSelectionBehaviorArchive*>(&::TST::TableCommandSelectionBehaviorArchive::default_instance());
 }
 
-FormulaEditingCommandGroupArchive::FormulaEditingCommandGroupArchive(const FormulaEditingCommandGroupArchive& from)
+DisableTableNameSelectionBehaviorArchive::DisableTableNameSelectionBehaviorArchive(const DisableTableNameSelectionBehaviorArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void FormulaEditingCommandGroupArchive::SharedCtor() {
+void DisableTableNameSelectionBehaviorArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  undoselectionvalid_ = false;
-  undoselectionstart_ = 0u;
-  undoselectionlength_ = 0u;
-  undoactivetoken_ = 0u;
-  redoselectionvalid_ = false;
-  redoselectionstart_ = 0u;
-  redoselectionlength_ = 0u;
-  redoactivetoken_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-FormulaEditingCommandGroupArchive::~FormulaEditingCommandGroupArchive() {
+DisableTableNameSelectionBehaviorArchive::~DisableTableNameSelectionBehaviorArchive() {
   SharedDtor();
 }
 
-void FormulaEditingCommandGroupArchive::SharedDtor() {
+void DisableTableNameSelectionBehaviorArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void FormulaEditingCommandGroupArchive::SetCachedSize(int size) const {
+void DisableTableNameSelectionBehaviorArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* FormulaEditingCommandGroupArchive::descriptor() {
+const ::google::protobuf::Descriptor* DisableTableNameSelectionBehaviorArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return FormulaEditingCommandGroupArchive_descriptor_;
+  return DisableTableNameSelectionBehaviorArchive_descriptor_;
 }
 
-const FormulaEditingCommandGroupArchive& FormulaEditingCommandGroupArchive::default_instance() {
+const DisableTableNameSelectionBehaviorArchive& DisableTableNameSelectionBehaviorArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-FormulaEditingCommandGroupArchive* FormulaEditingCommandGroupArchive::default_instance_ = NULL;
+DisableTableNameSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::default_instance_ = NULL;
 
-FormulaEditingCommandGroupArchive* FormulaEditingCommandGroupArchive::New() const {
-  return new FormulaEditingCommandGroupArchive;
+DisableTableNameSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::New() const {
+  return new DisableTableNameSelectionBehaviorArchive;
 }
 
-void FormulaEditingCommandGroupArchive::Clear() {
+void DisableTableNameSelectionBehaviorArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::ProgressiveCommandGroupArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandSelectionBehaviorArchive::Clear();
     }
-    undoselectionvalid_ = false;
-    undoselectionstart_ = 0u;
-    undoselectionlength_ = 0u;
-    undoactivetoken_ = 0u;
-    redoselectionvalid_ = false;
-    redoselectionstart_ = 0u;
-    redoselectionlength_ = 0u;
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    redoactivetoken_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool FormulaEditingCommandGroupArchive::MergePartialFromCodedStream(
+bool DisableTableNameSelectionBehaviorArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.ProgressiveCommandGroupArchive super = 1;
+      // required .TST.TableCommandSelectionBehaviorArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -34959,134 +39321,6 @@ bool FormulaEditingCommandGroupArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_undoSelectionValid;
-        break;
-      }
-
-      // required bool undoSelectionValid = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoSelectionValid:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &undoselectionvalid_)));
-          set_has_undoselectionvalid();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_undoSelectionStart;
-        break;
-      }
-
-      // required uint32 undoSelectionStart = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoSelectionStart:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &undoselectionstart_)));
-          set_has_undoselectionstart();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_undoSelectionLength;
-        break;
-      }
-
-      // required uint32 undoSelectionLength = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoSelectionLength:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &undoselectionlength_)));
-          set_has_undoselectionlength();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_undoActiveToken;
-        break;
-      }
-
-      // required uint32 undoActiveToken = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoActiveToken:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &undoactivetoken_)));
-          set_has_undoactivetoken();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(48)) goto parse_redoSelectionValid;
-        break;
-      }
-
-      // required bool redoSelectionValid = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoSelectionValid:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &redoselectionvalid_)));
-          set_has_redoselectionvalid();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_redoSelectionStart;
-        break;
-      }
-
-      // required uint32 redoSelectionStart = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoSelectionStart:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &redoselectionstart_)));
-          set_has_redoselectionstart();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(64)) goto parse_redoSelectionLength;
-        break;
-      }
-
-      // required uint32 redoSelectionLength = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoSelectionLength:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &redoselectionlength_)));
-          set_has_redoselectionlength();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(72)) goto parse_redoActiveToken;
-        break;
-      }
-
-      // required uint32 redoActiveToken = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoActiveToken:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &redoactivetoken_)));
-          set_has_redoactivetoken();
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -35107,109 +39341,29 @@ bool FormulaEditingCommandGroupArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void FormulaEditingCommandGroupArchive::SerializeWithCachedSizes(
+void DisableTableNameSelectionBehaviorArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.ProgressiveCommandGroupArchive super = 1;
+  // required .TST.TableCommandSelectionBehaviorArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required bool undoSelectionValid = 2;
-  if (has_undoselectionvalid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->undoselectionvalid(), output);
-  }
-
-  // required uint32 undoSelectionStart = 3;
-  if (has_undoselectionstart()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->undoselectionstart(), output);
-  }
-
-  // required uint32 undoSelectionLength = 4;
-  if (has_undoselectionlength()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->undoselectionlength(), output);
-  }
-
-  // required uint32 undoActiveToken = 5;
-  if (has_undoactivetoken()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->undoactivetoken(), output);
-  }
-
-  // required bool redoSelectionValid = 6;
-  if (has_redoselectionvalid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->redoselectionvalid(), output);
-  }
-
-  // required uint32 redoSelectionStart = 7;
-  if (has_redoselectionstart()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->redoselectionstart(), output);
-  }
-
-  // required uint32 redoSelectionLength = 8;
-  if (has_redoselectionlength()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->redoselectionlength(), output);
-  }
-
-  // required uint32 redoActiveToken = 9;
-  if (has_redoactivetoken()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(9, this->redoactivetoken(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* FormulaEditingCommandGroupArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* DisableTableNameSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.ProgressiveCommandGroupArchive super = 1;
+  // required .TST.TableCommandSelectionBehaviorArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required bool undoSelectionValid = 2;
-  if (has_undoselectionvalid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->undoselectionvalid(), target);
-  }
-
-  // required uint32 undoSelectionStart = 3;
-  if (has_undoselectionstart()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->undoselectionstart(), target);
-  }
-
-  // required uint32 undoSelectionLength = 4;
-  if (has_undoselectionlength()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->undoselectionlength(), target);
-  }
-
-  // required uint32 undoActiveToken = 5;
-  if (has_undoactivetoken()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->undoactivetoken(), target);
-  }
-
-  // required bool redoSelectionValid = 6;
-  if (has_redoselectionvalid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->redoselectionvalid(), target);
-  }
-
-  // required uint32 redoSelectionStart = 7;
-  if (has_redoselectionstart()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->redoselectionstart(), target);
-  }
-
-  // required uint32 redoSelectionLength = 8;
-  if (has_redoselectionlength()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->redoselectionlength(), target);
-  }
-
-  // required uint32 redoActiveToken = 9;
-  if (has_redoactivetoken()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(9, this->redoactivetoken(), target);
-  }
-
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -35217,71 +39371,17 @@ ::google::protobuf::uint8* FormulaEditingCommandGroupArchive::SerializeWithCache
   return target;
 }
 
-int FormulaEditingCommandGroupArchive::ByteSize() const {
+int DisableTableNameSelectionBehaviorArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.ProgressiveCommandGroupArchive super = 1;
+    // required .TST.TableCommandSelectionBehaviorArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required bool undoSelectionValid = 2;
-    if (has_undoselectionvalid()) {
-      total_size += 1 + 1;
-    }
-
-    // required uint32 undoSelectionStart = 3;
-    if (has_undoselectionstart()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->undoselectionstart());
-    }
-
-    // required uint32 undoSelectionLength = 4;
-    if (has_undoselectionlength()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->undoselectionlength());
-    }
-
-    // required uint32 undoActiveToken = 5;
-    if (has_undoactivetoken()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->undoactivetoken());
-    }
-
-    // required bool redoSelectionValid = 6;
-    if (has_redoselectionvalid()) {
-      total_size += 1 + 1;
-    }
-
-    // required uint32 redoSelectionStart = 7;
-    if (has_redoselectionstart()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->redoselectionstart());
-    }
-
-    // required uint32 redoSelectionLength = 8;
-    if (has_redoselectionlength()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->redoselectionlength());
-    }
-
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // required uint32 redoActiveToken = 9;
-    if (has_redoactivetoken()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->redoactivetoken());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -35294,10 +39394,10 @@ int FormulaEditingCommandGroupArchive::ByteSize() const {
   return total_size;
 }
 
-void FormulaEditingCommandGroupArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void DisableTableNameSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const FormulaEditingCommandGroupArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const FormulaEditingCommandGroupArchive*>(
+  const DisableTableNameSelectionBehaviorArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const DisableTableNameSelectionBehaviorArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -35306,56 +39406,30 @@ void FormulaEditingCommandGroupArchive::MergeFrom(const ::google::protobuf::Mess
   }
 }
 
-void FormulaEditingCommandGroupArchive::MergeFrom(const FormulaEditingCommandGroupArchive& from) {
+void DisableTableNameSelectionBehaviorArchive::MergeFrom(const DisableTableNameSelectionBehaviorArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::ProgressiveCommandGroupArchive::MergeFrom(from.super());
-    }
-    if (from.has_undoselectionvalid()) {
-      set_undoselectionvalid(from.undoselectionvalid());
-    }
-    if (from.has_undoselectionstart()) {
-      set_undoselectionstart(from.undoselectionstart());
-    }
-    if (from.has_undoselectionlength()) {
-      set_undoselectionlength(from.undoselectionlength());
-    }
-    if (from.has_undoactivetoken()) {
-      set_undoactivetoken(from.undoactivetoken());
-    }
-    if (from.has_redoselectionvalid()) {
-      set_redoselectionvalid(from.redoselectionvalid());
-    }
-    if (from.has_redoselectionstart()) {
-      set_redoselectionstart(from.redoselectionstart());
-    }
-    if (from.has_redoselectionlength()) {
-      set_redoselectionlength(from.redoselectionlength());
-    }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_redoactivetoken()) {
-      set_redoactivetoken(from.redoactivetoken());
+      mutable_super()->::TST::TableCommandSelectionBehaviorArchive::MergeFrom(from.super());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void FormulaEditingCommandGroupArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void DisableTableNameSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void FormulaEditingCommandGroupArchive::CopyFrom(const FormulaEditingCommandGroupArchive& from) {
+void DisableTableNameSelectionBehaviorArchive::CopyFrom(const DisableTableNameSelectionBehaviorArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool FormulaEditingCommandGroupArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x000001ff) != 0x000001ff) return false;
+bool DisableTableNameSelectionBehaviorArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -35363,28 +39437,20 @@ bool FormulaEditingCommandGroupArchive::IsInitialized() const {
   return true;
 }
 
-void FormulaEditingCommandGroupArchive::Swap(FormulaEditingCommandGroupArchive* other) {
+void DisableTableNameSelectionBehaviorArchive::Swap(DisableTableNameSelectionBehaviorArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(undoselectionvalid_, other->undoselectionvalid_);
-    std::swap(undoselectionstart_, other->undoselectionstart_);
-    std::swap(undoselectionlength_, other->undoselectionlength_);
-    std::swap(undoactivetoken_, other->undoactivetoken_);
-    std::swap(redoselectionvalid_, other->redoselectionvalid_);
-    std::swap(redoselectionstart_, other->redoselectionstart_);
-    std::swap(redoselectionlength_, other->redoselectionlength_);
-    std::swap(redoactivetoken_, other->redoactivetoken_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata FormulaEditingCommandGroupArchive::GetMetadata() const {
+::google::protobuf::Metadata DisableTableNameSelectionBehaviorArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = FormulaEditingCommandGroupArchive_descriptor_;
-  metadata.reflection = FormulaEditingCommandGroupArchive_reflection_;
+  metadata.descriptor = DisableTableNameSelectionBehaviorArchive_descriptor_;
+  metadata.reflection = DisableTableNameSelectionBehaviorArchive_reflection_;
   return metadata;
 }
 
@@ -35392,237 +39458,146 @@ ::google::protobuf::Metadata FormulaEditingCommandGroupArchive::GetMetadata() co
 // ===================================================================
 
 #ifndef _MSC_VER
-const int FormulaEditingCommandSelectionBehaviorArchive::kUndoSelectionValidFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kUndoSelectionStartFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kUndoSelectionLengthFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kUndoActiveTokenFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kRedoSelectionValidFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kRedoSelectionStartFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kRedoSelectionLengthFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kRedoActiveTokenFieldNumber;
-const int FormulaEditingCommandSelectionBehaviorArchive::kStorageFieldNumber;
+const int CommandApplyCellCommentArchive::kSuperFieldNumber;
+const int CommandApplyCellCommentArchive::kCellIdFieldNumber;
+const int CommandApplyCellCommentArchive::kOldCommentStorageFieldNumber;
+const int CommandApplyCellCommentArchive::kNewCommentStorageFieldNumber;
 #endif  // !_MSC_VER
 
-FormulaEditingCommandSelectionBehaviorArchive::FormulaEditingCommandSelectionBehaviorArchive()
+CommandApplyCellCommentArchive::CommandApplyCellCommentArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::InitAsDefaultInstance() {
-  storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandApplyCellCommentArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  cell_id_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
+  old_comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  new_comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-FormulaEditingCommandSelectionBehaviorArchive::FormulaEditingCommandSelectionBehaviorArchive(const FormulaEditingCommandSelectionBehaviorArchive& from)
+CommandApplyCellCommentArchive::CommandApplyCellCommentArchive(const CommandApplyCellCommentArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::SharedCtor() {
+void CommandApplyCellCommentArchive::SharedCtor() {
   _cached_size_ = 0;
-  undoselectionvalid_ = false;
-  undoselectionstart_ = 0u;
-  undoselectionlength_ = 0u;
-  undoactivetoken_ = 0u;
-  redoselectionvalid_ = false;
-  redoselectionstart_ = 0u;
-  redoselectionlength_ = 0u;
-  redoactivetoken_ = 0u;
-  storage_ = NULL;
+  super_ = NULL;
+  cell_id_ = NULL;
+  old_comment_storage_ = NULL;
+  new_comment_storage_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-FormulaEditingCommandSelectionBehaviorArchive::~FormulaEditingCommandSelectionBehaviorArchive() {
+CommandApplyCellCommentArchive::~CommandApplyCellCommentArchive() {
   SharedDtor();
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::SharedDtor() {
+void CommandApplyCellCommentArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete storage_;
+    delete super_;
+    delete cell_id_;
+    delete old_comment_storage_;
+    delete new_comment_storage_;
   }
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::SetCachedSize(int size) const {
+void CommandApplyCellCommentArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* FormulaEditingCommandSelectionBehaviorArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandApplyCellCommentArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return FormulaEditingCommandSelectionBehaviorArchive_descriptor_;
+  return CommandApplyCellCommentArchive_descriptor_;
 }
 
-const FormulaEditingCommandSelectionBehaviorArchive& FormulaEditingCommandSelectionBehaviorArchive::default_instance() {
+const CommandApplyCellCommentArchive& CommandApplyCellCommentArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-FormulaEditingCommandSelectionBehaviorArchive* FormulaEditingCommandSelectionBehaviorArchive::default_instance_ = NULL;
-
-FormulaEditingCommandSelectionBehaviorArchive* FormulaEditingCommandSelectionBehaviorArchive::New() const {
-  return new FormulaEditingCommandSelectionBehaviorArchive;
-}
+CommandApplyCellCommentArchive* CommandApplyCellCommentArchive::default_instance_ = NULL;
 
-void FormulaEditingCommandSelectionBehaviorArchive::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    undoselectionvalid_ = false;
-    undoselectionstart_ = 0u;
-    undoselectionlength_ = 0u;
-    undoactivetoken_ = 0u;
-    redoselectionvalid_ = false;
-    redoselectionstart_ = 0u;
-    redoselectionlength_ = 0u;
-    redoactivetoken_ = 0u;
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (has_storage()) {
-      if (storage_ != NULL) storage_->::TSP::Reference::Clear();
+CommandApplyCellCommentArchive* CommandApplyCellCommentArchive::New() const {
+  return new CommandApplyCellCommentArchive;
+}
+
+void CommandApplyCellCommentArchive::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_cell_id()) {
+      if (cell_id_ != NULL) cell_id_->::TST::CellID::Clear();
+    }
+    if (has_old_comment_storage()) {
+      if (old_comment_storage_ != NULL) old_comment_storage_->::TSP::Reference::Clear();
+    }
+    if (has_new_comment_storage()) {
+      if (new_comment_storage_ != NULL) new_comment_storage_->::TSP::Reference::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool FormulaEditingCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
+bool CommandApplyCellCommentArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional bool undoSelectionValid = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &undoselectionvalid_)));
-          set_has_undoselectionvalid();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_undoSelectionStart;
-        break;
-      }
-
-      // optional uint32 undoSelectionStart = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoSelectionStart:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &undoselectionstart_)));
-          set_has_undoselectionstart();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_undoSelectionLength;
-        break;
-      }
-
-      // optional uint32 undoSelectionLength = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoSelectionLength:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &undoselectionlength_)));
-          set_has_undoselectionlength();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_undoActiveToken;
-        break;
-      }
-
-      // optional uint32 undoActiveToken = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_undoActiveToken:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &undoactivetoken_)));
-          set_has_undoactivetoken();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(48)) goto parse_redoSelectionValid;
-        break;
-      }
-
-      // optional bool redoSelectionValid = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoSelectionValid:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &redoselectionvalid_)));
-          set_has_redoselectionvalid();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_redoSelectionStart;
-        break;
-      }
-
-      // optional uint32 redoSelectionStart = 7;
-      case 7: {
+      // required .TST.TableCommandArchive super = 1;
+      case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoSelectionStart:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &redoselectionstart_)));
-          set_has_redoselectionstart();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(64)) goto parse_redoSelectionLength;
+        if (input->ExpectTag(18)) goto parse_cell_id;
         break;
       }
 
-      // optional uint32 redoSelectionLength = 8;
-      case 8: {
+      // required .TST.CellID cell_id = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoSelectionLength:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &redoselectionlength_)));
-          set_has_redoselectionlength();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cell_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cell_id()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(72)) goto parse_redoActiveToken;
+        if (input->ExpectTag(26)) goto parse_old_comment_storage;
         break;
       }
 
-      // optional uint32 redoActiveToken = 9;
-      case 9: {
+      // optional .TSP.Reference old_comment_storage = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_redoActiveToken:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &redoactivetoken_)));
-          set_has_redoactivetoken();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_comment_storage:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_comment_storage()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(82)) goto parse_storage;
+        if (input->ExpectTag(34)) goto parse_new_comment_storage;
         break;
       }
 
-      // optional .TSP.Reference storage = 10;
-      case 10: {
+      // optional .TSP.Reference new_comment_storage = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_storage:
+         parse_new_comment_storage:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_storage()));
+               input, mutable_new_comment_storage()));
         } else {
           goto handle_uninterpreted;
         }
@@ -35646,52 +39621,30 @@ bool FormulaEditingCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
+void CommandApplyCellCommentArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional bool undoSelectionValid = 2;
-  if (has_undoselectionvalid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->undoselectionvalid(), output);
-  }
-
-  // optional uint32 undoSelectionStart = 3;
-  if (has_undoselectionstart()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->undoselectionstart(), output);
-  }
-
-  // optional uint32 undoSelectionLength = 4;
-  if (has_undoselectionlength()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->undoselectionlength(), output);
-  }
-
-  // optional uint32 undoActiveToken = 5;
-  if (has_undoactivetoken()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->undoactivetoken(), output);
-  }
-
-  // optional bool redoSelectionValid = 6;
-  if (has_redoselectionvalid()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->redoselectionvalid(), output);
-  }
-
-  // optional uint32 redoSelectionStart = 7;
-  if (has_redoselectionstart()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->redoselectionstart(), output);
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->super(), output);
   }
 
-  // optional uint32 redoSelectionLength = 8;
-  if (has_redoselectionlength()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->redoselectionlength(), output);
+  // required .TST.CellID cell_id = 2;
+  if (has_cell_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->cell_id(), output);
   }
 
-  // optional uint32 redoActiveToken = 9;
-  if (has_redoactivetoken()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(9, this->redoactivetoken(), output);
+  // optional .TSP.Reference old_comment_storage = 3;
+  if (has_old_comment_storage()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->old_comment_storage(), output);
   }
 
-  // optional .TSP.Reference storage = 10;
-  if (has_storage()) {
+  // optional .TSP.Reference new_comment_storage = 4;
+  if (has_new_comment_storage()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->storage(), output);
+      4, this->new_comment_storage(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -35700,53 +39653,34 @@ void FormulaEditingCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* FormulaEditingCommandSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandApplyCellCommentArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional bool undoSelectionValid = 2;
-  if (has_undoselectionvalid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->undoselectionvalid(), target);
-  }
-
-  // optional uint32 undoSelectionStart = 3;
-  if (has_undoselectionstart()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->undoselectionstart(), target);
-  }
-
-  // optional uint32 undoSelectionLength = 4;
-  if (has_undoselectionlength()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->undoselectionlength(), target);
-  }
-
-  // optional uint32 undoActiveToken = 5;
-  if (has_undoactivetoken()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->undoactivetoken(), target);
-  }
-
-  // optional bool redoSelectionValid = 6;
-  if (has_redoselectionvalid()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->redoselectionvalid(), target);
-  }
-
-  // optional uint32 redoSelectionStart = 7;
-  if (has_redoselectionstart()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->redoselectionstart(), target);
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->super(), target);
   }
 
-  // optional uint32 redoSelectionLength = 8;
-  if (has_redoselectionlength()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->redoselectionlength(), target);
+  // required .TST.CellID cell_id = 2;
+  if (has_cell_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->cell_id(), target);
   }
 
-  // optional uint32 redoActiveToken = 9;
-  if (has_redoactivetoken()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(9, this->redoactivetoken(), target);
+  // optional .TSP.Reference old_comment_storage = 3;
+  if (has_old_comment_storage()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->old_comment_storage(), target);
   }
 
-  // optional .TSP.Reference storage = 10;
-  if (has_storage()) {
+  // optional .TSP.Reference new_comment_storage = 4;
+  if (has_new_comment_storage()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        10, this->storage(), target);
+        4, this->new_comment_storage(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -35756,69 +39690,36 @@ ::google::protobuf::uint8* FormulaEditingCommandSelectionBehaviorArchive::Serial
   return target;
 }
 
-int FormulaEditingCommandSelectionBehaviorArchive::ByteSize() const {
+int CommandApplyCellCommentArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional bool undoSelectionValid = 2;
-    if (has_undoselectionvalid()) {
-      total_size += 1 + 1;
-    }
-
-    // optional uint32 undoSelectionStart = 3;
-    if (has_undoselectionstart()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->undoselectionstart());
-    }
-
-    // optional uint32 undoSelectionLength = 4;
-    if (has_undoselectionlength()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->undoselectionlength());
-    }
-
-    // optional uint32 undoActiveToken = 5;
-    if (has_undoactivetoken()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->undoactivetoken());
-    }
-
-    // optional bool redoSelectionValid = 6;
-    if (has_redoselectionvalid()) {
-      total_size += 1 + 1;
-    }
-
-    // optional uint32 redoSelectionStart = 7;
-    if (has_redoselectionstart()) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->redoselectionstart());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->super());
     }
 
-    // optional uint32 redoSelectionLength = 8;
-    if (has_redoselectionlength()) {
+    // required .TST.CellID cell_id = 2;
+    if (has_cell_id()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->redoselectionlength());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cell_id());
     }
 
-    // optional uint32 redoActiveToken = 9;
-    if (has_redoactivetoken()) {
+    // optional .TSP.Reference old_comment_storage = 3;
+    if (has_old_comment_storage()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->redoactivetoken());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_comment_storage());
     }
 
-  }
-  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    // optional .TSP.Reference storage = 10;
-    if (has_storage()) {
+    // optional .TSP.Reference new_comment_storage = 4;
+    if (has_new_comment_storage()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->storage());
+          this->new_comment_storage());
     }
 
   }
@@ -35833,10 +39734,10 @@ int FormulaEditingCommandSelectionBehaviorArchive::ByteSize() const {
   return total_size;
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandApplyCellCommentArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const FormulaEditingCommandSelectionBehaviorArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const FormulaEditingCommandSelectionBehaviorArchive*>(
+  const CommandApplyCellCommentArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyCellCommentArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -35845,84 +39746,72 @@ void FormulaEditingCommandSelectionBehaviorArchive::MergeFrom(const ::google::pr
   }
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::MergeFrom(const FormulaEditingCommandSelectionBehaviorArchive& from) {
+void CommandApplyCellCommentArchive::MergeFrom(const CommandApplyCellCommentArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_undoselectionvalid()) {
-      set_undoselectionvalid(from.undoselectionvalid());
-    }
-    if (from.has_undoselectionstart()) {
-      set_undoselectionstart(from.undoselectionstart());
-    }
-    if (from.has_undoselectionlength()) {
-      set_undoselectionlength(from.undoselectionlength());
-    }
-    if (from.has_undoactivetoken()) {
-      set_undoactivetoken(from.undoactivetoken());
-    }
-    if (from.has_redoselectionvalid()) {
-      set_redoselectionvalid(from.redoselectionvalid());
-    }
-    if (from.has_redoselectionstart()) {
-      set_redoselectionstart(from.redoselectionstart());
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_redoselectionlength()) {
-      set_redoselectionlength(from.redoselectionlength());
+    if (from.has_cell_id()) {
+      mutable_cell_id()->::TST::CellID::MergeFrom(from.cell_id());
     }
-    if (from.has_redoactivetoken()) {
-      set_redoactivetoken(from.redoactivetoken());
+    if (from.has_old_comment_storage()) {
+      mutable_old_comment_storage()->::TSP::Reference::MergeFrom(from.old_comment_storage());
     }
-  }
-  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
-    if (from.has_storage()) {
-      mutable_storage()->::TSP::Reference::MergeFrom(from.storage());
+    if (from.has_new_comment_storage()) {
+      mutable_new_comment_storage()->::TSP::Reference::MergeFrom(from.new_comment_storage());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandApplyCellCommentArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::CopyFrom(const FormulaEditingCommandSelectionBehaviorArchive& from) {
+void CommandApplyCellCommentArchive::CopyFrom(const CommandApplyCellCommentArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool FormulaEditingCommandSelectionBehaviorArchive::IsInitialized() const {
+bool CommandApplyCellCommentArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  if (has_storage()) {
-    if (!this->storage().IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
+  }
+  if (has_cell_id()) {
+    if (!this->cell_id().IsInitialized()) return false;
+  }
+  if (has_old_comment_storage()) {
+    if (!this->old_comment_storage().IsInitialized()) return false;
+  }
+  if (has_new_comment_storage()) {
+    if (!this->new_comment_storage().IsInitialized()) return false;
   }
   return true;
 }
 
-void FormulaEditingCommandSelectionBehaviorArchive::Swap(FormulaEditingCommandSelectionBehaviorArchive* other) {
+void CommandApplyCellCommentArchive::Swap(CommandApplyCellCommentArchive* other) {
   if (other != this) {
-    std::swap(undoselectionvalid_, other->undoselectionvalid_);
-    std::swap(undoselectionstart_, other->undoselectionstart_);
-    std::swap(undoselectionlength_, other->undoselectionlength_);
-    std::swap(undoactivetoken_, other->undoactivetoken_);
-    std::swap(redoselectionvalid_, other->redoselectionvalid_);
-    std::swap(redoselectionstart_, other->redoselectionstart_);
-    std::swap(redoselectionlength_, other->redoselectionlength_);
-    std::swap(redoactivetoken_, other->redoactivetoken_);
-    std::swap(storage_, other->storage_);
+    std::swap(super_, other->super_);
+    std::swap(cell_id_, other->cell_id_);
+    std::swap(old_comment_storage_, other->old_comment_storage_);
+    std::swap(new_comment_storage_, other->new_comment_storage_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata FormulaEditingCommandSelectionBehaviorArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandApplyCellCommentArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = FormulaEditingCommandSelectionBehaviorArchive_descriptor_;
-  metadata.reflection = FormulaEditingCommandSelectionBehaviorArchive_reflection_;
+  metadata.descriptor = CommandApplyCellCommentArchive_descriptor_;
+  metadata.reflection = CommandApplyCellCommentArchive_reflection_;
   return metadata;
 }
 
@@ -35930,167 +39819,146 @@ ::google::protobuf::Metadata FormulaEditingCommandSelectionBehaviorArchive::GetM
 // ===================================================================
 
 #ifndef _MSC_VER
-const int UndoRedoStateCommandSelectionBehaviorArchive::kBeforeUndoRedoStateFieldNumber;
-const int UndoRedoStateCommandSelectionBehaviorArchive::kAfterUndoRedoStateFieldNumber;
-const int UndoRedoStateCommandSelectionBehaviorArchive::kTableInfoFieldNumber;
-const int UndoRedoStateCommandSelectionBehaviorArchive::kBeforeTableSelectionFieldNumber;
-const int UndoRedoStateCommandSelectionBehaviorArchive::kAfterTableSelectionFieldNumber;
+const int CommandApplyConditionalStyleSetArchive::kSuperFieldNumber;
+const int CommandApplyConditionalStyleSetArchive::kSelectionFieldNumber;
+const int CommandApplyConditionalStyleSetArchive::kUndoCellMapFieldNumber;
+const int CommandApplyConditionalStyleSetArchive::kRedoCellMapFieldNumber;
 #endif  // !_MSC_VER
 
-UndoRedoStateCommandSelectionBehaviorArchive::UndoRedoStateCommandSelectionBehaviorArchive()
+CommandApplyConditionalStyleSetArchive::CommandApplyConditionalStyleSetArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::InitAsDefaultInstance() {
-  before_undo_redo_state_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  after_undo_redo_state_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  table_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  before_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  after_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+void CommandApplyConditionalStyleSetArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
 }
 
-UndoRedoStateCommandSelectionBehaviorArchive::UndoRedoStateCommandSelectionBehaviorArchive(const UndoRedoStateCommandSelectionBehaviorArchive& from)
+CommandApplyConditionalStyleSetArchive::CommandApplyConditionalStyleSetArchive(const CommandApplyConditionalStyleSetArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::SharedCtor() {
+void CommandApplyConditionalStyleSetArchive::SharedCtor() {
   _cached_size_ = 0;
-  before_undo_redo_state_ = NULL;
-  after_undo_redo_state_ = NULL;
-  table_info_ = NULL;
-  before_table_selection_ = NULL;
-  after_table_selection_ = NULL;
+  super_ = NULL;
+  selection_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-UndoRedoStateCommandSelectionBehaviorArchive::~UndoRedoStateCommandSelectionBehaviorArchive() {
+CommandApplyConditionalStyleSetArchive::~CommandApplyConditionalStyleSetArchive() {
   SharedDtor();
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::SharedDtor() {
+void CommandApplyConditionalStyleSetArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete before_undo_redo_state_;
-    delete after_undo_redo_state_;
-    delete table_info_;
-    delete before_table_selection_;
-    delete after_table_selection_;
+    delete super_;
+    delete selection_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
   }
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::SetCachedSize(int size) const {
+void CommandApplyConditionalStyleSetArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* UndoRedoStateCommandSelectionBehaviorArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandApplyConditionalStyleSetArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return UndoRedoStateCommandSelectionBehaviorArchive_descriptor_;
+  return CommandApplyConditionalStyleSetArchive_descriptor_;
 }
 
-const UndoRedoStateCommandSelectionBehaviorArchive& UndoRedoStateCommandSelectionBehaviorArchive::default_instance() {
+const CommandApplyConditionalStyleSetArchive& CommandApplyConditionalStyleSetArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-UndoRedoStateCommandSelectionBehaviorArchive* UndoRedoStateCommandSelectionBehaviorArchive::default_instance_ = NULL;
+CommandApplyConditionalStyleSetArchive* CommandApplyConditionalStyleSetArchive::default_instance_ = NULL;
 
-UndoRedoStateCommandSelectionBehaviorArchive* UndoRedoStateCommandSelectionBehaviorArchive::New() const {
-  return new UndoRedoStateCommandSelectionBehaviorArchive;
+CommandApplyConditionalStyleSetArchive* CommandApplyConditionalStyleSetArchive::New() const {
+  return new CommandApplyConditionalStyleSetArchive;
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::Clear() {
+void CommandApplyConditionalStyleSetArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_before_undo_redo_state()) {
-      if (before_undo_redo_state_ != NULL) before_undo_redo_state_->::TSP::Reference::Clear();
-    }
-    if (has_after_undo_redo_state()) {
-      if (after_undo_redo_state_ != NULL) after_undo_redo_state_->::TSP::Reference::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_table_info()) {
-      if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
     }
-    if (has_before_table_selection()) {
-      if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
     }
-    if (has_after_table_selection()) {
-      if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool UndoRedoStateCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
+bool CommandApplyConditionalStyleSetArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_before_undo_redo_state()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_after_undo_redo_state;
-        break;
-      }
-
-      // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_after_undo_redo_state:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_after_undo_redo_state()));
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_table_info;
+        if (input->ExpectTag(18)) goto parse_selection;
         break;
       }
 
-      // optional .TSP.Reference table_info = 3;
-      case 3: {
+      // required .TST.SelectionArchive selection = 2;
+      case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_info:
+         parse_selection:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_info()));
+               input, mutable_selection()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_before_table_selection;
+        if (input->ExpectTag(26)) goto parse_undo_cell_map;
         break;
       }
 
-      // optional .TST.SelectionArchive before_table_selection = 4;
-      case 4: {
+      // required .TST.CellMapArchive undo_cell_map = 3;
+      case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_before_table_selection:
+         parse_undo_cell_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_before_table_selection()));
+               input, mutable_undo_cell_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(50)) goto parse_after_table_selection;
+        if (input->ExpectTag(34)) goto parse_redo_cell_map;
         break;
       }
 
-      // optional .TST.SelectionArchive after_table_selection = 6;
-      case 6: {
+      // required .TST.CellMapArchive redo_cell_map = 4;
+      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_after_table_selection:
+         parse_redo_cell_map:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_after_table_selection()));
+               input, mutable_redo_cell_map()));
         } else {
           goto handle_uninterpreted;
         }
@@ -36114,36 +39982,30 @@ bool UndoRedoStateCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
+void CommandApplyConditionalStyleSetArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
-  if (has_before_undo_redo_state()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->before_undo_redo_state(), output);
-  }
-
-  // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
-  if (has_after_undo_redo_state()) {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->after_undo_redo_state(), output);
+      1, this->super(), output);
   }
 
-  // optional .TSP.Reference table_info = 3;
-  if (has_table_info()) {
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->table_info(), output);
+      2, this->selection(), output);
   }
 
-  // optional .TST.SelectionArchive before_table_selection = 4;
-  if (has_before_table_selection()) {
+  // required .TST.CellMapArchive undo_cell_map = 3;
+  if (has_undo_cell_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->before_table_selection(), output);
+      3, this->undo_cell_map(), output);
   }
 
-  // optional .TST.SelectionArchive after_table_selection = 6;
-  if (has_after_table_selection()) {
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->after_table_selection(), output);
+      4, this->redo_cell_map(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -36152,41 +40014,34 @@ void UndoRedoStateCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* UndoRedoStateCommandSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandApplyConditionalStyleSetArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
-  if (has_before_undo_redo_state()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->before_undo_redo_state(), target);
-  }
-
-  // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
-  if (has_after_undo_redo_state()) {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->after_undo_redo_state(), target);
+        1, this->super(), target);
   }
 
-  // optional .TSP.Reference table_info = 3;
-  if (has_table_info()) {
+  // required .TST.SelectionArchive selection = 2;
+  if (has_selection()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->table_info(), target);
+        2, this->selection(), target);
   }
 
-  // optional .TST.SelectionArchive before_table_selection = 4;
-  if (has_before_table_selection()) {
+  // required .TST.CellMapArchive undo_cell_map = 3;
+  if (has_undo_cell_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->before_table_selection(), target);
+        3, this->undo_cell_map(), target);
   }
 
-  // optional .TST.SelectionArchive after_table_selection = 6;
-  if (has_after_table_selection()) {
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->after_table_selection(), target);
+        4, this->redo_cell_map(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -36196,43 +40051,36 @@ ::google::protobuf::uint8* UndoRedoStateCommandSelectionBehaviorArchive::Seriali
   return target;
 }
 
-int UndoRedoStateCommandSelectionBehaviorArchive::ByteSize() const {
+int CommandApplyConditionalStyleSetArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
-    if (has_before_undo_redo_state()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->before_undo_redo_state());
-    }
-
-    // optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
-    if (has_after_undo_redo_state()) {
+    // required .TST.TableCommandArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->after_undo_redo_state());
+          this->super());
     }
 
-    // optional .TSP.Reference table_info = 3;
-    if (has_table_info()) {
+    // required .TST.SelectionArchive selection = 2;
+    if (has_selection()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_info());
+          this->selection());
     }
 
-    // optional .TST.SelectionArchive before_table_selection = 4;
-    if (has_before_table_selection()) {
+    // required .TST.CellMapArchive undo_cell_map = 3;
+    if (has_undo_cell_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->before_table_selection());
+          this->undo_cell_map());
     }
 
-    // optional .TST.SelectionArchive after_table_selection = 6;
-    if (has_after_table_selection()) {
+    // required .TST.CellMapArchive redo_cell_map = 4;
+    if (has_redo_cell_map()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->after_table_selection());
+          this->redo_cell_map());
     }
 
   }
@@ -36247,10 +40095,10 @@ int UndoRedoStateCommandSelectionBehaviorArchive::ByteSize() const {
   return total_size;
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandApplyConditionalStyleSetArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const UndoRedoStateCommandSelectionBehaviorArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const UndoRedoStateCommandSelectionBehaviorArchive*>(
+  const CommandApplyConditionalStyleSetArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyConditionalStyleSetArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -36259,78 +40107,72 @@ void UndoRedoStateCommandSelectionBehaviorArchive::MergeFrom(const ::google::pro
   }
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::MergeFrom(const UndoRedoStateCommandSelectionBehaviorArchive& from) {
+void CommandApplyConditionalStyleSetArchive::MergeFrom(const CommandApplyConditionalStyleSetArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_before_undo_redo_state()) {
-      mutable_before_undo_redo_state()->::TSP::Reference::MergeFrom(from.before_undo_redo_state());
-    }
-    if (from.has_after_undo_redo_state()) {
-      mutable_after_undo_redo_state()->::TSP::Reference::MergeFrom(from.after_undo_redo_state());
+    if (from.has_super()) {
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_table_info()) {
-      mutable_table_info()->::TSP::Reference::MergeFrom(from.table_info());
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
     }
-    if (from.has_before_table_selection()) {
-      mutable_before_table_selection()->::TST::SelectionArchive::MergeFrom(from.before_table_selection());
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
     }
-    if (from.has_after_table_selection()) {
-      mutable_after_table_selection()->::TST::SelectionArchive::MergeFrom(from.after_table_selection());
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandApplyConditionalStyleSetArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::CopyFrom(const UndoRedoStateCommandSelectionBehaviorArchive& from) {
+void CommandApplyConditionalStyleSetArchive::CopyFrom(const CommandApplyConditionalStyleSetArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool UndoRedoStateCommandSelectionBehaviorArchive::IsInitialized() const {
+bool CommandApplyConditionalStyleSetArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
-  if (has_before_undo_redo_state()) {
-    if (!this->before_undo_redo_state().IsInitialized()) return false;
-  }
-  if (has_after_undo_redo_state()) {
-    if (!this->after_undo_redo_state().IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
   }
-  if (has_table_info()) {
-    if (!this->table_info().IsInitialized()) return false;
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
   }
-  if (has_before_table_selection()) {
-    if (!this->before_table_selection().IsInitialized()) return false;
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
   }
-  if (has_after_table_selection()) {
-    if (!this->after_table_selection().IsInitialized()) return false;
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
   }
   return true;
 }
 
-void UndoRedoStateCommandSelectionBehaviorArchive::Swap(UndoRedoStateCommandSelectionBehaviorArchive* other) {
+void CommandApplyConditionalStyleSetArchive::Swap(CommandApplyConditionalStyleSetArchive* other) {
   if (other != this) {
-    std::swap(before_undo_redo_state_, other->before_undo_redo_state_);
-    std::swap(after_undo_redo_state_, other->after_undo_redo_state_);
-    std::swap(table_info_, other->table_info_);
-    std::swap(before_table_selection_, other->before_table_selection_);
-    std::swap(after_table_selection_, other->after_table_selection_);
+    std::swap(super_, other->super_);
+    std::swap(selection_, other->selection_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata UndoRedoStateCommandSelectionBehaviorArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandApplyConditionalStyleSetArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = UndoRedoStateCommandSelectionBehaviorArchive_descriptor_;
-  metadata.reflection = UndoRedoStateCommandSelectionBehaviorArchive_reflection_;
+  metadata.descriptor = CommandApplyConditionalStyleSetArchive_descriptor_;
+  metadata.reflection = CommandApplyConditionalStyleSetArchive_reflection_;
   return metadata;
 }
 
@@ -36338,144 +40180,102 @@ ::google::protobuf::Metadata UndoRedoStateCommandSelectionBehaviorArchive::GetMe
 // ===================================================================
 
 #ifndef _MSC_VER
-const int TableCommandSelectionBehaviorArchive::kBeforeTableSelectionFieldNumber;
-const int TableCommandSelectionBehaviorArchive::kAfterTableSelectionFieldNumber;
-const int TableCommandSelectionBehaviorArchive::kTableInfoFieldNumber;
-const int TableCommandSelectionBehaviorArchive::kLastColumnHitByTapFieldNumber;
+const int CommandSetFormulaTokenizationArchive::kSuperFieldNumber;
+const int CommandSetFormulaTokenizationArchive::kTokenizationFieldNumber;
 #endif  // !_MSC_VER
 
-TableCommandSelectionBehaviorArchive::TableCommandSelectionBehaviorArchive()
+CommandSetFormulaTokenizationArchive::CommandSetFormulaTokenizationArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void TableCommandSelectionBehaviorArchive::InitAsDefaultInstance() {
-  before_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  after_table_selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  table_info_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+void CommandSetFormulaTokenizationArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
 }
 
-TableCommandSelectionBehaviorArchive::TableCommandSelectionBehaviorArchive(const TableCommandSelectionBehaviorArchive& from)
+CommandSetFormulaTokenizationArchive::CommandSetFormulaTokenizationArchive(const CommandSetFormulaTokenizationArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void TableCommandSelectionBehaviorArchive::SharedCtor() {
+void CommandSetFormulaTokenizationArchive::SharedCtor() {
   _cached_size_ = 0;
-  before_table_selection_ = NULL;
-  after_table_selection_ = NULL;
-  table_info_ = NULL;
-  last_column_hit_by_tap_ = 0u;
+  super_ = NULL;
+  tokenization_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-TableCommandSelectionBehaviorArchive::~TableCommandSelectionBehaviorArchive() {
+CommandSetFormulaTokenizationArchive::~CommandSetFormulaTokenizationArchive() {
   SharedDtor();
 }
 
-void TableCommandSelectionBehaviorArchive::SharedDtor() {
+void CommandSetFormulaTokenizationArchive::SharedDtor() {
   if (this != default_instance_) {
-    delete before_table_selection_;
-    delete after_table_selection_;
-    delete table_info_;
+    delete super_;
   }
 }
 
-void TableCommandSelectionBehaviorArchive::SetCachedSize(int size) const {
+void CommandSetFormulaTokenizationArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* TableCommandSelectionBehaviorArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetFormulaTokenizationArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return TableCommandSelectionBehaviorArchive_descriptor_;
+  return CommandSetFormulaTokenizationArchive_descriptor_;
 }
 
-const TableCommandSelectionBehaviorArchive& TableCommandSelectionBehaviorArchive::default_instance() {
+const CommandSetFormulaTokenizationArchive& CommandSetFormulaTokenizationArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-TableCommandSelectionBehaviorArchive* TableCommandSelectionBehaviorArchive::default_instance_ = NULL;
+CommandSetFormulaTokenizationArchive* CommandSetFormulaTokenizationArchive::default_instance_ = NULL;
 
-TableCommandSelectionBehaviorArchive* TableCommandSelectionBehaviorArchive::New() const {
-  return new TableCommandSelectionBehaviorArchive;
+CommandSetFormulaTokenizationArchive* CommandSetFormulaTokenizationArchive::New() const {
+  return new CommandSetFormulaTokenizationArchive;
 }
 
-void TableCommandSelectionBehaviorArchive::Clear() {
+void CommandSetFormulaTokenizationArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_before_table_selection()) {
-      if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_after_table_selection()) {
-      if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_table_info()) {
-      if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
+    if (has_super()) {
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    last_column_hit_by_tap_ = 0u;
+    tokenization_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool TableCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
+bool CommandSetFormulaTokenizationArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .TST.SelectionArchive before_table_selection = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_before_table_selection()));
+               input, mutable_super()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_after_table_selection;
+        if (input->ExpectTag(16)) goto parse_tokenization;
         break;
       }
 
-      // optional .TST.SelectionArchive after_table_selection = 2;
+      // required bool tokenization = 2;
       case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_after_table_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_after_table_selection()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_table_info;
-        break;
-      }
-
-      // optional .TSP.Reference table_info = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_table_info:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_table_info()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_last_column_hit_by_tap;
-        break;
-      }
-
-      // optional uint32 last_column_hit_by_tap = 4;
-      case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_last_column_hit_by_tap:
+         parse_tokenization:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &last_column_hit_by_tap_)));
-          set_has_last_column_hit_by_tap();
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &tokenization_)));
+          set_has_tokenization();
         } else {
           goto handle_uninterpreted;
         }
@@ -36499,29 +40299,17 @@ bool TableCommandSelectionBehaviorArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void TableCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
+void CommandSetFormulaTokenizationArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .TST.SelectionArchive before_table_selection = 1;
-  if (has_before_table_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->before_table_selection(), output);
-  }
-
-  // optional .TST.SelectionArchive after_table_selection = 2;
-  if (has_after_table_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->after_table_selection(), output);
-  }
-
-  // optional .TSP.Reference table_info = 3;
-  if (has_table_info()) {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->table_info(), output);
+      1, this->super(), output);
   }
 
-  // optional uint32 last_column_hit_by_tap = 4;
-  if (has_last_column_hit_by_tap()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->last_column_hit_by_tap(), output);
+  // required bool tokenization = 2;
+  if (has_tokenization()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->tokenization(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -36530,32 +40318,18 @@ void TableCommandSelectionBehaviorArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* TableCommandSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetFormulaTokenizationArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // optional .TST.SelectionArchive before_table_selection = 1;
-  if (has_before_table_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->before_table_selection(), target);
-  }
-
-  // optional .TST.SelectionArchive after_table_selection = 2;
-  if (has_after_table_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->after_table_selection(), target);
-  }
-
-  // optional .TSP.Reference table_info = 3;
-  if (has_table_info()) {
+  // required .TSK.CommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->table_info(), target);
+        1, this->super(), target);
   }
 
-  // optional uint32 last_column_hit_by_tap = 4;
-  if (has_last_column_hit_by_tap()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->last_column_hit_by_tap(), target);
+  // required bool tokenization = 2;
+  if (has_tokenization()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->tokenization(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -36565,36 +40339,20 @@ ::google::protobuf::uint8* TableCommandSelectionBehaviorArchive::SerializeWithCa
   return target;
 }
 
-int TableCommandSelectionBehaviorArchive::ByteSize() const {
+int CommandSetFormulaTokenizationArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .TST.SelectionArchive before_table_selection = 1;
-    if (has_before_table_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->before_table_selection());
-    }
-
-    // optional .TST.SelectionArchive after_table_selection = 2;
-    if (has_after_table_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->after_table_selection());
-    }
-
-    // optional .TSP.Reference table_info = 3;
-    if (has_table_info()) {
+    // required .TSK.CommandArchive super = 1;
+    if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->table_info());
+          this->super());
     }
 
-    // optional uint32 last_column_hit_by_tap = 4;
-    if (has_last_column_hit_by_tap()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->last_column_hit_by_tap());
+    // required bool tokenization = 2;
+    if (has_tokenization()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -36609,10 +40367,10 @@ int TableCommandSelectionBehaviorArchive::ByteSize() const {
   return total_size;
 }
 
-void TableCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetFormulaTokenizationArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const TableCommandSelectionBehaviorArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const TableCommandSelectionBehaviorArchive*>(
+  const CommandSetFormulaTokenizationArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFormulaTokenizationArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -36621,68 +40379,55 @@ void TableCommandSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::M
   }
 }
 
-void TableCommandSelectionBehaviorArchive::MergeFrom(const TableCommandSelectionBehaviorArchive& from) {
+void CommandSetFormulaTokenizationArchive::MergeFrom(const CommandSetFormulaTokenizationArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_before_table_selection()) {
-      mutable_before_table_selection()->::TST::SelectionArchive::MergeFrom(from.before_table_selection());
-    }
-    if (from.has_after_table_selection()) {
-      mutable_after_table_selection()->::TST::SelectionArchive::MergeFrom(from.after_table_selection());
-    }
-    if (from.has_table_info()) {
-      mutable_table_info()->::TSP::Reference::MergeFrom(from.table_info());
+    if (from.has_super()) {
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_last_column_hit_by_tap()) {
-      set_last_column_hit_by_tap(from.last_column_hit_by_tap());
+    if (from.has_tokenization()) {
+      set_tokenization(from.tokenization());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void TableCommandSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetFormulaTokenizationArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void TableCommandSelectionBehaviorArchive::CopyFrom(const TableCommandSelectionBehaviorArchive& from) {
+void CommandSetFormulaTokenizationArchive::CopyFrom(const CommandSetFormulaTokenizationArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool TableCommandSelectionBehaviorArchive::IsInitialized() const {
+bool CommandSetFormulaTokenizationArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
-  if (has_before_table_selection()) {
-    if (!this->before_table_selection().IsInitialized()) return false;
-  }
-  if (has_after_table_selection()) {
-    if (!this->after_table_selection().IsInitialized()) return false;
-  }
-  if (has_table_info()) {
-    if (!this->table_info().IsInitialized()) return false;
+  if (has_super()) {
+    if (!this->super().IsInitialized()) return false;
   }
   return true;
 }
 
-void TableCommandSelectionBehaviorArchive::Swap(TableCommandSelectionBehaviorArchive* other) {
+void CommandSetFormulaTokenizationArchive::Swap(CommandSetFormulaTokenizationArchive* other) {
   if (other != this) {
-    std::swap(before_table_selection_, other->before_table_selection_);
-    std::swap(after_table_selection_, other->after_table_selection_);
-    std::swap(table_info_, other->table_info_);
-    std::swap(last_column_hit_by_tap_, other->last_column_hit_by_tap_);
+    std::swap(super_, other->super_);
+    std::swap(tokenization_, other->tokenization_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata TableCommandSelectionBehaviorArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetFormulaTokenizationArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = TableCommandSelectionBehaviorArchive_descriptor_;
-  metadata.reflection = TableCommandSelectionBehaviorArchive_reflection_;
+  metadata.descriptor = CommandSetFormulaTokenizationArchive_descriptor_;
+  metadata.reflection = CommandSetFormulaTokenizationArchive_reflection_;
   return metadata;
 }
 
@@ -36690,78 +40435,84 @@ ::google::protobuf::Metadata TableCommandSelectionBehaviorArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int DisableTableNameSelectionBehaviorArchive::kSuperFieldNumber;
+const int CommandSetFilterEnabledArchive::kSuperFieldNumber;
+const int CommandSetFilterEnabledArchive::kFilterIndexFieldNumber;
+const int CommandSetFilterEnabledArchive::kEnabledFieldNumber;
 #endif  // !_MSC_VER
 
-DisableTableNameSelectionBehaviorArchive::DisableTableNameSelectionBehaviorArchive()
+CommandSetFilterEnabledArchive::CommandSetFilterEnabledArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void DisableTableNameSelectionBehaviorArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandSelectionBehaviorArchive*>(&::TST::TableCommandSelectionBehaviorArchive::default_instance());
+void CommandSetFilterEnabledArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
 }
 
-DisableTableNameSelectionBehaviorArchive::DisableTableNameSelectionBehaviorArchive(const DisableTableNameSelectionBehaviorArchive& from)
+CommandSetFilterEnabledArchive::CommandSetFilterEnabledArchive(const CommandSetFilterEnabledArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void DisableTableNameSelectionBehaviorArchive::SharedCtor() {
+void CommandSetFilterEnabledArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  filter_index_ = 0u;
+  enabled_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-DisableTableNameSelectionBehaviorArchive::~DisableTableNameSelectionBehaviorArchive() {
+CommandSetFilterEnabledArchive::~CommandSetFilterEnabledArchive() {
   SharedDtor();
 }
 
-void DisableTableNameSelectionBehaviorArchive::SharedDtor() {
+void CommandSetFilterEnabledArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void DisableTableNameSelectionBehaviorArchive::SetCachedSize(int size) const {
+void CommandSetFilterEnabledArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* DisableTableNameSelectionBehaviorArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetFilterEnabledArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return DisableTableNameSelectionBehaviorArchive_descriptor_;
+  return CommandSetFilterEnabledArchive_descriptor_;
 }
 
-const DisableTableNameSelectionBehaviorArchive& DisableTableNameSelectionBehaviorArchive::default_instance() {
+const CommandSetFilterEnabledArchive& CommandSetFilterEnabledArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-DisableTableNameSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::default_instance_ = NULL;
+CommandSetFilterEnabledArchive* CommandSetFilterEnabledArchive::default_instance_ = NULL;
 
-DisableTableNameSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::New() const {
-  return new DisableTableNameSelectionBehaviorArchive;
+CommandSetFilterEnabledArchive* CommandSetFilterEnabledArchive::New() const {
+  return new CommandSetFilterEnabledArchive;
 }
 
-void DisableTableNameSelectionBehaviorArchive::Clear() {
+void CommandSetFilterEnabledArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandSelectionBehaviorArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
+    filter_index_ = 0u;
+    enabled_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool DisableTableNameSelectionBehaviorArchive::MergePartialFromCodedStream(
+bool CommandSetFilterEnabledArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandSelectionBehaviorArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -36770,6 +40521,38 @@ bool DisableTableNameSelectionBehaviorArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(16)) goto parse_filter_index;
+        break;
+      }
+
+      // required uint32 filter_index = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_filter_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &filter_index_)));
+          set_has_filter_index();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_enabled;
+        break;
+      }
+
+      // required bool enabled = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &enabled_)));
+          set_has_enabled();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -36790,29 +40573,49 @@ bool DisableTableNameSelectionBehaviorArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void DisableTableNameSelectionBehaviorArchive::SerializeWithCachedSizes(
+void CommandSetFilterEnabledArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandSelectionBehaviorArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
+  // required uint32 filter_index = 2;
+  if (has_filter_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->filter_index(), output);
+  }
+
+  // required bool enabled = 4;
+  if (has_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->enabled(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* DisableTableNameSelectionBehaviorArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetFilterEnabledArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandSelectionBehaviorArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
+  // required uint32 filter_index = 2;
+  if (has_filter_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->filter_index(), target);
+  }
+
+  // required bool enabled = 4;
+  if (has_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->enabled(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -36820,17 +40623,29 @@ ::google::protobuf::uint8* DisableTableNameSelectionBehaviorArchive::SerializeWi
   return target;
 }
 
-int DisableTableNameSelectionBehaviorArchive::ByteSize() const {
+int CommandSetFilterEnabledArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandSelectionBehaviorArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
+    // required uint32 filter_index = 2;
+    if (has_filter_index()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->filter_index());
+    }
+
+    // required bool enabled = 4;
+    if (has_enabled()) {
+      total_size += 1 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -36843,10 +40658,10 @@ int DisableTableNameSelectionBehaviorArchive::ByteSize() const {
   return total_size;
 }
 
-void DisableTableNameSelectionBehaviorArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetFilterEnabledArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const DisableTableNameSelectionBehaviorArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const DisableTableNameSelectionBehaviorArchive*>(
+  const CommandSetFilterEnabledArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFilterEnabledArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -36855,30 +40670,36 @@ void DisableTableNameSelectionBehaviorArchive::MergeFrom(const ::google::protobu
   }
 }
 
-void DisableTableNameSelectionBehaviorArchive::MergeFrom(const DisableTableNameSelectionBehaviorArchive& from) {
+void CommandSetFilterEnabledArchive::MergeFrom(const CommandSetFilterEnabledArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandSelectionBehaviorArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+    }
+    if (from.has_filter_index()) {
+      set_filter_index(from.filter_index());
+    }
+    if (from.has_enabled()) {
+      set_enabled(from.enabled());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void DisableTableNameSelectionBehaviorArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetFilterEnabledArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void DisableTableNameSelectionBehaviorArchive::CopyFrom(const DisableTableNameSelectionBehaviorArchive& from) {
+void CommandSetFilterEnabledArchive::CopyFrom(const CommandSetFilterEnabledArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool DisableTableNameSelectionBehaviorArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandSetFilterEnabledArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -36886,20 +40707,22 @@ bool DisableTableNameSelectionBehaviorArchive::IsInitialized() const {
   return true;
 }
 
-void DisableTableNameSelectionBehaviorArchive::Swap(DisableTableNameSelectionBehaviorArchive* other) {
+void CommandSetFilterEnabledArchive::Swap(CommandSetFilterEnabledArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(filter_index_, other->filter_index_);
+    std::swap(enabled_, other->enabled_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata DisableTableNameSelectionBehaviorArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetFilterEnabledArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = DisableTableNameSelectionBehaviorArchive_descriptor_;
-  metadata.reflection = DisableTableNameSelectionBehaviorArchive_reflection_;
+  metadata.descriptor = CommandSetFilterEnabledArchive_descriptor_;
+  metadata.reflection = CommandSetFilterEnabledArchive_reflection_;
   return metadata;
 }
 
@@ -36907,93 +40730,81 @@ ::google::protobuf::Metadata DisableTableNameSelectionBehaviorArchive::GetMetada
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandApplyCellCommentArchive::kSuperFieldNumber;
-const int CommandApplyCellCommentArchive::kCellIdFieldNumber;
-const int CommandApplyCellCommentArchive::kOldCommentStorageFieldNumber;
-const int CommandApplyCellCommentArchive::kNewCommentStorageFieldNumber;
+const int CommandSetFilterRuleEnabledArchive::kSuperFieldNumber;
+const int CommandSetFilterRuleEnabledArchive::kFilterIndexFieldNumber;
+const int CommandSetFilterRuleEnabledArchive::kRuleIndexFieldNumber;
+const int CommandSetFilterRuleEnabledArchive::kEnabledFieldNumber;
 #endif  // !_MSC_VER
 
-CommandApplyCellCommentArchive::CommandApplyCellCommentArchive()
+CommandSetFilterRuleEnabledArchive::CommandSetFilterRuleEnabledArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandApplyCellCommentArchive::InitAsDefaultInstance() {
+void CommandSetFilterRuleEnabledArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  cell_id_ = const_cast< ::TST::CellID*>(&::TST::CellID::default_instance());
-  old_comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  new_comment_storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandApplyCellCommentArchive::CommandApplyCellCommentArchive(const CommandApplyCellCommentArchive& from)
+CommandSetFilterRuleEnabledArchive::CommandSetFilterRuleEnabledArchive(const CommandSetFilterRuleEnabledArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandApplyCellCommentArchive::SharedCtor() {
+void CommandSetFilterRuleEnabledArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  cell_id_ = NULL;
-  old_comment_storage_ = NULL;
-  new_comment_storage_ = NULL;
+  filter_index_ = 0u;
+  rule_index_ = 0u;
+  enabled_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandApplyCellCommentArchive::~CommandApplyCellCommentArchive() {
+CommandSetFilterRuleEnabledArchive::~CommandSetFilterRuleEnabledArchive() {
   SharedDtor();
 }
 
-void CommandApplyCellCommentArchive::SharedDtor() {
+void CommandSetFilterRuleEnabledArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete cell_id_;
-    delete old_comment_storage_;
-    delete new_comment_storage_;
   }
 }
 
-void CommandApplyCellCommentArchive::SetCachedSize(int size) const {
+void CommandSetFilterRuleEnabledArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandApplyCellCommentArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetFilterRuleEnabledArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandApplyCellCommentArchive_descriptor_;
+  return CommandSetFilterRuleEnabledArchive_descriptor_;
 }
 
-const CommandApplyCellCommentArchive& CommandApplyCellCommentArchive::default_instance() {
+const CommandSetFilterRuleEnabledArchive& CommandSetFilterRuleEnabledArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandApplyCellCommentArchive* CommandApplyCellCommentArchive::default_instance_ = NULL;
+CommandSetFilterRuleEnabledArchive* CommandSetFilterRuleEnabledArchive::default_instance_ = NULL;
 
-CommandApplyCellCommentArchive* CommandApplyCellCommentArchive::New() const {
-  return new CommandApplyCellCommentArchive;
+CommandSetFilterRuleEnabledArchive* CommandSetFilterRuleEnabledArchive::New() const {
+  return new CommandSetFilterRuleEnabledArchive;
 }
 
-void CommandApplyCellCommentArchive::Clear() {
+void CommandSetFilterRuleEnabledArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_cell_id()) {
-      if (cell_id_ != NULL) cell_id_->::TST::CellID::Clear();
-    }
-    if (has_old_comment_storage()) {
-      if (old_comment_storage_ != NULL) old_comment_storage_->::TSP::Reference::Clear();
-    }
-    if (has_new_comment_storage()) {
-      if (new_comment_storage_ != NULL) new_comment_storage_->::TSP::Reference::Clear();
-    }
+    filter_index_ = 0u;
+    rule_index_ = 0u;
+    enabled_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandApplyCellCommentArchive::MergePartialFromCodedStream(
+bool CommandSetFilterRuleEnabledArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -37008,45 +40819,51 @@ bool CommandApplyCellCommentArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_cell_id;
+        if (input->ExpectTag(16)) goto parse_filter_index;
         break;
       }
 
-      // required .TST.CellID cell_id = 2;
+      // required uint32 filter_index = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_cell_id:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_cell_id()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_filter_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &filter_index_)));
+          set_has_filter_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_old_comment_storage;
+        if (input->ExpectTag(24)) goto parse_rule_index;
         break;
       }
 
-      // optional .TSP.Reference old_comment_storage = 3;
+      // required uint32 rule_index = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_comment_storage:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_comment_storage()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_rule_index:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &rule_index_)));
+          set_has_rule_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_new_comment_storage;
+        if (input->ExpectTag(32)) goto parse_enabled;
         break;
       }
 
-      // optional .TSP.Reference new_comment_storage = 4;
+      // required bool enabled = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_comment_storage:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_comment_storage()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_enabled:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &enabled_)));
+          set_has_enabled();
         } else {
           goto handle_uninterpreted;
         }
@@ -37070,7 +40887,7 @@ bool CommandApplyCellCommentArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandApplyCellCommentArchive::SerializeWithCachedSizes(
+void CommandSetFilterRuleEnabledArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -37078,22 +40895,19 @@ void CommandApplyCellCommentArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TST.CellID cell_id = 2;
-  if (has_cell_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->cell_id(), output);
+  // required uint32 filter_index = 2;
+  if (has_filter_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->filter_index(), output);
   }
 
-  // optional .TSP.Reference old_comment_storage = 3;
-  if (has_old_comment_storage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->old_comment_storage(), output);
+  // required uint32 rule_index = 3;
+  if (has_rule_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->rule_index(), output);
   }
 
-  // optional .TSP.Reference new_comment_storage = 4;
-  if (has_new_comment_storage()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->new_comment_storage(), output);
+  // required bool enabled = 4;
+  if (has_enabled()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->enabled(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -37102,7 +40916,7 @@ void CommandApplyCellCommentArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandApplyCellCommentArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetFilterRuleEnabledArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -37111,25 +40925,19 @@ ::google::protobuf::uint8* CommandApplyCellCommentArchive::SerializeWithCachedSi
         1, this->super(), target);
   }
 
-  // required .TST.CellID cell_id = 2;
-  if (has_cell_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->cell_id(), target);
+  // required uint32 filter_index = 2;
+  if (has_filter_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->filter_index(), target);
   }
 
-  // optional .TSP.Reference old_comment_storage = 3;
-  if (has_old_comment_storage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->old_comment_storage(), target);
+  // required uint32 rule_index = 3;
+  if (has_rule_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->rule_index(), target);
   }
 
-  // optional .TSP.Reference new_comment_storage = 4;
-  if (has_new_comment_storage()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->new_comment_storage(), target);
+  // required bool enabled = 4;
+  if (has_enabled()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->enabled(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -37139,7 +40947,7 @@ ::google::protobuf::uint8* CommandApplyCellCommentArchive::SerializeWithCachedSi
   return target;
 }
 
-int CommandApplyCellCommentArchive::ByteSize() const {
+int CommandSetFilterRuleEnabledArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -37150,25 +40958,23 @@ int CommandApplyCellCommentArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TST.CellID cell_id = 2;
-    if (has_cell_id()) {
+    // required uint32 filter_index = 2;
+    if (has_filter_index()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->cell_id());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->filter_index());
     }
 
-    // optional .TSP.Reference old_comment_storage = 3;
-    if (has_old_comment_storage()) {
+    // required uint32 rule_index = 3;
+    if (has_rule_index()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_comment_storage());
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->rule_index());
     }
 
-    // optional .TSP.Reference new_comment_storage = 4;
-    if (has_new_comment_storage()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_comment_storage());
+    // required bool enabled = 4;
+    if (has_enabled()) {
+      total_size += 1 + 1;
     }
 
   }
@@ -37183,10 +40989,10 @@ int CommandApplyCellCommentArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandApplyCellCommentArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetFilterRuleEnabledArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandApplyCellCommentArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyCellCommentArchive*>(
+  const CommandSetFilterRuleEnabledArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFilterRuleEnabledArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -37195,72 +41001,63 @@ void CommandApplyCellCommentArchive::MergeFrom(const ::google::protobuf::Message
   }
 }
 
-void CommandApplyCellCommentArchive::MergeFrom(const CommandApplyCellCommentArchive& from) {
+void CommandSetFilterRuleEnabledArchive::MergeFrom(const CommandSetFilterRuleEnabledArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_cell_id()) {
-      mutable_cell_id()->::TST::CellID::MergeFrom(from.cell_id());
+    if (from.has_filter_index()) {
+      set_filter_index(from.filter_index());
     }
-    if (from.has_old_comment_storage()) {
-      mutable_old_comment_storage()->::TSP::Reference::MergeFrom(from.old_comment_storage());
+    if (from.has_rule_index()) {
+      set_rule_index(from.rule_index());
     }
-    if (from.has_new_comment_storage()) {
-      mutable_new_comment_storage()->::TSP::Reference::MergeFrom(from.new_comment_storage());
+    if (from.has_enabled()) {
+      set_enabled(from.enabled());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandApplyCellCommentArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetFilterRuleEnabledArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandApplyCellCommentArchive::CopyFrom(const CommandApplyCellCommentArchive& from) {
+void CommandSetFilterRuleEnabledArchive::CopyFrom(const CommandSetFilterRuleEnabledArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandApplyCellCommentArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetFilterRuleEnabledArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_cell_id()) {
-    if (!this->cell_id().IsInitialized()) return false;
-  }
-  if (has_old_comment_storage()) {
-    if (!this->old_comment_storage().IsInitialized()) return false;
-  }
-  if (has_new_comment_storage()) {
-    if (!this->new_comment_storage().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandApplyCellCommentArchive::Swap(CommandApplyCellCommentArchive* other) {
+void CommandSetFilterRuleEnabledArchive::Swap(CommandSetFilterRuleEnabledArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(cell_id_, other->cell_id_);
-    std::swap(old_comment_storage_, other->old_comment_storage_);
-    std::swap(new_comment_storage_, other->new_comment_storage_);
+    std::swap(filter_index_, other->filter_index_);
+    std::swap(rule_index_, other->rule_index_);
+    std::swap(enabled_, other->enabled_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandApplyCellCommentArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetFilterRuleEnabledArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandApplyCellCommentArchive_descriptor_;
-  metadata.reflection = CommandApplyCellCommentArchive_reflection_;
+  metadata.descriptor = CommandSetFilterRuleEnabledArchive_descriptor_;
+  metadata.reflection = CommandSetFilterRuleEnabledArchive_reflection_;
   return metadata;
 }
 
@@ -37268,93 +41065,78 @@ ::google::protobuf::Metadata CommandApplyCellCommentArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandApplyConditionalStyleSetArchive::kSuperFieldNumber;
-const int CommandApplyConditionalStyleSetArchive::kSelectionFieldNumber;
-const int CommandApplyConditionalStyleSetArchive::kUndoCellMapFieldNumber;
-const int CommandApplyConditionalStyleSetArchive::kRedoCellMapFieldNumber;
+const int CommandSetFilterSetTypeArchive::kSuperFieldNumber;
+const int CommandSetFilterSetTypeArchive::kOldFilterSetTypeFieldNumber;
+const int CommandSetFilterSetTypeArchive::kNewFilterSetTypeFieldNumber;
 #endif  // !_MSC_VER
 
-CommandApplyConditionalStyleSetArchive::CommandApplyConditionalStyleSetArchive()
+CommandSetFilterSetTypeArchive::CommandSetFilterSetTypeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandApplyConditionalStyleSetArchive::InitAsDefaultInstance() {
+void CommandSetFilterSetTypeArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
 }
 
-CommandApplyConditionalStyleSetArchive::CommandApplyConditionalStyleSetArchive(const CommandApplyConditionalStyleSetArchive& from)
+CommandSetFilterSetTypeArchive::CommandSetFilterSetTypeArchive(const CommandSetFilterSetTypeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandApplyConditionalStyleSetArchive::SharedCtor() {
+void CommandSetFilterSetTypeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  selection_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
+  old_filter_set_type_ = 0;
+  new_filter_set_type_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandApplyConditionalStyleSetArchive::~CommandApplyConditionalStyleSetArchive() {
+CommandSetFilterSetTypeArchive::~CommandSetFilterSetTypeArchive() {
   SharedDtor();
 }
 
-void CommandApplyConditionalStyleSetArchive::SharedDtor() {
+void CommandSetFilterSetTypeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete selection_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
   }
 }
 
-void CommandApplyConditionalStyleSetArchive::SetCachedSize(int size) const {
+void CommandSetFilterSetTypeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandApplyConditionalStyleSetArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetFilterSetTypeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandApplyConditionalStyleSetArchive_descriptor_;
+  return CommandSetFilterSetTypeArchive_descriptor_;
 }
 
-const CommandApplyConditionalStyleSetArchive& CommandApplyConditionalStyleSetArchive::default_instance() {
+const CommandSetFilterSetTypeArchive& CommandSetFilterSetTypeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandApplyConditionalStyleSetArchive* CommandApplyConditionalStyleSetArchive::default_instance_ = NULL;
+CommandSetFilterSetTypeArchive* CommandSetFilterSetTypeArchive::default_instance_ = NULL;
 
-CommandApplyConditionalStyleSetArchive* CommandApplyConditionalStyleSetArchive::New() const {
-  return new CommandApplyConditionalStyleSetArchive;
+CommandSetFilterSetTypeArchive* CommandSetFilterSetTypeArchive::New() const {
+  return new CommandSetFilterSetTypeArchive;
 }
 
-void CommandApplyConditionalStyleSetArchive::Clear() {
+void CommandSetFilterSetTypeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-    }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-    }
+    old_filter_set_type_ = 0;
+    new_filter_set_type_ = 0;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandApplyConditionalStyleSetArchive::MergePartialFromCodedStream(
+bool CommandSetFilterSetTypeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -37369,45 +41151,45 @@ bool CommandApplyConditionalStyleSetArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_selection;
+        if (input->ExpectTag(16)) goto parse_old_filter_set_type;
         break;
       }
 
-      // required .TST.SelectionArchive selection = 2;
+      // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_old_filter_set_type:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::FilterSetArchive_FilterSetType_IsValid(value)) {
+            set_old_filter_set_type(static_cast< ::TST::FilterSetArchive_FilterSetType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(2, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_undo_cell_map;
+        if (input->ExpectTag(24)) goto parse_new_filter_set_type;
         break;
       }
 
-      // required .TST.CellMapArchive undo_cell_map = 3;
+      // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_redo_cell_map;
-        break;
-      }
-
-      // required .TST.CellMapArchive redo_cell_map = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_new_filter_set_type:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::TST::FilterSetArchive_FilterSetType_IsValid(value)) {
+            set_new_filter_set_type(static_cast< ::TST::FilterSetArchive_FilterSetType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(3, value);
+          }
         } else {
           goto handle_uninterpreted;
         }
@@ -37431,7 +41213,7 @@ bool CommandApplyConditionalStyleSetArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandApplyConditionalStyleSetArchive::SerializeWithCachedSizes(
+void CommandSetFilterSetTypeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -37439,22 +41221,16 @@ void CommandApplyConditionalStyleSetArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->selection(), output);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 3;
-  if (has_undo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->undo_cell_map(), output);
+  // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
+  if (has_old_filter_set_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->old_filter_set_type(), output);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->redo_cell_map(), output);
+  // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
+  if (has_new_filter_set_type()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      3, this->new_filter_set_type(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -37463,7 +41239,7 @@ void CommandApplyConditionalStyleSetArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandApplyConditionalStyleSetArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetFilterSetTypeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -37472,25 +41248,16 @@ ::google::protobuf::uint8* CommandApplyConditionalStyleSetArchive::SerializeWith
         1, this->super(), target);
   }
 
-  // required .TST.SelectionArchive selection = 2;
-  if (has_selection()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->selection(), target);
-  }
-
-  // required .TST.CellMapArchive undo_cell_map = 3;
-  if (has_undo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->undo_cell_map(), target);
+  // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
+  if (has_old_filter_set_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->old_filter_set_type(), target);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->redo_cell_map(), target);
+  // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
+  if (has_new_filter_set_type()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      3, this->new_filter_set_type(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -37500,7 +41267,7 @@ ::google::protobuf::uint8* CommandApplyConditionalStyleSetArchive::SerializeWith
   return target;
 }
 
-int CommandApplyConditionalStyleSetArchive::ByteSize() const {
+int CommandSetFilterSetTypeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -37511,25 +41278,16 @@ int CommandApplyConditionalStyleSetArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TST.SelectionArchive selection = 2;
-    if (has_selection()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
-    }
-
-    // required .TST.CellMapArchive undo_cell_map = 3;
-    if (has_undo_cell_map()) {
+    // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
+    if (has_old_filter_set_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->old_filter_set_type());
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 4;
-    if (has_redo_cell_map()) {
+    // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
+    if (has_new_filter_set_type()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->new_filter_set_type());
     }
 
   }
@@ -37544,10 +41302,10 @@ int CommandApplyConditionalStyleSetArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandApplyConditionalStyleSetArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetFilterSetTypeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandApplyConditionalStyleSetArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandApplyConditionalStyleSetArchive*>(
+  const CommandSetFilterSetTypeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFilterSetTypeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -37556,72 +41314,59 @@ void CommandApplyConditionalStyleSetArchive::MergeFrom(const ::google::protobuf:
   }
 }
 
-void CommandApplyConditionalStyleSetArchive::MergeFrom(const CommandApplyConditionalStyleSetArchive& from) {
+void CommandSetFilterSetTypeArchive::MergeFrom(const CommandSetFilterSetTypeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
-    }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    if (from.has_old_filter_set_type()) {
+      set_old_filter_set_type(from.old_filter_set_type());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_new_filter_set_type()) {
+      set_new_filter_set_type(from.new_filter_set_type());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandApplyConditionalStyleSetArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetFilterSetTypeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandApplyConditionalStyleSetArchive::CopyFrom(const CommandApplyConditionalStyleSetArchive& from) {
+void CommandSetFilterSetTypeArchive::CopyFrom(const CommandSetFilterSetTypeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandApplyConditionalStyleSetArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandSetFilterSetTypeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandApplyConditionalStyleSetArchive::Swap(CommandApplyConditionalStyleSetArchive* other) {
+void CommandSetFilterSetTypeArchive::Swap(CommandSetFilterSetTypeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(selection_, other->selection_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(old_filter_set_type_, other->old_filter_set_type_);
+    std::swap(new_filter_set_type_, other->new_filter_set_type_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandApplyConditionalStyleSetArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetFilterSetTypeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandApplyConditionalStyleSetArchive_descriptor_;
-  metadata.reflection = CommandApplyConditionalStyleSetArchive_reflection_;
+  metadata.descriptor = CommandSetFilterSetTypeArchive_descriptor_;
+  metadata.reflection = CommandSetFilterSetTypeArchive_reflection_;
   return metadata;
 }
 
@@ -37629,81 +41374,92 @@ ::google::protobuf::Metadata CommandApplyConditionalStyleSetArchive::GetMetadata
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetFormulaTokenizationArchive::kSuperFieldNumber;
-const int CommandSetFormulaTokenizationArchive::kTokenizationFieldNumber;
+const int CommandSetStyleNetworkArchive::kSuperFieldNumber;
+const int CommandSetStyleNetworkArchive::kOldStyleNetworkFieldNumber;
+const int CommandSetStyleNetworkArchive::kNewStyleNetworkFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetFormulaTokenizationArchive::CommandSetFormulaTokenizationArchive()
+CommandSetStyleNetworkArchive::CommandSetStyleNetworkArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetFormulaTokenizationArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+void CommandSetStyleNetworkArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  old_style_network_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
+  new_style_network_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
 }
 
-CommandSetFormulaTokenizationArchive::CommandSetFormulaTokenizationArchive(const CommandSetFormulaTokenizationArchive& from)
+CommandSetStyleNetworkArchive::CommandSetStyleNetworkArchive(const CommandSetStyleNetworkArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetFormulaTokenizationArchive::SharedCtor() {
+void CommandSetStyleNetworkArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  tokenization_ = false;
+  old_style_network_ = NULL;
+  new_style_network_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetFormulaTokenizationArchive::~CommandSetFormulaTokenizationArchive() {
+CommandSetStyleNetworkArchive::~CommandSetStyleNetworkArchive() {
   SharedDtor();
 }
 
-void CommandSetFormulaTokenizationArchive::SharedDtor() {
+void CommandSetStyleNetworkArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete old_style_network_;
+    delete new_style_network_;
   }
 }
 
-void CommandSetFormulaTokenizationArchive::SetCachedSize(int size) const {
+void CommandSetStyleNetworkArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetFormulaTokenizationArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetStyleNetworkArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetFormulaTokenizationArchive_descriptor_;
+  return CommandSetStyleNetworkArchive_descriptor_;
 }
 
-const CommandSetFormulaTokenizationArchive& CommandSetFormulaTokenizationArchive::default_instance() {
+const CommandSetStyleNetworkArchive& CommandSetStyleNetworkArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetFormulaTokenizationArchive* CommandSetFormulaTokenizationArchive::default_instance_ = NULL;
+CommandSetStyleNetworkArchive* CommandSetStyleNetworkArchive::default_instance_ = NULL;
 
-CommandSetFormulaTokenizationArchive* CommandSetFormulaTokenizationArchive::New() const {
-  return new CommandSetFormulaTokenizationArchive;
+CommandSetStyleNetworkArchive* CommandSetStyleNetworkArchive::New() const {
+  return new CommandSetStyleNetworkArchive;
 }
 
-void CommandSetFormulaTokenizationArchive::Clear() {
+void CommandSetStyleNetworkArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+    }
+    if (has_old_style_network()) {
+      if (old_style_network_ != NULL) old_style_network_->::TST::TableStyleNetworkArchive::Clear();
+    }
+    if (has_new_style_network()) {
+      if (new_style_network_ != NULL) new_style_network_->::TST::TableStyleNetworkArchive::Clear();
     }
-    tokenization_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetFormulaTokenizationArchive::MergePartialFromCodedStream(
+bool CommandSetStyleNetworkArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -37712,19 +41468,31 @@ bool CommandSetFormulaTokenizationArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_tokenization;
+        if (input->ExpectTag(18)) goto parse_old_style_network;
         break;
       }
 
-      // required bool tokenization = 2;
+      // required .TST.TableStyleNetworkArchive old_style_network = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_tokenization:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &tokenization_)));
-          set_has_tokenization();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_style_network:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_style_network()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_new_style_network;
+        break;
+      }
+
+      // required .TST.TableStyleNetworkArchive new_style_network = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_style_network:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_style_network()));
         } else {
           goto handle_uninterpreted;
         }
@@ -37748,17 +41516,24 @@ bool CommandSetFormulaTokenizationArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetFormulaTokenizationArchive::SerializeWithCachedSizes(
+void CommandSetStyleNetworkArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required bool tokenization = 2;
-  if (has_tokenization()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(2, this->tokenization(), output);
+  // required .TST.TableStyleNetworkArchive old_style_network = 2;
+  if (has_old_style_network()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->old_style_network(), output);
+  }
+
+  // required .TST.TableStyleNetworkArchive new_style_network = 3;
+  if (has_new_style_network()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->new_style_network(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -37767,18 +41542,27 @@ void CommandSetFormulaTokenizationArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetFormulaTokenizationArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetStyleNetworkArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required bool tokenization = 2;
-  if (has_tokenization()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(2, this->tokenization(), target);
+  // required .TST.TableStyleNetworkArchive old_style_network = 2;
+  if (has_old_style_network()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->old_style_network(), target);
+  }
+
+  // required .TST.TableStyleNetworkArchive new_style_network = 3;
+  if (has_new_style_network()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->new_style_network(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -37788,20 +41572,29 @@ ::google::protobuf::uint8* CommandSetFormulaTokenizationArchive::SerializeWithCa
   return target;
 }
 
-int CommandSetFormulaTokenizationArchive::ByteSize() const {
+int CommandSetStyleNetworkArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required bool tokenization = 2;
-    if (has_tokenization()) {
-      total_size += 1 + 1;
+    // required .TST.TableStyleNetworkArchive old_style_network = 2;
+    if (has_old_style_network()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_style_network());
+    }
+
+    // required .TST.TableStyleNetworkArchive new_style_network = 3;
+    if (has_new_style_network()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_style_network());
     }
 
   }
@@ -37816,10 +41609,10 @@ int CommandSetFormulaTokenizationArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetFormulaTokenizationArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetStyleNetworkArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetFormulaTokenizationArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFormulaTokenizationArchive*>(
+  const CommandSetStyleNetworkArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetStyleNetworkArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -37828,55 +41621,65 @@ void CommandSetFormulaTokenizationArchive::MergeFrom(const ::google::protobuf::M
   }
 }
 
-void CommandSetFormulaTokenizationArchive::MergeFrom(const CommandSetFormulaTokenizationArchive& from) {
+void CommandSetStyleNetworkArchive::MergeFrom(const CommandSetStyleNetworkArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_tokenization()) {
-      set_tokenization(from.tokenization());
+    if (from.has_old_style_network()) {
+      mutable_old_style_network()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_style_network());
+    }
+    if (from.has_new_style_network()) {
+      mutable_new_style_network()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_style_network());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetFormulaTokenizationArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetStyleNetworkArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetFormulaTokenizationArchive::CopyFrom(const CommandSetFormulaTokenizationArchive& from) {
+void CommandSetStyleNetworkArchive::CopyFrom(const CommandSetStyleNetworkArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetFormulaTokenizationArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetStyleNetworkArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_old_style_network()) {
+    if (!this->old_style_network().IsInitialized()) return false;
+  }
+  if (has_new_style_network()) {
+    if (!this->new_style_network().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetFormulaTokenizationArchive::Swap(CommandSetFormulaTokenizationArchive* other) {
+void CommandSetStyleNetworkArchive::Swap(CommandSetStyleNetworkArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(tokenization_, other->tokenization_);
+    std::swap(old_style_network_, other->old_style_network_);
+    std::swap(new_style_network_, other->new_style_network_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetFormulaTokenizationArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetStyleNetworkArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetFormulaTokenizationArchive_descriptor_;
-  metadata.reflection = CommandSetFormulaTokenizationArchive_reflection_;
+  metadata.descriptor = CommandSetStyleNetworkArchive_descriptor_;
+  metadata.reflection = CommandSetStyleNetworkArchive_reflection_;
   return metadata;
 }
 
@@ -37884,78 +41687,93 @@ ::google::protobuf::Metadata CommandSetFormulaTokenizationArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetFilterEnabledArchive::kSuperFieldNumber;
-const int CommandSetFilterEnabledArchive::kFilterIndexFieldNumber;
-const int CommandSetFilterEnabledArchive::kEnabledFieldNumber;
+const int CommandMutateCellsArchive::kSuperFieldNumber;
+const int CommandMutateCellsArchive::kUndoCellMapFieldNumber;
+const int CommandMutateCellsArchive::kRedoCellMapFieldNumber;
+const int CommandMutateCellsArchive::kSelectionFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetFilterEnabledArchive::CommandSetFilterEnabledArchive()
+CommandMutateCellsArchive::CommandMutateCellsArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetFilterEnabledArchive::InitAsDefaultInstance() {
+void CommandMutateCellsArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
 }
 
-CommandSetFilterEnabledArchive::CommandSetFilterEnabledArchive(const CommandSetFilterEnabledArchive& from)
+CommandMutateCellsArchive::CommandMutateCellsArchive(const CommandMutateCellsArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetFilterEnabledArchive::SharedCtor() {
+void CommandMutateCellsArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  filter_index_ = 0u;
-  enabled_ = false;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  selection_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetFilterEnabledArchive::~CommandSetFilterEnabledArchive() {
+CommandMutateCellsArchive::~CommandMutateCellsArchive() {
   SharedDtor();
 }
 
-void CommandSetFilterEnabledArchive::SharedDtor() {
+void CommandMutateCellsArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+    delete selection_;
   }
 }
 
-void CommandSetFilterEnabledArchive::SetCachedSize(int size) const {
+void CommandMutateCellsArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetFilterEnabledArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandMutateCellsArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetFilterEnabledArchive_descriptor_;
+  return CommandMutateCellsArchive_descriptor_;
 }
 
-const CommandSetFilterEnabledArchive& CommandSetFilterEnabledArchive::default_instance() {
+const CommandMutateCellsArchive& CommandMutateCellsArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetFilterEnabledArchive* CommandSetFilterEnabledArchive::default_instance_ = NULL;
+CommandMutateCellsArchive* CommandMutateCellsArchive::default_instance_ = NULL;
 
-CommandSetFilterEnabledArchive* CommandSetFilterEnabledArchive::New() const {
-  return new CommandSetFilterEnabledArchive;
+CommandMutateCellsArchive* CommandMutateCellsArchive::New() const {
+  return new CommandMutateCellsArchive;
 }
 
-void CommandSetFilterEnabledArchive::Clear() {
+void CommandMutateCellsArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    filter_index_ = 0u;
-    enabled_ = false;
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_selection()) {
+      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetFilterEnabledArchive::MergePartialFromCodedStream(
+bool CommandMutateCellsArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -37970,35 +41788,45 @@ bool CommandSetFilterEnabledArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_filter_index;
+        if (input->ExpectTag(18)) goto parse_undo_cell_map;
         break;
       }
 
-      // required uint32 filter_index = 2;
+      // required .TST.CellMapArchive undo_cell_map = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_filter_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &filter_index_)));
-          set_has_filter_index();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(32)) goto parse_enabled;
+        if (input->ExpectTag(26)) goto parse_redo_cell_map;
         break;
       }
 
-      // required bool enabled = 4;
+      // required .TST.CellMapArchive redo_cell_map = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_selection;
+        break;
+      }
+
+      // optional .TST.SelectionArchive selection = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_enabled:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &enabled_)));
-          set_has_enabled();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_selection:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_selection()));
         } else {
           goto handle_uninterpreted;
         }
@@ -38022,7 +41850,7 @@ bool CommandSetFilterEnabledArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetFilterEnabledArchive::SerializeWithCachedSizes(
+void CommandMutateCellsArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38030,14 +41858,22 @@ void CommandSetFilterEnabledArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 filter_index = 2;
-  if (has_filter_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->filter_index(), output);
+  // required .TST.CellMapArchive undo_cell_map = 2;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->undo_cell_map(), output);
   }
 
-  // required bool enabled = 4;
-  if (has_enabled()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->enabled(), output);
+  // required .TST.CellMapArchive redo_cell_map = 3;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->redo_cell_map(), output);
+  }
+
+  // optional .TST.SelectionArchive selection = 4;
+  if (has_selection()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->selection(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -38046,7 +41882,7 @@ void CommandSetFilterEnabledArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetFilterEnabledArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandMutateCellsArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38055,14 +41891,25 @@ ::google::protobuf::uint8* CommandSetFilterEnabledArchive::SerializeWithCachedSi
         1, this->super(), target);
   }
 
-  // required uint32 filter_index = 2;
-  if (has_filter_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->filter_index(), target);
+  // required .TST.CellMapArchive undo_cell_map = 2;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->undo_cell_map(), target);
   }
 
-  // required bool enabled = 4;
-  if (has_enabled()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->enabled(), target);
+  // required .TST.CellMapArchive redo_cell_map = 3;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->redo_cell_map(), target);
+  }
+
+  // optional .TST.SelectionArchive selection = 4;
+  if (has_selection()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->selection(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -38072,7 +41919,7 @@ ::google::protobuf::uint8* CommandSetFilterEnabledArchive::SerializeWithCachedSi
   return target;
 }
 
-int CommandSetFilterEnabledArchive::ByteSize() const {
+int CommandMutateCellsArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -38083,16 +41930,25 @@ int CommandSetFilterEnabledArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 filter_index = 2;
-    if (has_filter_index()) {
+    // required .TST.CellMapArchive undo_cell_map = 2;
+    if (has_undo_cell_map()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->filter_index());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
     }
 
-    // required bool enabled = 4;
-    if (has_enabled()) {
-      total_size += 1 + 1;
+    // required .TST.CellMapArchive redo_cell_map = 3;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+    // optional .TST.SelectionArchive selection = 4;
+    if (has_selection()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->selection());
     }
 
   }
@@ -38107,10 +41963,10 @@ int CommandSetFilterEnabledArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetFilterEnabledArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandMutateCellsArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetFilterEnabledArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFilterEnabledArchive*>(
+  const CommandMutateCellsArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutateCellsArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -38119,59 +41975,72 @@ void CommandSetFilterEnabledArchive::MergeFrom(const ::google::protobuf::Message
   }
 }
 
-void CommandSetFilterEnabledArchive::MergeFrom(const CommandSetFilterEnabledArchive& from) {
+void CommandMutateCellsArchive::MergeFrom(const CommandMutateCellsArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_filter_index()) {
-      set_filter_index(from.filter_index());
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
     }
-    if (from.has_enabled()) {
-      set_enabled(from.enabled());
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+    if (from.has_selection()) {
+      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetFilterEnabledArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandMutateCellsArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetFilterEnabledArchive::CopyFrom(const CommandSetFilterEnabledArchive& from) {
+void CommandMutateCellsArchive::CopyFrom(const CommandMutateCellsArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetFilterEnabledArchive::IsInitialized() const {
+bool CommandMutateCellsArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  if (has_selection()) {
+    if (!this->selection().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetFilterEnabledArchive::Swap(CommandSetFilterEnabledArchive* other) {
+void CommandMutateCellsArchive::Swap(CommandMutateCellsArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(filter_index_, other->filter_index_);
-    std::swap(enabled_, other->enabled_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(selection_, other->selection_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetFilterEnabledArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandMutateCellsArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetFilterEnabledArchive_descriptor_;
-  metadata.reflection = CommandSetFilterEnabledArchive_reflection_;
+  metadata.descriptor = CommandMutateCellsArchive_descriptor_;
+  metadata.reflection = CommandMutateCellsArchive_reflection_;
   return metadata;
 }
 
@@ -38179,81 +42048,77 @@ ::google::protobuf::Metadata CommandSetFilterEnabledArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetFilterRuleEnabledArchive::kSuperFieldNumber;
-const int CommandSetFilterRuleEnabledArchive::kFilterIndexFieldNumber;
-const int CommandSetFilterRuleEnabledArchive::kRuleIndexFieldNumber;
-const int CommandSetFilterRuleEnabledArchive::kEnabledFieldNumber;
+const int CommandDisableFilterRulesForColumnArchive::kSuperFieldNumber;
+const int CommandDisableFilterRulesForColumnArchive::kColumnIndexFieldNumber;
+const int CommandDisableFilterRulesForColumnArchive::kRuleIndicesFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetFilterRuleEnabledArchive::CommandSetFilterRuleEnabledArchive()
+CommandDisableFilterRulesForColumnArchive::CommandDisableFilterRulesForColumnArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetFilterRuleEnabledArchive::InitAsDefaultInstance() {
+void CommandDisableFilterRulesForColumnArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
 }
 
-CommandSetFilterRuleEnabledArchive::CommandSetFilterRuleEnabledArchive(const CommandSetFilterRuleEnabledArchive& from)
+CommandDisableFilterRulesForColumnArchive::CommandDisableFilterRulesForColumnArchive(const CommandDisableFilterRulesForColumnArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetFilterRuleEnabledArchive::SharedCtor() {
+void CommandDisableFilterRulesForColumnArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  filter_index_ = 0u;
-  rule_index_ = 0u;
-  enabled_ = false;
+  column_index_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetFilterRuleEnabledArchive::~CommandSetFilterRuleEnabledArchive() {
+CommandDisableFilterRulesForColumnArchive::~CommandDisableFilterRulesForColumnArchive() {
   SharedDtor();
 }
 
-void CommandSetFilterRuleEnabledArchive::SharedDtor() {
+void CommandDisableFilterRulesForColumnArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
   }
 }
 
-void CommandSetFilterRuleEnabledArchive::SetCachedSize(int size) const {
+void CommandDisableFilterRulesForColumnArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetFilterRuleEnabledArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandDisableFilterRulesForColumnArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetFilterRuleEnabledArchive_descriptor_;
+  return CommandDisableFilterRulesForColumnArchive_descriptor_;
 }
 
-const CommandSetFilterRuleEnabledArchive& CommandSetFilterRuleEnabledArchive::default_instance() {
+const CommandDisableFilterRulesForColumnArchive& CommandDisableFilterRulesForColumnArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetFilterRuleEnabledArchive* CommandSetFilterRuleEnabledArchive::default_instance_ = NULL;
+CommandDisableFilterRulesForColumnArchive* CommandDisableFilterRulesForColumnArchive::default_instance_ = NULL;
 
-CommandSetFilterRuleEnabledArchive* CommandSetFilterRuleEnabledArchive::New() const {
-  return new CommandSetFilterRuleEnabledArchive;
+CommandDisableFilterRulesForColumnArchive* CommandDisableFilterRulesForColumnArchive::New() const {
+  return new CommandDisableFilterRulesForColumnArchive;
 }
 
-void CommandSetFilterRuleEnabledArchive::Clear() {
+void CommandDisableFilterRulesForColumnArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    filter_index_ = 0u;
-    rule_index_ = 0u;
-    enabled_ = false;
+    column_index_ = 0u;
   }
+  rule_indices_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetFilterRuleEnabledArchive::MergePartialFromCodedStream(
+bool CommandDisableFilterRulesForColumnArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -38268,54 +42133,44 @@ bool CommandSetFilterRuleEnabledArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_filter_index;
+        if (input->ExpectTag(16)) goto parse_column_index;
         break;
       }
 
-      // required uint32 filter_index = 2;
+      // required uint32 column_index = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_filter_index:
+         parse_column_index:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &filter_index_)));
-          set_has_filter_index();
+                 input, &column_index_)));
+          set_has_column_index();
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_rule_index;
+        if (input->ExpectTag(24)) goto parse_rule_indices;
         break;
       }
 
-      // required uint32 rule_index = 3;
+      // repeated uint32 rule_indices = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_rule_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &rule_index_)));
-          set_has_rule_index();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_enabled;
-        break;
-      }
-
-      // required bool enabled = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_enabled:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &enabled_)));
-          set_has_enabled();
+         parse_rule_indices:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 1, 24, input, this->mutable_rule_indices())));
+        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+                   == ::google::protobuf::internal::WireFormatLite::
+                      WIRETYPE_LENGTH_DELIMITED) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, this->mutable_rule_indices())));
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(24)) goto parse_rule_indices;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -38336,7 +42191,7 @@ bool CommandSetFilterRuleEnabledArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetFilterRuleEnabledArchive::SerializeWithCachedSizes(
+void CommandDisableFilterRulesForColumnArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38344,19 +42199,15 @@ void CommandSetFilterRuleEnabledArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 filter_index = 2;
-  if (has_filter_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->filter_index(), output);
-  }
-
-  // required uint32 rule_index = 3;
-  if (has_rule_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(3, this->rule_index(), output);
+  // required uint32 column_index = 2;
+  if (has_column_index()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->column_index(), output);
   }
 
-  // required bool enabled = 4;
-  if (has_enabled()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->enabled(), output);
+  // repeated uint32 rule_indices = 3;
+  for (int i = 0; i < this->rule_indices_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
+      3, this->rule_indices(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -38365,7 +42216,7 @@ void CommandSetFilterRuleEnabledArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetFilterRuleEnabledArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandDisableFilterRulesForColumnArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38374,19 +42225,15 @@ ::google::protobuf::uint8* CommandSetFilterRuleEnabledArchive::SerializeWithCach
         1, this->super(), target);
   }
 
-  // required uint32 filter_index = 2;
-  if (has_filter_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->filter_index(), target);
-  }
-
-  // required uint32 rule_index = 3;
-  if (has_rule_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(3, this->rule_index(), target);
+  // required uint32 column_index = 2;
+  if (has_column_index()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->column_index(), target);
   }
 
-  // required bool enabled = 4;
-  if (has_enabled()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->enabled(), target);
+  // repeated uint32 rule_indices = 3;
+  for (int i = 0; i < this->rule_indices_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteUInt32ToArray(3, this->rule_indices(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -38396,7 +42243,7 @@ ::google::protobuf::uint8* CommandSetFilterRuleEnabledArchive::SerializeWithCach
   return target;
 }
 
-int CommandSetFilterRuleEnabledArchive::ByteSize() const {
+int CommandDisableFilterRulesForColumnArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -38407,26 +42254,24 @@ int CommandSetFilterRuleEnabledArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 filter_index = 2;
-    if (has_filter_index()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->filter_index());
-    }
-
-    // required uint32 rule_index = 3;
-    if (has_rule_index()) {
+    // required uint32 column_index = 2;
+    if (has_column_index()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->rule_index());
+          this->column_index());
     }
 
-    // required bool enabled = 4;
-    if (has_enabled()) {
-      total_size += 1 + 1;
+  }
+  // repeated uint32 rule_indices = 3;
+  {
+    int data_size = 0;
+    for (int i = 0; i < this->rule_indices_size(); i++) {
+      data_size += ::google::protobuf::internal::WireFormatLite::
+        UInt32Size(this->rule_indices(i));
     }
-
+    total_size += 1 * this->rule_indices_size() + data_size;
   }
+
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -38438,10 +42283,10 @@ int CommandSetFilterRuleEnabledArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetFilterRuleEnabledArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandDisableFilterRulesForColumnArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetFilterRuleEnabledArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFilterRuleEnabledArchive*>(
+  const CommandDisableFilterRulesForColumnArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDisableFilterRulesForColumnArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -38450,39 +42295,34 @@ void CommandSetFilterRuleEnabledArchive::MergeFrom(const ::google::protobuf::Mes
   }
 }
 
-void CommandSetFilterRuleEnabledArchive::MergeFrom(const CommandSetFilterRuleEnabledArchive& from) {
+void CommandDisableFilterRulesForColumnArchive::MergeFrom(const CommandDisableFilterRulesForColumnArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
+  rule_indices_.MergeFrom(from.rule_indices_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_filter_index()) {
-      set_filter_index(from.filter_index());
-    }
-    if (from.has_rule_index()) {
-      set_rule_index(from.rule_index());
-    }
-    if (from.has_enabled()) {
-      set_enabled(from.enabled());
+    if (from.has_column_index()) {
+      set_column_index(from.column_index());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetFilterRuleEnabledArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandDisableFilterRulesForColumnArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetFilterRuleEnabledArchive::CopyFrom(const CommandSetFilterRuleEnabledArchive& from) {
+void CommandDisableFilterRulesForColumnArchive::CopyFrom(const CommandDisableFilterRulesForColumnArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetFilterRuleEnabledArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000000f) != 0x0000000f) return false;
+bool CommandDisableFilterRulesForColumnArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
@@ -38490,23 +42330,22 @@ bool CommandSetFilterRuleEnabledArchive::IsInitialized() const {
   return true;
 }
 
-void CommandSetFilterRuleEnabledArchive::Swap(CommandSetFilterRuleEnabledArchive* other) {
+void CommandDisableFilterRulesForColumnArchive::Swap(CommandDisableFilterRulesForColumnArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(filter_index_, other->filter_index_);
-    std::swap(rule_index_, other->rule_index_);
-    std::swap(enabled_, other->enabled_);
+    std::swap(column_index_, other->column_index_);
+    rule_indices_.Swap(&other->rule_indices_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetFilterRuleEnabledArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandDisableFilterRulesForColumnArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetFilterRuleEnabledArchive_descriptor_;
-  metadata.reflection = CommandSetFilterRuleEnabledArchive_reflection_;
+  metadata.descriptor = CommandDisableFilterRulesForColumnArchive_descriptor_;
+  metadata.reflection = CommandDisableFilterRulesForColumnArchive_reflection_;
   return metadata;
 }
 
@@ -38514,78 +42353,100 @@ ::google::protobuf::Metadata CommandSetFilterRuleEnabledArchive::GetMetadata() c
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetFilterSetTypeArchive::kSuperFieldNumber;
-const int CommandSetFilterSetTypeArchive::kOldFilterSetTypeFieldNumber;
-const int CommandSetFilterSetTypeArchive::kNewFilterSetTypeFieldNumber;
+const int CommandSetTextStyleArchive::kSuperFieldNumber;
+const int CommandSetTextStyleArchive::kRegionFieldNumber;
+const int CommandSetTextStyleArchive::kUndoCellMapFieldNumber;
+const int CommandSetTextStyleArchive::kRedoCellMapFieldNumber;
+const int CommandSetTextStyleArchive::kSubcommandsFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetFilterSetTypeArchive::CommandSetFilterSetTypeArchive()
+CommandSetTextStyleArchive::CommandSetTextStyleArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetFilterSetTypeArchive::InitAsDefaultInstance() {
+void CommandSetTextStyleArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  region_ = const_cast< ::TST::CellRegion*>(&::TST::CellRegion::default_instance());
+  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
+  subcommands_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
-CommandSetFilterSetTypeArchive::CommandSetFilterSetTypeArchive(const CommandSetFilterSetTypeArchive& from)
+CommandSetTextStyleArchive::CommandSetTextStyleArchive(const CommandSetTextStyleArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetFilterSetTypeArchive::SharedCtor() {
+void CommandSetTextStyleArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  old_filter_set_type_ = 0;
-  new_filter_set_type_ = 0;
+  region_ = NULL;
+  undo_cell_map_ = NULL;
+  redo_cell_map_ = NULL;
+  subcommands_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetFilterSetTypeArchive::~CommandSetFilterSetTypeArchive() {
+CommandSetTextStyleArchive::~CommandSetTextStyleArchive() {
   SharedDtor();
 }
 
-void CommandSetFilterSetTypeArchive::SharedDtor() {
+void CommandSetTextStyleArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete region_;
+    delete undo_cell_map_;
+    delete redo_cell_map_;
+    delete subcommands_;
   }
 }
 
-void CommandSetFilterSetTypeArchive::SetCachedSize(int size) const {
+void CommandSetTextStyleArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetFilterSetTypeArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetTextStyleArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetFilterSetTypeArchive_descriptor_;
+  return CommandSetTextStyleArchive_descriptor_;
 }
 
-const CommandSetFilterSetTypeArchive& CommandSetFilterSetTypeArchive::default_instance() {
+const CommandSetTextStyleArchive& CommandSetTextStyleArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetFilterSetTypeArchive* CommandSetFilterSetTypeArchive::default_instance_ = NULL;
+CommandSetTextStyleArchive* CommandSetTextStyleArchive::default_instance_ = NULL;
 
-CommandSetFilterSetTypeArchive* CommandSetFilterSetTypeArchive::New() const {
-  return new CommandSetFilterSetTypeArchive;
+CommandSetTextStyleArchive* CommandSetTextStyleArchive::New() const {
+  return new CommandSetTextStyleArchive;
 }
 
-void CommandSetFilterSetTypeArchive::Clear() {
+void CommandSetTextStyleArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    old_filter_set_type_ = 0;
-    new_filter_set_type_ = 0;
+    if (has_region()) {
+      if (region_ != NULL) region_->::TST::CellRegion::Clear();
+    }
+    if (has_undo_cell_map()) {
+      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_redo_cell_map()) {
+      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    }
+    if (has_subcommands()) {
+      if (subcommands_ != NULL) subcommands_->::TSP::Reference::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetFilterSetTypeArchive::MergePartialFromCodedStream(
+bool CommandSetTextStyleArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -38600,45 +42461,59 @@ bool CommandSetFilterSetTypeArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_old_filter_set_type;
+        if (input->ExpectTag(18)) goto parse_region;
         break;
       }
 
-      // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
+      // required .TST.CellRegion region = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_old_filter_set_type:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::FilterSetArchive_FilterSetType_IsValid(value)) {
-            set_old_filter_set_type(static_cast< ::TST::FilterSetArchive_FilterSetType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_region:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_region()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_new_filter_set_type;
+        if (input->ExpectTag(26)) goto parse_undo_cell_map;
         break;
       }
 
-      // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
+      // optional .TST.CellMapArchive undo_cell_map = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_new_filter_set_type:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::TST::FilterSetArchive_FilterSetType_IsValid(value)) {
-            set_new_filter_set_type(static_cast< ::TST::FilterSetArchive_FilterSetType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(3, value);
-          }
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_undo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_undo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_redo_cell_map;
+        break;
+      }
+
+      // optional .TST.CellMapArchive redo_cell_map = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_redo_cell_map:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_redo_cell_map()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(42)) goto parse_subcommands;
+        break;
+      }
+
+      // optional .TSP.Reference subcommands = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_subcommands:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_subcommands()));
         } else {
           goto handle_uninterpreted;
         }
@@ -38662,7 +42537,7 @@ bool CommandSetFilterSetTypeArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetFilterSetTypeArchive::SerializeWithCachedSizes(
+void CommandSetTextStyleArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38670,16 +42545,28 @@ void CommandSetFilterSetTypeArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
-  if (has_old_filter_set_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->old_filter_set_type(), output);
+  // required .TST.CellRegion region = 2;
+  if (has_region()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->region(), output);
   }
 
-  // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
-  if (has_new_filter_set_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->new_filter_set_type(), output);
+  // optional .TST.CellMapArchive undo_cell_map = 3;
+  if (has_undo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->undo_cell_map(), output);
+  }
+
+  // optional .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->redo_cell_map(), output);
+  }
+
+  // optional .TSP.Reference subcommands = 5;
+  if (has_subcommands()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->subcommands(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -38688,7 +42575,7 @@ void CommandSetFilterSetTypeArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetFilterSetTypeArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetTextStyleArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38697,16 +42584,32 @@ ::google::protobuf::uint8* CommandSetFilterSetTypeArchive::SerializeWithCachedSi
         1, this->super(), target);
   }
 
-  // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
-  if (has_old_filter_set_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->old_filter_set_type(), target);
+  // required .TST.CellRegion region = 2;
+  if (has_region()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->region(), target);
   }
 
-  // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
-  if (has_new_filter_set_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->new_filter_set_type(), target);
+  // optional .TST.CellMapArchive undo_cell_map = 3;
+  if (has_undo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->undo_cell_map(), target);
+  }
+
+  // optional .TST.CellMapArchive redo_cell_map = 4;
+  if (has_redo_cell_map()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->redo_cell_map(), target);
+  }
+
+  // optional .TSP.Reference subcommands = 5;
+  if (has_subcommands()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->subcommands(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -38716,7 +42619,7 @@ ::google::protobuf::uint8* CommandSetFilterSetTypeArchive::SerializeWithCachedSi
   return target;
 }
 
-int CommandSetFilterSetTypeArchive::ByteSize() const {
+int CommandSetTextStyleArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -38727,16 +42630,32 @@ int CommandSetFilterSetTypeArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
-    if (has_old_filter_set_type()) {
+    // required .TST.CellRegion region = 2;
+    if (has_region()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->old_filter_set_type());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->region());
     }
 
-    // required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
-    if (has_new_filter_set_type()) {
+    // optional .TST.CellMapArchive undo_cell_map = 3;
+    if (has_undo_cell_map()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->new_filter_set_type());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->undo_cell_map());
+    }
+
+    // optional .TST.CellMapArchive redo_cell_map = 4;
+    if (has_redo_cell_map()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->redo_cell_map());
+    }
+
+    // optional .TSP.Reference subcommands = 5;
+    if (has_subcommands()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->subcommands());
     }
 
   }
@@ -38751,10 +42670,10 @@ int CommandSetFilterSetTypeArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetFilterSetTypeArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetTextStyleArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetFilterSetTypeArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetFilterSetTypeArchive*>(
+  const CommandSetTextStyleArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetTextStyleArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -38763,59 +42682,79 @@ void CommandSetFilterSetTypeArchive::MergeFrom(const ::google::protobuf::Message
   }
 }
 
-void CommandSetFilterSetTypeArchive::MergeFrom(const CommandSetFilterSetTypeArchive& from) {
+void CommandSetTextStyleArchive::MergeFrom(const CommandSetTextStyleArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_old_filter_set_type()) {
-      set_old_filter_set_type(from.old_filter_set_type());
+    if (from.has_region()) {
+      mutable_region()->::TST::CellRegion::MergeFrom(from.region());
     }
-    if (from.has_new_filter_set_type()) {
-      set_new_filter_set_type(from.new_filter_set_type());
+    if (from.has_undo_cell_map()) {
+      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    }
+    if (from.has_redo_cell_map()) {
+      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    }
+    if (from.has_subcommands()) {
+      mutable_subcommands()->::TSP::Reference::MergeFrom(from.subcommands());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetFilterSetTypeArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetTextStyleArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetFilterSetTypeArchive::CopyFrom(const CommandSetFilterSetTypeArchive& from) {
+void CommandSetTextStyleArchive::CopyFrom(const CommandSetTextStyleArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetFilterSetTypeArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetTextStyleArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_region()) {
+    if (!this->region().IsInitialized()) return false;
+  }
+  if (has_undo_cell_map()) {
+    if (!this->undo_cell_map().IsInitialized()) return false;
+  }
+  if (has_redo_cell_map()) {
+    if (!this->redo_cell_map().IsInitialized()) return false;
+  }
+  if (has_subcommands()) {
+    if (!this->subcommands().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandSetFilterSetTypeArchive::Swap(CommandSetFilterSetTypeArchive* other) {
+void CommandSetTextStyleArchive::Swap(CommandSetTextStyleArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(old_filter_set_type_, other->old_filter_set_type_);
-    std::swap(new_filter_set_type_, other->new_filter_set_type_);
+    std::swap(region_, other->region_);
+    std::swap(undo_cell_map_, other->undo_cell_map_);
+    std::swap(redo_cell_map_, other->redo_cell_map_);
+    std::swap(subcommands_, other->subcommands_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetFilterSetTypeArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetTextStyleArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetFilterSetTypeArchive_descriptor_;
-  metadata.reflection = CommandSetFilterSetTypeArchive_reflection_;
+  metadata.descriptor = CommandSetTextStyleArchive_descriptor_;
+  metadata.reflection = CommandSetTextStyleArchive_reflection_;
   return metadata;
 }
 
@@ -38823,86 +42762,72 @@ ::google::protobuf::Metadata CommandSetFilterSetTypeArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetStyleNetworkArchive::kSuperFieldNumber;
-const int CommandSetStyleNetworkArchive::kOldStyleNetworkFieldNumber;
-const int CommandSetStyleNetworkArchive::kNewStyleNetworkFieldNumber;
+const int CommandNotifyForTransformingArchive::kSuperFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetStyleNetworkArchive::CommandSetStyleNetworkArchive()
+CommandNotifyForTransformingArchive::CommandNotifyForTransformingArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetStyleNetworkArchive::InitAsDefaultInstance() {
+void CommandNotifyForTransformingArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  old_style_network_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
-  new_style_network_ = const_cast< ::TST::TableStyleNetworkArchive*>(&::TST::TableStyleNetworkArchive::default_instance());
 }
 
-CommandSetStyleNetworkArchive::CommandSetStyleNetworkArchive(const CommandSetStyleNetworkArchive& from)
+CommandNotifyForTransformingArchive::CommandNotifyForTransformingArchive(const CommandNotifyForTransformingArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetStyleNetworkArchive::SharedCtor() {
+void CommandNotifyForTransformingArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  old_style_network_ = NULL;
-  new_style_network_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetStyleNetworkArchive::~CommandSetStyleNetworkArchive() {
+CommandNotifyForTransformingArchive::~CommandNotifyForTransformingArchive() {
   SharedDtor();
 }
 
-void CommandSetStyleNetworkArchive::SharedDtor() {
+void CommandNotifyForTransformingArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete old_style_network_;
-    delete new_style_network_;
   }
 }
 
-void CommandSetStyleNetworkArchive::SetCachedSize(int size) const {
+void CommandNotifyForTransformingArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetStyleNetworkArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandNotifyForTransformingArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetStyleNetworkArchive_descriptor_;
+  return CommandNotifyForTransformingArchive_descriptor_;
 }
 
-const CommandSetStyleNetworkArchive& CommandSetStyleNetworkArchive::default_instance() {
+const CommandNotifyForTransformingArchive& CommandNotifyForTransformingArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetStyleNetworkArchive* CommandSetStyleNetworkArchive::default_instance_ = NULL;
+CommandNotifyForTransformingArchive* CommandNotifyForTransformingArchive::default_instance_ = NULL;
 
-CommandSetStyleNetworkArchive* CommandSetStyleNetworkArchive::New() const {
-  return new CommandSetStyleNetworkArchive;
+CommandNotifyForTransformingArchive* CommandNotifyForTransformingArchive::New() const {
+  return new CommandNotifyForTransformingArchive;
 }
 
-void CommandSetStyleNetworkArchive::Clear() {
+void CommandNotifyForTransformingArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_old_style_network()) {
-      if (old_style_network_ != NULL) old_style_network_->::TST::TableStyleNetworkArchive::Clear();
-    }
-    if (has_new_style_network()) {
-      if (new_style_network_ != NULL) new_style_network_->::TST::TableStyleNetworkArchive::Clear();
-    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetStyleNetworkArchive::MergePartialFromCodedStream(
+bool CommandNotifyForTransformingArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -38917,34 +42842,6 @@ bool CommandSetStyleNetworkArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_old_style_network;
-        break;
-      }
-
-      // required .TST.TableStyleNetworkArchive old_style_network = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_old_style_network:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_old_style_network()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_new_style_network;
-        break;
-      }
-
-      // required .TST.TableStyleNetworkArchive new_style_network = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_new_style_network:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_new_style_network()));
-        } else {
-          goto handle_uninterpreted;
-        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -38965,7 +42862,7 @@ bool CommandSetStyleNetworkArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetStyleNetworkArchive::SerializeWithCachedSizes(
+void CommandNotifyForTransformingArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -38973,45 +42870,19 @@ void CommandSetStyleNetworkArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TST.TableStyleNetworkArchive old_style_network = 2;
-  if (has_old_style_network()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->old_style_network(), output);
-  }
-
-  // required .TST.TableStyleNetworkArchive new_style_network = 3;
-  if (has_new_style_network()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->new_style_network(), output);
-  }
-
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* CommandSetStyleNetworkArchive::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
-  if (has_super()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->super(), target);
-  }
-
-  // required .TST.TableStyleNetworkArchive old_style_network = 2;
-  if (has_old_style_network()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->old_style_network(), target);
+        unknown_fields(), output);
   }
+}
 
-  // required .TST.TableStyleNetworkArchive new_style_network = 3;
-  if (has_new_style_network()) {
+::google::protobuf::uint8* CommandNotifyForTransformingArchive::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // required .TST.TableCommandArchive super = 1;
+  if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->new_style_network(), target);
+        1, this->super(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -39021,7 +42892,7 @@ ::google::protobuf::uint8* CommandSetStyleNetworkArchive::SerializeWithCachedSiz
   return target;
 }
 
-int CommandSetStyleNetworkArchive::ByteSize() const {
+int CommandNotifyForTransformingArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -39032,20 +42903,6 @@ int CommandSetStyleNetworkArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TST.TableStyleNetworkArchive old_style_network = 2;
-    if (has_old_style_network()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->old_style_network());
-    }
-
-    // required .TST.TableStyleNetworkArchive new_style_network = 3;
-    if (has_new_style_network()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->new_style_network());
-    }
-
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -39058,10 +42915,10 @@ int CommandSetStyleNetworkArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetStyleNetworkArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandNotifyForTransformingArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetStyleNetworkArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetStyleNetworkArchive*>(
+  const CommandNotifyForTransformingArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandNotifyForTransformingArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -39070,65 +42927,51 @@ void CommandSetStyleNetworkArchive::MergeFrom(const ::google::protobuf::Message&
   }
 }
 
-void CommandSetStyleNetworkArchive::MergeFrom(const CommandSetStyleNetworkArchive& from) {
+void CommandNotifyForTransformingArchive::MergeFrom(const CommandNotifyForTransformingArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_old_style_network()) {
-      mutable_old_style_network()->::TST::TableStyleNetworkArchive::MergeFrom(from.old_style_network());
-    }
-    if (from.has_new_style_network()) {
-      mutable_new_style_network()->::TST::TableStyleNetworkArchive::MergeFrom(from.new_style_network());
-    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetStyleNetworkArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandNotifyForTransformingArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetStyleNetworkArchive::CopyFrom(const CommandSetStyleNetworkArchive& from) {
+void CommandNotifyForTransformingArchive::CopyFrom(const CommandNotifyForTransformingArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetStyleNetworkArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandNotifyForTransformingArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_old_style_network()) {
-    if (!this->old_style_network().IsInitialized()) return false;
-  }
-  if (has_new_style_network()) {
-    if (!this->new_style_network().IsInitialized()) return false;
-  }
   return true;
 }
 
-void CommandSetStyleNetworkArchive::Swap(CommandSetStyleNetworkArchive* other) {
+void CommandNotifyForTransformingArchive::Swap(CommandNotifyForTransformingArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(old_style_network_, other->old_style_network_);
-    std::swap(new_style_network_, other->new_style_network_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetStyleNetworkArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandNotifyForTransformingArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetStyleNetworkArchive_descriptor_;
-  metadata.reflection = CommandSetStyleNetworkArchive_reflection_;
+  metadata.descriptor = CommandNotifyForTransformingArchive_descriptor_;
+  metadata.reflection = CommandNotifyForTransformingArchive_reflection_;
   return metadata;
 }
 
@@ -39136,99 +42979,108 @@ ::google::protobuf::Metadata CommandSetStyleNetworkArchive::GetMetadata() const
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandMutateCellsArchive::kSuperFieldNumber;
-const int CommandMutateCellsArchive::kUndoCellMapFieldNumber;
-const int CommandMutateCellsArchive::kRedoCellMapFieldNumber;
-const int CommandMutateCellsArchive::kSelectionFieldNumber;
+const int CommandSetStorageLanguageArchive::kSuperFieldNumber;
+const int CommandSetStorageLanguageArchive::kStorageFieldNumber;
+const int CommandSetStorageLanguageArchive::kLanguageFieldNumber;
+const int CommandSetStorageLanguageArchive::kRangeLocationFieldNumber;
+const int CommandSetStorageLanguageArchive::kRangeLengthFieldNumber;
+const int CommandSetStorageLanguageArchive::kUndoTransactionFieldNumber;
 #endif  // !_MSC_VER
 
-CommandMutateCellsArchive::CommandMutateCellsArchive()
+CommandSetStorageLanguageArchive::CommandSetStorageLanguageArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandMutateCellsArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  selection_ = const_cast< ::TST::SelectionArchive*>(&::TST::SelectionArchive::default_instance());
+void CommandSetStorageLanguageArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
+  storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  undo_transaction_ = const_cast< ::TSWP::UndoTransaction*>(&::TSWP::UndoTransaction::default_instance());
 }
 
-CommandMutateCellsArchive::CommandMutateCellsArchive(const CommandMutateCellsArchive& from)
+CommandSetStorageLanguageArchive::CommandSetStorageLanguageArchive(const CommandSetStorageLanguageArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandMutateCellsArchive::SharedCtor() {
+void CommandSetStorageLanguageArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
-  selection_ = NULL;
+  storage_ = NULL;
+  language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  range_location_ = 0u;
+  range_length_ = 0u;
+  undo_transaction_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandMutateCellsArchive::~CommandMutateCellsArchive() {
+CommandSetStorageLanguageArchive::~CommandSetStorageLanguageArchive() {
   SharedDtor();
 }
 
-void CommandMutateCellsArchive::SharedDtor() {
+void CommandSetStorageLanguageArchive::SharedDtor() {
+  if (language_ != &::google::protobuf::internal::kEmptyString) {
+    delete language_;
+  }
   if (this != default_instance_) {
     delete super_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
-    delete selection_;
+    delete storage_;
+    delete undo_transaction_;
   }
 }
 
-void CommandMutateCellsArchive::SetCachedSize(int size) const {
+void CommandSetStorageLanguageArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandMutateCellsArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetStorageLanguageArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandMutateCellsArchive_descriptor_;
+  return CommandSetStorageLanguageArchive_descriptor_;
 }
 
-const CommandMutateCellsArchive& CommandMutateCellsArchive::default_instance() {
+const CommandSetStorageLanguageArchive& CommandSetStorageLanguageArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandMutateCellsArchive* CommandMutateCellsArchive::default_instance_ = NULL;
+CommandSetStorageLanguageArchive* CommandSetStorageLanguageArchive::default_instance_ = NULL;
 
-CommandMutateCellsArchive* CommandMutateCellsArchive::New() const {
-  return new CommandMutateCellsArchive;
+CommandSetStorageLanguageArchive* CommandSetStorageLanguageArchive::New() const {
+  return new CommandSetStorageLanguageArchive;
 }
 
-void CommandMutateCellsArchive::Clear() {
+void CommandSetStorageLanguageArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
     }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    if (has_storage()) {
+      if (storage_ != NULL) storage_->::TSP::Reference::Clear();
     }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    if (has_language()) {
+      if (language_ != &::google::protobuf::internal::kEmptyString) {
+        language_->clear();
+      }
     }
-    if (has_selection()) {
-      if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+    range_location_ = 0u;
+    range_length_ = 0u;
+    if (has_undo_transaction()) {
+      if (undo_transaction_ != NULL) undo_transaction_->::TSWP::UndoTransaction::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandMutateCellsArchive::MergePartialFromCodedStream(
+bool CommandSetStorageLanguageArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TST.TableCommandArchive super = 1;
+      // required .TSK.CommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -39237,45 +43089,80 @@ bool CommandMutateCellsArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_undo_cell_map;
+        if (input->ExpectTag(18)) goto parse_storage;
         break;
       }
 
-      // required .TST.CellMapArchive undo_cell_map = 2;
+      // required .TSP.Reference storage = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
+         parse_storage:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
+               input, mutable_storage()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_redo_cell_map;
+        if (input->ExpectTag(26)) goto parse_language;
         break;
       }
 
-      // required .TST.CellMapArchive redo_cell_map = 3;
+      // required string language = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
+         parse_language:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_language()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->language().data(), this->language().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_selection;
+        if (input->ExpectTag(32)) goto parse_range_location;
         break;
       }
 
-      // optional .TST.SelectionArchive selection = 4;
+      // required uint32 range_location = 4;
       case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_range_location:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &range_location_)));
+          set_has_range_location();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_range_length;
+        break;
+      }
+
+      // required uint32 range_length = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_range_length:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &range_length_)));
+          set_has_range_length();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_undo_transaction;
+        break;
+      }
+
+      // optional .TSWP.UndoTransaction undo_transaction = 6;
+      case 6: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_selection:
+         parse_undo_transaction:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_selection()));
+               input, mutable_undo_transaction()));
         } else {
           goto handle_uninterpreted;
         }
@@ -39299,30 +43186,43 @@ bool CommandMutateCellsArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandMutateCellsArchive::SerializeWithCachedSizes(
+void CommandSetStorageLanguageArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  if (has_undo_cell_map()) {
+  // required .TSP.Reference storage = 2;
+  if (has_storage()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->undo_cell_map(), output);
+      2, this->storage(), output);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 3;
-  if (has_redo_cell_map()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->redo_cell_map(), output);
+  // required string language = 3;
+  if (has_language()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->language().data(), this->language().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      3, this->language(), output);
   }
 
-  // optional .TST.SelectionArchive selection = 4;
-  if (has_selection()) {
+  // required uint32 range_location = 4;
+  if (has_range_location()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->range_location(), output);
+  }
+
+  // required uint32 range_length = 5;
+  if (has_range_length()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->range_length(), output);
+  }
+
+  // optional .TSWP.UndoTransaction undo_transaction = 6;
+  if (has_undo_transaction()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->selection(), output);
+      6, this->undo_transaction(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -39331,34 +43231,47 @@ void CommandMutateCellsArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandMutateCellsArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetStorageLanguageArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  if (has_undo_cell_map()) {
+  // required .TSP.Reference storage = 2;
+  if (has_storage()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->undo_cell_map(), target);
+        2, this->storage(), target);
   }
 
-  // required .TST.CellMapArchive redo_cell_map = 3;
-  if (has_redo_cell_map()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        3, this->redo_cell_map(), target);
+  // required string language = 3;
+  if (has_language()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->language().data(), this->language().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        3, this->language(), target);
   }
 
-  // optional .TST.SelectionArchive selection = 4;
-  if (has_selection()) {
+  // required uint32 range_location = 4;
+  if (has_range_location()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->range_location(), target);
+  }
+
+  // required uint32 range_length = 5;
+  if (has_range_length()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->range_length(), target);
+  }
+
+  // optional .TSWP.UndoTransaction undo_transaction = 6;
+  if (has_undo_transaction()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->selection(), target);
+        6, this->undo_transaction(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -39368,36 +43281,50 @@ ::google::protobuf::uint8* CommandMutateCellsArchive::SerializeWithCachedSizesTo
   return target;
 }
 
-int CommandMutateCellsArchive::ByteSize() const {
+int CommandSetStorageLanguageArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TST.TableCommandArchive super = 1;
+    // required .TSK.CommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TST.CellMapArchive undo_cell_map = 2;
-    if (has_undo_cell_map()) {
+    // required .TSP.Reference storage = 2;
+    if (has_storage()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+          this->storage());
     }
 
-    // required .TST.CellMapArchive redo_cell_map = 3;
-    if (has_redo_cell_map()) {
+    // required string language = 3;
+    if (has_language()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->language());
     }
 
-    // optional .TST.SelectionArchive selection = 4;
-    if (has_selection()) {
+    // required uint32 range_location = 4;
+    if (has_range_location()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->range_location());
+    }
+
+    // required uint32 range_length = 5;
+    if (has_range_length()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->range_length());
+    }
+
+    // optional .TSWP.UndoTransaction undo_transaction = 6;
+    if (has_undo_transaction()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->selection());
+          this->undo_transaction());
     }
 
   }
@@ -39412,10 +43339,10 @@ int CommandMutateCellsArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandMutateCellsArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetStorageLanguageArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandMutateCellsArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandMutateCellsArchive*>(
+  const CommandSetStorageLanguageArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetStorageLanguageArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -39424,72 +43351,77 @@ void CommandMutateCellsArchive::MergeFrom(const ::google::protobuf::Message& fro
   }
 }
 
-void CommandMutateCellsArchive::MergeFrom(const CommandMutateCellsArchive& from) {
+void CommandSetStorageLanguageArchive::MergeFrom(const CommandSetStorageLanguageArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
+      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
     }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    if (from.has_storage()) {
+      mutable_storage()->::TSP::Reference::MergeFrom(from.storage());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_language()) {
+      set_language(from.language());
     }
-    if (from.has_selection()) {
-      mutable_selection()->::TST::SelectionArchive::MergeFrom(from.selection());
+    if (from.has_range_location()) {
+      set_range_location(from.range_location());
+    }
+    if (from.has_range_length()) {
+      set_range_length(from.range_length());
+    }
+    if (from.has_undo_transaction()) {
+      mutable_undo_transaction()->::TSWP::UndoTransaction::MergeFrom(from.undo_transaction());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandMutateCellsArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetStorageLanguageArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandMutateCellsArchive::CopyFrom(const CommandMutateCellsArchive& from) {
+void CommandSetStorageLanguageArchive::CopyFrom(const CommandSetStorageLanguageArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandMutateCellsArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+bool CommandSetStorageLanguageArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
-  }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
+  if (has_storage()) {
+    if (!this->storage().IsInitialized()) return false;
   }
-  if (has_selection()) {
-    if (!this->selection().IsInitialized()) return false;
+  if (has_undo_transaction()) {
+    if (!this->undo_transaction().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandMutateCellsArchive::Swap(CommandMutateCellsArchive* other) {
+void CommandSetStorageLanguageArchive::Swap(CommandSetStorageLanguageArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
-    std::swap(selection_, other->selection_);
+    std::swap(storage_, other->storage_);
+    std::swap(language_, other->language_);
+    std::swap(range_location_, other->range_location_);
+    std::swap(range_length_, other->range_length_);
+    std::swap(undo_transaction_, other->undo_transaction_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandMutateCellsArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetStorageLanguageArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandMutateCellsArchive_descriptor_;
-  metadata.reflection = CommandMutateCellsArchive_reflection_;
+  metadata.descriptor = CommandSetStorageLanguageArchive_descriptor_;
+  metadata.reflection = CommandSetStorageLanguageArchive_reflection_;
   return metadata;
 }
 
@@ -39497,77 +43429,86 @@ ::google::protobuf::Metadata CommandMutateCellsArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandDisableFilterRulesForColumnArchive::kSuperFieldNumber;
-const int CommandDisableFilterRulesForColumnArchive::kColumnIndexFieldNumber;
-const int CommandDisableFilterRulesForColumnArchive::kRuleIndicesFieldNumber;
+const int CommandSetSortOrderArchive::kSuperFieldNumber;
+const int CommandSetSortOrderArchive::kOldSortOrderFieldNumber;
+const int CommandSetSortOrderArchive::kNewSortOrderFieldNumber;
 #endif  // !_MSC_VER
 
-CommandDisableFilterRulesForColumnArchive::CommandDisableFilterRulesForColumnArchive()
+CommandSetSortOrderArchive::CommandSetSortOrderArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandDisableFilterRulesForColumnArchive::InitAsDefaultInstance() {
+void CommandSetSortOrderArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  old_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
+  new_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
 }
 
-CommandDisableFilterRulesForColumnArchive::CommandDisableFilterRulesForColumnArchive(const CommandDisableFilterRulesForColumnArchive& from)
+CommandSetSortOrderArchive::CommandSetSortOrderArchive(const CommandSetSortOrderArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandDisableFilterRulesForColumnArchive::SharedCtor() {
+void CommandSetSortOrderArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  column_index_ = 0u;
+  old_sort_order_ = NULL;
+  new_sort_order_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandDisableFilterRulesForColumnArchive::~CommandDisableFilterRulesForColumnArchive() {
+CommandSetSortOrderArchive::~CommandSetSortOrderArchive() {
   SharedDtor();
 }
 
-void CommandDisableFilterRulesForColumnArchive::SharedDtor() {
+void CommandSetSortOrderArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete old_sort_order_;
+    delete new_sort_order_;
   }
 }
 
-void CommandDisableFilterRulesForColumnArchive::SetCachedSize(int size) const {
+void CommandSetSortOrderArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandDisableFilterRulesForColumnArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandSetSortOrderArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandDisableFilterRulesForColumnArchive_descriptor_;
+  return CommandSetSortOrderArchive_descriptor_;
 }
 
-const CommandDisableFilterRulesForColumnArchive& CommandDisableFilterRulesForColumnArchive::default_instance() {
+const CommandSetSortOrderArchive& CommandSetSortOrderArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandDisableFilterRulesForColumnArchive* CommandDisableFilterRulesForColumnArchive::default_instance_ = NULL;
+CommandSetSortOrderArchive* CommandSetSortOrderArchive::default_instance_ = NULL;
 
-CommandDisableFilterRulesForColumnArchive* CommandDisableFilterRulesForColumnArchive::New() const {
-  return new CommandDisableFilterRulesForColumnArchive;
+CommandSetSortOrderArchive* CommandSetSortOrderArchive::New() const {
+  return new CommandSetSortOrderArchive;
 }
 
-void CommandDisableFilterRulesForColumnArchive::Clear() {
+void CommandSetSortOrderArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    column_index_ = 0u;
+    if (has_old_sort_order()) {
+      if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
+    }
+    if (has_new_sort_order()) {
+      if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
+    }
   }
-  rule_indices_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandDisableFilterRulesForColumnArchive::MergePartialFromCodedStream(
+bool CommandSetSortOrderArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -39582,44 +43523,34 @@ bool CommandDisableFilterRulesForColumnArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(16)) goto parse_column_index;
+        if (input->ExpectTag(18)) goto parse_old_sort_order;
         break;
       }
 
-      // required uint32 column_index = 2;
+      // optional .TST.TableSortOrderArchive old_sort_order = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_column_index:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &column_index_)));
-          set_has_column_index();
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_sort_order:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_sort_order()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_rule_indices;
+        if (input->ExpectTag(26)) goto parse_new_sort_order;
         break;
       }
 
-      // repeated uint32 rule_indices = 3;
+      // optional .TST.TableSortOrderArchive new_sort_order = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_rule_indices:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 1, 24, input, this->mutable_rule_indices())));
-        } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
-                   == ::google::protobuf::internal::WireFormatLite::
-                      WIRETYPE_LENGTH_DELIMITED) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitiveNoInline<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, this->mutable_rule_indices())));
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_sort_order:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_sort_order()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(24)) goto parse_rule_indices;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -39640,7 +43571,7 @@ bool CommandDisableFilterRulesForColumnArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandDisableFilterRulesForColumnArchive::SerializeWithCachedSizes(
+void CommandSetSortOrderArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -39648,15 +43579,16 @@ void CommandDisableFilterRulesForColumnArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required uint32 column_index = 2;
-  if (has_column_index()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(2, this->column_index(), output);
+  // optional .TST.TableSortOrderArchive old_sort_order = 2;
+  if (has_old_sort_order()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->old_sort_order(), output);
   }
 
-  // repeated uint32 rule_indices = 3;
-  for (int i = 0; i < this->rule_indices_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(
-      3, this->rule_indices(i), output);
+  // optional .TST.TableSortOrderArchive new_sort_order = 3;
+  if (has_new_sort_order()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->new_sort_order(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -39665,7 +43597,7 @@ void CommandDisableFilterRulesForColumnArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandDisableFilterRulesForColumnArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandSetSortOrderArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -39674,15 +43606,18 @@ ::google::protobuf::uint8* CommandDisableFilterRulesForColumnArchive::SerializeW
         1, this->super(), target);
   }
 
-  // required uint32 column_index = 2;
-  if (has_column_index()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(2, this->column_index(), target);
+  // optional .TST.TableSortOrderArchive old_sort_order = 2;
+  if (has_old_sort_order()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->old_sort_order(), target);
   }
 
-  // repeated uint32 rule_indices = 3;
-  for (int i = 0; i < this->rule_indices_size(); i++) {
+  // optional .TST.TableSortOrderArchive new_sort_order = 3;
+  if (has_new_sort_order()) {
     target = ::google::protobuf::internal::WireFormatLite::
-      WriteUInt32ToArray(3, this->rule_indices(i), target);
+      WriteMessageNoVirtualToArray(
+        3, this->new_sort_order(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -39692,7 +43627,7 @@ ::google::protobuf::uint8* CommandDisableFilterRulesForColumnArchive::SerializeW
   return target;
 }
 
-int CommandDisableFilterRulesForColumnArchive::ByteSize() const {
+int CommandSetSortOrderArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -39703,24 +43638,21 @@ int CommandDisableFilterRulesForColumnArchive::ByteSize() const {
           this->super());
     }
 
-    // required uint32 column_index = 2;
-    if (has_column_index()) {
+    // optional .TST.TableSortOrderArchive old_sort_order = 2;
+    if (has_old_sort_order()) {
       total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->column_index());
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_sort_order());
     }
 
-  }
-  // repeated uint32 rule_indices = 3;
-  {
-    int data_size = 0;
-    for (int i = 0; i < this->rule_indices_size(); i++) {
-      data_size += ::google::protobuf::internal::WireFormatLite::
-        UInt32Size(this->rule_indices(i));
+    // optional .TST.TableSortOrderArchive new_sort_order = 3;
+    if (has_new_sort_order()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_sort_order());
     }
-    total_size += 1 * this->rule_indices_size() + data_size;
-  }
 
+  }
   if (!unknown_fields().empty()) {
     total_size +=
       ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -39732,10 +43664,10 @@ int CommandDisableFilterRulesForColumnArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandDisableFilterRulesForColumnArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandSetSortOrderArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandDisableFilterRulesForColumnArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandDisableFilterRulesForColumnArchive*>(
+  const CommandSetSortOrderArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetSortOrderArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -39744,57 +43676,65 @@ void CommandDisableFilterRulesForColumnArchive::MergeFrom(const ::google::protob
   }
 }
 
-void CommandDisableFilterRulesForColumnArchive::MergeFrom(const CommandDisableFilterRulesForColumnArchive& from) {
+void CommandSetSortOrderArchive::MergeFrom(const CommandSetSortOrderArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
-  rule_indices_.MergeFrom(from.rule_indices_);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_column_index()) {
-      set_column_index(from.column_index());
+    if (from.has_old_sort_order()) {
+      mutable_old_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.old_sort_order());
+    }
+    if (from.has_new_sort_order()) {
+      mutable_new_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.new_sort_order());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandDisableFilterRulesForColumnArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandSetSortOrderArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandDisableFilterRulesForColumnArchive::CopyFrom(const CommandDisableFilterRulesForColumnArchive& from) {
+void CommandSetSortOrderArchive::CopyFrom(const CommandSetSortOrderArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandDisableFilterRulesForColumnArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
+bool CommandSetSortOrderArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_old_sort_order()) {
+    if (!this->old_sort_order().IsInitialized()) return false;
+  }
+  if (has_new_sort_order()) {
+    if (!this->new_sort_order().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandDisableFilterRulesForColumnArchive::Swap(CommandDisableFilterRulesForColumnArchive* other) {
+void CommandSetSortOrderArchive::Swap(CommandSetSortOrderArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(column_index_, other->column_index_);
-    rule_indices_.Swap(&other->rule_indices_);
+    std::swap(old_sort_order_, other->old_sort_order_);
+    std::swap(new_sort_order_, other->new_sort_order_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandDisableFilterRulesForColumnArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandSetSortOrderArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandDisableFilterRulesForColumnArchive_descriptor_;
-  metadata.reflection = CommandDisableFilterRulesForColumnArchive_reflection_;
+  metadata.descriptor = CommandSetSortOrderArchive_descriptor_;
+  metadata.reflection = CommandSetSortOrderArchive_reflection_;
   return metadata;
 }
 
@@ -39802,100 +43742,93 @@ ::google::protobuf::Metadata CommandDisableFilterRulesForColumnArchive::GetMetad
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetTextStyleArchive::kSuperFieldNumber;
-const int CommandSetTextStyleArchive::kRegionFieldNumber;
-const int CommandSetTextStyleArchive::kUndoCellMapFieldNumber;
-const int CommandSetTextStyleArchive::kRedoCellMapFieldNumber;
-const int CommandSetTextStyleArchive::kSubcommandsFieldNumber;
+const int CommandRewriteSortOrderForTectonicShiftArchive::kSuperFieldNumber;
+const int CommandRewriteSortOrderForTectonicShiftArchive::kTectonicShiftFieldNumber;
+const int CommandRewriteSortOrderForTectonicShiftArchive::kOldSortOrderFieldNumber;
+const int CommandRewriteSortOrderForTectonicShiftArchive::kNewSortOrderFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetTextStyleArchive::CommandSetTextStyleArchive()
+CommandRewriteSortOrderForTectonicShiftArchive::CommandRewriteSortOrderForTectonicShiftArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetTextStyleArchive::InitAsDefaultInstance() {
+void CommandRewriteSortOrderForTectonicShiftArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
-  region_ = const_cast< ::TST::CellRegion*>(&::TST::CellRegion::default_instance());
-  undo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  redo_cell_map_ = const_cast< ::TST::CellMapArchive*>(&::TST::CellMapArchive::default_instance());
-  subcommands_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  tectonic_shift_ = const_cast< ::TSCE::TectonicShiftArchive*>(&::TSCE::TectonicShiftArchive::default_instance());
+  old_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
+  new_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
 }
 
-CommandSetTextStyleArchive::CommandSetTextStyleArchive(const CommandSetTextStyleArchive& from)
+CommandRewriteSortOrderForTectonicShiftArchive::CommandRewriteSortOrderForTectonicShiftArchive(const CommandRewriteSortOrderForTectonicShiftArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetTextStyleArchive::SharedCtor() {
+void CommandRewriteSortOrderForTectonicShiftArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  region_ = NULL;
-  undo_cell_map_ = NULL;
-  redo_cell_map_ = NULL;
-  subcommands_ = NULL;
+  tectonic_shift_ = NULL;
+  old_sort_order_ = NULL;
+  new_sort_order_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetTextStyleArchive::~CommandSetTextStyleArchive() {
+CommandRewriteSortOrderForTectonicShiftArchive::~CommandRewriteSortOrderForTectonicShiftArchive() {
   SharedDtor();
 }
 
-void CommandSetTextStyleArchive::SharedDtor() {
+void CommandRewriteSortOrderForTectonicShiftArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete region_;
-    delete undo_cell_map_;
-    delete redo_cell_map_;
-    delete subcommands_;
+    delete tectonic_shift_;
+    delete old_sort_order_;
+    delete new_sort_order_;
   }
 }
 
-void CommandSetTextStyleArchive::SetCachedSize(int size) const {
+void CommandRewriteSortOrderForTectonicShiftArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetTextStyleArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteSortOrderForTectonicShiftArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetTextStyleArchive_descriptor_;
+  return CommandRewriteSortOrderForTectonicShiftArchive_descriptor_;
 }
 
-const CommandSetTextStyleArchive& CommandSetTextStyleArchive::default_instance() {
+const CommandRewriteSortOrderForTectonicShiftArchive& CommandRewriteSortOrderForTectonicShiftArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetTextStyleArchive* CommandSetTextStyleArchive::default_instance_ = NULL;
+CommandRewriteSortOrderForTectonicShiftArchive* CommandRewriteSortOrderForTectonicShiftArchive::default_instance_ = NULL;
 
-CommandSetTextStyleArchive* CommandSetTextStyleArchive::New() const {
-  return new CommandSetTextStyleArchive;
+CommandRewriteSortOrderForTectonicShiftArchive* CommandRewriteSortOrderForTectonicShiftArchive::New() const {
+  return new CommandRewriteSortOrderForTectonicShiftArchive;
 }
 
-void CommandSetTextStyleArchive::Clear() {
+void CommandRewriteSortOrderForTectonicShiftArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_region()) {
-      if (region_ != NULL) region_->::TST::CellRegion::Clear();
-    }
-    if (has_undo_cell_map()) {
-      if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+    if (has_tectonic_shift()) {
+      if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
     }
-    if (has_redo_cell_map()) {
-      if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+    if (has_old_sort_order()) {
+      if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
     }
-    if (has_subcommands()) {
-      if (subcommands_ != NULL) subcommands_->::TSP::Reference::Clear();
+    if (has_new_sort_order()) {
+      if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetTextStyleArchive::MergePartialFromCodedStream(
+bool CommandRewriteSortOrderForTectonicShiftArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -39910,59 +43843,45 @@ bool CommandSetTextStyleArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_region;
+        if (input->ExpectTag(18)) goto parse_tectonic_shift;
         break;
       }
 
-      // required .TST.CellRegion region = 2;
+      // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_region:
+         parse_tectonic_shift:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_region()));
+               input, mutable_tectonic_shift()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_undo_cell_map;
+        if (input->ExpectTag(26)) goto parse_old_sort_order;
         break;
       }
 
-      // optional .TST.CellMapArchive undo_cell_map = 3;
+      // optional .TST.TableSortOrderArchive old_sort_order = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_cell_map:
+         parse_old_sort_order:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_cell_map()));
+               input, mutable_old_sort_order()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(34)) goto parse_redo_cell_map;
+        if (input->ExpectTag(34)) goto parse_new_sort_order;
         break;
       }
 
-      // optional .TST.CellMapArchive redo_cell_map = 4;
+      // optional .TST.TableSortOrderArchive new_sort_order = 4;
       case 4: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_redo_cell_map:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_redo_cell_map()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(42)) goto parse_subcommands;
-        break;
-      }
-
-      // optional .TSP.Reference subcommands = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_subcommands:
+         parse_new_sort_order:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_subcommands()));
+               input, mutable_new_sort_order()));
         } else {
           goto handle_uninterpreted;
         }
@@ -39986,7 +43905,7 @@ bool CommandSetTextStyleArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetTextStyleArchive::SerializeWithCachedSizes(
+void CommandRewriteSortOrderForTectonicShiftArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -39994,28 +43913,22 @@ void CommandSetTextStyleArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
-  // required .TST.CellRegion region = 2;
-  if (has_region()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->region(), output);
-  }
-
-  // optional .TST.CellMapArchive undo_cell_map = 3;
-  if (has_undo_cell_map()) {
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+  if (has_tectonic_shift()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->undo_cell_map(), output);
+      2, this->tectonic_shift(), output);
   }
 
-  // optional .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
+  // optional .TST.TableSortOrderArchive old_sort_order = 3;
+  if (has_old_sort_order()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->redo_cell_map(), output);
+      3, this->old_sort_order(), output);
   }
 
-  // optional .TSP.Reference subcommands = 5;
-  if (has_subcommands()) {
+  // optional .TST.TableSortOrderArchive new_sort_order = 4;
+  if (has_new_sort_order()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->subcommands(), output);
+      4, this->new_sort_order(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -40024,7 +43937,7 @@ void CommandSetTextStyleArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetTextStyleArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteSortOrderForTectonicShiftArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -40033,32 +43946,25 @@ ::google::protobuf::uint8* CommandSetTextStyleArchive::SerializeWithCachedSizesT
         1, this->super(), target);
   }
 
-  // required .TST.CellRegion region = 2;
-  if (has_region()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->region(), target);
-  }
-
-  // optional .TST.CellMapArchive undo_cell_map = 3;
-  if (has_undo_cell_map()) {
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+  if (has_tectonic_shift()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        3, this->undo_cell_map(), target);
+        2, this->tectonic_shift(), target);
   }
 
-  // optional .TST.CellMapArchive redo_cell_map = 4;
-  if (has_redo_cell_map()) {
+  // optional .TST.TableSortOrderArchive old_sort_order = 3;
+  if (has_old_sort_order()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        4, this->redo_cell_map(), target);
+        3, this->old_sort_order(), target);
   }
 
-  // optional .TSP.Reference subcommands = 5;
-  if (has_subcommands()) {
+  // optional .TST.TableSortOrderArchive new_sort_order = 4;
+  if (has_new_sort_order()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->subcommands(), target);
+        4, this->new_sort_order(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -40068,7 +43974,7 @@ ::google::protobuf::uint8* CommandSetTextStyleArchive::SerializeWithCachedSizesT
   return target;
 }
 
-int CommandSetTextStyleArchive::ByteSize() const {
+int CommandRewriteSortOrderForTectonicShiftArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -40079,32 +43985,25 @@ int CommandSetTextStyleArchive::ByteSize() const {
           this->super());
     }
 
-    // required .TST.CellRegion region = 2;
-    if (has_region()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->region());
-    }
-
-    // optional .TST.CellMapArchive undo_cell_map = 3;
-    if (has_undo_cell_map()) {
+    // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+    if (has_tectonic_shift()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_cell_map());
+          this->tectonic_shift());
     }
 
-    // optional .TST.CellMapArchive redo_cell_map = 4;
-    if (has_redo_cell_map()) {
+    // optional .TST.TableSortOrderArchive old_sort_order = 3;
+    if (has_old_sort_order()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->redo_cell_map());
+          this->old_sort_order());
     }
 
-    // optional .TSP.Reference subcommands = 5;
-    if (has_subcommands()) {
+    // optional .TST.TableSortOrderArchive new_sort_order = 4;
+    if (has_new_sort_order()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->subcommands());
+          this->new_sort_order());
     }
 
   }
@@ -40119,10 +44018,10 @@ int CommandSetTextStyleArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetTextStyleArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteSortOrderForTectonicShiftArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetTextStyleArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetTextStyleArchive*>(
+  const CommandRewriteSortOrderForTectonicShiftArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteSortOrderForTectonicShiftArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -40131,79 +44030,72 @@ void CommandSetTextStyleArchive::MergeFrom(const ::google::protobuf::Message& fr
   }
 }
 
-void CommandSetTextStyleArchive::MergeFrom(const CommandSetTextStyleArchive& from) {
+void CommandRewriteSortOrderForTectonicShiftArchive::MergeFrom(const CommandRewriteSortOrderForTectonicShiftArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_region()) {
-      mutable_region()->::TST::CellRegion::MergeFrom(from.region());
-    }
-    if (from.has_undo_cell_map()) {
-      mutable_undo_cell_map()->::TST::CellMapArchive::MergeFrom(from.undo_cell_map());
+    if (from.has_tectonic_shift()) {
+      mutable_tectonic_shift()->::TSCE::TectonicShiftArchive::MergeFrom(from.tectonic_shift());
     }
-    if (from.has_redo_cell_map()) {
-      mutable_redo_cell_map()->::TST::CellMapArchive::MergeFrom(from.redo_cell_map());
+    if (from.has_old_sort_order()) {
+      mutable_old_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.old_sort_order());
     }
-    if (from.has_subcommands()) {
-      mutable_subcommands()->::TSP::Reference::MergeFrom(from.subcommands());
+    if (from.has_new_sort_order()) {
+      mutable_new_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.new_sort_order());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetTextStyleArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteSortOrderForTectonicShiftArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetTextStyleArchive::CopyFrom(const CommandSetTextStyleArchive& from) {
+void CommandRewriteSortOrderForTectonicShiftArchive::CopyFrom(const CommandRewriteSortOrderForTectonicShiftArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetTextStyleArchive::IsInitialized() const {
+bool CommandRewriteSortOrderForTectonicShiftArchive::IsInitialized() const {
   if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_region()) {
-    if (!this->region().IsInitialized()) return false;
-  }
-  if (has_undo_cell_map()) {
-    if (!this->undo_cell_map().IsInitialized()) return false;
+  if (has_tectonic_shift()) {
+    if (!this->tectonic_shift().IsInitialized()) return false;
   }
-  if (has_redo_cell_map()) {
-    if (!this->redo_cell_map().IsInitialized()) return false;
+  if (has_old_sort_order()) {
+    if (!this->old_sort_order().IsInitialized()) return false;
   }
-  if (has_subcommands()) {
-    if (!this->subcommands().IsInitialized()) return false;
+  if (has_new_sort_order()) {
+    if (!this->new_sort_order().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSetTextStyleArchive::Swap(CommandSetTextStyleArchive* other) {
+void CommandRewriteSortOrderForTectonicShiftArchive::Swap(CommandRewriteSortOrderForTectonicShiftArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(region_, other->region_);
-    std::swap(undo_cell_map_, other->undo_cell_map_);
-    std::swap(redo_cell_map_, other->redo_cell_map_);
-    std::swap(subcommands_, other->subcommands_);
+    std::swap(tectonic_shift_, other->tectonic_shift_);
+    std::swap(old_sort_order_, other->old_sort_order_);
+    std::swap(new_sort_order_, other->new_sort_order_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetTextStyleArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteSortOrderForTectonicShiftArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetTextStyleArchive_descriptor_;
-  metadata.reflection = CommandSetTextStyleArchive_reflection_;
+  metadata.descriptor = CommandRewriteSortOrderForTectonicShiftArchive_descriptor_;
+  metadata.reflection = CommandRewriteSortOrderForTectonicShiftArchive_reflection_;
   return metadata;
 }
 
@@ -40211,72 +44103,93 @@ ::google::protobuf::Metadata CommandSetTextStyleArchive::GetMetadata() const {
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandNotifyForTransformingArchive::kSuperFieldNumber;
+const int CommandRewriteSortOrderForSortArchive::kSuperFieldNumber;
+const int CommandRewriteSortOrderForSortArchive::kSortMappingFieldNumber;
+const int CommandRewriteSortOrderForSortArchive::kOldSortOrderFieldNumber;
+const int CommandRewriteSortOrderForSortArchive::kNewSortOrderFieldNumber;
 #endif  // !_MSC_VER
 
-CommandNotifyForTransformingArchive::CommandNotifyForTransformingArchive()
+CommandRewriteSortOrderForSortArchive::CommandRewriteSortOrderForSortArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandNotifyForTransformingArchive::InitAsDefaultInstance() {
+void CommandRewriteSortOrderForSortArchive::InitAsDefaultInstance() {
   super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  sort_mapping_ = const_cast< ::TSK::ShuffleMappingArchive*>(&::TSK::ShuffleMappingArchive::default_instance());
+  old_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
+  new_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
 }
 
-CommandNotifyForTransformingArchive::CommandNotifyForTransformingArchive(const CommandNotifyForTransformingArchive& from)
+CommandRewriteSortOrderForSortArchive::CommandRewriteSortOrderForSortArchive(const CommandRewriteSortOrderForSortArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandNotifyForTransformingArchive::SharedCtor() {
+void CommandRewriteSortOrderForSortArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
+  sort_mapping_ = NULL;
+  old_sort_order_ = NULL;
+  new_sort_order_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandNotifyForTransformingArchive::~CommandNotifyForTransformingArchive() {
+CommandRewriteSortOrderForSortArchive::~CommandRewriteSortOrderForSortArchive() {
   SharedDtor();
 }
 
-void CommandNotifyForTransformingArchive::SharedDtor() {
+void CommandRewriteSortOrderForSortArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
+    delete sort_mapping_;
+    delete old_sort_order_;
+    delete new_sort_order_;
   }
 }
 
-void CommandNotifyForTransformingArchive::SetCachedSize(int size) const {
+void CommandRewriteSortOrderForSortArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandNotifyForTransformingArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteSortOrderForSortArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandNotifyForTransformingArchive_descriptor_;
+  return CommandRewriteSortOrderForSortArchive_descriptor_;
 }
 
-const CommandNotifyForTransformingArchive& CommandNotifyForTransformingArchive::default_instance() {
+const CommandRewriteSortOrderForSortArchive& CommandRewriteSortOrderForSortArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandNotifyForTransformingArchive* CommandNotifyForTransformingArchive::default_instance_ = NULL;
+CommandRewriteSortOrderForSortArchive* CommandRewriteSortOrderForSortArchive::default_instance_ = NULL;
 
-CommandNotifyForTransformingArchive* CommandNotifyForTransformingArchive::New() const {
-  return new CommandNotifyForTransformingArchive;
+CommandRewriteSortOrderForSortArchive* CommandRewriteSortOrderForSortArchive::New() const {
+  return new CommandRewriteSortOrderForSortArchive;
 }
 
-void CommandNotifyForTransformingArchive::Clear() {
+void CommandRewriteSortOrderForSortArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
       if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
+    if (has_sort_mapping()) {
+      if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
+    }
+    if (has_old_sort_order()) {
+      if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
+    }
+    if (has_new_sort_order()) {
+      if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandNotifyForTransformingArchive::MergePartialFromCodedStream(
+bool CommandRewriteSortOrderForSortArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
@@ -40291,6 +44204,48 @@ bool CommandNotifyForTransformingArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(18)) goto parse_sort_mapping;
+        break;
+      }
+
+      // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_sort_mapping:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_sort_mapping()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_old_sort_order;
+        break;
+      }
+
+      // optional .TST.TableSortOrderArchive old_sort_order = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_old_sort_order:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_old_sort_order()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_new_sort_order;
+        break;
+      }
+
+      // optional .TST.TableSortOrderArchive new_sort_order = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_new_sort_order:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_new_sort_order()));
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -40311,7 +44266,7 @@ bool CommandNotifyForTransformingArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandNotifyForTransformingArchive::SerializeWithCachedSizes(
+void CommandRewriteSortOrderForSortArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -40319,13 +44274,31 @@ void CommandNotifyForTransformingArchive::SerializeWithCachedSizes(
       1, this->super(), output);
   }
 
+  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+  if (has_sort_mapping()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->sort_mapping(), output);
+  }
+
+  // optional .TST.TableSortOrderArchive old_sort_order = 3;
+  if (has_old_sort_order()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->old_sort_order(), output);
+  }
+
+  // optional .TST.TableSortOrderArchive new_sort_order = 4;
+  if (has_new_sort_order()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->new_sort_order(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
   }
 }
 
-::google::protobuf::uint8* CommandNotifyForTransformingArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteSortOrderForSortArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
   // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
@@ -40334,6 +44307,27 @@ ::google::protobuf::uint8* CommandNotifyForTransformingArchive::SerializeWithCac
         1, this->super(), target);
   }
 
+  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+  if (has_sort_mapping()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->sort_mapping(), target);
+  }
+
+  // optional .TST.TableSortOrderArchive old_sort_order = 3;
+  if (has_old_sort_order()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->old_sort_order(), target);
+  }
+
+  // optional .TST.TableSortOrderArchive new_sort_order = 4;
+  if (has_new_sort_order()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->new_sort_order(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -40341,7 +44335,7 @@ ::google::protobuf::uint8* CommandNotifyForTransformingArchive::SerializeWithCac
   return target;
 }
 
-int CommandNotifyForTransformingArchive::ByteSize() const {
+int CommandRewriteSortOrderForSortArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
@@ -40352,6 +44346,27 @@ int CommandNotifyForTransformingArchive::ByteSize() const {
           this->super());
     }
 
+    // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+    if (has_sort_mapping()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->sort_mapping());
+    }
+
+    // optional .TST.TableSortOrderArchive old_sort_order = 3;
+    if (has_old_sort_order()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->old_sort_order());
+    }
+
+    // optional .TST.TableSortOrderArchive new_sort_order = 4;
+    if (has_new_sort_order()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->new_sort_order());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -40364,10 +44379,10 @@ int CommandNotifyForTransformingArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandNotifyForTransformingArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteSortOrderForSortArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandNotifyForTransformingArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandNotifyForTransformingArchive*>(
+  const CommandRewriteSortOrderForSortArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteSortOrderForSortArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -40376,51 +44391,72 @@ void CommandNotifyForTransformingArchive::MergeFrom(const ::google::protobuf::Me
   }
 }
 
-void CommandNotifyForTransformingArchive::MergeFrom(const CommandNotifyForTransformingArchive& from) {
+void CommandRewriteSortOrderForSortArchive::MergeFrom(const CommandRewriteSortOrderForSortArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
       mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
+    if (from.has_sort_mapping()) {
+      mutable_sort_mapping()->::TSK::ShuffleMappingArchive::MergeFrom(from.sort_mapping());
+    }
+    if (from.has_old_sort_order()) {
+      mutable_old_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.old_sort_order());
+    }
+    if (from.has_new_sort_order()) {
+      mutable_new_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.new_sort_order());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandNotifyForTransformingArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteSortOrderForSortArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandNotifyForTransformingArchive::CopyFrom(const CommandNotifyForTransformingArchive& from) {
+void CommandRewriteSortOrderForSortArchive::CopyFrom(const CommandRewriteSortOrderForSortArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandNotifyForTransformingArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
+bool CommandRewriteSortOrderForSortArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000003) != 0x00000003) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
+  if (has_sort_mapping()) {
+    if (!this->sort_mapping().IsInitialized()) return false;
+  }
+  if (has_old_sort_order()) {
+    if (!this->old_sort_order().IsInitialized()) return false;
+  }
+  if (has_new_sort_order()) {
+    if (!this->new_sort_order().IsInitialized()) return false;
+  }
   return true;
 }
 
-void CommandNotifyForTransformingArchive::Swap(CommandNotifyForTransformingArchive* other) {
+void CommandRewriteSortOrderForSortArchive::Swap(CommandRewriteSortOrderForSortArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
+    std::swap(sort_mapping_, other->sort_mapping_);
+    std::swap(old_sort_order_, other->old_sort_order_);
+    std::swap(new_sort_order_, other->new_sort_order_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandNotifyForTransformingArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteSortOrderForSortArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandNotifyForTransformingArchive_descriptor_;
-  metadata.reflection = CommandNotifyForTransformingArchive_reflection_;
+  metadata.descriptor = CommandRewriteSortOrderForSortArchive_descriptor_;
+  metadata.reflection = CommandRewriteSortOrderForSortArchive_reflection_;
   return metadata;
 }
 
@@ -40428,108 +44464,92 @@ ::google::protobuf::Metadata CommandNotifyForTransformingArchive::GetMetadata()
 // ===================================================================
 
 #ifndef _MSC_VER
-const int CommandSetStorageLanguageArchive::kSuperFieldNumber;
-const int CommandSetStorageLanguageArchive::kStorageFieldNumber;
-const int CommandSetStorageLanguageArchive::kLanguageFieldNumber;
-const int CommandSetStorageLanguageArchive::kRangeLocationFieldNumber;
-const int CommandSetStorageLanguageArchive::kRangeLengthFieldNumber;
-const int CommandSetStorageLanguageArchive::kUndoTransactionFieldNumber;
+const int CommandRewriteSortOrderForTableResizeArchive::kSuperFieldNumber;
+const int CommandRewriteSortOrderForTableResizeArchive::kOldSortOrderFieldNumber;
+const int CommandRewriteSortOrderForTableResizeArchive::kNewSortOrderFieldNumber;
 #endif  // !_MSC_VER
 
-CommandSetStorageLanguageArchive::CommandSetStorageLanguageArchive()
+CommandRewriteSortOrderForTableResizeArchive::CommandRewriteSortOrderForTableResizeArchive()
   : ::google::protobuf::Message() {
   SharedCtor();
 }
 
-void CommandSetStorageLanguageArchive::InitAsDefaultInstance() {
-  super_ = const_cast< ::TSK::CommandArchive*>(&::TSK::CommandArchive::default_instance());
-  storage_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
-  undo_transaction_ = const_cast< ::TSWP::UndoTransaction*>(&::TSWP::UndoTransaction::default_instance());
+void CommandRewriteSortOrderForTableResizeArchive::InitAsDefaultInstance() {
+  super_ = const_cast< ::TST::TableCommandArchive*>(&::TST::TableCommandArchive::default_instance());
+  old_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
+  new_sort_order_ = const_cast< ::TST::TableSortOrderArchive*>(&::TST::TableSortOrderArchive::default_instance());
 }
 
-CommandSetStorageLanguageArchive::CommandSetStorageLanguageArchive(const CommandSetStorageLanguageArchive& from)
+CommandRewriteSortOrderForTableResizeArchive::CommandRewriteSortOrderForTableResizeArchive(const CommandRewriteSortOrderForTableResizeArchive& from)
   : ::google::protobuf::Message() {
   SharedCtor();
   MergeFrom(from);
 }
 
-void CommandSetStorageLanguageArchive::SharedCtor() {
+void CommandRewriteSortOrderForTableResizeArchive::SharedCtor() {
   _cached_size_ = 0;
   super_ = NULL;
-  storage_ = NULL;
-  language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  range_location_ = 0u;
-  range_length_ = 0u;
-  undo_transaction_ = NULL;
+  old_sort_order_ = NULL;
+  new_sort_order_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
-CommandSetStorageLanguageArchive::~CommandSetStorageLanguageArchive() {
+CommandRewriteSortOrderForTableResizeArchive::~CommandRewriteSortOrderForTableResizeArchive() {
   SharedDtor();
 }
 
-void CommandSetStorageLanguageArchive::SharedDtor() {
-  if (language_ != &::google::protobuf::internal::kEmptyString) {
-    delete language_;
-  }
+void CommandRewriteSortOrderForTableResizeArchive::SharedDtor() {
   if (this != default_instance_) {
     delete super_;
-    delete storage_;
-    delete undo_transaction_;
+    delete old_sort_order_;
+    delete new_sort_order_;
   }
 }
 
-void CommandSetStorageLanguageArchive::SetCachedSize(int size) const {
+void CommandRewriteSortOrderForTableResizeArchive::SetCachedSize(int size) const {
   GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
   _cached_size_ = size;
   GOOGLE_SAFE_CONCURRENT_WRITES_END();
 }
-const ::google::protobuf::Descriptor* CommandSetStorageLanguageArchive::descriptor() {
+const ::google::protobuf::Descriptor* CommandRewriteSortOrderForTableResizeArchive::descriptor() {
   protobuf_AssignDescriptorsOnce();
-  return CommandSetStorageLanguageArchive_descriptor_;
+  return CommandRewriteSortOrderForTableResizeArchive_descriptor_;
 }
 
-const CommandSetStorageLanguageArchive& CommandSetStorageLanguageArchive::default_instance() {
+const CommandRewriteSortOrderForTableResizeArchive& CommandRewriteSortOrderForTableResizeArchive::default_instance() {
   if (default_instance_ == NULL) protobuf_AddDesc_TSTCommandArchives_2eproto();
   return *default_instance_;
 }
 
-CommandSetStorageLanguageArchive* CommandSetStorageLanguageArchive::default_instance_ = NULL;
+CommandRewriteSortOrderForTableResizeArchive* CommandRewriteSortOrderForTableResizeArchive::default_instance_ = NULL;
 
-CommandSetStorageLanguageArchive* CommandSetStorageLanguageArchive::New() const {
-  return new CommandSetStorageLanguageArchive;
+CommandRewriteSortOrderForTableResizeArchive* CommandRewriteSortOrderForTableResizeArchive::New() const {
+  return new CommandRewriteSortOrderForTableResizeArchive;
 }
 
-void CommandSetStorageLanguageArchive::Clear() {
+void CommandRewriteSortOrderForTableResizeArchive::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (has_super()) {
-      if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
-    }
-    if (has_storage()) {
-      if (storage_ != NULL) storage_->::TSP::Reference::Clear();
+      if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
     }
-    if (has_language()) {
-      if (language_ != &::google::protobuf::internal::kEmptyString) {
-        language_->clear();
-      }
+    if (has_old_sort_order()) {
+      if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
     }
-    range_location_ = 0u;
-    range_length_ = 0u;
-    if (has_undo_transaction()) {
-      if (undo_transaction_ != NULL) undo_transaction_->::TSWP::UndoTransaction::Clear();
+    if (has_new_sort_order()) {
+      if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
     }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
 }
 
-bool CommandSetStorageLanguageArchive::MergePartialFromCodedStream(
+bool CommandRewriteSortOrderForTableResizeArchive::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
 #define DO_(EXPRESSION) if (!(EXPRESSION)) return false
   ::google::protobuf::uint32 tag;
   while ((tag = input->ReadTag()) != 0) {
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .TSK.CommandArchive super = 1;
+      // required .TST.TableCommandArchive super = 1;
       case 1: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
@@ -40538,80 +44558,31 @@ bool CommandSetStorageLanguageArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(18)) goto parse_storage;
+        if (input->ExpectTag(18)) goto parse_old_sort_order;
         break;
       }
 
-      // required .TSP.Reference storage = 2;
+      // optional .TST.TableSortOrderArchive old_sort_order = 2;
       case 2: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_storage:
+         parse_old_sort_order:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_storage()));
+               input, mutable_old_sort_order()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(26)) goto parse_language;
+        if (input->ExpectTag(26)) goto parse_new_sort_order;
         break;
       }
 
-      // required string language = 3;
+      // optional .TST.TableSortOrderArchive new_sort_order = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_language:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_language()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->language().data(), this->language().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_range_location;
-        break;
-      }
-
-      // required uint32 range_location = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_range_location:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &range_location_)));
-          set_has_range_location();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_range_length;
-        break;
-      }
-
-      // required uint32 range_length = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_range_length:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &range_length_)));
-          set_has_range_length();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(50)) goto parse_undo_transaction;
-        break;
-      }
-
-      // optional .TSWP.UndoTransaction undo_transaction = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_undo_transaction:
+         parse_new_sort_order:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_undo_transaction()));
+               input, mutable_new_sort_order()));
         } else {
           goto handle_uninterpreted;
         }
@@ -40635,43 +44606,24 @@ bool CommandSetStorageLanguageArchive::MergePartialFromCodedStream(
 #undef DO_
 }
 
-void CommandSetStorageLanguageArchive::SerializeWithCachedSizes(
+void CommandRewriteSortOrderForTableResizeArchive::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
       1, this->super(), output);
   }
 
-  // required .TSP.Reference storage = 2;
-  if (has_storage()) {
+  // optional .TST.TableSortOrderArchive old_sort_order = 2;
+  if (has_old_sort_order()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->storage(), output);
-  }
-
-  // required string language = 3;
-  if (has_language()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->language().data(), this->language().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->language(), output);
-  }
-
-  // required uint32 range_location = 4;
-  if (has_range_location()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(4, this->range_location(), output);
+      2, this->old_sort_order(), output);
   }
 
-  // required uint32 range_length = 5;
-  if (has_range_length()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(5, this->range_length(), output);
-  }
-
-  // optional .TSWP.UndoTransaction undo_transaction = 6;
-  if (has_undo_transaction()) {
+  // optional .TST.TableSortOrderArchive new_sort_order = 3;
+  if (has_new_sort_order()) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      6, this->undo_transaction(), output);
+      3, this->new_sort_order(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -40680,47 +44632,27 @@ void CommandSetStorageLanguageArchive::SerializeWithCachedSizes(
   }
 }
 
-::google::protobuf::uint8* CommandSetStorageLanguageArchive::SerializeWithCachedSizesToArray(
+::google::protobuf::uint8* CommandRewriteSortOrderForTableResizeArchive::SerializeWithCachedSizesToArray(
     ::google::protobuf::uint8* target) const {
-  // required .TSK.CommandArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   if (has_super()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
         1, this->super(), target);
   }
 
-  // required .TSP.Reference storage = 2;
-  if (has_storage()) {
+  // optional .TST.TableSortOrderArchive old_sort_order = 2;
+  if (has_old_sort_order()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        2, this->storage(), target);
-  }
-
-  // required string language = 3;
-  if (has_language()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->language().data(), this->language().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->language(), target);
+        2, this->old_sort_order(), target);
   }
 
-  // required uint32 range_location = 4;
-  if (has_range_location()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(4, this->range_location(), target);
-  }
-
-  // required uint32 range_length = 5;
-  if (has_range_length()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(5, this->range_length(), target);
-  }
-
-  // optional .TSWP.UndoTransaction undo_transaction = 6;
-  if (has_undo_transaction()) {
+  // optional .TST.TableSortOrderArchive new_sort_order = 3;
+  if (has_new_sort_order()) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        6, this->undo_transaction(), target);
+        3, this->new_sort_order(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -40730,50 +44662,29 @@ ::google::protobuf::uint8* CommandSetStorageLanguageArchive::SerializeWithCached
   return target;
 }
 
-int CommandSetStorageLanguageArchive::ByteSize() const {
+int CommandRewriteSortOrderForTableResizeArchive::ByteSize() const {
   int total_size = 0;
 
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required .TSK.CommandArchive super = 1;
+    // required .TST.TableCommandArchive super = 1;
     if (has_super()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
           this->super());
     }
 
-    // required .TSP.Reference storage = 2;
-    if (has_storage()) {
+    // optional .TST.TableSortOrderArchive old_sort_order = 2;
+    if (has_old_sort_order()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->storage());
-    }
-
-    // required string language = 3;
-    if (has_language()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->language());
-    }
-
-    // required uint32 range_location = 4;
-    if (has_range_location()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->range_location());
-    }
-
-    // required uint32 range_length = 5;
-    if (has_range_length()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->range_length());
+          this->old_sort_order());
     }
 
-    // optional .TSWP.UndoTransaction undo_transaction = 6;
-    if (has_undo_transaction()) {
+    // optional .TST.TableSortOrderArchive new_sort_order = 3;
+    if (has_new_sort_order()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->undo_transaction());
+          this->new_sort_order());
     }
 
   }
@@ -40788,10 +44699,10 @@ int CommandSetStorageLanguageArchive::ByteSize() const {
   return total_size;
 }
 
-void CommandSetStorageLanguageArchive::MergeFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteSortOrderForTableResizeArchive::MergeFrom(const ::google::protobuf::Message& from) {
   GOOGLE_CHECK_NE(&from, this);
-  const CommandSetStorageLanguageArchive* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const CommandSetStorageLanguageArchive*>(
+  const CommandRewriteSortOrderForTableResizeArchive* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const CommandRewriteSortOrderForTableResizeArchive*>(
       &from);
   if (source == NULL) {
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
@@ -40800,77 +44711,65 @@ void CommandSetStorageLanguageArchive::MergeFrom(const ::google::protobuf::Messa
   }
 }
 
-void CommandSetStorageLanguageArchive::MergeFrom(const CommandSetStorageLanguageArchive& from) {
+void CommandRewriteSortOrderForTableResizeArchive::MergeFrom(const CommandRewriteSortOrderForTableResizeArchive& from) {
   GOOGLE_CHECK_NE(&from, this);
   if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     if (from.has_super()) {
-      mutable_super()->::TSK::CommandArchive::MergeFrom(from.super());
-    }
-    if (from.has_storage()) {
-      mutable_storage()->::TSP::Reference::MergeFrom(from.storage());
-    }
-    if (from.has_language()) {
-      set_language(from.language());
-    }
-    if (from.has_range_location()) {
-      set_range_location(from.range_location());
+      mutable_super()->::TST::TableCommandArchive::MergeFrom(from.super());
     }
-    if (from.has_range_length()) {
-      set_range_length(from.range_length());
+    if (from.has_old_sort_order()) {
+      mutable_old_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.old_sort_order());
     }
-    if (from.has_undo_transaction()) {
-      mutable_undo_transaction()->::TSWP::UndoTransaction::MergeFrom(from.undo_transaction());
+    if (from.has_new_sort_order()) {
+      mutable_new_sort_order()->::TST::TableSortOrderArchive::MergeFrom(from.new_sort_order());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
 
-void CommandSetStorageLanguageArchive::CopyFrom(const ::google::protobuf::Message& from) {
+void CommandRewriteSortOrderForTableResizeArchive::CopyFrom(const ::google::protobuf::Message& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-void CommandSetStorageLanguageArchive::CopyFrom(const CommandSetStorageLanguageArchive& from) {
+void CommandRewriteSortOrderForTableResizeArchive::CopyFrom(const CommandRewriteSortOrderForTableResizeArchive& from) {
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
-bool CommandSetStorageLanguageArchive::IsInitialized() const {
-  if ((_has_bits_[0] & 0x0000001f) != 0x0000001f) return false;
+bool CommandRewriteSortOrderForTableResizeArchive::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
 
   if (has_super()) {
     if (!this->super().IsInitialized()) return false;
   }
-  if (has_storage()) {
-    if (!this->storage().IsInitialized()) return false;
+  if (has_old_sort_order()) {
+    if (!this->old_sort_order().IsInitialized()) return false;
   }
-  if (has_undo_transaction()) {
-    if (!this->undo_transaction().IsInitialized()) return false;
+  if (has_new_sort_order()) {
+    if (!this->new_sort_order().IsInitialized()) return false;
   }
   return true;
 }
 
-void CommandSetStorageLanguageArchive::Swap(CommandSetStorageLanguageArchive* other) {
+void CommandRewriteSortOrderForTableResizeArchive::Swap(CommandRewriteSortOrderForTableResizeArchive* other) {
   if (other != this) {
     std::swap(super_, other->super_);
-    std::swap(storage_, other->storage_);
-    std::swap(language_, other->language_);
-    std::swap(range_location_, other->range_location_);
-    std::swap(range_length_, other->range_length_);
-    std::swap(undo_transaction_, other->undo_transaction_);
+    std::swap(old_sort_order_, other->old_sort_order_);
+    std::swap(new_sort_order_, other->new_sort_order_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
   }
 }
 
-::google::protobuf::Metadata CommandSetStorageLanguageArchive::GetMetadata() const {
+::google::protobuf::Metadata CommandRewriteSortOrderForTableResizeArchive::GetMetadata() const {
   protobuf_AssignDescriptorsOnce();
   ::google::protobuf::Metadata metadata;
-  metadata.descriptor = CommandSetStorageLanguageArchive_descriptor_;
-  metadata.reflection = CommandSetStorageLanguageArchive_reflection_;
+  metadata.descriptor = CommandRewriteSortOrderForTableResizeArchive_descriptor_;
+  metadata.reflection = CommandRewriteSortOrderForTableResizeArchive_reflection_;
   return metadata;
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.h
index a5139ed..38e41e9 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSTCommandArchives.pb.h
@@ -42,6 +42,7 @@ void protobuf_AssignDesc_TSTCommandArchives_2eproto();
 void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
 class TableCommandArchive;
+class CommandApplyCellDiffArchive;
 class CommandChangeFreezeHeaderStateArchive;
 class CommandDeleteCellsArchive;
 class CommandDeleteCellContentsArchive;
@@ -52,6 +53,7 @@ class CommandCoerceMultipleCellsArchive;
 class CommandSetControlCellsDisplayNumberFormatArchive;
 class CommandSetAutomaticFormatArchive;
 class CommandSetAutomaticDurationUnitsArchive;
+class CommandReplaceCustomFormatArchive;
 class CommandInsertColumnsOrRowsArchive;
 class CommandInsertColumnsOrRowsArchive_StyleIndexPair;
 class CommandPasteArchive;
@@ -69,6 +71,7 @@ class CommandSetTableFontSizeArchive;
 class CommandSetTableFontNameArchive;
 class CommandSetTableNameHeightArchive;
 class CommandStyleCellsArchive;
+class CommandSetFillPropertyArchive;
 class CommandStyleTableArchive;
 class CommandFillCellsArchive;
 class CommandReplaceTextArchive;
@@ -79,6 +82,9 @@ class CommandAddQuickFilterRulesArchive;
 class CommandDeleteFilterRulesArchive;
 class CommandModifyFilterRuleArchive;
 class CommandApplyStrokePresetArchive;
+class CommandAddTableStylePresetArchive;
+class CommandRemoveTableStylePresetArchive;
+class CommandReplaceTableStylePresetArchive;
 class CommandApplyTableStylePresetArchive;
 class CommandApplyTableStylePresetArchive_StyleIndexTuple;
 class CommandSetStyleApplyClearsAllFlagArchive;
@@ -139,6 +145,10 @@ class CommandDisableFilterRulesForColumnArchive;
 class CommandSetTextStyleArchive;
 class CommandNotifyForTransformingArchive;
 class CommandSetStorageLanguageArchive;
+class CommandSetSortOrderArchive;
+class CommandRewriteSortOrderForTectonicShiftArchive;
+class CommandRewriteSortOrderForSortArchive;
+class CommandRewriteSortOrderForTableResizeArchive;
 
 enum CommandDirectionArchive {
   directionRow = 0,
@@ -303,6 +313,126 @@ class TableCommandArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class CommandApplyCellDiffArchive : public ::google::protobuf::Message {
+ public:
+  CommandApplyCellDiffArchive();
+  virtual ~CommandApplyCellDiffArchive();
+
+  CommandApplyCellDiffArchive(const CommandApplyCellDiffArchive& from);
+
+  inline CommandApplyCellDiffArchive& operator=(const CommandApplyCellDiffArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandApplyCellDiffArchive& default_instance();
+
+  void Swap(CommandApplyCellDiffArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandApplyCellDiffArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandApplyCellDiffArchive& from);
+  void MergeFrom(const CommandApplyCellDiffArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // required .TST.CellRegion cell_region = 2;
+  inline bool has_cell_region() const;
+  inline void clear_cell_region();
+  static const int kCellRegionFieldNumber = 2;
+  inline const ::TST::CellRegion& cell_region() const;
+  inline ::TST::CellRegion* mutable_cell_region();
+  inline ::TST::CellRegion* release_cell_region();
+  inline void set_allocated_cell_region(::TST::CellRegion* cell_region);
+
+  // required .TSP.Reference cell_diff = 3;
+  inline bool has_cell_diff() const;
+  inline void clear_cell_diff();
+  static const int kCellDiffFieldNumber = 3;
+  inline const ::TSP::Reference& cell_diff() const;
+  inline ::TSP::Reference* mutable_cell_diff();
+  inline ::TSP::Reference* release_cell_diff();
+  inline void set_allocated_cell_diff(::TSP::Reference* cell_diff);
+
+  // required .TSP.Reference inverse_cell_diff_map = 4;
+  inline bool has_inverse_cell_diff_map() const;
+  inline void clear_inverse_cell_diff_map();
+  static const int kInverseCellDiffMapFieldNumber = 4;
+  inline const ::TSP::Reference& inverse_cell_diff_map() const;
+  inline ::TSP::Reference* mutable_inverse_cell_diff_map();
+  inline ::TSP::Reference* release_inverse_cell_diff_map();
+  inline void set_allocated_inverse_cell_diff_map(::TSP::Reference* inverse_cell_diff_map);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandApplyCellDiffArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_cell_region();
+  inline void clear_has_cell_region();
+  inline void set_has_cell_diff();
+  inline void clear_has_cell_diff();
+  inline void set_has_inverse_cell_diff_map();
+  inline void clear_has_inverse_cell_diff_map();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TST::CellRegion* cell_region_;
+  ::TSP::Reference* cell_diff_;
+  ::TSP::Reference* inverse_cell_diff_map_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandApplyCellDiffArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class CommandChangeFreezeHeaderStateArchive : public ::google::protobuf::Message {
  public:
   CommandChangeFreezeHeaderStateArchive();
@@ -1561,6 +1691,114 @@ class CommandSetAutomaticDurationUnitsArchive : public ::google::protobuf::Messa
 };
 // -------------------------------------------------------------------
 
+class CommandReplaceCustomFormatArchive : public ::google::protobuf::Message {
+ public:
+  CommandReplaceCustomFormatArchive();
+  virtual ~CommandReplaceCustomFormatArchive();
+
+  CommandReplaceCustomFormatArchive(const CommandReplaceCustomFormatArchive& from);
+
+  inline CommandReplaceCustomFormatArchive& operator=(const CommandReplaceCustomFormatArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceCustomFormatArchive& default_instance();
+
+  void Swap(CommandReplaceCustomFormatArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceCustomFormatArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceCustomFormatArchive& from);
+  void MergeFrom(const CommandReplaceCustomFormatArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.CellMapArchive undo_map = 1;
+  inline bool has_undo_map() const;
+  inline void clear_undo_map();
+  static const int kUndoMapFieldNumber = 1;
+  inline const ::TST::CellMapArchive& undo_map() const;
+  inline ::TST::CellMapArchive* mutable_undo_map();
+  inline ::TST::CellMapArchive* release_undo_map();
+  inline void set_allocated_undo_map(::TST::CellMapArchive* undo_map);
+
+  // required .TST.CellMapArchive redo_map = 2;
+  inline bool has_redo_map() const;
+  inline void clear_redo_map();
+  static const int kRedoMapFieldNumber = 2;
+  inline const ::TST::CellMapArchive& redo_map() const;
+  inline ::TST::CellMapArchive* mutable_redo_map();
+  inline ::TST::CellMapArchive* release_redo_map();
+  inline void set_allocated_redo_map(::TST::CellMapArchive* redo_map);
+
+  // required .TST.TableCommandArchive super = 6;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 6;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandReplaceCustomFormatArchive)
+ private:
+  inline void set_has_undo_map();
+  inline void clear_has_undo_map();
+  inline void set_has_redo_map();
+  inline void clear_has_redo_map();
+  inline void set_has_super();
+  inline void clear_has_super();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::CellMapArchive* undo_map_;
+  ::TST::CellMapArchive* redo_map_;
+  ::TST::TableCommandArchive* super_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandReplaceCustomFormatArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class CommandInsertColumnsOrRowsArchive_StyleIndexPair : public ::google::protobuf::Message {
  public:
   CommandInsertColumnsOrRowsArchive_StyleIndexPair();
@@ -2038,23 +2276,23 @@ class CommandPasteArchive : public ::google::protobuf::Message {
   inline ::TST::SelectionArchive* release_final_selection();
   inline void set_allocated_final_selection(::TST::SelectionArchive* final_selection);
 
-  // required .TST.CellMapArchive undo_cell_map = 3;
+  // required .TST.TiledCellMapArchive undo_cell_map = 3;
   inline bool has_undo_cell_map() const;
   inline void clear_undo_cell_map();
   static const int kUndoCellMapFieldNumber = 3;
-  inline const ::TST::CellMapArchive& undo_cell_map() const;
-  inline ::TST::CellMapArchive* mutable_undo_cell_map();
-  inline ::TST::CellMapArchive* release_undo_cell_map();
-  inline void set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map);
+  inline const ::TST::TiledCellMapArchive& undo_cell_map() const;
+  inline ::TST::TiledCellMapArchive* mutable_undo_cell_map();
+  inline ::TST::TiledCellMapArchive* release_undo_cell_map();
+  inline void set_allocated_undo_cell_map(::TST::TiledCellMapArchive* undo_cell_map);
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
+  // required .TST.TiledCellMapArchive redo_cell_map = 4;
   inline bool has_redo_cell_map() const;
   inline void clear_redo_cell_map();
   static const int kRedoCellMapFieldNumber = 4;
-  inline const ::TST::CellMapArchive& redo_cell_map() const;
-  inline ::TST::CellMapArchive* mutable_redo_cell_map();
-  inline ::TST::CellMapArchive* release_redo_cell_map();
-  inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
+  inline const ::TST::TiledCellMapArchive& redo_cell_map() const;
+  inline ::TST::TiledCellMapArchive* mutable_redo_cell_map();
+  inline ::TST::TiledCellMapArchive* release_redo_cell_map();
+  inline void set_allocated_redo_cell_map(::TST::TiledCellMapArchive* redo_cell_map);
 
   // optional .TSP.Reference command_undo = 6;
   inline bool has_command_undo() const;
@@ -2114,8 +2352,8 @@ class CommandPasteArchive : public ::google::protobuf::Message {
 
   ::TST::SelectionArchive* user_selection_;
   ::TST::SelectionArchive* final_selection_;
-  ::TST::CellMapArchive* undo_cell_map_;
-  ::TST::CellMapArchive* redo_cell_map_;
+  ::TST::TiledCellMapArchive* undo_cell_map_;
+  ::TST::TiledCellMapArchive* redo_cell_map_;
   ::TSP::Reference* command_undo_;
   ::TST::TableCommandArchive* super_;
   ::google::protobuf::RepeatedPtrField< ::TSP::Reference > formula_rewrite_commands_;
@@ -4277,14 +4515,14 @@ class CommandStyleCellsArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class CommandStyleTableArchive : public ::google::protobuf::Message {
+class CommandSetFillPropertyArchive : public ::google::protobuf::Message {
  public:
-  CommandStyleTableArchive();
-  virtual ~CommandStyleTableArchive();
+  CommandSetFillPropertyArchive();
+  virtual ~CommandSetFillPropertyArchive();
 
-  CommandStyleTableArchive(const CommandStyleTableArchive& from);
+  CommandSetFillPropertyArchive(const CommandSetFillPropertyArchive& from);
 
-  inline CommandStyleTableArchive& operator=(const CommandStyleTableArchive& from) {
+  inline CommandSetFillPropertyArchive& operator=(const CommandSetFillPropertyArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -4298,17 +4536,17 @@ class CommandStyleTableArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandStyleTableArchive& default_instance();
+  static const CommandSetFillPropertyArchive& default_instance();
 
-  void Swap(CommandStyleTableArchive* other);
+  void Swap(CommandSetFillPropertyArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandStyleTableArchive* New() const;
+  CommandSetFillPropertyArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandStyleTableArchive& from);
-  void MergeFrom(const CommandStyleTableArchive& from);
+  void CopyFrom(const CommandSetFillPropertyArchive& from);
+  void MergeFrom(const CommandSetFillPropertyArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -4340,64 +4578,208 @@ class CommandStyleTableArchive : public ::google::protobuf::Message {
   inline ::TST::TableCommandArchive* release_super();
   inline void set_allocated_super(::TST::TableCommandArchive* super);
 
-  // optional .TSP.ReferenceDictionary format_properties = 2;
-  inline bool has_format_properties() const;
-  inline void clear_format_properties();
-  static const int kFormatPropertiesFieldNumber = 2;
-  inline const ::TSP::ReferenceDictionary& format_properties() const;
-  inline ::TSP::ReferenceDictionary* mutable_format_properties();
-  inline ::TSP::ReferenceDictionary* release_format_properties();
-  inline void set_allocated_format_properties(::TSP::ReferenceDictionary* format_properties);
+  // optional .TSD.FillArchive fill = 2;
+  inline bool has_fill() const;
+  inline void clear_fill();
+  static const int kFillFieldNumber = 2;
+  inline const ::TSD::FillArchive& fill() const;
+  inline ::TSD::FillArchive* mutable_fill();
+  inline ::TSD::FillArchive* release_fill();
+  inline void set_allocated_fill(::TSD::FillArchive* fill);
+
+  // optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+  inline bool has_cell_fill_stand_in() const;
+  inline void clear_cell_fill_stand_in();
+  static const int kCellFillStandInFieldNumber = 3;
+  inline const ::TST::CellFillStandIn& cell_fill_stand_in() const;
+  inline ::TST::CellFillStandIn* mutable_cell_fill_stand_in();
+  inline ::TST::CellFillStandIn* release_cell_fill_stand_in();
+  inline void set_allocated_cell_fill_stand_in(::TST::CellFillStandIn* cell_fill_stand_in);
+
+  // required .TST.SelectionArchive selection = 4;
+  inline bool has_selection() const;
+  inline void clear_selection();
+  static const int kSelectionFieldNumber = 4;
+  inline const ::TST::SelectionArchive& selection() const;
+  inline ::TST::SelectionArchive* mutable_selection();
+  inline ::TST::SelectionArchive* release_selection();
+  inline void set_allocated_selection(::TST::SelectionArchive* selection);
 
-  // optional .TSP.Reference old_style = 3;
-  inline bool has_old_style() const;
-  inline void clear_old_style();
-  static const int kOldStyleFieldNumber = 3;
-  inline const ::TSP::Reference& old_style() const;
-  inline ::TSP::Reference* mutable_old_style();
-  inline ::TSP::Reference* release_old_style();
-  inline void set_allocated_old_style(::TSP::Reference* old_style);
+  // required .TST.CellMapArchive undo_cell_map = 5;
+  inline bool has_undo_cell_map() const;
+  inline void clear_undo_cell_map();
+  static const int kUndoCellMapFieldNumber = 5;
+  inline const ::TST::CellMapArchive& undo_cell_map() const;
+  inline ::TST::CellMapArchive* mutable_undo_cell_map();
+  inline ::TST::CellMapArchive* release_undo_cell_map();
+  inline void set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map);
 
-  // optional .TSP.Reference new_style = 4;
-  inline bool has_new_style() const;
-  inline void clear_new_style();
-  static const int kNewStyleFieldNumber = 4;
-  inline const ::TSP::Reference& new_style() const;
-  inline ::TSP::Reference* mutable_new_style();
-  inline ::TSP::Reference* release_new_style();
-  inline void set_allocated_new_style(::TSP::Reference* new_style);
+  // required .TST.CellMapArchive redo_cell_map = 6;
+  inline bool has_redo_cell_map() const;
+  inline void clear_redo_cell_map();
+  static const int kRedoCellMapFieldNumber = 6;
+  inline const ::TST::CellMapArchive& redo_cell_map() const;
+  inline ::TST::CellMapArchive* mutable_redo_cell_map();
+  inline ::TST::CellMapArchive* release_redo_cell_map();
+  inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandStyleTableArchive)
+  // @@protoc_insertion_point(class_scope:TST.CommandSetFillPropertyArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_format_properties();
-  inline void clear_has_format_properties();
-  inline void set_has_old_style();
-  inline void clear_has_old_style();
-  inline void set_has_new_style();
-  inline void clear_has_new_style();
+  inline void set_has_fill();
+  inline void clear_has_fill();
+  inline void set_has_cell_fill_stand_in();
+  inline void clear_has_cell_fill_stand_in();
+  inline void set_has_selection();
+  inline void clear_has_selection();
+  inline void set_has_undo_cell_map();
+  inline void clear_has_undo_cell_map();
+  inline void set_has_redo_cell_map();
+  inline void clear_has_redo_cell_map();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::TableCommandArchive* super_;
-  ::TSP::ReferenceDictionary* format_properties_;
-  ::TSP::Reference* old_style_;
-  ::TSP::Reference* new_style_;
+  ::TSD::FillArchive* fill_;
+  ::TST::CellFillStandIn* cell_fill_stand_in_;
+  ::TST::SelectionArchive* selection_;
+  ::TST::CellMapArchive* undo_cell_map_;
+  ::TST::CellMapArchive* redo_cell_map_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandStyleTableArchive* default_instance_;
+  static CommandSetFillPropertyArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandFillCellsArchive : public ::google::protobuf::Message {
+class CommandStyleTableArchive : public ::google::protobuf::Message {
+ public:
+  CommandStyleTableArchive();
+  virtual ~CommandStyleTableArchive();
+
+  CommandStyleTableArchive(const CommandStyleTableArchive& from);
+
+  inline CommandStyleTableArchive& operator=(const CommandStyleTableArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandStyleTableArchive& default_instance();
+
+  void Swap(CommandStyleTableArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandStyleTableArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandStyleTableArchive& from);
+  void MergeFrom(const CommandStyleTableArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // optional .TSP.ReferenceDictionary format_properties = 2;
+  inline bool has_format_properties() const;
+  inline void clear_format_properties();
+  static const int kFormatPropertiesFieldNumber = 2;
+  inline const ::TSP::ReferenceDictionary& format_properties() const;
+  inline ::TSP::ReferenceDictionary* mutable_format_properties();
+  inline ::TSP::ReferenceDictionary* release_format_properties();
+  inline void set_allocated_format_properties(::TSP::ReferenceDictionary* format_properties);
+
+  // optional .TSP.Reference old_style = 3;
+  inline bool has_old_style() const;
+  inline void clear_old_style();
+  static const int kOldStyleFieldNumber = 3;
+  inline const ::TSP::Reference& old_style() const;
+  inline ::TSP::Reference* mutable_old_style();
+  inline ::TSP::Reference* release_old_style();
+  inline void set_allocated_old_style(::TSP::Reference* old_style);
+
+  // optional .TSP.Reference new_style = 4;
+  inline bool has_new_style() const;
+  inline void clear_new_style();
+  static const int kNewStyleFieldNumber = 4;
+  inline const ::TSP::Reference& new_style() const;
+  inline ::TSP::Reference* mutable_new_style();
+  inline ::TSP::Reference* release_new_style();
+  inline void set_allocated_new_style(::TSP::Reference* new_style);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandStyleTableArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_format_properties();
+  inline void clear_has_format_properties();
+  inline void set_has_old_style();
+  inline void clear_has_old_style();
+  inline void set_has_new_style();
+  inline void clear_has_new_style();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TSP::ReferenceDictionary* format_properties_;
+  ::TSP::Reference* old_style_;
+  ::TSP::Reference* new_style_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandStyleTableArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandFillCellsArchive : public ::google::protobuf::Message {
  public:
   CommandFillCellsArchive();
   virtual ~CommandFillCellsArchive();
@@ -5541,14 +5923,14 @@ class CommandApplyStrokePresetArchive : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
-class CommandApplyTableStylePresetArchive_StyleIndexTuple : public ::google::protobuf::Message {
+class CommandAddTableStylePresetArchive : public ::google::protobuf::Message {
  public:
-  CommandApplyTableStylePresetArchive_StyleIndexTuple();
-  virtual ~CommandApplyTableStylePresetArchive_StyleIndexTuple();
+  CommandAddTableStylePresetArchive();
+  virtual ~CommandAddTableStylePresetArchive();
 
-  CommandApplyTableStylePresetArchive_StyleIndexTuple(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from);
+  CommandAddTableStylePresetArchive(const CommandAddTableStylePresetArchive& from);
 
-  inline CommandApplyTableStylePresetArchive_StyleIndexTuple& operator=(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from) {
+  inline CommandAddTableStylePresetArchive& operator=(const CommandAddTableStylePresetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5562,17 +5944,17 @@ class CommandApplyTableStylePresetArchive_StyleIndexTuple : public ::google::pro
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandApplyTableStylePresetArchive_StyleIndexTuple& default_instance();
+  static const CommandAddTableStylePresetArchive& default_instance();
 
-  void Swap(CommandApplyTableStylePresetArchive_StyleIndexTuple* other);
+  void Swap(CommandAddTableStylePresetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandApplyTableStylePresetArchive_StyleIndexTuple* New() const;
+  CommandAddTableStylePresetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from);
-  void MergeFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from);
+  void CopyFrom(const CommandAddTableStylePresetArchive& from);
+  void MergeFrom(const CommandAddTableStylePresetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5595,66 +5977,76 @@ class CommandApplyTableStylePresetArchive_StyleIndexTuple : public ::google::pro
 
   // accessors -------------------------------------------------------
 
-  // required uint32 index = 1;
-  inline bool has_index() const;
-  inline void clear_index();
-  static const int kIndexFieldNumber = 1;
-  inline ::google::protobuf::uint32 index() const;
-  inline void set_index(::google::protobuf::uint32 value);
-
-  // optional .TSP.Reference cell_style = 5;
-  inline bool has_cell_style() const;
-  inline void clear_cell_style();
-  static const int kCellStyleFieldNumber = 5;
-  inline const ::TSP::Reference& cell_style() const;
-  inline ::TSP::Reference* mutable_cell_style();
-  inline ::TSP::Reference* release_cell_style();
-  inline void set_allocated_cell_style(::TSP::Reference* cell_style);
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
 
-  // optional .TSP.Reference text_style = 6;
-  inline bool has_text_style() const;
-  inline void clear_text_style();
-  static const int kTextStyleFieldNumber = 6;
-  inline const ::TSP::Reference& text_style() const;
-  inline ::TSP::Reference* mutable_text_style();
-  inline ::TSP::Reference* release_text_style();
-  inline void set_allocated_text_style(::TSP::Reference* text_style);
+  // required int32 preset_index = 2;
+  inline bool has_preset_index() const;
+  inline void clear_preset_index();
+  static const int kPresetIndexFieldNumber = 2;
+  inline ::google::protobuf::int32 preset_index() const;
+  inline void set_preset_index(::google::protobuf::int32 value);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandApplyTableStylePresetArchive.StyleIndexTuple)
+  // required .TST.TableStyleNetworkArchive table_styles = 3;
+  inline bool has_table_styles() const;
+  inline void clear_table_styles();
+  static const int kTableStylesFieldNumber = 3;
+  inline const ::TST::TableStyleNetworkArchive& table_styles() const;
+  inline ::TST::TableStyleNetworkArchive* mutable_table_styles();
+  inline ::TST::TableStyleNetworkArchive* release_table_styles();
+  inline void set_allocated_table_styles(::TST::TableStyleNetworkArchive* table_styles);
+
+  // required bool send_notification = 4;
+  inline bool has_send_notification() const;
+  inline void clear_send_notification();
+  static const int kSendNotificationFieldNumber = 4;
+  inline bool send_notification() const;
+  inline void set_send_notification(bool value);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandAddTableStylePresetArchive)
  private:
-  inline void set_has_index();
-  inline void clear_has_index();
-  inline void set_has_cell_style();
-  inline void clear_has_cell_style();
-  inline void set_has_text_style();
-  inline void clear_has_text_style();
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_preset_index();
+  inline void clear_has_preset_index();
+  inline void set_has_table_styles();
+  inline void clear_has_table_styles();
+  inline void set_has_send_notification();
+  inline void clear_has_send_notification();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSP::Reference* cell_style_;
-  ::TSP::Reference* text_style_;
-  ::google::protobuf::uint32 index_;
+  ::TST::TableCommandArchive* super_;
+  ::TST::TableStyleNetworkArchive* table_styles_;
+  ::google::protobuf::int32 preset_index_;
+  bool send_notification_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandApplyTableStylePresetArchive_StyleIndexTuple* default_instance_;
+  static CommandAddTableStylePresetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandApplyTableStylePresetArchive : public ::google::protobuf::Message {
+class CommandRemoveTableStylePresetArchive : public ::google::protobuf::Message {
  public:
-  CommandApplyTableStylePresetArchive();
-  virtual ~CommandApplyTableStylePresetArchive();
+  CommandRemoveTableStylePresetArchive();
+  virtual ~CommandRemoveTableStylePresetArchive();
 
-  CommandApplyTableStylePresetArchive(const CommandApplyTableStylePresetArchive& from);
+  CommandRemoveTableStylePresetArchive(const CommandRemoveTableStylePresetArchive& from);
 
-  inline CommandApplyTableStylePresetArchive& operator=(const CommandApplyTableStylePresetArchive& from) {
+  inline CommandRemoveTableStylePresetArchive& operator=(const CommandRemoveTableStylePresetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5668,17 +6060,17 @@ class CommandApplyTableStylePresetArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandApplyTableStylePresetArchive& default_instance();
+  static const CommandRemoveTableStylePresetArchive& default_instance();
 
-  void Swap(CommandApplyTableStylePresetArchive* other);
+  void Swap(CommandRemoveTableStylePresetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandApplyTableStylePresetArchive* New() const;
+  CommandRemoveTableStylePresetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandApplyTableStylePresetArchive& from);
-  void MergeFrom(const CommandApplyTableStylePresetArchive& from);
+  void CopyFrom(const CommandRemoveTableStylePresetArchive& from);
+  void MergeFrom(const CommandRemoveTableStylePresetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5699,166 +6091,210 @@ class CommandApplyTableStylePresetArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
-  typedef CommandApplyTableStylePresetArchive_StyleIndexTuple StyleIndexTuple;
-
   // accessors -------------------------------------------------------
 
-  // required .TST.TableCommandArchive super = 1;
+  // required .TSK.CommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TST::TableCommandArchive& super() const;
-  inline ::TST::TableCommandArchive* mutable_super();
-  inline ::TST::TableCommandArchive* release_super();
-  inline void set_allocated_super(::TST::TableCommandArchive* super);
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
 
-  // required .TST.CellMapArchive undo_cell_map = 2;
-  inline bool has_undo_cell_map() const;
-  inline void clear_undo_cell_map();
-  static const int kUndoCellMapFieldNumber = 2;
-  inline const ::TST::CellMapArchive& undo_cell_map() const;
-  inline ::TST::CellMapArchive* mutable_undo_cell_map();
-  inline ::TST::CellMapArchive* release_undo_cell_map();
-  inline void set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map);
+  // required .TSP.Reference theme = 2;
+  inline bool has_theme() const;
+  inline void clear_theme();
+  static const int kThemeFieldNumber = 2;
+  inline const ::TSP::Reference& theme() const;
+  inline ::TSP::Reference* mutable_theme();
+  inline ::TSP::Reference* release_theme();
+  inline void set_allocated_theme(::TSP::Reference* theme);
+
+  // required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+  inline bool has_removed_table_styles() const;
+  inline void clear_removed_table_styles();
+  static const int kRemovedTableStylesFieldNumber = 3;
+  inline const ::TST::TableStyleNetworkArchive& removed_table_styles() const;
+  inline ::TST::TableStyleNetworkArchive* mutable_removed_table_styles();
+  inline ::TST::TableStyleNetworkArchive* release_removed_table_styles();
+  inline void set_allocated_removed_table_styles(::TST::TableStyleNetworkArchive* removed_table_styles);
+
+  // required int32 preset_id = 4;
+  inline bool has_preset_id() const;
+  inline void clear_preset_id();
+  static const int kPresetIdFieldNumber = 4;
+  inline ::google::protobuf::int32 preset_id() const;
+  inline void set_preset_id(::google::protobuf::int32 value);
+
+  // required int32 preset_index_in_theme = 5;
+  inline bool has_preset_index_in_theme() const;
+  inline void clear_preset_index_in_theme();
+  static const int kPresetIndexInThemeFieldNumber = 5;
+  inline ::google::protobuf::int32 preset_index_in_theme() const;
+  inline void set_preset_index_in_theme(::google::protobuf::int32 value);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandRemoveTableStylePresetArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_theme();
+  inline void clear_has_theme();
+  inline void set_has_removed_table_styles();
+  inline void clear_has_removed_table_styles();
+  inline void set_has_preset_id();
+  inline void clear_has_preset_id();
+  inline void set_has_preset_index_in_theme();
+  inline void clear_has_preset_index_in_theme();
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
-  inline bool has_redo_cell_map() const;
-  inline void clear_redo_cell_map();
-  static const int kRedoCellMapFieldNumber = 4;
-  inline const ::TST::CellMapArchive& redo_cell_map() const;
-  inline ::TST::CellMapArchive* mutable_redo_cell_map();
-  inline ::TST::CellMapArchive* release_redo_cell_map();
-  inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  // required int32 preset_index = 5;
-  inline bool has_preset_index() const;
-  inline void clear_preset_index();
-  static const int kPresetIndexFieldNumber = 5;
-  inline ::google::protobuf::int32 preset_index() const;
-  inline void set_preset_index(::google::protobuf::int32 value);
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* theme_;
+  ::TST::TableStyleNetworkArchive* removed_table_styles_;
+  ::google::protobuf::int32 preset_id_;
+  ::google::protobuf::int32 preset_index_in_theme_;
 
-  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
-  inline bool has_old_table_styles() const;
-  inline void clear_old_table_styles();
-  static const int kOldTableStylesFieldNumber = 7;
-  inline const ::TST::TableStyleNetworkArchive& old_table_styles() const;
-  inline ::TST::TableStyleNetworkArchive* mutable_old_table_styles();
-  inline ::TST::TableStyleNetworkArchive* release_old_table_styles();
-  inline void set_allocated_old_table_styles(::TST::TableStyleNetworkArchive* old_table_styles);
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
-  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-  inline bool has_new_table_styles() const;
-  inline void clear_new_table_styles();
-  static const int kNewTableStylesFieldNumber = 8;
-  inline const ::TST::TableStyleNetworkArchive& new_table_styles() const;
-  inline ::TST::TableStyleNetworkArchive* mutable_new_table_styles();
-  inline ::TST::TableStyleNetworkArchive* release_new_table_styles();
-  inline void set_allocated_new_table_styles(::TST::TableStyleNetworkArchive* new_table_styles);
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
-  // optional bool apply_clears_all = 10;
-  inline bool has_apply_clears_all() const;
-  inline void clear_apply_clears_all();
-  static const int kApplyClearsAllFieldNumber = 10;
-  inline bool apply_clears_all() const;
-  inline void set_apply_clears_all(bool value);
+  void InitAsDefaultInstance();
+  static CommandRemoveTableStylePresetArchive* default_instance_;
+};
+// -------------------------------------------------------------------
 
-  // optional .TSP.Reference font_size_command = 11;
-  inline bool has_font_size_command() const;
-  inline void clear_font_size_command();
-  static const int kFontSizeCommandFieldNumber = 11;
-  inline const ::TSP::Reference& font_size_command() const;
-  inline ::TSP::Reference* mutable_font_size_command();
-  inline ::TSP::Reference* release_font_size_command();
-  inline void set_allocated_font_size_command(::TSP::Reference* font_size_command);
+class CommandReplaceTableStylePresetArchive : public ::google::protobuf::Message {
+ public:
+  CommandReplaceTableStylePresetArchive();
+  virtual ~CommandReplaceTableStylePresetArchive();
 
-  // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
-  inline bool has_set_style_apply_clears_all_flag_command() const;
-  inline void clear_set_style_apply_clears_all_flag_command();
-  static const int kSetStyleApplyClearsAllFlagCommandFieldNumber = 12;
-  inline const ::TSP::Reference& set_style_apply_clears_all_flag_command() const;
-  inline ::TSP::Reference* mutable_set_style_apply_clears_all_flag_command();
-  inline ::TSP::Reference* release_set_style_apply_clears_all_flag_command();
-  inline void set_allocated_set_style_apply_clears_all_flag_command(::TSP::Reference* set_style_apply_clears_all_flag_command);
+  CommandReplaceTableStylePresetArchive(const CommandReplaceTableStylePresetArchive& from);
 
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
-  inline int row_style_index_tuples_size() const;
-  inline void clear_row_style_index_tuples();
-  static const int kRowStyleIndexTuplesFieldNumber = 13;
-  inline const ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple& row_style_index_tuples(int index) const;
-  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* mutable_row_style_index_tuples(int index);
-  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* add_row_style_index_tuples();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >&
-      row_style_index_tuples() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >*
-      mutable_row_style_index_tuples();
+  inline CommandReplaceTableStylePresetArchive& operator=(const CommandReplaceTableStylePresetArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
 
-  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
-  inline int col_style_index_tuples_size() const;
-  inline void clear_col_style_index_tuples();
-  static const int kColStyleIndexTuplesFieldNumber = 14;
-  inline const ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple& col_style_index_tuples(int index) const;
-  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* mutable_col_style_index_tuples(int index);
-  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* add_col_style_index_tuples();
-  inline const ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >&
-      col_style_index_tuples() const;
-  inline ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >*
-      mutable_col_style_index_tuples();
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
 
-  // @@protoc_insertion_point(class_scope:TST.CommandApplyTableStylePresetArchive)
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandReplaceTableStylePresetArchive& default_instance();
+
+  void Swap(CommandReplaceTableStylePresetArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandReplaceTableStylePresetArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandReplaceTableStylePresetArchive& from);
+  void MergeFrom(const CommandReplaceTableStylePresetArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSK.CommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSK::CommandArchive& super() const;
+  inline ::TSK::CommandArchive* mutable_super();
+  inline ::TSK::CommandArchive* release_super();
+  inline void set_allocated_super(::TSK::CommandArchive* super);
+
+  // required .TSP.Reference theme = 2;
+  inline bool has_theme() const;
+  inline void clear_theme();
+  static const int kThemeFieldNumber = 2;
+  inline const ::TSP::Reference& theme() const;
+  inline ::TSP::Reference* mutable_theme();
+  inline ::TSP::Reference* release_theme();
+  inline void set_allocated_theme(::TSP::Reference* theme);
+
+  // required .TST.TableStyleNetworkArchive old_table_styles = 3;
+  inline bool has_old_table_styles() const;
+  inline void clear_old_table_styles();
+  static const int kOldTableStylesFieldNumber = 3;
+  inline const ::TST::TableStyleNetworkArchive& old_table_styles() const;
+  inline ::TST::TableStyleNetworkArchive* mutable_old_table_styles();
+  inline ::TST::TableStyleNetworkArchive* release_old_table_styles();
+  inline void set_allocated_old_table_styles(::TST::TableStyleNetworkArchive* old_table_styles);
+
+  // required .TST.TableStyleNetworkArchive new_table_styles = 4;
+  inline bool has_new_table_styles() const;
+  inline void clear_new_table_styles();
+  static const int kNewTableStylesFieldNumber = 4;
+  inline const ::TST::TableStyleNetworkArchive& new_table_styles() const;
+  inline ::TST::TableStyleNetworkArchive* mutable_new_table_styles();
+  inline ::TST::TableStyleNetworkArchive* release_new_table_styles();
+  inline void set_allocated_new_table_styles(::TST::TableStyleNetworkArchive* new_table_styles);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandReplaceTableStylePresetArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_undo_cell_map();
-  inline void clear_has_undo_cell_map();
-  inline void set_has_redo_cell_map();
-  inline void clear_has_redo_cell_map();
-  inline void set_has_preset_index();
-  inline void clear_has_preset_index();
+  inline void set_has_theme();
+  inline void clear_has_theme();
   inline void set_has_old_table_styles();
   inline void clear_has_old_table_styles();
   inline void set_has_new_table_styles();
   inline void clear_has_new_table_styles();
-  inline void set_has_apply_clears_all();
-  inline void clear_has_apply_clears_all();
-  inline void set_has_font_size_command();
-  inline void clear_has_font_size_command();
-  inline void set_has_set_style_apply_clears_all_flag_command();
-  inline void clear_has_set_style_apply_clears_all_flag_command();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::TableCommandArchive* super_;
-  ::TST::CellMapArchive* undo_cell_map_;
-  ::TST::CellMapArchive* redo_cell_map_;
+  ::TSK::CommandArchive* super_;
+  ::TSP::Reference* theme_;
   ::TST::TableStyleNetworkArchive* old_table_styles_;
-  ::google::protobuf::int32 preset_index_;
-  bool apply_clears_all_;
   ::TST::TableStyleNetworkArchive* new_table_styles_;
-  ::TSP::Reference* font_size_command_;
-  ::TSP::Reference* set_style_apply_clears_all_flag_command_;
-  ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple > row_style_index_tuples_;
-  ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple > col_style_index_tuples_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandApplyTableStylePresetArchive* default_instance_;
+  static CommandReplaceTableStylePresetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetStyleApplyClearsAllFlagArchive : public ::google::protobuf::Message {
+class CommandApplyTableStylePresetArchive_StyleIndexTuple : public ::google::protobuf::Message {
  public:
-  CommandSetStyleApplyClearsAllFlagArchive();
-  virtual ~CommandSetStyleApplyClearsAllFlagArchive();
+  CommandApplyTableStylePresetArchive_StyleIndexTuple();
+  virtual ~CommandApplyTableStylePresetArchive_StyleIndexTuple();
 
-  CommandSetStyleApplyClearsAllFlagArchive(const CommandSetStyleApplyClearsAllFlagArchive& from);
+  CommandApplyTableStylePresetArchive_StyleIndexTuple(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from);
 
-  inline CommandSetStyleApplyClearsAllFlagArchive& operator=(const CommandSetStyleApplyClearsAllFlagArchive& from) {
+  inline CommandApplyTableStylePresetArchive_StyleIndexTuple& operator=(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5872,17 +6308,17 @@ class CommandSetStyleApplyClearsAllFlagArchive : public ::google::protobuf::Mess
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetStyleApplyClearsAllFlagArchive& default_instance();
+  static const CommandApplyTableStylePresetArchive_StyleIndexTuple& default_instance();
 
-  void Swap(CommandSetStyleApplyClearsAllFlagArchive* other);
+  void Swap(CommandApplyTableStylePresetArchive_StyleIndexTuple* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetStyleApplyClearsAllFlagArchive* New() const;
+  CommandApplyTableStylePresetArchive_StyleIndexTuple* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetStyleApplyClearsAllFlagArchive& from);
-  void MergeFrom(const CommandSetStyleApplyClearsAllFlagArchive& from);
+  void CopyFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from);
+  void MergeFrom(const CommandApplyTableStylePresetArchive_StyleIndexTuple& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5905,54 +6341,66 @@ class CommandSetStyleApplyClearsAllFlagArchive : public ::google::protobuf::Mess
 
   // accessors -------------------------------------------------------
 
-  // required .TST.TableCommandArchive super = 1;
-  inline bool has_super() const;
-  inline void clear_super();
-  static const int kSuperFieldNumber = 1;
-  inline const ::TST::TableCommandArchive& super() const;
-  inline ::TST::TableCommandArchive* mutable_super();
-  inline ::TST::TableCommandArchive* release_super();
-  inline void set_allocated_super(::TST::TableCommandArchive* super);
+  // required uint32 index = 1;
+  inline bool has_index() const;
+  inline void clear_index();
+  static const int kIndexFieldNumber = 1;
+  inline ::google::protobuf::uint32 index() const;
+  inline void set_index(::google::protobuf::uint32 value);
 
-  // required bool apply_clears_all = 2;
-  inline bool has_apply_clears_all() const;
-  inline void clear_apply_clears_all();
-  static const int kApplyClearsAllFieldNumber = 2;
-  inline bool apply_clears_all() const;
-  inline void set_apply_clears_all(bool value);
+  // optional .TSP.Reference cell_style = 5;
+  inline bool has_cell_style() const;
+  inline void clear_cell_style();
+  static const int kCellStyleFieldNumber = 5;
+  inline const ::TSP::Reference& cell_style() const;
+  inline ::TSP::Reference* mutable_cell_style();
+  inline ::TSP::Reference* release_cell_style();
+  inline void set_allocated_cell_style(::TSP::Reference* cell_style);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandSetStyleApplyClearsAllFlagArchive)
+  // optional .TSP.Reference text_style = 6;
+  inline bool has_text_style() const;
+  inline void clear_text_style();
+  static const int kTextStyleFieldNumber = 6;
+  inline const ::TSP::Reference& text_style() const;
+  inline ::TSP::Reference* mutable_text_style();
+  inline ::TSP::Reference* release_text_style();
+  inline void set_allocated_text_style(::TSP::Reference* text_style);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandApplyTableStylePresetArchive.StyleIndexTuple)
  private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_apply_clears_all();
-  inline void clear_has_apply_clears_all();
+  inline void set_has_index();
+  inline void clear_has_index();
+  inline void set_has_cell_style();
+  inline void clear_has_cell_style();
+  inline void set_has_text_style();
+  inline void clear_has_text_style();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TST::TableCommandArchive* super_;
-  bool apply_clears_all_;
+  ::TSP::Reference* cell_style_;
+  ::TSP::Reference* text_style_;
+  ::google::protobuf::uint32 index_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetStyleApplyClearsAllFlagArchive* default_instance_;
+  static CommandApplyTableStylePresetArchive_StyleIndexTuple* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
+class CommandApplyTableStylePresetArchive : public ::google::protobuf::Message {
  public:
-  CommandApplyThemeToTableArchive();
-  virtual ~CommandApplyThemeToTableArchive();
+  CommandApplyTableStylePresetArchive();
+  virtual ~CommandApplyTableStylePresetArchive();
 
-  CommandApplyThemeToTableArchive(const CommandApplyThemeToTableArchive& from);
+  CommandApplyTableStylePresetArchive(const CommandApplyTableStylePresetArchive& from);
 
-  inline CommandApplyThemeToTableArchive& operator=(const CommandApplyThemeToTableArchive& from) {
+  inline CommandApplyTableStylePresetArchive& operator=(const CommandApplyTableStylePresetArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -5966,17 +6414,17 @@ class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandApplyThemeToTableArchive& default_instance();
+  static const CommandApplyTableStylePresetArchive& default_instance();
 
-  void Swap(CommandApplyThemeToTableArchive* other);
+  void Swap(CommandApplyTableStylePresetArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandApplyThemeToTableArchive* New() const;
+  CommandApplyTableStylePresetArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandApplyThemeToTableArchive& from);
-  void MergeFrom(const CommandApplyThemeToTableArchive& from);
+  void CopyFrom(const CommandApplyTableStylePresetArchive& from);
+  void MergeFrom(const CommandApplyTableStylePresetArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -5997,6 +6445,8 @@ class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
 
   // nested types ----------------------------------------------------
 
+  typedef CommandApplyTableStylePresetArchive_StyleIndexTuple StyleIndexTuple;
+
   // accessors -------------------------------------------------------
 
   // required .TST.TableCommandArchive super = 1;
@@ -6026,6 +6476,13 @@ class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
   inline ::TST::CellMapArchive* release_redo_cell_map();
   inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
 
+  // required int32 preset_index = 5;
+  inline bool has_preset_index() const;
+  inline void clear_preset_index();
+  static const int kPresetIndexFieldNumber = 5;
+  inline ::google::protobuf::int32 preset_index() const;
+  inline void set_preset_index(::google::protobuf::int32 value);
+
   // required .TST.TableStyleNetworkArchive old_table_styles = 7;
   inline bool has_old_table_styles() const;
   inline void clear_old_table_styles();
@@ -6035,27 +6492,84 @@ class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
   inline ::TST::TableStyleNetworkArchive* release_old_table_styles();
   inline void set_allocated_old_table_styles(::TST::TableStyleNetworkArchive* old_table_styles);
 
-  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
-  inline bool has_new_table_styles() const;
-  inline void clear_new_table_styles();
+  // optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
+  inline bool has_new_table_styles() const PROTOBUF_DEPRECATED;
+  inline void clear_new_table_styles() PROTOBUF_DEPRECATED;
   static const int kNewTableStylesFieldNumber = 8;
-  inline const ::TST::TableStyleNetworkArchive& new_table_styles() const;
-  inline ::TST::TableStyleNetworkArchive* mutable_new_table_styles();
-  inline ::TST::TableStyleNetworkArchive* release_new_table_styles();
-  inline void set_allocated_new_table_styles(::TST::TableStyleNetworkArchive* new_table_styles);
+  inline const ::TST::TableStyleNetworkArchive& new_table_styles() const PROTOBUF_DEPRECATED;
+  inline ::TST::TableStyleNetworkArchive* mutable_new_table_styles() PROTOBUF_DEPRECATED;
+  inline ::TST::TableStyleNetworkArchive* release_new_table_styles() PROTOBUF_DEPRECATED;
+  inline void set_allocated_new_table_styles(::TST::TableStyleNetworkArchive* new_table_styles) PROTOBUF_DEPRECATED;
 
-  // @@protoc_insertion_point(class_scope:TST.CommandApplyThemeToTableArchive)
- private:
-  inline void set_has_super();
-  inline void clear_has_super();
-  inline void set_has_undo_cell_map();
-  inline void clear_has_undo_cell_map();
-  inline void set_has_redo_cell_map();
+  // optional bool apply_clears_all = 10;
+  inline bool has_apply_clears_all() const;
+  inline void clear_apply_clears_all();
+  static const int kApplyClearsAllFieldNumber = 10;
+  inline bool apply_clears_all() const;
+  inline void set_apply_clears_all(bool value);
+
+  // optional .TSP.Reference font_size_command = 11;
+  inline bool has_font_size_command() const;
+  inline void clear_font_size_command();
+  static const int kFontSizeCommandFieldNumber = 11;
+  inline const ::TSP::Reference& font_size_command() const;
+  inline ::TSP::Reference* mutable_font_size_command();
+  inline ::TSP::Reference* release_font_size_command();
+  inline void set_allocated_font_size_command(::TSP::Reference* font_size_command);
+
+  // optional .TSP.Reference set_style_apply_clears_all_flag_command = 12;
+  inline bool has_set_style_apply_clears_all_flag_command() const;
+  inline void clear_set_style_apply_clears_all_flag_command();
+  static const int kSetStyleApplyClearsAllFlagCommandFieldNumber = 12;
+  inline const ::TSP::Reference& set_style_apply_clears_all_flag_command() const;
+  inline ::TSP::Reference* mutable_set_style_apply_clears_all_flag_command();
+  inline ::TSP::Reference* release_set_style_apply_clears_all_flag_command();
+  inline void set_allocated_set_style_apply_clears_all_flag_command(::TSP::Reference* set_style_apply_clears_all_flag_command);
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple row_style_index_tuples = 13;
+  inline int row_style_index_tuples_size() const;
+  inline void clear_row_style_index_tuples();
+  static const int kRowStyleIndexTuplesFieldNumber = 13;
+  inline const ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple& row_style_index_tuples(int index) const;
+  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* mutable_row_style_index_tuples(int index);
+  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* add_row_style_index_tuples();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >&
+      row_style_index_tuples() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >*
+      mutable_row_style_index_tuples();
+
+  // repeated .TST.CommandApplyTableStylePresetArchive.StyleIndexTuple col_style_index_tuples = 14;
+  inline int col_style_index_tuples_size() const;
+  inline void clear_col_style_index_tuples();
+  static const int kColStyleIndexTuplesFieldNumber = 14;
+  inline const ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple& col_style_index_tuples(int index) const;
+  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* mutable_col_style_index_tuples(int index);
+  inline ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple* add_col_style_index_tuples();
+  inline const ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >&
+      col_style_index_tuples() const;
+  inline ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple >*
+      mutable_col_style_index_tuples();
+
+  // @@protoc_insertion_point(class_scope:TST.CommandApplyTableStylePresetArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_undo_cell_map();
+  inline void clear_has_undo_cell_map();
+  inline void set_has_redo_cell_map();
   inline void clear_has_redo_cell_map();
+  inline void set_has_preset_index();
+  inline void clear_has_preset_index();
   inline void set_has_old_table_styles();
   inline void clear_has_old_table_styles();
   inline void set_has_new_table_styles();
   inline void clear_has_new_table_styles();
+  inline void set_has_apply_clears_all();
+  inline void clear_has_apply_clears_all();
+  inline void set_has_font_size_command();
+  inline void clear_has_font_size_command();
+  inline void set_has_set_style_apply_clears_all_flag_command();
+  inline void clear_has_set_style_apply_clears_all_flag_command();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -6063,28 +6577,34 @@ class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
   ::TST::CellMapArchive* undo_cell_map_;
   ::TST::CellMapArchive* redo_cell_map_;
   ::TST::TableStyleNetworkArchive* old_table_styles_;
+  ::google::protobuf::int32 preset_index_;
+  bool apply_clears_all_;
   ::TST::TableStyleNetworkArchive* new_table_styles_;
+  ::TSP::Reference* font_size_command_;
+  ::TSP::Reference* set_style_apply_clears_all_flag_command_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple > row_style_index_tuples_;
+  ::google::protobuf::RepeatedPtrField< ::TST::CommandApplyTableStylePresetArchive_StyleIndexTuple > col_style_index_tuples_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandApplyThemeToTableArchive* default_instance_;
+  static CommandApplyTableStylePresetArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandApplyThemeChildForTableArchive : public ::google::protobuf::Message {
+class CommandSetStyleApplyClearsAllFlagArchive : public ::google::protobuf::Message {
  public:
-  CommandApplyThemeChildForTableArchive();
-  virtual ~CommandApplyThemeChildForTableArchive();
+  CommandSetStyleApplyClearsAllFlagArchive();
+  virtual ~CommandSetStyleApplyClearsAllFlagArchive();
 
-  CommandApplyThemeChildForTableArchive(const CommandApplyThemeChildForTableArchive& from);
+  CommandSetStyleApplyClearsAllFlagArchive(const CommandSetStyleApplyClearsAllFlagArchive& from);
 
-  inline CommandApplyThemeChildForTableArchive& operator=(const CommandApplyThemeChildForTableArchive& from) {
+  inline CommandSetStyleApplyClearsAllFlagArchive& operator=(const CommandSetStyleApplyClearsAllFlagArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6098,17 +6618,17 @@ class CommandApplyThemeChildForTableArchive : public ::google::protobuf::Message
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandApplyThemeChildForTableArchive& default_instance();
+  static const CommandSetStyleApplyClearsAllFlagArchive& default_instance();
 
-  void Swap(CommandApplyThemeChildForTableArchive* other);
+  void Swap(CommandSetStyleApplyClearsAllFlagArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandApplyThemeChildForTableArchive* New() const;
+  CommandSetStyleApplyClearsAllFlagArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandApplyThemeChildForTableArchive& from);
-  void MergeFrom(const CommandApplyThemeChildForTableArchive& from);
+  void CopyFrom(const CommandSetStyleApplyClearsAllFlagArchive& from);
+  void MergeFrom(const CommandSetStyleApplyClearsAllFlagArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6131,35 +6651,33 @@ class CommandApplyThemeChildForTableArchive : public ::google::protobuf::Message
 
   // accessors -------------------------------------------------------
 
-  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
-  inline const ::TSS::ApplyThemeChildCommandArchive& super() const;
-  inline ::TSS::ApplyThemeChildCommandArchive* mutable_super();
-  inline ::TSS::ApplyThemeChildCommandArchive* release_super();
-  inline void set_allocated_super(::TSS::ApplyThemeChildCommandArchive* super);
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
 
-  // required .TSP.Reference apply_command = 2;
-  inline bool has_apply_command() const;
-  inline void clear_apply_command();
-  static const int kApplyCommandFieldNumber = 2;
-  inline const ::TSP::Reference& apply_command() const;
-  inline ::TSP::Reference* mutable_apply_command();
-  inline ::TSP::Reference* release_apply_command();
-  inline void set_allocated_apply_command(::TSP::Reference* apply_command);
+  // required bool apply_clears_all = 2;
+  inline bool has_apply_clears_all() const;
+  inline void clear_apply_clears_all();
+  static const int kApplyClearsAllFieldNumber = 2;
+  inline bool apply_clears_all() const;
+  inline void set_apply_clears_all(bool value);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandApplyThemeChildForTableArchive)
+  // @@protoc_insertion_point(class_scope:TST.CommandSetStyleApplyClearsAllFlagArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_apply_command();
-  inline void clear_has_apply_command();
+  inline void set_has_apply_clears_all();
+  inline void clear_has_apply_clears_all();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
-  ::TSS::ApplyThemeChildCommandArchive* super_;
-  ::TSP::Reference* apply_command_;
+  ::TST::TableCommandArchive* super_;
+  bool apply_clears_all_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
@@ -6169,18 +6687,18 @@ class CommandApplyThemeChildForTableArchive : public ::google::protobuf::Message
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandApplyThemeChildForTableArchive* default_instance_;
+  static CommandSetStyleApplyClearsAllFlagArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandToggleTextPropertyArchive : public ::google::protobuf::Message {
+class CommandApplyThemeToTableArchive : public ::google::protobuf::Message {
  public:
-  CommandToggleTextPropertyArchive();
-  virtual ~CommandToggleTextPropertyArchive();
+  CommandApplyThemeToTableArchive();
+  virtual ~CommandApplyThemeToTableArchive();
 
-  CommandToggleTextPropertyArchive(const CommandToggleTextPropertyArchive& from);
+  CommandApplyThemeToTableArchive(const CommandApplyThemeToTableArchive& from);
 
-  inline CommandToggleTextPropertyArchive& operator=(const CommandToggleTextPropertyArchive& from) {
+  inline CommandApplyThemeToTableArchive& operator=(const CommandApplyThemeToTableArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6194,17 +6712,17 @@ class CommandToggleTextPropertyArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandToggleTextPropertyArchive& default_instance();
+  static const CommandApplyThemeToTableArchive& default_instance();
 
-  void Swap(CommandToggleTextPropertyArchive* other);
+  void Swap(CommandApplyThemeToTableArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandToggleTextPropertyArchive* New() const;
+  CommandApplyThemeToTableArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandToggleTextPropertyArchive& from);
-  void MergeFrom(const CommandToggleTextPropertyArchive& from);
+  void CopyFrom(const CommandApplyThemeToTableArchive& from);
+  void MergeFrom(const CommandApplyThemeToTableArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6236,141 +6754,83 @@ class CommandToggleTextPropertyArchive : public ::google::protobuf::Message {
   inline ::TST::TableCommandArchive* release_super();
   inline void set_allocated_super(::TST::TableCommandArchive* super);
 
-  // required .TST.SelectionArchive selection = 2;
-  inline bool has_selection() const;
-  inline void clear_selection();
-  static const int kSelectionFieldNumber = 2;
-  inline const ::TST::SelectionArchive& selection() const;
-  inline ::TST::SelectionArchive* mutable_selection();
-  inline ::TST::SelectionArchive* release_selection();
-  inline void set_allocated_selection(::TST::SelectionArchive* selection);
-
-  // required uint32 property = 3;
-  inline bool has_property() const;
-  inline void clear_property();
-  static const int kPropertyFieldNumber = 3;
-  inline ::google::protobuf::uint32 property() const;
-  inline void set_property(::google::protobuf::uint32 value);
-
-  // required .TST.CellMapArchive undo_cell_map = 4;
+  // required .TST.CellMapArchive undo_cell_map = 2;
   inline bool has_undo_cell_map() const;
   inline void clear_undo_cell_map();
-  static const int kUndoCellMapFieldNumber = 4;
+  static const int kUndoCellMapFieldNumber = 2;
   inline const ::TST::CellMapArchive& undo_cell_map() const;
   inline ::TST::CellMapArchive* mutable_undo_cell_map();
   inline ::TST::CellMapArchive* release_undo_cell_map();
   inline void set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map);
 
-  // required .TST.CellMapArchive redo_cell_map = 5;
+  // required .TST.CellMapArchive redo_cell_map = 4;
   inline bool has_redo_cell_map() const;
   inline void clear_redo_cell_map();
-  static const int kRedoCellMapFieldNumber = 5;
+  static const int kRedoCellMapFieldNumber = 4;
   inline const ::TST::CellMapArchive& redo_cell_map() const;
   inline ::TST::CellMapArchive* mutable_redo_cell_map();
   inline ::TST::CellMapArchive* release_redo_cell_map();
   inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
 
-  // required .TST.Cell default_body_cell = 6;
-  inline bool has_default_body_cell() const;
-  inline void clear_default_body_cell();
-  static const int kDefaultBodyCellFieldNumber = 6;
-  inline const ::TST::Cell& default_body_cell() const;
-  inline ::TST::Cell* mutable_default_body_cell();
-  inline ::TST::Cell* release_default_body_cell();
-  inline void set_allocated_default_body_cell(::TST::Cell* default_body_cell);
-
-  // required .TST.Cell default_hr_cell = 7;
-  inline bool has_default_hr_cell() const;
-  inline void clear_default_hr_cell();
-  static const int kDefaultHrCellFieldNumber = 7;
-  inline const ::TST::Cell& default_hr_cell() const;
-  inline ::TST::Cell* mutable_default_hr_cell();
-  inline ::TST::Cell* release_default_hr_cell();
-  inline void set_allocated_default_hr_cell(::TST::Cell* default_hr_cell);
-
-  // required .TST.Cell default_hc_cell = 8;
-  inline bool has_default_hc_cell() const;
-  inline void clear_default_hc_cell();
-  static const int kDefaultHcCellFieldNumber = 8;
-  inline const ::TST::Cell& default_hc_cell() const;
-  inline ::TST::Cell* mutable_default_hc_cell();
-  inline ::TST::Cell* release_default_hc_cell();
-  inline void set_allocated_default_hc_cell(::TST::Cell* default_hc_cell);
-
-  // required .TST.Cell default_fr_cell = 9;
-  inline bool has_default_fr_cell() const;
-  inline void clear_default_fr_cell();
-  static const int kDefaultFrCellFieldNumber = 9;
-  inline const ::TST::Cell& default_fr_cell() const;
-  inline ::TST::Cell* mutable_default_fr_cell();
-  inline ::TST::Cell* release_default_fr_cell();
-  inline void set_allocated_default_fr_cell(::TST::Cell* default_fr_cell);
+  // required .TST.TableStyleNetworkArchive old_table_styles = 7;
+  inline bool has_old_table_styles() const;
+  inline void clear_old_table_styles();
+  static const int kOldTableStylesFieldNumber = 7;
+  inline const ::TST::TableStyleNetworkArchive& old_table_styles() const;
+  inline ::TST::TableStyleNetworkArchive* mutable_old_table_styles();
+  inline ::TST::TableStyleNetworkArchive* release_old_table_styles();
+  inline void set_allocated_old_table_styles(::TST::TableStyleNetworkArchive* old_table_styles);
 
-  // optional .TSP.Reference text_undo = 10;
-  inline bool has_text_undo() const;
-  inline void clear_text_undo();
-  static const int kTextUndoFieldNumber = 10;
-  inline const ::TSP::Reference& text_undo() const;
-  inline ::TSP::Reference* mutable_text_undo();
-  inline ::TSP::Reference* release_text_undo();
-  inline void set_allocated_text_undo(::TSP::Reference* text_undo);
+  // required .TST.TableStyleNetworkArchive new_table_styles = 8;
+  inline bool has_new_table_styles() const;
+  inline void clear_new_table_styles();
+  static const int kNewTableStylesFieldNumber = 8;
+  inline const ::TST::TableStyleNetworkArchive& new_table_styles() const;
+  inline ::TST::TableStyleNetworkArchive* mutable_new_table_styles();
+  inline ::TST::TableStyleNetworkArchive* release_new_table_styles();
+  inline void set_allocated_new_table_styles(::TST::TableStyleNetworkArchive* new_table_styles);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandToggleTextPropertyArchive)
+  // @@protoc_insertion_point(class_scope:TST.CommandApplyThemeToTableArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
-  inline void set_has_selection();
-  inline void clear_has_selection();
-  inline void set_has_property();
-  inline void clear_has_property();
   inline void set_has_undo_cell_map();
   inline void clear_has_undo_cell_map();
   inline void set_has_redo_cell_map();
   inline void clear_has_redo_cell_map();
-  inline void set_has_default_body_cell();
-  inline void clear_has_default_body_cell();
-  inline void set_has_default_hr_cell();
-  inline void clear_has_default_hr_cell();
-  inline void set_has_default_hc_cell();
-  inline void clear_has_default_hc_cell();
-  inline void set_has_default_fr_cell();
-  inline void clear_has_default_fr_cell();
-  inline void set_has_text_undo();
-  inline void clear_has_text_undo();
+  inline void set_has_old_table_styles();
+  inline void clear_has_old_table_styles();
+  inline void set_has_new_table_styles();
+  inline void clear_has_new_table_styles();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::TST::TableCommandArchive* super_;
-  ::TST::SelectionArchive* selection_;
   ::TST::CellMapArchive* undo_cell_map_;
   ::TST::CellMapArchive* redo_cell_map_;
-  ::TST::Cell* default_body_cell_;
-  ::TST::Cell* default_hr_cell_;
-  ::TST::Cell* default_hc_cell_;
-  ::TST::Cell* default_fr_cell_;
-  ::TSP::Reference* text_undo_;
-  ::google::protobuf::uint32 property_;
+  ::TST::TableStyleNetworkArchive* old_table_styles_;
+  ::TST::TableStyleNetworkArchive* new_table_styles_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(10 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandToggleTextPropertyArchive* default_instance_;
+  static CommandApplyThemeToTableArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandResetFillPropertyToDefault : public ::google::protobuf::Message {
+class CommandApplyThemeChildForTableArchive : public ::google::protobuf::Message {
  public:
-  CommandResetFillPropertyToDefault();
-  virtual ~CommandResetFillPropertyToDefault();
+  CommandApplyThemeChildForTableArchive();
+  virtual ~CommandApplyThemeChildForTableArchive();
 
-  CommandResetFillPropertyToDefault(const CommandResetFillPropertyToDefault& from);
+  CommandApplyThemeChildForTableArchive(const CommandApplyThemeChildForTableArchive& from);
 
-  inline CommandResetFillPropertyToDefault& operator=(const CommandResetFillPropertyToDefault& from) {
+  inline CommandApplyThemeChildForTableArchive& operator=(const CommandApplyThemeChildForTableArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6384,17 +6844,113 @@ class CommandResetFillPropertyToDefault : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandResetFillPropertyToDefault& default_instance();
+  static const CommandApplyThemeChildForTableArchive& default_instance();
 
-  void Swap(CommandResetFillPropertyToDefault* other);
+  void Swap(CommandApplyThemeChildForTableArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandResetFillPropertyToDefault* New() const;
+  CommandApplyThemeChildForTableArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandResetFillPropertyToDefault& from);
-  void MergeFrom(const CommandResetFillPropertyToDefault& from);
+  void CopyFrom(const CommandApplyThemeChildForTableArchive& from);
+  void MergeFrom(const CommandApplyThemeChildForTableArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TSS.ApplyThemeChildCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TSS::ApplyThemeChildCommandArchive& super() const;
+  inline ::TSS::ApplyThemeChildCommandArchive* mutable_super();
+  inline ::TSS::ApplyThemeChildCommandArchive* release_super();
+  inline void set_allocated_super(::TSS::ApplyThemeChildCommandArchive* super);
+
+  // required .TSP.Reference apply_command = 2;
+  inline bool has_apply_command() const;
+  inline void clear_apply_command();
+  static const int kApplyCommandFieldNumber = 2;
+  inline const ::TSP::Reference& apply_command() const;
+  inline ::TSP::Reference* mutable_apply_command();
+  inline ::TSP::Reference* release_apply_command();
+  inline void set_allocated_apply_command(::TSP::Reference* apply_command);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandApplyThemeChildForTableArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_apply_command();
+  inline void clear_has_apply_command();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TSS::ApplyThemeChildCommandArchive* super_;
+  ::TSP::Reference* apply_command_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandApplyThemeChildForTableArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandToggleTextPropertyArchive : public ::google::protobuf::Message {
+ public:
+  CommandToggleTextPropertyArchive();
+  virtual ~CommandToggleTextPropertyArchive();
+
+  CommandToggleTextPropertyArchive(const CommandToggleTextPropertyArchive& from);
+
+  inline CommandToggleTextPropertyArchive& operator=(const CommandToggleTextPropertyArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandToggleTextPropertyArchive& default_instance();
+
+  void Swap(CommandToggleTextPropertyArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandToggleTextPropertyArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandToggleTextPropertyArchive& from);
+  void MergeFrom(const CommandToggleTextPropertyArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6435,6 +6991,13 @@ class CommandResetFillPropertyToDefault : public ::google::protobuf::Message {
   inline ::TST::SelectionArchive* release_selection();
   inline void set_allocated_selection(::TST::SelectionArchive* selection);
 
+  // required uint32 property = 3;
+  inline bool has_property() const;
+  inline void clear_property();
+  static const int kPropertyFieldNumber = 3;
+  inline ::google::protobuf::uint32 property() const;
+  inline void set_property(::google::protobuf::uint32 value);
+
   // required .TST.CellMapArchive undo_cell_map = 4;
   inline bool has_undo_cell_map() const;
   inline void clear_undo_cell_map();
@@ -6453,16 +7016,73 @@ class CommandResetFillPropertyToDefault : public ::google::protobuf::Message {
   inline ::TST::CellMapArchive* release_redo_cell_map();
   inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandResetFillPropertyToDefault)
+  // required .TST.Cell default_body_cell = 6;
+  inline bool has_default_body_cell() const;
+  inline void clear_default_body_cell();
+  static const int kDefaultBodyCellFieldNumber = 6;
+  inline const ::TST::Cell& default_body_cell() const;
+  inline ::TST::Cell* mutable_default_body_cell();
+  inline ::TST::Cell* release_default_body_cell();
+  inline void set_allocated_default_body_cell(::TST::Cell* default_body_cell);
+
+  // required .TST.Cell default_hr_cell = 7;
+  inline bool has_default_hr_cell() const;
+  inline void clear_default_hr_cell();
+  static const int kDefaultHrCellFieldNumber = 7;
+  inline const ::TST::Cell& default_hr_cell() const;
+  inline ::TST::Cell* mutable_default_hr_cell();
+  inline ::TST::Cell* release_default_hr_cell();
+  inline void set_allocated_default_hr_cell(::TST::Cell* default_hr_cell);
+
+  // required .TST.Cell default_hc_cell = 8;
+  inline bool has_default_hc_cell() const;
+  inline void clear_default_hc_cell();
+  static const int kDefaultHcCellFieldNumber = 8;
+  inline const ::TST::Cell& default_hc_cell() const;
+  inline ::TST::Cell* mutable_default_hc_cell();
+  inline ::TST::Cell* release_default_hc_cell();
+  inline void set_allocated_default_hc_cell(::TST::Cell* default_hc_cell);
+
+  // required .TST.Cell default_fr_cell = 9;
+  inline bool has_default_fr_cell() const;
+  inline void clear_default_fr_cell();
+  static const int kDefaultFrCellFieldNumber = 9;
+  inline const ::TST::Cell& default_fr_cell() const;
+  inline ::TST::Cell* mutable_default_fr_cell();
+  inline ::TST::Cell* release_default_fr_cell();
+  inline void set_allocated_default_fr_cell(::TST::Cell* default_fr_cell);
+
+  // optional .TSP.Reference text_undo = 10;
+  inline bool has_text_undo() const;
+  inline void clear_text_undo();
+  static const int kTextUndoFieldNumber = 10;
+  inline const ::TSP::Reference& text_undo() const;
+  inline ::TSP::Reference* mutable_text_undo();
+  inline ::TSP::Reference* release_text_undo();
+  inline void set_allocated_text_undo(::TSP::Reference* text_undo);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandToggleTextPropertyArchive)
  private:
   inline void set_has_super();
   inline void clear_has_super();
   inline void set_has_selection();
   inline void clear_has_selection();
+  inline void set_has_property();
+  inline void clear_has_property();
   inline void set_has_undo_cell_map();
   inline void clear_has_undo_cell_map();
   inline void set_has_redo_cell_map();
   inline void clear_has_redo_cell_map();
+  inline void set_has_default_body_cell();
+  inline void clear_has_default_body_cell();
+  inline void set_has_default_hr_cell();
+  inline void clear_has_default_hr_cell();
+  inline void set_has_default_hc_cell();
+  inline void clear_has_default_hc_cell();
+  inline void set_has_default_fr_cell();
+  inline void clear_has_default_fr_cell();
+  inline void set_has_text_undo();
+  inline void clear_has_text_undo();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -6470,27 +7090,33 @@ class CommandResetFillPropertyToDefault : public ::google::protobuf::Message {
   ::TST::SelectionArchive* selection_;
   ::TST::CellMapArchive* undo_cell_map_;
   ::TST::CellMapArchive* redo_cell_map_;
+  ::TST::Cell* default_body_cell_;
+  ::TST::Cell* default_hr_cell_;
+  ::TST::Cell* default_hc_cell_;
+  ::TST::Cell* default_fr_cell_;
+  ::TSP::Reference* text_undo_;
+  ::google::protobuf::uint32 property_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(10 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
   friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandResetFillPropertyToDefault* default_instance_;
+  static CommandToggleTextPropertyArchive* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetSingleNumberFormatParameterArchive : public ::google::protobuf::Message {
+class CommandResetFillPropertyToDefault : public ::google::protobuf::Message {
  public:
-  CommandSetSingleNumberFormatParameterArchive();
-  virtual ~CommandSetSingleNumberFormatParameterArchive();
+  CommandResetFillPropertyToDefault();
+  virtual ~CommandResetFillPropertyToDefault();
 
-  CommandSetSingleNumberFormatParameterArchive(const CommandSetSingleNumberFormatParameterArchive& from);
+  CommandResetFillPropertyToDefault(const CommandResetFillPropertyToDefault& from);
 
-  inline CommandSetSingleNumberFormatParameterArchive& operator=(const CommandSetSingleNumberFormatParameterArchive& from) {
+  inline CommandResetFillPropertyToDefault& operator=(const CommandResetFillPropertyToDefault& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6504,17 +7130,17 @@ class CommandSetSingleNumberFormatParameterArchive : public ::google::protobuf::
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetSingleNumberFormatParameterArchive& default_instance();
+  static const CommandResetFillPropertyToDefault& default_instance();
 
-  void Swap(CommandSetSingleNumberFormatParameterArchive* other);
+  void Swap(CommandResetFillPropertyToDefault* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetSingleNumberFormatParameterArchive* New() const;
+  CommandResetFillPropertyToDefault* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetSingleNumberFormatParameterArchive& from);
-  void MergeFrom(const CommandSetSingleNumberFormatParameterArchive& from);
+  void CopyFrom(const CommandResetFillPropertyToDefault& from);
+  void MergeFrom(const CommandResetFillPropertyToDefault& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6555,25 +7181,25 @@ class CommandSetSingleNumberFormatParameterArchive : public ::google::protobuf::
   inline ::TST::SelectionArchive* release_selection();
   inline void set_allocated_selection(::TST::SelectionArchive* selection);
 
-  // required .TST.CellMapArchive undo_cell_map = 3;
+  // required .TST.CellMapArchive undo_cell_map = 4;
   inline bool has_undo_cell_map() const;
   inline void clear_undo_cell_map();
-  static const int kUndoCellMapFieldNumber = 3;
+  static const int kUndoCellMapFieldNumber = 4;
   inline const ::TST::CellMapArchive& undo_cell_map() const;
   inline ::TST::CellMapArchive* mutable_undo_cell_map();
   inline ::TST::CellMapArchive* release_undo_cell_map();
   inline void set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map);
 
-  // required .TST.CellMapArchive redo_cell_map = 4;
+  // required .TST.CellMapArchive redo_cell_map = 5;
   inline bool has_redo_cell_map() const;
   inline void clear_redo_cell_map();
-  static const int kRedoCellMapFieldNumber = 4;
+  static const int kRedoCellMapFieldNumber = 5;
   inline const ::TST::CellMapArchive& redo_cell_map() const;
   inline ::TST::CellMapArchive* mutable_redo_cell_map();
   inline ::TST::CellMapArchive* release_redo_cell_map();
   inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
 
-  // @@protoc_insertion_point(class_scope:TST.CommandSetSingleNumberFormatParameterArchive)
+  // @@protoc_insertion_point(class_scope:TST.CommandResetFillPropertyToDefault)
  private:
   inline void set_has_super();
   inline void clear_has_super();
@@ -6599,18 +7225,18 @@ class CommandSetSingleNumberFormatParameterArchive : public ::google::protobuf::
   friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
 
   void InitAsDefaultInstance();
-  static CommandSetSingleNumberFormatParameterArchive* default_instance_;
+  static CommandResetFillPropertyToDefault* default_instance_;
 };
 // -------------------------------------------------------------------
 
-class CommandSetBaseArchive : public ::google::protobuf::Message {
+class CommandSetSingleNumberFormatParameterArchive : public ::google::protobuf::Message {
  public:
-  CommandSetBaseArchive();
-  virtual ~CommandSetBaseArchive();
+  CommandSetSingleNumberFormatParameterArchive();
+  virtual ~CommandSetSingleNumberFormatParameterArchive();
 
-  CommandSetBaseArchive(const CommandSetBaseArchive& from);
+  CommandSetSingleNumberFormatParameterArchive(const CommandSetSingleNumberFormatParameterArchive& from);
 
-  inline CommandSetBaseArchive& operator=(const CommandSetBaseArchive& from) {
+  inline CommandSetSingleNumberFormatParameterArchive& operator=(const CommandSetSingleNumberFormatParameterArchive& from) {
     CopyFrom(from);
     return *this;
   }
@@ -6624,17 +7250,17 @@ class CommandSetBaseArchive : public ::google::protobuf::Message {
   }
 
   static const ::google::protobuf::Descriptor* descriptor();
-  static const CommandSetBaseArchive& default_instance();
+  static const CommandSetSingleNumberFormatParameterArchive& default_instance();
 
-  void Swap(CommandSetBaseArchive* other);
+  void Swap(CommandSetSingleNumberFormatParameterArchive* other);
 
   // implements Message ----------------------------------------------
 
-  CommandSetBaseArchive* New() const;
+  CommandSetSingleNumberFormatParameterArchive* New() const;
   void CopyFrom(const ::google::protobuf::Message& from);
   void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const CommandSetBaseArchive& from);
-  void MergeFrom(const CommandSetBaseArchive& from);
+  void CopyFrom(const CommandSetSingleNumberFormatParameterArchive& from);
+  void MergeFrom(const CommandSetSingleNumberFormatParameterArchive& from);
   void Clear();
   bool IsInitialized() const;
 
@@ -6657,7 +7283,127 @@ class CommandSetBaseArchive : public ::google::protobuf::Message {
 
   // accessors -------------------------------------------------------
 
-  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // required .TST.SelectionArchive selection = 2;
+  inline bool has_selection() const;
+  inline void clear_selection();
+  static const int kSelectionFieldNumber = 2;
+  inline const ::TST::SelectionArchive& selection() const;
+  inline ::TST::SelectionArchive* mutable_selection();
+  inline ::TST::SelectionArchive* release_selection();
+  inline void set_allocated_selection(::TST::SelectionArchive* selection);
+
+  // required .TST.CellMapArchive undo_cell_map = 3;
+  inline bool has_undo_cell_map() const;
+  inline void clear_undo_cell_map();
+  static const int kUndoCellMapFieldNumber = 3;
+  inline const ::TST::CellMapArchive& undo_cell_map() const;
+  inline ::TST::CellMapArchive* mutable_undo_cell_map();
+  inline ::TST::CellMapArchive* release_undo_cell_map();
+  inline void set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map);
+
+  // required .TST.CellMapArchive redo_cell_map = 4;
+  inline bool has_redo_cell_map() const;
+  inline void clear_redo_cell_map();
+  static const int kRedoCellMapFieldNumber = 4;
+  inline const ::TST::CellMapArchive& redo_cell_map() const;
+  inline ::TST::CellMapArchive* mutable_redo_cell_map();
+  inline ::TST::CellMapArchive* release_redo_cell_map();
+  inline void set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandSetSingleNumberFormatParameterArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_selection();
+  inline void clear_has_selection();
+  inline void set_has_undo_cell_map();
+  inline void clear_has_undo_cell_map();
+  inline void set_has_redo_cell_map();
+  inline void clear_has_redo_cell_map();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TST::SelectionArchive* selection_;
+  ::TST::CellMapArchive* undo_cell_map_;
+  ::TST::CellMapArchive* redo_cell_map_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandSetSingleNumberFormatParameterArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandSetBaseArchive : public ::google::protobuf::Message {
+ public:
+  CommandSetBaseArchive();
+  virtual ~CommandSetBaseArchive();
+
+  CommandSetBaseArchive(const CommandSetBaseArchive& from);
+
+  inline CommandSetBaseArchive& operator=(const CommandSetBaseArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandSetBaseArchive& default_instance();
+
+  void Swap(CommandSetBaseArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandSetBaseArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandSetBaseArchive& from);
+  void MergeFrom(const CommandSetBaseArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.CommandSetSingleNumberFormatParameterArchive super = 1;
   inline bool has_super() const;
   inline void clear_super();
   static const int kSuperFieldNumber = 1;
@@ -12509,141 +13255,597 @@ class CommandSetStorageLanguageArchive : public ::google::protobuf::Message {
   void InitAsDefaultInstance();
   static CommandSetStorageLanguageArchive* default_instance_;
 };
-// ===================================================================
-
+// -------------------------------------------------------------------
 
-// ===================================================================
+class CommandSetSortOrderArchive : public ::google::protobuf::Message {
+ public:
+  CommandSetSortOrderArchive();
+  virtual ~CommandSetSortOrderArchive();
 
-// TableCommandArchive
+  CommandSetSortOrderArchive(const CommandSetSortOrderArchive& from);
 
-// required .TSP.Reference tableInfo = 1;
-inline bool TableCommandArchive::has_tableinfo() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void TableCommandArchive::set_has_tableinfo() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void TableCommandArchive::clear_has_tableinfo() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void TableCommandArchive::clear_tableinfo() {
-  if (tableinfo_ != NULL) tableinfo_->::TSP::Reference::Clear();
-  clear_has_tableinfo();
-}
-inline const ::TSP::Reference& TableCommandArchive::tableinfo() const {
-  return tableinfo_ != NULL ? *tableinfo_ : *default_instance_->tableinfo_;
-}
-inline ::TSP::Reference* TableCommandArchive::mutable_tableinfo() {
-  set_has_tableinfo();
-  if (tableinfo_ == NULL) tableinfo_ = new ::TSP::Reference;
-  return tableinfo_;
-}
-inline ::TSP::Reference* TableCommandArchive::release_tableinfo() {
-  clear_has_tableinfo();
-  ::TSP::Reference* temp = tableinfo_;
-  tableinfo_ = NULL;
-  return temp;
-}
-inline void TableCommandArchive::set_allocated_tableinfo(::TSP::Reference* tableinfo) {
-  delete tableinfo_;
-  tableinfo_ = tableinfo;
-  if (tableinfo) {
-    set_has_tableinfo();
-  } else {
-    clear_has_tableinfo();
+  inline CommandSetSortOrderArchive& operator=(const CommandSetSortOrderArchive& from) {
+    CopyFrom(from);
+    return *this;
   }
-}
 
-// optional string commandname = 2;
-inline bool TableCommandArchive::has_commandname() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void TableCommandArchive::set_has_commandname() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void TableCommandArchive::clear_has_commandname() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void TableCommandArchive::clear_commandname() {
-  if (commandname_ != &::google::protobuf::internal::kEmptyString) {
-    commandname_->clear();
-  }
-  clear_has_commandname();
-}
-inline const ::std::string& TableCommandArchive::commandname() const {
-  return *commandname_;
-}
-inline void TableCommandArchive::set_commandname(const ::std::string& value) {
-  set_has_commandname();
-  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
-    commandname_ = new ::std::string;
-  }
-  commandname_->assign(value);
-}
-inline void TableCommandArchive::set_commandname(const char* value) {
-  set_has_commandname();
-  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
-    commandname_ = new ::std::string;
-  }
-  commandname_->assign(value);
-}
-inline void TableCommandArchive::set_commandname(const char* value, size_t size) {
-  set_has_commandname();
-  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
-    commandname_ = new ::std::string;
-  }
-  commandname_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* TableCommandArchive::mutable_commandname() {
-  set_has_commandname();
-  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
-    commandname_ = new ::std::string;
-  }
-  return commandname_;
-}
-inline ::std::string* TableCommandArchive::release_commandname() {
-  clear_has_commandname();
-  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = commandname_;
-    commandname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
-}
-inline void TableCommandArchive::set_allocated_commandname(::std::string* commandname) {
-  if (commandname_ != &::google::protobuf::internal::kEmptyString) {
-    delete commandname_;
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
   }
-  if (commandname) {
-    set_has_commandname();
-    commandname_ = commandname;
-  } else {
-    clear_has_commandname();
-    commandname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
   }
-}
 
-// required .TSK.CommandArchive super = 3;
-inline bool TableCommandArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void TableCommandArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void TableCommandArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void TableCommandArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
-  clear_has_super();
-}
-inline const ::TSK::CommandArchive& TableCommandArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
-}
-inline ::TSK::CommandArchive* TableCommandArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandSetSortOrderArchive& default_instance();
+
+  void Swap(CommandSetSortOrderArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandSetSortOrderArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandSetSortOrderArchive& from);
+  void MergeFrom(const CommandSetSortOrderArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // optional .TST.TableSortOrderArchive old_sort_order = 2;
+  inline bool has_old_sort_order() const;
+  inline void clear_old_sort_order();
+  static const int kOldSortOrderFieldNumber = 2;
+  inline const ::TST::TableSortOrderArchive& old_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_old_sort_order();
+  inline ::TST::TableSortOrderArchive* release_old_sort_order();
+  inline void set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order);
+
+  // optional .TST.TableSortOrderArchive new_sort_order = 3;
+  inline bool has_new_sort_order() const;
+  inline void clear_new_sort_order();
+  static const int kNewSortOrderFieldNumber = 3;
+  inline const ::TST::TableSortOrderArchive& new_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_new_sort_order();
+  inline ::TST::TableSortOrderArchive* release_new_sort_order();
+  inline void set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandSetSortOrderArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_old_sort_order();
+  inline void clear_has_old_sort_order();
+  inline void set_has_new_sort_order();
+  inline void clear_has_new_sort_order();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TST::TableSortOrderArchive* old_sort_order_;
+  ::TST::TableSortOrderArchive* new_sort_order_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandSetSortOrderArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandRewriteSortOrderForTectonicShiftArchive : public ::google::protobuf::Message {
+ public:
+  CommandRewriteSortOrderForTectonicShiftArchive();
+  virtual ~CommandRewriteSortOrderForTectonicShiftArchive();
+
+  CommandRewriteSortOrderForTectonicShiftArchive(const CommandRewriteSortOrderForTectonicShiftArchive& from);
+
+  inline CommandRewriteSortOrderForTectonicShiftArchive& operator=(const CommandRewriteSortOrderForTectonicShiftArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandRewriteSortOrderForTectonicShiftArchive& default_instance();
+
+  void Swap(CommandRewriteSortOrderForTectonicShiftArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandRewriteSortOrderForTectonicShiftArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandRewriteSortOrderForTectonicShiftArchive& from);
+  void MergeFrom(const CommandRewriteSortOrderForTectonicShiftArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+  inline bool has_tectonic_shift() const;
+  inline void clear_tectonic_shift();
+  static const int kTectonicShiftFieldNumber = 2;
+  inline const ::TSCE::TectonicShiftArchive& tectonic_shift() const;
+  inline ::TSCE::TectonicShiftArchive* mutable_tectonic_shift();
+  inline ::TSCE::TectonicShiftArchive* release_tectonic_shift();
+  inline void set_allocated_tectonic_shift(::TSCE::TectonicShiftArchive* tectonic_shift);
+
+  // optional .TST.TableSortOrderArchive old_sort_order = 3;
+  inline bool has_old_sort_order() const;
+  inline void clear_old_sort_order();
+  static const int kOldSortOrderFieldNumber = 3;
+  inline const ::TST::TableSortOrderArchive& old_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_old_sort_order();
+  inline ::TST::TableSortOrderArchive* release_old_sort_order();
+  inline void set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order);
+
+  // optional .TST.TableSortOrderArchive new_sort_order = 4;
+  inline bool has_new_sort_order() const;
+  inline void clear_new_sort_order();
+  static const int kNewSortOrderFieldNumber = 4;
+  inline const ::TST::TableSortOrderArchive& new_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_new_sort_order();
+  inline ::TST::TableSortOrderArchive* release_new_sort_order();
+  inline void set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandRewriteSortOrderForTectonicShiftArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_tectonic_shift();
+  inline void clear_has_tectonic_shift();
+  inline void set_has_old_sort_order();
+  inline void clear_has_old_sort_order();
+  inline void set_has_new_sort_order();
+  inline void clear_has_new_sort_order();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TSCE::TectonicShiftArchive* tectonic_shift_;
+  ::TST::TableSortOrderArchive* old_sort_order_;
+  ::TST::TableSortOrderArchive* new_sort_order_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandRewriteSortOrderForTectonicShiftArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandRewriteSortOrderForSortArchive : public ::google::protobuf::Message {
+ public:
+  CommandRewriteSortOrderForSortArchive();
+  virtual ~CommandRewriteSortOrderForSortArchive();
+
+  CommandRewriteSortOrderForSortArchive(const CommandRewriteSortOrderForSortArchive& from);
+
+  inline CommandRewriteSortOrderForSortArchive& operator=(const CommandRewriteSortOrderForSortArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandRewriteSortOrderForSortArchive& default_instance();
+
+  void Swap(CommandRewriteSortOrderForSortArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandRewriteSortOrderForSortArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandRewriteSortOrderForSortArchive& from);
+  void MergeFrom(const CommandRewriteSortOrderForSortArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // required .TSK.ShuffleMappingArchive sort_mapping = 2;
+  inline bool has_sort_mapping() const;
+  inline void clear_sort_mapping();
+  static const int kSortMappingFieldNumber = 2;
+  inline const ::TSK::ShuffleMappingArchive& sort_mapping() const;
+  inline ::TSK::ShuffleMappingArchive* mutable_sort_mapping();
+  inline ::TSK::ShuffleMappingArchive* release_sort_mapping();
+  inline void set_allocated_sort_mapping(::TSK::ShuffleMappingArchive* sort_mapping);
+
+  // optional .TST.TableSortOrderArchive old_sort_order = 3;
+  inline bool has_old_sort_order() const;
+  inline void clear_old_sort_order();
+  static const int kOldSortOrderFieldNumber = 3;
+  inline const ::TST::TableSortOrderArchive& old_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_old_sort_order();
+  inline ::TST::TableSortOrderArchive* release_old_sort_order();
+  inline void set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order);
+
+  // optional .TST.TableSortOrderArchive new_sort_order = 4;
+  inline bool has_new_sort_order() const;
+  inline void clear_new_sort_order();
+  static const int kNewSortOrderFieldNumber = 4;
+  inline const ::TST::TableSortOrderArchive& new_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_new_sort_order();
+  inline ::TST::TableSortOrderArchive* release_new_sort_order();
+  inline void set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandRewriteSortOrderForSortArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_sort_mapping();
+  inline void clear_has_sort_mapping();
+  inline void set_has_old_sort_order();
+  inline void clear_has_old_sort_order();
+  inline void set_has_new_sort_order();
+  inline void clear_has_new_sort_order();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TSK::ShuffleMappingArchive* sort_mapping_;
+  ::TST::TableSortOrderArchive* old_sort_order_;
+  ::TST::TableSortOrderArchive* new_sort_order_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandRewriteSortOrderForSortArchive* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class CommandRewriteSortOrderForTableResizeArchive : public ::google::protobuf::Message {
+ public:
+  CommandRewriteSortOrderForTableResizeArchive();
+  virtual ~CommandRewriteSortOrderForTableResizeArchive();
+
+  CommandRewriteSortOrderForTableResizeArchive(const CommandRewriteSortOrderForTableResizeArchive& from);
+
+  inline CommandRewriteSortOrderForTableResizeArchive& operator=(const CommandRewriteSortOrderForTableResizeArchive& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const CommandRewriteSortOrderForTableResizeArchive& default_instance();
+
+  void Swap(CommandRewriteSortOrderForTableResizeArchive* other);
+
+  // implements Message ----------------------------------------------
+
+  CommandRewriteSortOrderForTableResizeArchive* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const CommandRewriteSortOrderForTableResizeArchive& from);
+  void MergeFrom(const CommandRewriteSortOrderForTableResizeArchive& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // required .TST.TableCommandArchive super = 1;
+  inline bool has_super() const;
+  inline void clear_super();
+  static const int kSuperFieldNumber = 1;
+  inline const ::TST::TableCommandArchive& super() const;
+  inline ::TST::TableCommandArchive* mutable_super();
+  inline ::TST::TableCommandArchive* release_super();
+  inline void set_allocated_super(::TST::TableCommandArchive* super);
+
+  // optional .TST.TableSortOrderArchive old_sort_order = 2;
+  inline bool has_old_sort_order() const;
+  inline void clear_old_sort_order();
+  static const int kOldSortOrderFieldNumber = 2;
+  inline const ::TST::TableSortOrderArchive& old_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_old_sort_order();
+  inline ::TST::TableSortOrderArchive* release_old_sort_order();
+  inline void set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order);
+
+  // optional .TST.TableSortOrderArchive new_sort_order = 3;
+  inline bool has_new_sort_order() const;
+  inline void clear_new_sort_order();
+  static const int kNewSortOrderFieldNumber = 3;
+  inline const ::TST::TableSortOrderArchive& new_sort_order() const;
+  inline ::TST::TableSortOrderArchive* mutable_new_sort_order();
+  inline ::TST::TableSortOrderArchive* release_new_sort_order();
+  inline void set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order);
+
+  // @@protoc_insertion_point(class_scope:TST.CommandRewriteSortOrderForTableResizeArchive)
+ private:
+  inline void set_has_super();
+  inline void clear_has_super();
+  inline void set_has_old_sort_order();
+  inline void clear_has_old_sort_order();
+  inline void set_has_new_sort_order();
+  inline void clear_has_new_sort_order();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::TST::TableCommandArchive* super_;
+  ::TST::TableSortOrderArchive* old_sort_order_;
+  ::TST::TableSortOrderArchive* new_sort_order_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
+
+  friend void  protobuf_AddDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_AssignDesc_TSTCommandArchives_2eproto();
+  friend void protobuf_ShutdownFile_TSTCommandArchives_2eproto();
+
+  void InitAsDefaultInstance();
+  static CommandRewriteSortOrderForTableResizeArchive* default_instance_;
+};
+// ===================================================================
+
+
+// ===================================================================
+
+// TableCommandArchive
+
+// required .TSP.Reference tableInfo = 1;
+inline bool TableCommandArchive::has_tableinfo() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void TableCommandArchive::set_has_tableinfo() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void TableCommandArchive::clear_has_tableinfo() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void TableCommandArchive::clear_tableinfo() {
+  if (tableinfo_ != NULL) tableinfo_->::TSP::Reference::Clear();
+  clear_has_tableinfo();
+}
+inline const ::TSP::Reference& TableCommandArchive::tableinfo() const {
+  return tableinfo_ != NULL ? *tableinfo_ : *default_instance_->tableinfo_;
+}
+inline ::TSP::Reference* TableCommandArchive::mutable_tableinfo() {
+  set_has_tableinfo();
+  if (tableinfo_ == NULL) tableinfo_ = new ::TSP::Reference;
+  return tableinfo_;
+}
+inline ::TSP::Reference* TableCommandArchive::release_tableinfo() {
+  clear_has_tableinfo();
+  ::TSP::Reference* temp = tableinfo_;
+  tableinfo_ = NULL;
+  return temp;
+}
+inline void TableCommandArchive::set_allocated_tableinfo(::TSP::Reference* tableinfo) {
+  delete tableinfo_;
+  tableinfo_ = tableinfo;
+  if (tableinfo) {
+    set_has_tableinfo();
+  } else {
+    clear_has_tableinfo();
+  }
+}
+
+// optional string commandname = 2;
+inline bool TableCommandArchive::has_commandname() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void TableCommandArchive::set_has_commandname() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void TableCommandArchive::clear_has_commandname() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void TableCommandArchive::clear_commandname() {
+  if (commandname_ != &::google::protobuf::internal::kEmptyString) {
+    commandname_->clear();
+  }
+  clear_has_commandname();
+}
+inline const ::std::string& TableCommandArchive::commandname() const {
+  return *commandname_;
+}
+inline void TableCommandArchive::set_commandname(const ::std::string& value) {
+  set_has_commandname();
+  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
+    commandname_ = new ::std::string;
+  }
+  commandname_->assign(value);
+}
+inline void TableCommandArchive::set_commandname(const char* value) {
+  set_has_commandname();
+  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
+    commandname_ = new ::std::string;
+  }
+  commandname_->assign(value);
+}
+inline void TableCommandArchive::set_commandname(const char* value, size_t size) {
+  set_has_commandname();
+  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
+    commandname_ = new ::std::string;
+  }
+  commandname_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* TableCommandArchive::mutable_commandname() {
+  set_has_commandname();
+  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
+    commandname_ = new ::std::string;
+  }
+  return commandname_;
+}
+inline ::std::string* TableCommandArchive::release_commandname() {
+  clear_has_commandname();
+  if (commandname_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = commandname_;
+    commandname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void TableCommandArchive::set_allocated_commandname(::std::string* commandname) {
+  if (commandname_ != &::google::protobuf::internal::kEmptyString) {
+    delete commandname_;
+  }
+  if (commandname) {
+    set_has_commandname();
+    commandname_ = commandname;
+  } else {
+    clear_has_commandname();
+    commandname_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required .TSK.CommandArchive super = 3;
+inline bool TableCommandArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void TableCommandArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void TableCommandArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void TableCommandArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::CommandArchive& TableCommandArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::CommandArchive* TableCommandArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
 inline ::TSK::CommandArchive* TableCommandArchive::release_super() {
@@ -12676,12 +13878,168 @@ inline void TableCommandArchive::clear_editing_mode_at_start() {
   editing_mode_at_start_ = 0u;
   clear_has_editing_mode_at_start();
 }
-inline ::google::protobuf::uint32 TableCommandArchive::editing_mode_at_start() const {
-  return editing_mode_at_start_;
+inline ::google::protobuf::uint32 TableCommandArchive::editing_mode_at_start() const {
+  return editing_mode_at_start_;
+}
+inline void TableCommandArchive::set_editing_mode_at_start(::google::protobuf::uint32 value) {
+  set_has_editing_mode_at_start();
+  editing_mode_at_start_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandApplyCellDiffArchive
+
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandApplyCellDiffArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandApplyCellDiffArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandApplyCellDiffArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandApplyCellDiffArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TST::TableCommandArchive& CommandApplyCellDiffArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TST::TableCommandArchive* CommandApplyCellDiffArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
+}
+inline ::TST::TableCommandArchive* CommandApplyCellDiffArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandApplyCellDiffArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required .TST.CellRegion cell_region = 2;
+inline bool CommandApplyCellDiffArchive::has_cell_region() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandApplyCellDiffArchive::set_has_cell_region() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandApplyCellDiffArchive::clear_has_cell_region() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandApplyCellDiffArchive::clear_cell_region() {
+  if (cell_region_ != NULL) cell_region_->::TST::CellRegion::Clear();
+  clear_has_cell_region();
+}
+inline const ::TST::CellRegion& CommandApplyCellDiffArchive::cell_region() const {
+  return cell_region_ != NULL ? *cell_region_ : *default_instance_->cell_region_;
+}
+inline ::TST::CellRegion* CommandApplyCellDiffArchive::mutable_cell_region() {
+  set_has_cell_region();
+  if (cell_region_ == NULL) cell_region_ = new ::TST::CellRegion;
+  return cell_region_;
+}
+inline ::TST::CellRegion* CommandApplyCellDiffArchive::release_cell_region() {
+  clear_has_cell_region();
+  ::TST::CellRegion* temp = cell_region_;
+  cell_region_ = NULL;
+  return temp;
+}
+inline void CommandApplyCellDiffArchive::set_allocated_cell_region(::TST::CellRegion* cell_region) {
+  delete cell_region_;
+  cell_region_ = cell_region;
+  if (cell_region) {
+    set_has_cell_region();
+  } else {
+    clear_has_cell_region();
+  }
+}
+
+// required .TSP.Reference cell_diff = 3;
+inline bool CommandApplyCellDiffArchive::has_cell_diff() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandApplyCellDiffArchive::set_has_cell_diff() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandApplyCellDiffArchive::clear_has_cell_diff() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandApplyCellDiffArchive::clear_cell_diff() {
+  if (cell_diff_ != NULL) cell_diff_->::TSP::Reference::Clear();
+  clear_has_cell_diff();
+}
+inline const ::TSP::Reference& CommandApplyCellDiffArchive::cell_diff() const {
+  return cell_diff_ != NULL ? *cell_diff_ : *default_instance_->cell_diff_;
+}
+inline ::TSP::Reference* CommandApplyCellDiffArchive::mutable_cell_diff() {
+  set_has_cell_diff();
+  if (cell_diff_ == NULL) cell_diff_ = new ::TSP::Reference;
+  return cell_diff_;
+}
+inline ::TSP::Reference* CommandApplyCellDiffArchive::release_cell_diff() {
+  clear_has_cell_diff();
+  ::TSP::Reference* temp = cell_diff_;
+  cell_diff_ = NULL;
+  return temp;
+}
+inline void CommandApplyCellDiffArchive::set_allocated_cell_diff(::TSP::Reference* cell_diff) {
+  delete cell_diff_;
+  cell_diff_ = cell_diff;
+  if (cell_diff) {
+    set_has_cell_diff();
+  } else {
+    clear_has_cell_diff();
+  }
+}
+
+// required .TSP.Reference inverse_cell_diff_map = 4;
+inline bool CommandApplyCellDiffArchive::has_inverse_cell_diff_map() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandApplyCellDiffArchive::set_has_inverse_cell_diff_map() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandApplyCellDiffArchive::clear_has_inverse_cell_diff_map() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandApplyCellDiffArchive::clear_inverse_cell_diff_map() {
+  if (inverse_cell_diff_map_ != NULL) inverse_cell_diff_map_->::TSP::Reference::Clear();
+  clear_has_inverse_cell_diff_map();
+}
+inline const ::TSP::Reference& CommandApplyCellDiffArchive::inverse_cell_diff_map() const {
+  return inverse_cell_diff_map_ != NULL ? *inverse_cell_diff_map_ : *default_instance_->inverse_cell_diff_map_;
+}
+inline ::TSP::Reference* CommandApplyCellDiffArchive::mutable_inverse_cell_diff_map() {
+  set_has_inverse_cell_diff_map();
+  if (inverse_cell_diff_map_ == NULL) inverse_cell_diff_map_ = new ::TSP::Reference;
+  return inverse_cell_diff_map_;
 }
-inline void TableCommandArchive::set_editing_mode_at_start(::google::protobuf::uint32 value) {
-  set_has_editing_mode_at_start();
-  editing_mode_at_start_ = value;
+inline ::TSP::Reference* CommandApplyCellDiffArchive::release_inverse_cell_diff_map() {
+  clear_has_inverse_cell_diff_map();
+  ::TSP::Reference* temp = inverse_cell_diff_map_;
+  inverse_cell_diff_map_ = NULL;
+  return temp;
+}
+inline void CommandApplyCellDiffArchive::set_allocated_inverse_cell_diff_map(::TSP::Reference* inverse_cell_diff_map) {
+  delete inverse_cell_diff_map_;
+  inverse_cell_diff_map_ = inverse_cell_diff_map;
+  if (inverse_cell_diff_map) {
+    set_has_inverse_cell_diff_map();
+  } else {
+    clear_has_inverse_cell_diff_map();
+  }
 }
 
 // -------------------------------------------------------------------
@@ -14363,6 +15721,124 @@ inline void CommandSetAutomaticDurationUnitsArchive::set_allocated_super(::TST::
 
 // -------------------------------------------------------------------
 
+// CommandReplaceCustomFormatArchive
+
+// required .TST.CellMapArchive undo_map = 1;
+inline bool CommandReplaceCustomFormatArchive::has_undo_map() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandReplaceCustomFormatArchive::set_has_undo_map() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandReplaceCustomFormatArchive::clear_has_undo_map() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandReplaceCustomFormatArchive::clear_undo_map() {
+  if (undo_map_ != NULL) undo_map_->::TST::CellMapArchive::Clear();
+  clear_has_undo_map();
+}
+inline const ::TST::CellMapArchive& CommandReplaceCustomFormatArchive::undo_map() const {
+  return undo_map_ != NULL ? *undo_map_ : *default_instance_->undo_map_;
+}
+inline ::TST::CellMapArchive* CommandReplaceCustomFormatArchive::mutable_undo_map() {
+  set_has_undo_map();
+  if (undo_map_ == NULL) undo_map_ = new ::TST::CellMapArchive;
+  return undo_map_;
+}
+inline ::TST::CellMapArchive* CommandReplaceCustomFormatArchive::release_undo_map() {
+  clear_has_undo_map();
+  ::TST::CellMapArchive* temp = undo_map_;
+  undo_map_ = NULL;
+  return temp;
+}
+inline void CommandReplaceCustomFormatArchive::set_allocated_undo_map(::TST::CellMapArchive* undo_map) {
+  delete undo_map_;
+  undo_map_ = undo_map;
+  if (undo_map) {
+    set_has_undo_map();
+  } else {
+    clear_has_undo_map();
+  }
+}
+
+// required .TST.CellMapArchive redo_map = 2;
+inline bool CommandReplaceCustomFormatArchive::has_redo_map() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandReplaceCustomFormatArchive::set_has_redo_map() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandReplaceCustomFormatArchive::clear_has_redo_map() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandReplaceCustomFormatArchive::clear_redo_map() {
+  if (redo_map_ != NULL) redo_map_->::TST::CellMapArchive::Clear();
+  clear_has_redo_map();
+}
+inline const ::TST::CellMapArchive& CommandReplaceCustomFormatArchive::redo_map() const {
+  return redo_map_ != NULL ? *redo_map_ : *default_instance_->redo_map_;
+}
+inline ::TST::CellMapArchive* CommandReplaceCustomFormatArchive::mutable_redo_map() {
+  set_has_redo_map();
+  if (redo_map_ == NULL) redo_map_ = new ::TST::CellMapArchive;
+  return redo_map_;
+}
+inline ::TST::CellMapArchive* CommandReplaceCustomFormatArchive::release_redo_map() {
+  clear_has_redo_map();
+  ::TST::CellMapArchive* temp = redo_map_;
+  redo_map_ = NULL;
+  return temp;
+}
+inline void CommandReplaceCustomFormatArchive::set_allocated_redo_map(::TST::CellMapArchive* redo_map) {
+  delete redo_map_;
+  redo_map_ = redo_map;
+  if (redo_map) {
+    set_has_redo_map();
+  } else {
+    clear_has_redo_map();
+  }
+}
+
+// required .TST.TableCommandArchive super = 6;
+inline bool CommandReplaceCustomFormatArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandReplaceCustomFormatArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandReplaceCustomFormatArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandReplaceCustomFormatArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TST::TableCommandArchive& CommandReplaceCustomFormatArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TST::TableCommandArchive* CommandReplaceCustomFormatArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
+}
+inline ::TST::TableCommandArchive* CommandReplaceCustomFormatArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandReplaceCustomFormatArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// -------------------------------------------------------------------
+
 // CommandInsertColumnsOrRowsArchive_StyleIndexPair
 
 // required .TSP.Reference style = 1;
@@ -15067,7 +16543,7 @@ inline void CommandPasteArchive::set_allocated_final_selection(::TST::SelectionA
   }
 }
 
-// required .TST.CellMapArchive undo_cell_map = 3;
+// required .TST.TiledCellMapArchive undo_cell_map = 3;
 inline bool CommandPasteArchive::has_undo_cell_map() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
@@ -15078,24 +16554,24 @@ inline void CommandPasteArchive::clear_has_undo_cell_map() {
   _has_bits_[0] &= ~0x00000004u;
 }
 inline void CommandPasteArchive::clear_undo_cell_map() {
-  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::TiledCellMapArchive::Clear();
   clear_has_undo_cell_map();
 }
-inline const ::TST::CellMapArchive& CommandPasteArchive::undo_cell_map() const {
+inline const ::TST::TiledCellMapArchive& CommandPasteArchive::undo_cell_map() const {
   return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
 }
-inline ::TST::CellMapArchive* CommandPasteArchive::mutable_undo_cell_map() {
+inline ::TST::TiledCellMapArchive* CommandPasteArchive::mutable_undo_cell_map() {
   set_has_undo_cell_map();
-  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
+  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::TiledCellMapArchive;
   return undo_cell_map_;
 }
-inline ::TST::CellMapArchive* CommandPasteArchive::release_undo_cell_map() {
+inline ::TST::TiledCellMapArchive* CommandPasteArchive::release_undo_cell_map() {
   clear_has_undo_cell_map();
-  ::TST::CellMapArchive* temp = undo_cell_map_;
+  ::TST::TiledCellMapArchive* temp = undo_cell_map_;
   undo_cell_map_ = NULL;
   return temp;
 }
-inline void CommandPasteArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
+inline void CommandPasteArchive::set_allocated_undo_cell_map(::TST::TiledCellMapArchive* undo_cell_map) {
   delete undo_cell_map_;
   undo_cell_map_ = undo_cell_map;
   if (undo_cell_map) {
@@ -15105,7 +16581,7 @@ inline void CommandPasteArchive::set_allocated_undo_cell_map(::TST::CellMapArchi
   }
 }
 
-// required .TST.CellMapArchive redo_cell_map = 4;
+// required .TST.TiledCellMapArchive redo_cell_map = 4;
 inline bool CommandPasteArchive::has_redo_cell_map() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
@@ -15116,24 +16592,24 @@ inline void CommandPasteArchive::clear_has_redo_cell_map() {
   _has_bits_[0] &= ~0x00000008u;
 }
 inline void CommandPasteArchive::clear_redo_cell_map() {
-  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::TiledCellMapArchive::Clear();
   clear_has_redo_cell_map();
 }
-inline const ::TST::CellMapArchive& CommandPasteArchive::redo_cell_map() const {
+inline const ::TST::TiledCellMapArchive& CommandPasteArchive::redo_cell_map() const {
   return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
 }
-inline ::TST::CellMapArchive* CommandPasteArchive::mutable_redo_cell_map() {
+inline ::TST::TiledCellMapArchive* CommandPasteArchive::mutable_redo_cell_map() {
   set_has_redo_cell_map();
-  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
+  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::TiledCellMapArchive;
   return redo_cell_map_;
 }
-inline ::TST::CellMapArchive* CommandPasteArchive::release_redo_cell_map() {
+inline ::TST::TiledCellMapArchive* CommandPasteArchive::release_redo_cell_map() {
   clear_has_redo_cell_map();
-  ::TST::CellMapArchive* temp = redo_cell_map_;
+  ::TST::TiledCellMapArchive* temp = redo_cell_map_;
   redo_cell_map_ = NULL;
   return temp;
 }
-inline void CommandPasteArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
+inline void CommandPasteArchive::set_allocated_redo_cell_map(::TST::TiledCellMapArchive* redo_cell_map) {
   delete redo_cell_map_;
   redo_cell_map_ = redo_cell_map;
   if (redo_cell_map) {
@@ -18617,7 +20093,239 @@ inline void CommandStyleCellsArchive::set_allocated_text_undo(::TSP::Reference*
   if (text_undo) {
     set_has_text_undo();
   } else {
-    clear_has_text_undo();
+    clear_has_text_undo();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// CommandSetFillPropertyArchive
+
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandSetFillPropertyArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandSetFillPropertyArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandSetFillPropertyArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandSetFillPropertyArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TST::TableCommandArchive& CommandSetFillPropertyArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TST::TableCommandArchive* CommandSetFillPropertyArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
+}
+inline ::TST::TableCommandArchive* CommandSetFillPropertyArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandSetFillPropertyArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// optional .TSD.FillArchive fill = 2;
+inline bool CommandSetFillPropertyArchive::has_fill() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetFillPropertyArchive::set_has_fill() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetFillPropertyArchive::clear_has_fill() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetFillPropertyArchive::clear_fill() {
+  if (fill_ != NULL) fill_->::TSD::FillArchive::Clear();
+  clear_has_fill();
+}
+inline const ::TSD::FillArchive& CommandSetFillPropertyArchive::fill() const {
+  return fill_ != NULL ? *fill_ : *default_instance_->fill_;
+}
+inline ::TSD::FillArchive* CommandSetFillPropertyArchive::mutable_fill() {
+  set_has_fill();
+  if (fill_ == NULL) fill_ = new ::TSD::FillArchive;
+  return fill_;
+}
+inline ::TSD::FillArchive* CommandSetFillPropertyArchive::release_fill() {
+  clear_has_fill();
+  ::TSD::FillArchive* temp = fill_;
+  fill_ = NULL;
+  return temp;
+}
+inline void CommandSetFillPropertyArchive::set_allocated_fill(::TSD::FillArchive* fill) {
+  delete fill_;
+  fill_ = fill;
+  if (fill) {
+    set_has_fill();
+  } else {
+    clear_has_fill();
+  }
+}
+
+// optional .TST.CellFillStandIn cell_fill_stand_in = 3;
+inline bool CommandSetFillPropertyArchive::has_cell_fill_stand_in() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandSetFillPropertyArchive::set_has_cell_fill_stand_in() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetFillPropertyArchive::clear_has_cell_fill_stand_in() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetFillPropertyArchive::clear_cell_fill_stand_in() {
+  if (cell_fill_stand_in_ != NULL) cell_fill_stand_in_->::TST::CellFillStandIn::Clear();
+  clear_has_cell_fill_stand_in();
+}
+inline const ::TST::CellFillStandIn& CommandSetFillPropertyArchive::cell_fill_stand_in() const {
+  return cell_fill_stand_in_ != NULL ? *cell_fill_stand_in_ : *default_instance_->cell_fill_stand_in_;
+}
+inline ::TST::CellFillStandIn* CommandSetFillPropertyArchive::mutable_cell_fill_stand_in() {
+  set_has_cell_fill_stand_in();
+  if (cell_fill_stand_in_ == NULL) cell_fill_stand_in_ = new ::TST::CellFillStandIn;
+  return cell_fill_stand_in_;
+}
+inline ::TST::CellFillStandIn* CommandSetFillPropertyArchive::release_cell_fill_stand_in() {
+  clear_has_cell_fill_stand_in();
+  ::TST::CellFillStandIn* temp = cell_fill_stand_in_;
+  cell_fill_stand_in_ = NULL;
+  return temp;
+}
+inline void CommandSetFillPropertyArchive::set_allocated_cell_fill_stand_in(::TST::CellFillStandIn* cell_fill_stand_in) {
+  delete cell_fill_stand_in_;
+  cell_fill_stand_in_ = cell_fill_stand_in;
+  if (cell_fill_stand_in) {
+    set_has_cell_fill_stand_in();
+  } else {
+    clear_has_cell_fill_stand_in();
+  }
+}
+
+// required .TST.SelectionArchive selection = 4;
+inline bool CommandSetFillPropertyArchive::has_selection() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetFillPropertyArchive::set_has_selection() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetFillPropertyArchive::clear_has_selection() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetFillPropertyArchive::clear_selection() {
+  if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+  clear_has_selection();
+}
+inline const ::TST::SelectionArchive& CommandSetFillPropertyArchive::selection() const {
+  return selection_ != NULL ? *selection_ : *default_instance_->selection_;
+}
+inline ::TST::SelectionArchive* CommandSetFillPropertyArchive::mutable_selection() {
+  set_has_selection();
+  if (selection_ == NULL) selection_ = new ::TST::SelectionArchive;
+  return selection_;
+}
+inline ::TST::SelectionArchive* CommandSetFillPropertyArchive::release_selection() {
+  clear_has_selection();
+  ::TST::SelectionArchive* temp = selection_;
+  selection_ = NULL;
+  return temp;
+}
+inline void CommandSetFillPropertyArchive::set_allocated_selection(::TST::SelectionArchive* selection) {
+  delete selection_;
+  selection_ = selection;
+  if (selection) {
+    set_has_selection();
+  } else {
+    clear_has_selection();
+  }
+}
+
+// required .TST.CellMapArchive undo_cell_map = 5;
+inline bool CommandSetFillPropertyArchive::has_undo_cell_map() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSetFillPropertyArchive::set_has_undo_cell_map() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSetFillPropertyArchive::clear_has_undo_cell_map() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSetFillPropertyArchive::clear_undo_cell_map() {
+  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_undo_cell_map();
+}
+inline const ::TST::CellMapArchive& CommandSetFillPropertyArchive::undo_cell_map() const {
+  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetFillPropertyArchive::mutable_undo_cell_map() {
+  set_has_undo_cell_map();
+  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
+  return undo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetFillPropertyArchive::release_undo_cell_map() {
+  clear_has_undo_cell_map();
+  ::TST::CellMapArchive* temp = undo_cell_map_;
+  undo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandSetFillPropertyArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
+  delete undo_cell_map_;
+  undo_cell_map_ = undo_cell_map;
+  if (undo_cell_map) {
+    set_has_undo_cell_map();
+  } else {
+    clear_has_undo_cell_map();
+  }
+}
+
+// required .TST.CellMapArchive redo_cell_map = 6;
+inline bool CommandSetFillPropertyArchive::has_redo_cell_map() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandSetFillPropertyArchive::set_has_redo_cell_map() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandSetFillPropertyArchive::clear_has_redo_cell_map() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandSetFillPropertyArchive::clear_redo_cell_map() {
+  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_redo_cell_map();
+}
+inline const ::TST::CellMapArchive& CommandSetFillPropertyArchive::redo_cell_map() const {
+  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetFillPropertyArchive::mutable_redo_cell_map() {
+  set_has_redo_cell_map();
+  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
+  return redo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetFillPropertyArchive::release_redo_cell_map() {
+  clear_has_redo_cell_map();
+  ::TST::CellMapArchive* temp = redo_cell_map_;
+  redo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandSetFillPropertyArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
+  delete redo_cell_map_;
+  redo_cell_map_ = redo_cell_map;
+  if (redo_cell_map) {
+    set_has_redo_cell_map();
+  } else {
+    clear_has_redo_cell_map();
   }
 }
 
@@ -20173,36 +21881,478 @@ inline ::TST::SelectionArchive* CommandApplyStrokePresetArchive::release_expande
   expanded_selection_ = NULL;
   return temp;
 }
-inline void CommandApplyStrokePresetArchive::set_allocated_expanded_selection(::TST::SelectionArchive* expanded_selection) {
-  delete expanded_selection_;
-  expanded_selection_ = expanded_selection;
-  if (expanded_selection) {
-    set_has_expanded_selection();
+inline void CommandApplyStrokePresetArchive::set_allocated_expanded_selection(::TST::SelectionArchive* expanded_selection) {
+  delete expanded_selection_;
+  expanded_selection_ = expanded_selection;
+  if (expanded_selection) {
+    set_has_expanded_selection();
+  } else {
+    clear_has_expanded_selection();
+  }
+}
+
+// required int32 preset_index = 5;
+inline bool CommandApplyStrokePresetArchive::has_preset_index() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void CommandApplyStrokePresetArchive::set_has_preset_index() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void CommandApplyStrokePresetArchive::clear_has_preset_index() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void CommandApplyStrokePresetArchive::clear_preset_index() {
+  preset_index_ = 0;
+  clear_has_preset_index();
+}
+inline ::google::protobuf::int32 CommandApplyStrokePresetArchive::preset_index() const {
+  return preset_index_;
+}
+inline void CommandApplyStrokePresetArchive::set_preset_index(::google::protobuf::int32 value) {
+  set_has_preset_index();
+  preset_index_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandAddTableStylePresetArchive
+
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandAddTableStylePresetArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandAddTableStylePresetArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandAddTableStylePresetArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandAddTableStylePresetArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TST::TableCommandArchive& CommandAddTableStylePresetArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TST::TableCommandArchive* CommandAddTableStylePresetArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
+}
+inline ::TST::TableCommandArchive* CommandAddTableStylePresetArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandAddTableStylePresetArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required int32 preset_index = 2;
+inline bool CommandAddTableStylePresetArchive::has_preset_index() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandAddTableStylePresetArchive::set_has_preset_index() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandAddTableStylePresetArchive::clear_has_preset_index() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandAddTableStylePresetArchive::clear_preset_index() {
+  preset_index_ = 0;
+  clear_has_preset_index();
+}
+inline ::google::protobuf::int32 CommandAddTableStylePresetArchive::preset_index() const {
+  return preset_index_;
+}
+inline void CommandAddTableStylePresetArchive::set_preset_index(::google::protobuf::int32 value) {
+  set_has_preset_index();
+  preset_index_ = value;
+}
+
+// required .TST.TableStyleNetworkArchive table_styles = 3;
+inline bool CommandAddTableStylePresetArchive::has_table_styles() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandAddTableStylePresetArchive::set_has_table_styles() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandAddTableStylePresetArchive::clear_has_table_styles() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandAddTableStylePresetArchive::clear_table_styles() {
+  if (table_styles_ != NULL) table_styles_->::TST::TableStyleNetworkArchive::Clear();
+  clear_has_table_styles();
+}
+inline const ::TST::TableStyleNetworkArchive& CommandAddTableStylePresetArchive::table_styles() const {
+  return table_styles_ != NULL ? *table_styles_ : *default_instance_->table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandAddTableStylePresetArchive::mutable_table_styles() {
+  set_has_table_styles();
+  if (table_styles_ == NULL) table_styles_ = new ::TST::TableStyleNetworkArchive;
+  return table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandAddTableStylePresetArchive::release_table_styles() {
+  clear_has_table_styles();
+  ::TST::TableStyleNetworkArchive* temp = table_styles_;
+  table_styles_ = NULL;
+  return temp;
+}
+inline void CommandAddTableStylePresetArchive::set_allocated_table_styles(::TST::TableStyleNetworkArchive* table_styles) {
+  delete table_styles_;
+  table_styles_ = table_styles;
+  if (table_styles) {
+    set_has_table_styles();
+  } else {
+    clear_has_table_styles();
+  }
+}
+
+// required bool send_notification = 4;
+inline bool CommandAddTableStylePresetArchive::has_send_notification() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandAddTableStylePresetArchive::set_has_send_notification() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandAddTableStylePresetArchive::clear_has_send_notification() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandAddTableStylePresetArchive::clear_send_notification() {
+  send_notification_ = false;
+  clear_has_send_notification();
+}
+inline bool CommandAddTableStylePresetArchive::send_notification() const {
+  return send_notification_;
+}
+inline void CommandAddTableStylePresetArchive::set_send_notification(bool value) {
+  set_has_send_notification();
+  send_notification_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandRemoveTableStylePresetArchive
+
+// required .TSK.CommandArchive super = 1;
+inline bool CommandRemoveTableStylePresetArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandRemoveTableStylePresetArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::CommandArchive& CommandRemoveTableStylePresetArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::CommandArchive* CommandRemoveTableStylePresetArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
+}
+inline ::TSK::CommandArchive* CommandRemoveTableStylePresetArchive::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandRemoveTableStylePresetArchive::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required .TSP.Reference theme = 2;
+inline bool CommandRemoveTableStylePresetArchive::has_theme() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandRemoveTableStylePresetArchive::set_has_theme() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_has_theme() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_theme() {
+  if (theme_ != NULL) theme_->::TSP::Reference::Clear();
+  clear_has_theme();
+}
+inline const ::TSP::Reference& CommandRemoveTableStylePresetArchive::theme() const {
+  return theme_ != NULL ? *theme_ : *default_instance_->theme_;
+}
+inline ::TSP::Reference* CommandRemoveTableStylePresetArchive::mutable_theme() {
+  set_has_theme();
+  if (theme_ == NULL) theme_ = new ::TSP::Reference;
+  return theme_;
+}
+inline ::TSP::Reference* CommandRemoveTableStylePresetArchive::release_theme() {
+  clear_has_theme();
+  ::TSP::Reference* temp = theme_;
+  theme_ = NULL;
+  return temp;
+}
+inline void CommandRemoveTableStylePresetArchive::set_allocated_theme(::TSP::Reference* theme) {
+  delete theme_;
+  theme_ = theme;
+  if (theme) {
+    set_has_theme();
+  } else {
+    clear_has_theme();
+  }
+}
+
+// required .TST.TableStyleNetworkArchive removed_table_styles = 3;
+inline bool CommandRemoveTableStylePresetArchive::has_removed_table_styles() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandRemoveTableStylePresetArchive::set_has_removed_table_styles() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_has_removed_table_styles() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_removed_table_styles() {
+  if (removed_table_styles_ != NULL) removed_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+  clear_has_removed_table_styles();
+}
+inline const ::TST::TableStyleNetworkArchive& CommandRemoveTableStylePresetArchive::removed_table_styles() const {
+  return removed_table_styles_ != NULL ? *removed_table_styles_ : *default_instance_->removed_table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandRemoveTableStylePresetArchive::mutable_removed_table_styles() {
+  set_has_removed_table_styles();
+  if (removed_table_styles_ == NULL) removed_table_styles_ = new ::TST::TableStyleNetworkArchive;
+  return removed_table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandRemoveTableStylePresetArchive::release_removed_table_styles() {
+  clear_has_removed_table_styles();
+  ::TST::TableStyleNetworkArchive* temp = removed_table_styles_;
+  removed_table_styles_ = NULL;
+  return temp;
+}
+inline void CommandRemoveTableStylePresetArchive::set_allocated_removed_table_styles(::TST::TableStyleNetworkArchive* removed_table_styles) {
+  delete removed_table_styles_;
+  removed_table_styles_ = removed_table_styles;
+  if (removed_table_styles) {
+    set_has_removed_table_styles();
+  } else {
+    clear_has_removed_table_styles();
+  }
+}
+
+// required int32 preset_id = 4;
+inline bool CommandRemoveTableStylePresetArchive::has_preset_id() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandRemoveTableStylePresetArchive::set_has_preset_id() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_has_preset_id() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_preset_id() {
+  preset_id_ = 0;
+  clear_has_preset_id();
+}
+inline ::google::protobuf::int32 CommandRemoveTableStylePresetArchive::preset_id() const {
+  return preset_id_;
+}
+inline void CommandRemoveTableStylePresetArchive::set_preset_id(::google::protobuf::int32 value) {
+  set_has_preset_id();
+  preset_id_ = value;
+}
+
+// required int32 preset_index_in_theme = 5;
+inline bool CommandRemoveTableStylePresetArchive::has_preset_index_in_theme() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandRemoveTableStylePresetArchive::set_has_preset_index_in_theme() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_has_preset_index_in_theme() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandRemoveTableStylePresetArchive::clear_preset_index_in_theme() {
+  preset_index_in_theme_ = 0;
+  clear_has_preset_index_in_theme();
+}
+inline ::google::protobuf::int32 CommandRemoveTableStylePresetArchive::preset_index_in_theme() const {
+  return preset_index_in_theme_;
+}
+inline void CommandRemoveTableStylePresetArchive::set_preset_index_in_theme(::google::protobuf::int32 value) {
+  set_has_preset_index_in_theme();
+  preset_index_in_theme_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// CommandReplaceTableStylePresetArchive
+
+// required .TSK.CommandArchive super = 1;
+inline bool CommandReplaceTableStylePresetArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void CommandReplaceTableStylePresetArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void CommandReplaceTableStylePresetArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void CommandReplaceTableStylePresetArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+  clear_has_super();
+}
+inline const ::TSK::CommandArchive& CommandReplaceTableStylePresetArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
+}
+inline ::TSK::CommandArchive* CommandReplaceTableStylePresetArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  return super_;
+}
+inline ::TSK::CommandArchive* CommandReplaceTableStylePresetArchive::release_super() {
+  clear_has_super();
+  ::TSK::CommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandReplaceTableStylePresetArchive::set_allocated_super(::TSK::CommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
+}
+
+// required .TSP.Reference theme = 2;
+inline bool CommandReplaceTableStylePresetArchive::has_theme() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandReplaceTableStylePresetArchive::set_has_theme() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandReplaceTableStylePresetArchive::clear_has_theme() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandReplaceTableStylePresetArchive::clear_theme() {
+  if (theme_ != NULL) theme_->::TSP::Reference::Clear();
+  clear_has_theme();
+}
+inline const ::TSP::Reference& CommandReplaceTableStylePresetArchive::theme() const {
+  return theme_ != NULL ? *theme_ : *default_instance_->theme_;
+}
+inline ::TSP::Reference* CommandReplaceTableStylePresetArchive::mutable_theme() {
+  set_has_theme();
+  if (theme_ == NULL) theme_ = new ::TSP::Reference;
+  return theme_;
+}
+inline ::TSP::Reference* CommandReplaceTableStylePresetArchive::release_theme() {
+  clear_has_theme();
+  ::TSP::Reference* temp = theme_;
+  theme_ = NULL;
+  return temp;
+}
+inline void CommandReplaceTableStylePresetArchive::set_allocated_theme(::TSP::Reference* theme) {
+  delete theme_;
+  theme_ = theme;
+  if (theme) {
+    set_has_theme();
+  } else {
+    clear_has_theme();
+  }
+}
+
+// required .TST.TableStyleNetworkArchive old_table_styles = 3;
+inline bool CommandReplaceTableStylePresetArchive::has_old_table_styles() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandReplaceTableStylePresetArchive::set_has_old_table_styles() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandReplaceTableStylePresetArchive::clear_has_old_table_styles() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandReplaceTableStylePresetArchive::clear_old_table_styles() {
+  if (old_table_styles_ != NULL) old_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+  clear_has_old_table_styles();
+}
+inline const ::TST::TableStyleNetworkArchive& CommandReplaceTableStylePresetArchive::old_table_styles() const {
+  return old_table_styles_ != NULL ? *old_table_styles_ : *default_instance_->old_table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandReplaceTableStylePresetArchive::mutable_old_table_styles() {
+  set_has_old_table_styles();
+  if (old_table_styles_ == NULL) old_table_styles_ = new ::TST::TableStyleNetworkArchive;
+  return old_table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandReplaceTableStylePresetArchive::release_old_table_styles() {
+  clear_has_old_table_styles();
+  ::TST::TableStyleNetworkArchive* temp = old_table_styles_;
+  old_table_styles_ = NULL;
+  return temp;
+}
+inline void CommandReplaceTableStylePresetArchive::set_allocated_old_table_styles(::TST::TableStyleNetworkArchive* old_table_styles) {
+  delete old_table_styles_;
+  old_table_styles_ = old_table_styles;
+  if (old_table_styles) {
+    set_has_old_table_styles();
   } else {
-    clear_has_expanded_selection();
+    clear_has_old_table_styles();
   }
 }
 
-// required int32 preset_index = 5;
-inline bool CommandApplyStrokePresetArchive::has_preset_index() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+// required .TST.TableStyleNetworkArchive new_table_styles = 4;
+inline bool CommandReplaceTableStylePresetArchive::has_new_table_styles() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandApplyStrokePresetArchive::set_has_preset_index() {
-  _has_bits_[0] |= 0x00000020u;
+inline void CommandReplaceTableStylePresetArchive::set_has_new_table_styles() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandApplyStrokePresetArchive::clear_has_preset_index() {
-  _has_bits_[0] &= ~0x00000020u;
+inline void CommandReplaceTableStylePresetArchive::clear_has_new_table_styles() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandApplyStrokePresetArchive::clear_preset_index() {
-  preset_index_ = 0;
-  clear_has_preset_index();
+inline void CommandReplaceTableStylePresetArchive::clear_new_table_styles() {
+  if (new_table_styles_ != NULL) new_table_styles_->::TST::TableStyleNetworkArchive::Clear();
+  clear_has_new_table_styles();
 }
-inline ::google::protobuf::int32 CommandApplyStrokePresetArchive::preset_index() const {
-  return preset_index_;
+inline const ::TST::TableStyleNetworkArchive& CommandReplaceTableStylePresetArchive::new_table_styles() const {
+  return new_table_styles_ != NULL ? *new_table_styles_ : *default_instance_->new_table_styles_;
 }
-inline void CommandApplyStrokePresetArchive::set_preset_index(::google::protobuf::int32 value) {
-  set_has_preset_index();
-  preset_index_ = value;
+inline ::TST::TableStyleNetworkArchive* CommandReplaceTableStylePresetArchive::mutable_new_table_styles() {
+  set_has_new_table_styles();
+  if (new_table_styles_ == NULL) new_table_styles_ = new ::TST::TableStyleNetworkArchive;
+  return new_table_styles_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandReplaceTableStylePresetArchive::release_new_table_styles() {
+  clear_has_new_table_styles();
+  ::TST::TableStyleNetworkArchive* temp = new_table_styles_;
+  new_table_styles_ = NULL;
+  return temp;
+}
+inline void CommandReplaceTableStylePresetArchive::set_allocated_new_table_styles(::TST::TableStyleNetworkArchive* new_table_styles) {
+  delete new_table_styles_;
+  new_table_styles_ = new_table_styles;
+  if (new_table_styles) {
+    set_has_new_table_styles();
+  } else {
+    clear_has_new_table_styles();
+  }
 }
 
 // -------------------------------------------------------------------
@@ -20485,7 +22635,7 @@ inline void CommandApplyTableStylePresetArchive::set_allocated_old_table_styles(
   }
 }
 
-// required .TST.TableStyleNetworkArchive new_table_styles = 8;
+// optional .TST.TableStyleNetworkArchive new_table_styles = 8 [deprecated = true];
 inline bool CommandApplyTableStylePresetArchive::has_new_table_styles() const {
   return (_has_bits_[0] & 0x00000020u) != 0;
 }
@@ -26113,621 +28263,975 @@ inline void FormulaEditingCommandGroupArchive::clear_redoselectionlength() {
   redoselectionlength_ = 0u;
   clear_has_redoselectionlength();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandGroupArchive::redoselectionlength() const {
-  return redoselectionlength_;
+inline ::google::protobuf::uint32 FormulaEditingCommandGroupArchive::redoselectionlength() const {
+  return redoselectionlength_;
+}
+inline void FormulaEditingCommandGroupArchive::set_redoselectionlength(::google::protobuf::uint32 value) {
+  set_has_redoselectionlength();
+  redoselectionlength_ = value;
+}
+
+// required uint32 redoActiveToken = 9;
+inline bool FormulaEditingCommandGroupArchive::has_redoactivetoken() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void FormulaEditingCommandGroupArchive::set_has_redoactivetoken() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void FormulaEditingCommandGroupArchive::clear_has_redoactivetoken() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void FormulaEditingCommandGroupArchive::clear_redoactivetoken() {
+  redoactivetoken_ = 0u;
+  clear_has_redoactivetoken();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandGroupArchive::redoactivetoken() const {
+  return redoactivetoken_;
+}
+inline void FormulaEditingCommandGroupArchive::set_redoactivetoken(::google::protobuf::uint32 value) {
+  set_has_redoactivetoken();
+  redoactivetoken_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// FormulaEditingCommandSelectionBehaviorArchive
+
+// optional bool undoSelectionValid = 2;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoselectionvalid() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoselectionvalid() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoselectionvalid() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoselectionvalid() {
+  undoselectionvalid_ = false;
+  clear_has_undoselectionvalid();
+}
+inline bool FormulaEditingCommandSelectionBehaviorArchive::undoselectionvalid() const {
+  return undoselectionvalid_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoselectionvalid(bool value) {
+  set_has_undoselectionvalid();
+  undoselectionvalid_ = value;
+}
+
+// optional uint32 undoSelectionStart = 3;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoselectionstart() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoselectionstart() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoselectionstart() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoselectionstart() {
+  undoselectionstart_ = 0u;
+  clear_has_undoselectionstart();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::undoselectionstart() const {
+  return undoselectionstart_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoselectionstart(::google::protobuf::uint32 value) {
+  set_has_undoselectionstart();
+  undoselectionstart_ = value;
+}
+
+// optional uint32 undoSelectionLength = 4;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoselectionlength() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoselectionlength() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoselectionlength() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoselectionlength() {
+  undoselectionlength_ = 0u;
+  clear_has_undoselectionlength();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::undoselectionlength() const {
+  return undoselectionlength_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoselectionlength(::google::protobuf::uint32 value) {
+  set_has_undoselectionlength();
+  undoselectionlength_ = value;
+}
+
+// optional uint32 undoActiveToken = 5;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoactivetoken() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoactivetoken() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoactivetoken() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoactivetoken() {
+  undoactivetoken_ = 0u;
+  clear_has_undoactivetoken();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::undoactivetoken() const {
+  return undoactivetoken_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoactivetoken(::google::protobuf::uint32 value) {
+  set_has_undoactivetoken();
+  undoactivetoken_ = value;
+}
+
+// optional bool redoSelectionValid = 6;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoselectionvalid() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoselectionvalid() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoselectionvalid() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoselectionvalid() {
+  redoselectionvalid_ = false;
+  clear_has_redoselectionvalid();
+}
+inline bool FormulaEditingCommandSelectionBehaviorArchive::redoselectionvalid() const {
+  return redoselectionvalid_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoselectionvalid(bool value) {
+  set_has_redoselectionvalid();
+  redoselectionvalid_ = value;
+}
+
+// optional uint32 redoSelectionStart = 7;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoselectionstart() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoselectionstart() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoselectionstart() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoselectionstart() {
+  redoselectionstart_ = 0u;
+  clear_has_redoselectionstart();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::redoselectionstart() const {
+  return redoselectionstart_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoselectionstart(::google::protobuf::uint32 value) {
+  set_has_redoselectionstart();
+  redoselectionstart_ = value;
+}
+
+// optional uint32 redoSelectionLength = 8;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoselectionlength() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoselectionlength() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoselectionlength() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoselectionlength() {
+  redoselectionlength_ = 0u;
+  clear_has_redoselectionlength();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::redoselectionlength() const {
+  return redoselectionlength_;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoselectionlength(::google::protobuf::uint32 value) {
+  set_has_redoselectionlength();
+  redoselectionlength_ = value;
+}
+
+// optional uint32 redoActiveToken = 9;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoactivetoken() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoactivetoken() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoactivetoken() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoactivetoken() {
+  redoactivetoken_ = 0u;
+  clear_has_redoactivetoken();
+}
+inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::redoactivetoken() const {
+  return redoactivetoken_;
 }
-inline void FormulaEditingCommandGroupArchive::set_redoselectionlength(::google::protobuf::uint32 value) {
-  set_has_redoselectionlength();
-  redoselectionlength_ = value;
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoactivetoken(::google::protobuf::uint32 value) {
+  set_has_redoactivetoken();
+  redoactivetoken_ = value;
 }
 
-// required uint32 redoActiveToken = 9;
-inline bool FormulaEditingCommandGroupArchive::has_redoactivetoken() const {
+// optional .TSP.Reference storage = 10;
+inline bool FormulaEditingCommandSelectionBehaviorArchive::has_storage() const {
   return (_has_bits_[0] & 0x00000100u) != 0;
 }
-inline void FormulaEditingCommandGroupArchive::set_has_redoactivetoken() {
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_storage() {
   _has_bits_[0] |= 0x00000100u;
 }
-inline void FormulaEditingCommandGroupArchive::clear_has_redoactivetoken() {
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_storage() {
   _has_bits_[0] &= ~0x00000100u;
 }
-inline void FormulaEditingCommandGroupArchive::clear_redoactivetoken() {
-  redoactivetoken_ = 0u;
-  clear_has_redoactivetoken();
+inline void FormulaEditingCommandSelectionBehaviorArchive::clear_storage() {
+  if (storage_ != NULL) storage_->::TSP::Reference::Clear();
+  clear_has_storage();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandGroupArchive::redoactivetoken() const {
-  return redoactivetoken_;
+inline const ::TSP::Reference& FormulaEditingCommandSelectionBehaviorArchive::storage() const {
+  return storage_ != NULL ? *storage_ : *default_instance_->storage_;
 }
-inline void FormulaEditingCommandGroupArchive::set_redoactivetoken(::google::protobuf::uint32 value) {
-  set_has_redoactivetoken();
-  redoactivetoken_ = value;
+inline ::TSP::Reference* FormulaEditingCommandSelectionBehaviorArchive::mutable_storage() {
+  set_has_storage();
+  if (storage_ == NULL) storage_ = new ::TSP::Reference;
+  return storage_;
+}
+inline ::TSP::Reference* FormulaEditingCommandSelectionBehaviorArchive::release_storage() {
+  clear_has_storage();
+  ::TSP::Reference* temp = storage_;
+  storage_ = NULL;
+  return temp;
+}
+inline void FormulaEditingCommandSelectionBehaviorArchive::set_allocated_storage(::TSP::Reference* storage) {
+  delete storage_;
+  storage_ = storage;
+  if (storage) {
+    set_has_storage();
+  } else {
+    clear_has_storage();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// FormulaEditingCommandSelectionBehaviorArchive
+// UndoRedoStateCommandSelectionBehaviorArchive
 
-// optional bool undoSelectionValid = 2;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoselectionvalid() const {
+// optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
+inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_before_undo_redo_state() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoselectionvalid() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_before_undo_redo_state() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoselectionvalid() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_before_undo_redo_state() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoselectionvalid() {
-  undoselectionvalid_ = false;
-  clear_has_undoselectionvalid();
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_before_undo_redo_state() {
+  if (before_undo_redo_state_ != NULL) before_undo_redo_state_->::TSP::Reference::Clear();
+  clear_has_before_undo_redo_state();
 }
-inline bool FormulaEditingCommandSelectionBehaviorArchive::undoselectionvalid() const {
-  return undoselectionvalid_;
+inline const ::TSP::Reference& UndoRedoStateCommandSelectionBehaviorArchive::before_undo_redo_state() const {
+  return before_undo_redo_state_ != NULL ? *before_undo_redo_state_ : *default_instance_->before_undo_redo_state_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoselectionvalid(bool value) {
-  set_has_undoselectionvalid();
-  undoselectionvalid_ = value;
+inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::mutable_before_undo_redo_state() {
+  set_has_before_undo_redo_state();
+  if (before_undo_redo_state_ == NULL) before_undo_redo_state_ = new ::TSP::Reference;
+  return before_undo_redo_state_;
+}
+inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::release_before_undo_redo_state() {
+  clear_has_before_undo_redo_state();
+  ::TSP::Reference* temp = before_undo_redo_state_;
+  before_undo_redo_state_ = NULL;
+  return temp;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_before_undo_redo_state(::TSP::Reference* before_undo_redo_state) {
+  delete before_undo_redo_state_;
+  before_undo_redo_state_ = before_undo_redo_state;
+  if (before_undo_redo_state) {
+    set_has_before_undo_redo_state();
+  } else {
+    clear_has_before_undo_redo_state();
+  }
 }
 
-// optional uint32 undoSelectionStart = 3;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoselectionstart() const {
+// optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
+inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_after_undo_redo_state() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoselectionstart() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_after_undo_redo_state() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoselectionstart() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_after_undo_redo_state() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoselectionstart() {
-  undoselectionstart_ = 0u;
-  clear_has_undoselectionstart();
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_after_undo_redo_state() {
+  if (after_undo_redo_state_ != NULL) after_undo_redo_state_->::TSP::Reference::Clear();
+  clear_has_after_undo_redo_state();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::undoselectionstart() const {
-  return undoselectionstart_;
+inline const ::TSP::Reference& UndoRedoStateCommandSelectionBehaviorArchive::after_undo_redo_state() const {
+  return after_undo_redo_state_ != NULL ? *after_undo_redo_state_ : *default_instance_->after_undo_redo_state_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoselectionstart(::google::protobuf::uint32 value) {
-  set_has_undoselectionstart();
-  undoselectionstart_ = value;
+inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::mutable_after_undo_redo_state() {
+  set_has_after_undo_redo_state();
+  if (after_undo_redo_state_ == NULL) after_undo_redo_state_ = new ::TSP::Reference;
+  return after_undo_redo_state_;
+}
+inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::release_after_undo_redo_state() {
+  clear_has_after_undo_redo_state();
+  ::TSP::Reference* temp = after_undo_redo_state_;
+  after_undo_redo_state_ = NULL;
+  return temp;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_after_undo_redo_state(::TSP::Reference* after_undo_redo_state) {
+  delete after_undo_redo_state_;
+  after_undo_redo_state_ = after_undo_redo_state;
+  if (after_undo_redo_state) {
+    set_has_after_undo_redo_state();
+  } else {
+    clear_has_after_undo_redo_state();
+  }
 }
 
-// optional uint32 undoSelectionLength = 4;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoselectionlength() const {
+// optional .TSP.Reference table_info = 3;
+inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_table_info() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoselectionlength() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_table_info() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoselectionlength() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_table_info() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoselectionlength() {
-  undoselectionlength_ = 0u;
-  clear_has_undoselectionlength();
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_table_info() {
+  if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
+  clear_has_table_info();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::undoselectionlength() const {
-  return undoselectionlength_;
+inline const ::TSP::Reference& UndoRedoStateCommandSelectionBehaviorArchive::table_info() const {
+  return table_info_ != NULL ? *table_info_ : *default_instance_->table_info_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoselectionlength(::google::protobuf::uint32 value) {
-  set_has_undoselectionlength();
-  undoselectionlength_ = value;
+inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::mutable_table_info() {
+  set_has_table_info();
+  if (table_info_ == NULL) table_info_ = new ::TSP::Reference;
+  return table_info_;
+}
+inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::release_table_info() {
+  clear_has_table_info();
+  ::TSP::Reference* temp = table_info_;
+  table_info_ = NULL;
+  return temp;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_table_info(::TSP::Reference* table_info) {
+  delete table_info_;
+  table_info_ = table_info;
+  if (table_info) {
+    set_has_table_info();
+  } else {
+    clear_has_table_info();
+  }
 }
 
-// optional uint32 undoActiveToken = 5;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_undoactivetoken() const {
+// optional .TST.SelectionArchive before_table_selection = 4;
+inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_before_table_selection() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_undoactivetoken() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_before_table_selection() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_undoactivetoken() {
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_before_table_selection() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_undoactivetoken() {
-  undoactivetoken_ = 0u;
-  clear_has_undoactivetoken();
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_before_table_selection() {
+  if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
+  clear_has_before_table_selection();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::undoactivetoken() const {
-  return undoactivetoken_;
+inline const ::TST::SelectionArchive& UndoRedoStateCommandSelectionBehaviorArchive::before_table_selection() const {
+  return before_table_selection_ != NULL ? *before_table_selection_ : *default_instance_->before_table_selection_;
+}
+inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::mutable_before_table_selection() {
+  set_has_before_table_selection();
+  if (before_table_selection_ == NULL) before_table_selection_ = new ::TST::SelectionArchive;
+  return before_table_selection_;
+}
+inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::release_before_table_selection() {
+  clear_has_before_table_selection();
+  ::TST::SelectionArchive* temp = before_table_selection_;
+  before_table_selection_ = NULL;
+  return temp;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_before_table_selection(::TST::SelectionArchive* before_table_selection) {
+  delete before_table_selection_;
+  before_table_selection_ = before_table_selection;
+  if (before_table_selection) {
+    set_has_before_table_selection();
+  } else {
+    clear_has_before_table_selection();
+  }
+}
+
+// optional .TST.SelectionArchive after_table_selection = 6;
+inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_after_table_selection() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_after_table_selection() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_after_table_selection() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_after_table_selection() {
+  if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
+  clear_has_after_table_selection();
+}
+inline const ::TST::SelectionArchive& UndoRedoStateCommandSelectionBehaviorArchive::after_table_selection() const {
+  return after_table_selection_ != NULL ? *after_table_selection_ : *default_instance_->after_table_selection_;
+}
+inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::mutable_after_table_selection() {
+  set_has_after_table_selection();
+  if (after_table_selection_ == NULL) after_table_selection_ = new ::TST::SelectionArchive;
+  return after_table_selection_;
+}
+inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::release_after_table_selection() {
+  clear_has_after_table_selection();
+  ::TST::SelectionArchive* temp = after_table_selection_;
+  after_table_selection_ = NULL;
+  return temp;
+}
+inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_after_table_selection(::TST::SelectionArchive* after_table_selection) {
+  delete after_table_selection_;
+  after_table_selection_ = after_table_selection;
+  if (after_table_selection) {
+    set_has_after_table_selection();
+  } else {
+    clear_has_after_table_selection();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// TableCommandSelectionBehaviorArchive
+
+// optional .TST.SelectionArchive before_table_selection = 1;
+inline bool TableCommandSelectionBehaviorArchive::has_before_table_selection() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_undoactivetoken(::google::protobuf::uint32 value) {
-  set_has_undoactivetoken();
-  undoactivetoken_ = value;
+inline void TableCommandSelectionBehaviorArchive::set_has_before_table_selection() {
+  _has_bits_[0] |= 0x00000001u;
 }
-
-// optional bool redoSelectionValid = 6;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoselectionvalid() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+inline void TableCommandSelectionBehaviorArchive::clear_has_before_table_selection() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoselectionvalid() {
-  _has_bits_[0] |= 0x00000010u;
+inline void TableCommandSelectionBehaviorArchive::clear_before_table_selection() {
+  if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
+  clear_has_before_table_selection();
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoselectionvalid() {
-  _has_bits_[0] &= ~0x00000010u;
+inline const ::TST::SelectionArchive& TableCommandSelectionBehaviorArchive::before_table_selection() const {
+  return before_table_selection_ != NULL ? *before_table_selection_ : *default_instance_->before_table_selection_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoselectionvalid() {
-  redoselectionvalid_ = false;
-  clear_has_redoselectionvalid();
+inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::mutable_before_table_selection() {
+  set_has_before_table_selection();
+  if (before_table_selection_ == NULL) before_table_selection_ = new ::TST::SelectionArchive;
+  return before_table_selection_;
 }
-inline bool FormulaEditingCommandSelectionBehaviorArchive::redoselectionvalid() const {
-  return redoselectionvalid_;
+inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::release_before_table_selection() {
+  clear_has_before_table_selection();
+  ::TST::SelectionArchive* temp = before_table_selection_;
+  before_table_selection_ = NULL;
+  return temp;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoselectionvalid(bool value) {
-  set_has_redoselectionvalid();
-  redoselectionvalid_ = value;
+inline void TableCommandSelectionBehaviorArchive::set_allocated_before_table_selection(::TST::SelectionArchive* before_table_selection) {
+  delete before_table_selection_;
+  before_table_selection_ = before_table_selection;
+  if (before_table_selection) {
+    set_has_before_table_selection();
+  } else {
+    clear_has_before_table_selection();
+  }
 }
 
-// optional uint32 redoSelectionStart = 7;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoselectionstart() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+// optional .TST.SelectionArchive after_table_selection = 2;
+inline bool TableCommandSelectionBehaviorArchive::has_after_table_selection() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoselectionstart() {
-  _has_bits_[0] |= 0x00000020u;
+inline void TableCommandSelectionBehaviorArchive::set_has_after_table_selection() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoselectionstart() {
-  _has_bits_[0] &= ~0x00000020u;
+inline void TableCommandSelectionBehaviorArchive::clear_has_after_table_selection() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoselectionstart() {
-  redoselectionstart_ = 0u;
-  clear_has_redoselectionstart();
+inline void TableCommandSelectionBehaviorArchive::clear_after_table_selection() {
+  if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
+  clear_has_after_table_selection();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::redoselectionstart() const {
-  return redoselectionstart_;
+inline const ::TST::SelectionArchive& TableCommandSelectionBehaviorArchive::after_table_selection() const {
+  return after_table_selection_ != NULL ? *after_table_selection_ : *default_instance_->after_table_selection_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoselectionstart(::google::protobuf::uint32 value) {
-  set_has_redoselectionstart();
-  redoselectionstart_ = value;
+inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::mutable_after_table_selection() {
+  set_has_after_table_selection();
+  if (after_table_selection_ == NULL) after_table_selection_ = new ::TST::SelectionArchive;
+  return after_table_selection_;
+}
+inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::release_after_table_selection() {
+  clear_has_after_table_selection();
+  ::TST::SelectionArchive* temp = after_table_selection_;
+  after_table_selection_ = NULL;
+  return temp;
+}
+inline void TableCommandSelectionBehaviorArchive::set_allocated_after_table_selection(::TST::SelectionArchive* after_table_selection) {
+  delete after_table_selection_;
+  after_table_selection_ = after_table_selection;
+  if (after_table_selection) {
+    set_has_after_table_selection();
+  } else {
+    clear_has_after_table_selection();
+  }
 }
 
-// optional uint32 redoSelectionLength = 8;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoselectionlength() const {
-  return (_has_bits_[0] & 0x00000040u) != 0;
+// optional .TSP.Reference table_info = 3;
+inline bool TableCommandSelectionBehaviorArchive::has_table_info() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoselectionlength() {
-  _has_bits_[0] |= 0x00000040u;
+inline void TableCommandSelectionBehaviorArchive::set_has_table_info() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoselectionlength() {
-  _has_bits_[0] &= ~0x00000040u;
+inline void TableCommandSelectionBehaviorArchive::clear_has_table_info() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoselectionlength() {
-  redoselectionlength_ = 0u;
-  clear_has_redoselectionlength();
+inline void TableCommandSelectionBehaviorArchive::clear_table_info() {
+  if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
+  clear_has_table_info();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::redoselectionlength() const {
-  return redoselectionlength_;
+inline const ::TSP::Reference& TableCommandSelectionBehaviorArchive::table_info() const {
+  return table_info_ != NULL ? *table_info_ : *default_instance_->table_info_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoselectionlength(::google::protobuf::uint32 value) {
-  set_has_redoselectionlength();
-  redoselectionlength_ = value;
+inline ::TSP::Reference* TableCommandSelectionBehaviorArchive::mutable_table_info() {
+  set_has_table_info();
+  if (table_info_ == NULL) table_info_ = new ::TSP::Reference;
+  return table_info_;
+}
+inline ::TSP::Reference* TableCommandSelectionBehaviorArchive::release_table_info() {
+  clear_has_table_info();
+  ::TSP::Reference* temp = table_info_;
+  table_info_ = NULL;
+  return temp;
+}
+inline void TableCommandSelectionBehaviorArchive::set_allocated_table_info(::TSP::Reference* table_info) {
+  delete table_info_;
+  table_info_ = table_info;
+  if (table_info) {
+    set_has_table_info();
+  } else {
+    clear_has_table_info();
+  }
 }
 
-// optional uint32 redoActiveToken = 9;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_redoactivetoken() const {
-  return (_has_bits_[0] & 0x00000080u) != 0;
+// optional uint32 last_column_hit_by_tap = 4;
+inline bool TableCommandSelectionBehaviorArchive::has_last_column_hit_by_tap() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_redoactivetoken() {
-  _has_bits_[0] |= 0x00000080u;
+inline void TableCommandSelectionBehaviorArchive::set_has_last_column_hit_by_tap() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_redoactivetoken() {
-  _has_bits_[0] &= ~0x00000080u;
+inline void TableCommandSelectionBehaviorArchive::clear_has_last_column_hit_by_tap() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_redoactivetoken() {
-  redoactivetoken_ = 0u;
-  clear_has_redoactivetoken();
+inline void TableCommandSelectionBehaviorArchive::clear_last_column_hit_by_tap() {
+  last_column_hit_by_tap_ = 0u;
+  clear_has_last_column_hit_by_tap();
 }
-inline ::google::protobuf::uint32 FormulaEditingCommandSelectionBehaviorArchive::redoactivetoken() const {
-  return redoactivetoken_;
+inline ::google::protobuf::uint32 TableCommandSelectionBehaviorArchive::last_column_hit_by_tap() const {
+  return last_column_hit_by_tap_;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_redoactivetoken(::google::protobuf::uint32 value) {
-  set_has_redoactivetoken();
-  redoactivetoken_ = value;
+inline void TableCommandSelectionBehaviorArchive::set_last_column_hit_by_tap(::google::protobuf::uint32 value) {
+  set_has_last_column_hit_by_tap();
+  last_column_hit_by_tap_ = value;
 }
 
-// optional .TSP.Reference storage = 10;
-inline bool FormulaEditingCommandSelectionBehaviorArchive::has_storage() const {
-  return (_has_bits_[0] & 0x00000100u) != 0;
+// -------------------------------------------------------------------
+
+// DisableTableNameSelectionBehaviorArchive
+
+// required .TST.TableCommandSelectionBehaviorArchive super = 1;
+inline bool DisableTableNameSelectionBehaviorArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_has_storage() {
-  _has_bits_[0] |= 0x00000100u;
+inline void DisableTableNameSelectionBehaviorArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_has_storage() {
-  _has_bits_[0] &= ~0x00000100u;
+inline void DisableTableNameSelectionBehaviorArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::clear_storage() {
-  if (storage_ != NULL) storage_->::TSP::Reference::Clear();
-  clear_has_storage();
+inline void DisableTableNameSelectionBehaviorArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandSelectionBehaviorArchive::Clear();
+  clear_has_super();
 }
-inline const ::TSP::Reference& FormulaEditingCommandSelectionBehaviorArchive::storage() const {
-  return storage_ != NULL ? *storage_ : *default_instance_->storage_;
+inline const ::TST::TableCommandSelectionBehaviorArchive& DisableTableNameSelectionBehaviorArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSP::Reference* FormulaEditingCommandSelectionBehaviorArchive::mutable_storage() {
-  set_has_storage();
-  if (storage_ == NULL) storage_ = new ::TSP::Reference;
-  return storage_;
+inline ::TST::TableCommandSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandSelectionBehaviorArchive;
+  return super_;
 }
-inline ::TSP::Reference* FormulaEditingCommandSelectionBehaviorArchive::release_storage() {
-  clear_has_storage();
-  ::TSP::Reference* temp = storage_;
-  storage_ = NULL;
+inline ::TST::TableCommandSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandSelectionBehaviorArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void FormulaEditingCommandSelectionBehaviorArchive::set_allocated_storage(::TSP::Reference* storage) {
-  delete storage_;
-  storage_ = storage;
-  if (storage) {
-    set_has_storage();
+inline void DisableTableNameSelectionBehaviorArchive::set_allocated_super(::TST::TableCommandSelectionBehaviorArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_storage();
+    clear_has_super();
   }
 }
 
 // -------------------------------------------------------------------
 
-// UndoRedoStateCommandSelectionBehaviorArchive
+// CommandApplyCellCommentArchive
 
-// optional .TSP.Reference before_undo_redo_state = 1 [deprecated = true];
-inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_before_undo_redo_state() const {
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandApplyCellCommentArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_before_undo_redo_state() {
+inline void CommandApplyCellCommentArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_before_undo_redo_state() {
+inline void CommandApplyCellCommentArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_before_undo_redo_state() {
-  if (before_undo_redo_state_ != NULL) before_undo_redo_state_->::TSP::Reference::Clear();
-  clear_has_before_undo_redo_state();
+inline void CommandApplyCellCommentArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
 }
-inline const ::TSP::Reference& UndoRedoStateCommandSelectionBehaviorArchive::before_undo_redo_state() const {
-  return before_undo_redo_state_ != NULL ? *before_undo_redo_state_ : *default_instance_->before_undo_redo_state_;
+inline const ::TST::TableCommandArchive& CommandApplyCellCommentArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::mutable_before_undo_redo_state() {
-  set_has_before_undo_redo_state();
-  if (before_undo_redo_state_ == NULL) before_undo_redo_state_ = new ::TSP::Reference;
-  return before_undo_redo_state_;
+inline ::TST::TableCommandArchive* CommandApplyCellCommentArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
 }
-inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::release_before_undo_redo_state() {
-  clear_has_before_undo_redo_state();
-  ::TSP::Reference* temp = before_undo_redo_state_;
-  before_undo_redo_state_ = NULL;
+inline ::TST::TableCommandArchive* CommandApplyCellCommentArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_before_undo_redo_state(::TSP::Reference* before_undo_redo_state) {
-  delete before_undo_redo_state_;
-  before_undo_redo_state_ = before_undo_redo_state;
-  if (before_undo_redo_state) {
-    set_has_before_undo_redo_state();
+inline void CommandApplyCellCommentArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_before_undo_redo_state();
+    clear_has_super();
   }
 }
 
-// optional .TSP.Reference after_undo_redo_state = 2 [deprecated = true];
-inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_after_undo_redo_state() const {
+// required .TST.CellID cell_id = 2;
+inline bool CommandApplyCellCommentArchive::has_cell_id() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_after_undo_redo_state() {
+inline void CommandApplyCellCommentArchive::set_has_cell_id() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_after_undo_redo_state() {
+inline void CommandApplyCellCommentArchive::clear_has_cell_id() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_after_undo_redo_state() {
-  if (after_undo_redo_state_ != NULL) after_undo_redo_state_->::TSP::Reference::Clear();
-  clear_has_after_undo_redo_state();
+inline void CommandApplyCellCommentArchive::clear_cell_id() {
+  if (cell_id_ != NULL) cell_id_->::TST::CellID::Clear();
+  clear_has_cell_id();
 }
-inline const ::TSP::Reference& UndoRedoStateCommandSelectionBehaviorArchive::after_undo_redo_state() const {
-  return after_undo_redo_state_ != NULL ? *after_undo_redo_state_ : *default_instance_->after_undo_redo_state_;
+inline const ::TST::CellID& CommandApplyCellCommentArchive::cell_id() const {
+  return cell_id_ != NULL ? *cell_id_ : *default_instance_->cell_id_;
 }
-inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::mutable_after_undo_redo_state() {
-  set_has_after_undo_redo_state();
-  if (after_undo_redo_state_ == NULL) after_undo_redo_state_ = new ::TSP::Reference;
-  return after_undo_redo_state_;
+inline ::TST::CellID* CommandApplyCellCommentArchive::mutable_cell_id() {
+  set_has_cell_id();
+  if (cell_id_ == NULL) cell_id_ = new ::TST::CellID;
+  return cell_id_;
 }
-inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::release_after_undo_redo_state() {
-  clear_has_after_undo_redo_state();
-  ::TSP::Reference* temp = after_undo_redo_state_;
-  after_undo_redo_state_ = NULL;
+inline ::TST::CellID* CommandApplyCellCommentArchive::release_cell_id() {
+  clear_has_cell_id();
+  ::TST::CellID* temp = cell_id_;
+  cell_id_ = NULL;
   return temp;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_after_undo_redo_state(::TSP::Reference* after_undo_redo_state) {
-  delete after_undo_redo_state_;
-  after_undo_redo_state_ = after_undo_redo_state;
-  if (after_undo_redo_state) {
-    set_has_after_undo_redo_state();
+inline void CommandApplyCellCommentArchive::set_allocated_cell_id(::TST::CellID* cell_id) {
+  delete cell_id_;
+  cell_id_ = cell_id;
+  if (cell_id) {
+    set_has_cell_id();
   } else {
-    clear_has_after_undo_redo_state();
+    clear_has_cell_id();
   }
 }
 
-// optional .TSP.Reference table_info = 3;
-inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_table_info() const {
+// optional .TSP.Reference old_comment_storage = 3;
+inline bool CommandApplyCellCommentArchive::has_old_comment_storage() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_table_info() {
+inline void CommandApplyCellCommentArchive::set_has_old_comment_storage() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_table_info() {
+inline void CommandApplyCellCommentArchive::clear_has_old_comment_storage() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_table_info() {
-  if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
-  clear_has_table_info();
+inline void CommandApplyCellCommentArchive::clear_old_comment_storage() {
+  if (old_comment_storage_ != NULL) old_comment_storage_->::TSP::Reference::Clear();
+  clear_has_old_comment_storage();
 }
-inline const ::TSP::Reference& UndoRedoStateCommandSelectionBehaviorArchive::table_info() const {
-  return table_info_ != NULL ? *table_info_ : *default_instance_->table_info_;
+inline const ::TSP::Reference& CommandApplyCellCommentArchive::old_comment_storage() const {
+  return old_comment_storage_ != NULL ? *old_comment_storage_ : *default_instance_->old_comment_storage_;
 }
-inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::mutable_table_info() {
-  set_has_table_info();
-  if (table_info_ == NULL) table_info_ = new ::TSP::Reference;
-  return table_info_;
+inline ::TSP::Reference* CommandApplyCellCommentArchive::mutable_old_comment_storage() {
+  set_has_old_comment_storage();
+  if (old_comment_storage_ == NULL) old_comment_storage_ = new ::TSP::Reference;
+  return old_comment_storage_;
 }
-inline ::TSP::Reference* UndoRedoStateCommandSelectionBehaviorArchive::release_table_info() {
-  clear_has_table_info();
-  ::TSP::Reference* temp = table_info_;
-  table_info_ = NULL;
+inline ::TSP::Reference* CommandApplyCellCommentArchive::release_old_comment_storage() {
+  clear_has_old_comment_storage();
+  ::TSP::Reference* temp = old_comment_storage_;
+  old_comment_storage_ = NULL;
   return temp;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_table_info(::TSP::Reference* table_info) {
-  delete table_info_;
-  table_info_ = table_info;
-  if (table_info) {
-    set_has_table_info();
+inline void CommandApplyCellCommentArchive::set_allocated_old_comment_storage(::TSP::Reference* old_comment_storage) {
+  delete old_comment_storage_;
+  old_comment_storage_ = old_comment_storage;
+  if (old_comment_storage) {
+    set_has_old_comment_storage();
   } else {
-    clear_has_table_info();
+    clear_has_old_comment_storage();
   }
 }
 
-// optional .TST.SelectionArchive before_table_selection = 4;
-inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_before_table_selection() const {
+// optional .TSP.Reference new_comment_storage = 4;
+inline bool CommandApplyCellCommentArchive::has_new_comment_storage() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_before_table_selection() {
+inline void CommandApplyCellCommentArchive::set_has_new_comment_storage() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_before_table_selection() {
+inline void CommandApplyCellCommentArchive::clear_has_new_comment_storage() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_before_table_selection() {
-  if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
-  clear_has_before_table_selection();
-}
-inline const ::TST::SelectionArchive& UndoRedoStateCommandSelectionBehaviorArchive::before_table_selection() const {
-  return before_table_selection_ != NULL ? *before_table_selection_ : *default_instance_->before_table_selection_;
-}
-inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::mutable_before_table_selection() {
-  set_has_before_table_selection();
-  if (before_table_selection_ == NULL) before_table_selection_ = new ::TST::SelectionArchive;
-  return before_table_selection_;
-}
-inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::release_before_table_selection() {
-  clear_has_before_table_selection();
-  ::TST::SelectionArchive* temp = before_table_selection_;
-  before_table_selection_ = NULL;
-  return temp;
-}
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_before_table_selection(::TST::SelectionArchive* before_table_selection) {
-  delete before_table_selection_;
-  before_table_selection_ = before_table_selection;
-  if (before_table_selection) {
-    set_has_before_table_selection();
-  } else {
-    clear_has_before_table_selection();
-  }
-}
-
-// optional .TST.SelectionArchive after_table_selection = 6;
-inline bool UndoRedoStateCommandSelectionBehaviorArchive::has_after_table_selection() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_has_after_table_selection() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_has_after_table_selection() {
-  _has_bits_[0] &= ~0x00000010u;
-}
-inline void UndoRedoStateCommandSelectionBehaviorArchive::clear_after_table_selection() {
-  if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
-  clear_has_after_table_selection();
+inline void CommandApplyCellCommentArchive::clear_new_comment_storage() {
+  if (new_comment_storage_ != NULL) new_comment_storage_->::TSP::Reference::Clear();
+  clear_has_new_comment_storage();
 }
-inline const ::TST::SelectionArchive& UndoRedoStateCommandSelectionBehaviorArchive::after_table_selection() const {
-  return after_table_selection_ != NULL ? *after_table_selection_ : *default_instance_->after_table_selection_;
+inline const ::TSP::Reference& CommandApplyCellCommentArchive::new_comment_storage() const {
+  return new_comment_storage_ != NULL ? *new_comment_storage_ : *default_instance_->new_comment_storage_;
 }
-inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::mutable_after_table_selection() {
-  set_has_after_table_selection();
-  if (after_table_selection_ == NULL) after_table_selection_ = new ::TST::SelectionArchive;
-  return after_table_selection_;
+inline ::TSP::Reference* CommandApplyCellCommentArchive::mutable_new_comment_storage() {
+  set_has_new_comment_storage();
+  if (new_comment_storage_ == NULL) new_comment_storage_ = new ::TSP::Reference;
+  return new_comment_storage_;
 }
-inline ::TST::SelectionArchive* UndoRedoStateCommandSelectionBehaviorArchive::release_after_table_selection() {
-  clear_has_after_table_selection();
-  ::TST::SelectionArchive* temp = after_table_selection_;
-  after_table_selection_ = NULL;
+inline ::TSP::Reference* CommandApplyCellCommentArchive::release_new_comment_storage() {
+  clear_has_new_comment_storage();
+  ::TSP::Reference* temp = new_comment_storage_;
+  new_comment_storage_ = NULL;
   return temp;
 }
-inline void UndoRedoStateCommandSelectionBehaviorArchive::set_allocated_after_table_selection(::TST::SelectionArchive* after_table_selection) {
-  delete after_table_selection_;
-  after_table_selection_ = after_table_selection;
-  if (after_table_selection) {
-    set_has_after_table_selection();
+inline void CommandApplyCellCommentArchive::set_allocated_new_comment_storage(::TSP::Reference* new_comment_storage) {
+  delete new_comment_storage_;
+  new_comment_storage_ = new_comment_storage;
+  if (new_comment_storage) {
+    set_has_new_comment_storage();
   } else {
-    clear_has_after_table_selection();
+    clear_has_new_comment_storage();
   }
 }
 
 // -------------------------------------------------------------------
 
-// TableCommandSelectionBehaviorArchive
+// CommandApplyConditionalStyleSetArchive
 
-// optional .TST.SelectionArchive before_table_selection = 1;
-inline bool TableCommandSelectionBehaviorArchive::has_before_table_selection() const {
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandApplyConditionalStyleSetArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void TableCommandSelectionBehaviorArchive::set_has_before_table_selection() {
+inline void CommandApplyConditionalStyleSetArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_has_before_table_selection() {
+inline void CommandApplyConditionalStyleSetArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_before_table_selection() {
-  if (before_table_selection_ != NULL) before_table_selection_->::TST::SelectionArchive::Clear();
-  clear_has_before_table_selection();
+inline void CommandApplyConditionalStyleSetArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
 }
-inline const ::TST::SelectionArchive& TableCommandSelectionBehaviorArchive::before_table_selection() const {
-  return before_table_selection_ != NULL ? *before_table_selection_ : *default_instance_->before_table_selection_;
+inline const ::TST::TableCommandArchive& CommandApplyConditionalStyleSetArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::mutable_before_table_selection() {
-  set_has_before_table_selection();
-  if (before_table_selection_ == NULL) before_table_selection_ = new ::TST::SelectionArchive;
-  return before_table_selection_;
+inline ::TST::TableCommandArchive* CommandApplyConditionalStyleSetArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
 }
-inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::release_before_table_selection() {
-  clear_has_before_table_selection();
-  ::TST::SelectionArchive* temp = before_table_selection_;
-  before_table_selection_ = NULL;
+inline ::TST::TableCommandArchive* CommandApplyConditionalStyleSetArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void TableCommandSelectionBehaviorArchive::set_allocated_before_table_selection(::TST::SelectionArchive* before_table_selection) {
-  delete before_table_selection_;
-  before_table_selection_ = before_table_selection;
-  if (before_table_selection) {
-    set_has_before_table_selection();
+inline void CommandApplyConditionalStyleSetArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_before_table_selection();
+    clear_has_super();
   }
 }
 
-// optional .TST.SelectionArchive after_table_selection = 2;
-inline bool TableCommandSelectionBehaviorArchive::has_after_table_selection() const {
+// required .TST.SelectionArchive selection = 2;
+inline bool CommandApplyConditionalStyleSetArchive::has_selection() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void TableCommandSelectionBehaviorArchive::set_has_after_table_selection() {
+inline void CommandApplyConditionalStyleSetArchive::set_has_selection() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_has_after_table_selection() {
+inline void CommandApplyConditionalStyleSetArchive::clear_has_selection() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_after_table_selection() {
-  if (after_table_selection_ != NULL) after_table_selection_->::TST::SelectionArchive::Clear();
-  clear_has_after_table_selection();
+inline void CommandApplyConditionalStyleSetArchive::clear_selection() {
+  if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+  clear_has_selection();
 }
-inline const ::TST::SelectionArchive& TableCommandSelectionBehaviorArchive::after_table_selection() const {
-  return after_table_selection_ != NULL ? *after_table_selection_ : *default_instance_->after_table_selection_;
+inline const ::TST::SelectionArchive& CommandApplyConditionalStyleSetArchive::selection() const {
+  return selection_ != NULL ? *selection_ : *default_instance_->selection_;
 }
-inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::mutable_after_table_selection() {
-  set_has_after_table_selection();
-  if (after_table_selection_ == NULL) after_table_selection_ = new ::TST::SelectionArchive;
-  return after_table_selection_;
+inline ::TST::SelectionArchive* CommandApplyConditionalStyleSetArchive::mutable_selection() {
+  set_has_selection();
+  if (selection_ == NULL) selection_ = new ::TST::SelectionArchive;
+  return selection_;
 }
-inline ::TST::SelectionArchive* TableCommandSelectionBehaviorArchive::release_after_table_selection() {
-  clear_has_after_table_selection();
-  ::TST::SelectionArchive* temp = after_table_selection_;
-  after_table_selection_ = NULL;
+inline ::TST::SelectionArchive* CommandApplyConditionalStyleSetArchive::release_selection() {
+  clear_has_selection();
+  ::TST::SelectionArchive* temp = selection_;
+  selection_ = NULL;
   return temp;
 }
-inline void TableCommandSelectionBehaviorArchive::set_allocated_after_table_selection(::TST::SelectionArchive* after_table_selection) {
-  delete after_table_selection_;
-  after_table_selection_ = after_table_selection;
-  if (after_table_selection) {
-    set_has_after_table_selection();
+inline void CommandApplyConditionalStyleSetArchive::set_allocated_selection(::TST::SelectionArchive* selection) {
+  delete selection_;
+  selection_ = selection;
+  if (selection) {
+    set_has_selection();
   } else {
-    clear_has_after_table_selection();
+    clear_has_selection();
   }
 }
 
-// optional .TSP.Reference table_info = 3;
-inline bool TableCommandSelectionBehaviorArchive::has_table_info() const {
+// required .TST.CellMapArchive undo_cell_map = 3;
+inline bool CommandApplyConditionalStyleSetArchive::has_undo_cell_map() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void TableCommandSelectionBehaviorArchive::set_has_table_info() {
+inline void CommandApplyConditionalStyleSetArchive::set_has_undo_cell_map() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_has_table_info() {
+inline void CommandApplyConditionalStyleSetArchive::clear_has_undo_cell_map() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_table_info() {
-  if (table_info_ != NULL) table_info_->::TSP::Reference::Clear();
-  clear_has_table_info();
+inline void CommandApplyConditionalStyleSetArchive::clear_undo_cell_map() {
+  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_undo_cell_map();
 }
-inline const ::TSP::Reference& TableCommandSelectionBehaviorArchive::table_info() const {
-  return table_info_ != NULL ? *table_info_ : *default_instance_->table_info_;
+inline const ::TST::CellMapArchive& CommandApplyConditionalStyleSetArchive::undo_cell_map() const {
+  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
 }
-inline ::TSP::Reference* TableCommandSelectionBehaviorArchive::mutable_table_info() {
-  set_has_table_info();
-  if (table_info_ == NULL) table_info_ = new ::TSP::Reference;
-  return table_info_;
+inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::mutable_undo_cell_map() {
+  set_has_undo_cell_map();
+  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
+  return undo_cell_map_;
 }
-inline ::TSP::Reference* TableCommandSelectionBehaviorArchive::release_table_info() {
-  clear_has_table_info();
-  ::TSP::Reference* temp = table_info_;
-  table_info_ = NULL;
+inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::release_undo_cell_map() {
+  clear_has_undo_cell_map();
+  ::TST::CellMapArchive* temp = undo_cell_map_;
+  undo_cell_map_ = NULL;
   return temp;
 }
-inline void TableCommandSelectionBehaviorArchive::set_allocated_table_info(::TSP::Reference* table_info) {
-  delete table_info_;
-  table_info_ = table_info;
-  if (table_info) {
-    set_has_table_info();
+inline void CommandApplyConditionalStyleSetArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
+  delete undo_cell_map_;
+  undo_cell_map_ = undo_cell_map;
+  if (undo_cell_map) {
+    set_has_undo_cell_map();
   } else {
-    clear_has_table_info();
+    clear_has_undo_cell_map();
   }
 }
 
-// optional uint32 last_column_hit_by_tap = 4;
-inline bool TableCommandSelectionBehaviorArchive::has_last_column_hit_by_tap() const {
+// required .TST.CellMapArchive redo_cell_map = 4;
+inline bool CommandApplyConditionalStyleSetArchive::has_redo_cell_map() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void TableCommandSelectionBehaviorArchive::set_has_last_column_hit_by_tap() {
+inline void CommandApplyConditionalStyleSetArchive::set_has_redo_cell_map() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_has_last_column_hit_by_tap() {
+inline void CommandApplyConditionalStyleSetArchive::clear_has_redo_cell_map() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void TableCommandSelectionBehaviorArchive::clear_last_column_hit_by_tap() {
-  last_column_hit_by_tap_ = 0u;
-  clear_has_last_column_hit_by_tap();
+inline void CommandApplyConditionalStyleSetArchive::clear_redo_cell_map() {
+  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_redo_cell_map();
 }
-inline ::google::protobuf::uint32 TableCommandSelectionBehaviorArchive::last_column_hit_by_tap() const {
-  return last_column_hit_by_tap_;
+inline const ::TST::CellMapArchive& CommandApplyConditionalStyleSetArchive::redo_cell_map() const {
+  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
 }
-inline void TableCommandSelectionBehaviorArchive::set_last_column_hit_by_tap(::google::protobuf::uint32 value) {
-  set_has_last_column_hit_by_tap();
-  last_column_hit_by_tap_ = value;
+inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::mutable_redo_cell_map() {
+  set_has_redo_cell_map();
+  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
+  return redo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::release_redo_cell_map() {
+  clear_has_redo_cell_map();
+  ::TST::CellMapArchive* temp = redo_cell_map_;
+  redo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandApplyConditionalStyleSetArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
+  delete redo_cell_map_;
+  redo_cell_map_ = redo_cell_map;
+  if (redo_cell_map) {
+    set_has_redo_cell_map();
+  } else {
+    clear_has_redo_cell_map();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// DisableTableNameSelectionBehaviorArchive
+// CommandSetFormulaTokenizationArchive
 
-// required .TST.TableCommandSelectionBehaviorArchive super = 1;
-inline bool DisableTableNameSelectionBehaviorArchive::has_super() const {
+// required .TSK.CommandArchive super = 1;
+inline bool CommandSetFormulaTokenizationArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void DisableTableNameSelectionBehaviorArchive::set_has_super() {
+inline void CommandSetFormulaTokenizationArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void DisableTableNameSelectionBehaviorArchive::clear_has_super() {
+inline void CommandSetFormulaTokenizationArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void DisableTableNameSelectionBehaviorArchive::clear_super() {
-  if (super_ != NULL) super_->::TST::TableCommandSelectionBehaviorArchive::Clear();
+inline void CommandSetFormulaTokenizationArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandSelectionBehaviorArchive& DisableTableNameSelectionBehaviorArchive::super() const {
+inline const ::TSK::CommandArchive& CommandSetFormulaTokenizationArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::mutable_super() {
+inline ::TSK::CommandArchive* CommandSetFormulaTokenizationArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TST::TableCommandSelectionBehaviorArchive;
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TST::TableCommandSelectionBehaviorArchive* DisableTableNameSelectionBehaviorArchive::release_super() {
+inline ::TSK::CommandArchive* CommandSetFormulaTokenizationArchive::release_super() {
   clear_has_super();
-  ::TST::TableCommandSelectionBehaviorArchive* temp = super_;
+  ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void DisableTableNameSelectionBehaviorArchive::set_allocated_super(::TST::TableCommandSelectionBehaviorArchive* super) {
+inline void CommandSetFormulaTokenizationArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -26737,195 +29241,147 @@ inline void DisableTableNameSelectionBehaviorArchive::set_allocated_super(::TST:
   }
 }
 
+// required bool tokenization = 2;
+inline bool CommandSetFormulaTokenizationArchive::has_tokenization() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetFormulaTokenizationArchive::set_has_tokenization() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetFormulaTokenizationArchive::clear_has_tokenization() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetFormulaTokenizationArchive::clear_tokenization() {
+  tokenization_ = false;
+  clear_has_tokenization();
+}
+inline bool CommandSetFormulaTokenizationArchive::tokenization() const {
+  return tokenization_;
+}
+inline void CommandSetFormulaTokenizationArchive::set_tokenization(bool value) {
+  set_has_tokenization();
+  tokenization_ = value;
+}
+
 // -------------------------------------------------------------------
 
-// CommandApplyCellCommentArchive
+// CommandSetFilterEnabledArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandApplyCellCommentArchive::has_super() const {
+inline bool CommandSetFilterEnabledArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandApplyCellCommentArchive::set_has_super() {
+inline void CommandSetFilterEnabledArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandApplyCellCommentArchive::clear_has_super() {
+inline void CommandSetFilterEnabledArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandApplyCellCommentArchive::clear_super() {
+inline void CommandSetFilterEnabledArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandApplyCellCommentArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandSetFilterEnabledArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandApplyCellCommentArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandSetFilterEnabledArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandApplyCellCommentArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandSetFilterEnabledArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandApplyCellCommentArchive::set_allocated_super(::TST::TableCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
-  } else {
-    clear_has_super();
-  }
-}
-
-// required .TST.CellID cell_id = 2;
-inline bool CommandApplyCellCommentArchive::has_cell_id() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void CommandApplyCellCommentArchive::set_has_cell_id() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void CommandApplyCellCommentArchive::clear_has_cell_id() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void CommandApplyCellCommentArchive::clear_cell_id() {
-  if (cell_id_ != NULL) cell_id_->::TST::CellID::Clear();
-  clear_has_cell_id();
-}
-inline const ::TST::CellID& CommandApplyCellCommentArchive::cell_id() const {
-  return cell_id_ != NULL ? *cell_id_ : *default_instance_->cell_id_;
-}
-inline ::TST::CellID* CommandApplyCellCommentArchive::mutable_cell_id() {
-  set_has_cell_id();
-  if (cell_id_ == NULL) cell_id_ = new ::TST::CellID;
-  return cell_id_;
-}
-inline ::TST::CellID* CommandApplyCellCommentArchive::release_cell_id() {
-  clear_has_cell_id();
-  ::TST::CellID* temp = cell_id_;
-  cell_id_ = NULL;
-  return temp;
-}
-inline void CommandApplyCellCommentArchive::set_allocated_cell_id(::TST::CellID* cell_id) {
-  delete cell_id_;
-  cell_id_ = cell_id;
-  if (cell_id) {
-    set_has_cell_id();
-  } else {
-    clear_has_cell_id();
-  }
-}
-
-// optional .TSP.Reference old_comment_storage = 3;
-inline bool CommandApplyCellCommentArchive::has_old_comment_storage() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void CommandApplyCellCommentArchive::set_has_old_comment_storage() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void CommandApplyCellCommentArchive::clear_has_old_comment_storage() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void CommandApplyCellCommentArchive::clear_old_comment_storage() {
-  if (old_comment_storage_ != NULL) old_comment_storage_->::TSP::Reference::Clear();
-  clear_has_old_comment_storage();
-}
-inline const ::TSP::Reference& CommandApplyCellCommentArchive::old_comment_storage() const {
-  return old_comment_storage_ != NULL ? *old_comment_storage_ : *default_instance_->old_comment_storage_;
-}
-inline ::TSP::Reference* CommandApplyCellCommentArchive::mutable_old_comment_storage() {
-  set_has_old_comment_storage();
-  if (old_comment_storage_ == NULL) old_comment_storage_ = new ::TSP::Reference;
-  return old_comment_storage_;
-}
-inline ::TSP::Reference* CommandApplyCellCommentArchive::release_old_comment_storage() {
-  clear_has_old_comment_storage();
-  ::TSP::Reference* temp = old_comment_storage_;
-  old_comment_storage_ = NULL;
-  return temp;
-}
-inline void CommandApplyCellCommentArchive::set_allocated_old_comment_storage(::TSP::Reference* old_comment_storage) {
-  delete old_comment_storage_;
-  old_comment_storage_ = old_comment_storage;
-  if (old_comment_storage) {
-    set_has_old_comment_storage();
+inline void CommandSetFilterEnabledArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_old_comment_storage();
+    clear_has_super();
   }
 }
 
-// optional .TSP.Reference new_comment_storage = 4;
-inline bool CommandApplyCellCommentArchive::has_new_comment_storage() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// required uint32 filter_index = 2;
+inline bool CommandSetFilterEnabledArchive::has_filter_index() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandApplyCellCommentArchive::set_has_new_comment_storage() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandSetFilterEnabledArchive::set_has_filter_index() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandApplyCellCommentArchive::clear_has_new_comment_storage() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandSetFilterEnabledArchive::clear_has_filter_index() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandApplyCellCommentArchive::clear_new_comment_storage() {
-  if (new_comment_storage_ != NULL) new_comment_storage_->::TSP::Reference::Clear();
-  clear_has_new_comment_storage();
+inline void CommandSetFilterEnabledArchive::clear_filter_index() {
+  filter_index_ = 0u;
+  clear_has_filter_index();
 }
-inline const ::TSP::Reference& CommandApplyCellCommentArchive::new_comment_storage() const {
-  return new_comment_storage_ != NULL ? *new_comment_storage_ : *default_instance_->new_comment_storage_;
+inline ::google::protobuf::uint32 CommandSetFilterEnabledArchive::filter_index() const {
+  return filter_index_;
 }
-inline ::TSP::Reference* CommandApplyCellCommentArchive::mutable_new_comment_storage() {
-  set_has_new_comment_storage();
-  if (new_comment_storage_ == NULL) new_comment_storage_ = new ::TSP::Reference;
-  return new_comment_storage_;
+inline void CommandSetFilterEnabledArchive::set_filter_index(::google::protobuf::uint32 value) {
+  set_has_filter_index();
+  filter_index_ = value;
 }
-inline ::TSP::Reference* CommandApplyCellCommentArchive::release_new_comment_storage() {
-  clear_has_new_comment_storage();
-  ::TSP::Reference* temp = new_comment_storage_;
-  new_comment_storage_ = NULL;
-  return temp;
+
+// required bool enabled = 4;
+inline bool CommandSetFilterEnabledArchive::has_enabled() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandApplyCellCommentArchive::set_allocated_new_comment_storage(::TSP::Reference* new_comment_storage) {
-  delete new_comment_storage_;
-  new_comment_storage_ = new_comment_storage;
-  if (new_comment_storage) {
-    set_has_new_comment_storage();
-  } else {
-    clear_has_new_comment_storage();
-  }
+inline void CommandSetFilterEnabledArchive::set_has_enabled() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetFilterEnabledArchive::clear_has_enabled() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetFilterEnabledArchive::clear_enabled() {
+  enabled_ = false;
+  clear_has_enabled();
+}
+inline bool CommandSetFilterEnabledArchive::enabled() const {
+  return enabled_;
+}
+inline void CommandSetFilterEnabledArchive::set_enabled(bool value) {
+  set_has_enabled();
+  enabled_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandApplyConditionalStyleSetArchive
+// CommandSetFilterRuleEnabledArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandApplyConditionalStyleSetArchive::has_super() const {
+inline bool CommandSetFilterRuleEnabledArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_has_super() {
+inline void CommandSetFilterRuleEnabledArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_has_super() {
+inline void CommandSetFilterRuleEnabledArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_super() {
+inline void CommandSetFilterRuleEnabledArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandApplyConditionalStyleSetArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandSetFilterRuleEnabledArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandApplyConditionalStyleSetArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandSetFilterRuleEnabledArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandApplyConditionalStyleSetArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandSetFilterRuleEnabledArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandSetFilterRuleEnabledArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -26935,153 +29391,105 @@ inline void CommandApplyConditionalStyleSetArchive::set_allocated_super(::TST::T
   }
 }
 
-// required .TST.SelectionArchive selection = 2;
-inline bool CommandApplyConditionalStyleSetArchive::has_selection() const {
+// required uint32 filter_index = 2;
+inline bool CommandSetFilterRuleEnabledArchive::has_filter_index() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_has_selection() {
+inline void CommandSetFilterRuleEnabledArchive::set_has_filter_index() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_has_selection() {
+inline void CommandSetFilterRuleEnabledArchive::clear_has_filter_index() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_selection() {
-  if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-  clear_has_selection();
-}
-inline const ::TST::SelectionArchive& CommandApplyConditionalStyleSetArchive::selection() const {
-  return selection_ != NULL ? *selection_ : *default_instance_->selection_;
-}
-inline ::TST::SelectionArchive* CommandApplyConditionalStyleSetArchive::mutable_selection() {
-  set_has_selection();
-  if (selection_ == NULL) selection_ = new ::TST::SelectionArchive;
-  return selection_;
+inline void CommandSetFilterRuleEnabledArchive::clear_filter_index() {
+  filter_index_ = 0u;
+  clear_has_filter_index();
 }
-inline ::TST::SelectionArchive* CommandApplyConditionalStyleSetArchive::release_selection() {
-  clear_has_selection();
-  ::TST::SelectionArchive* temp = selection_;
-  selection_ = NULL;
-  return temp;
+inline ::google::protobuf::uint32 CommandSetFilterRuleEnabledArchive::filter_index() const {
+  return filter_index_;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_allocated_selection(::TST::SelectionArchive* selection) {
-  delete selection_;
-  selection_ = selection;
-  if (selection) {
-    set_has_selection();
-  } else {
-    clear_has_selection();
-  }
+inline void CommandSetFilterRuleEnabledArchive::set_filter_index(::google::protobuf::uint32 value) {
+  set_has_filter_index();
+  filter_index_ = value;
 }
 
-// required .TST.CellMapArchive undo_cell_map = 3;
-inline bool CommandApplyConditionalStyleSetArchive::has_undo_cell_map() const {
+// required uint32 rule_index = 3;
+inline bool CommandSetFilterRuleEnabledArchive::has_rule_index() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_has_undo_cell_map() {
+inline void CommandSetFilterRuleEnabledArchive::set_has_rule_index() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_has_undo_cell_map() {
+inline void CommandSetFilterRuleEnabledArchive::clear_has_rule_index() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_undo_cell_map() {
-  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-  clear_has_undo_cell_map();
-}
-inline const ::TST::CellMapArchive& CommandApplyConditionalStyleSetArchive::undo_cell_map() const {
-  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
-}
-inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::mutable_undo_cell_map() {
-  set_has_undo_cell_map();
-  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
-  return undo_cell_map_;
+inline void CommandSetFilterRuleEnabledArchive::clear_rule_index() {
+  rule_index_ = 0u;
+  clear_has_rule_index();
 }
-inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::release_undo_cell_map() {
-  clear_has_undo_cell_map();
-  ::TST::CellMapArchive* temp = undo_cell_map_;
-  undo_cell_map_ = NULL;
-  return temp;
+inline ::google::protobuf::uint32 CommandSetFilterRuleEnabledArchive::rule_index() const {
+  return rule_index_;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
-  delete undo_cell_map_;
-  undo_cell_map_ = undo_cell_map;
-  if (undo_cell_map) {
-    set_has_undo_cell_map();
-  } else {
-    clear_has_undo_cell_map();
-  }
+inline void CommandSetFilterRuleEnabledArchive::set_rule_index(::google::protobuf::uint32 value) {
+  set_has_rule_index();
+  rule_index_ = value;
 }
 
-// required .TST.CellMapArchive redo_cell_map = 4;
-inline bool CommandApplyConditionalStyleSetArchive::has_redo_cell_map() const {
+// required bool enabled = 4;
+inline bool CommandSetFilterRuleEnabledArchive::has_enabled() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_has_redo_cell_map() {
+inline void CommandSetFilterRuleEnabledArchive::set_has_enabled() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_has_redo_cell_map() {
+inline void CommandSetFilterRuleEnabledArchive::clear_has_enabled() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandApplyConditionalStyleSetArchive::clear_redo_cell_map() {
-  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-  clear_has_redo_cell_map();
-}
-inline const ::TST::CellMapArchive& CommandApplyConditionalStyleSetArchive::redo_cell_map() const {
-  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
-}
-inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::mutable_redo_cell_map() {
-  set_has_redo_cell_map();
-  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
-  return redo_cell_map_;
+inline void CommandSetFilterRuleEnabledArchive::clear_enabled() {
+  enabled_ = false;
+  clear_has_enabled();
 }
-inline ::TST::CellMapArchive* CommandApplyConditionalStyleSetArchive::release_redo_cell_map() {
-  clear_has_redo_cell_map();
-  ::TST::CellMapArchive* temp = redo_cell_map_;
-  redo_cell_map_ = NULL;
-  return temp;
+inline bool CommandSetFilterRuleEnabledArchive::enabled() const {
+  return enabled_;
 }
-inline void CommandApplyConditionalStyleSetArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
-  delete redo_cell_map_;
-  redo_cell_map_ = redo_cell_map;
-  if (redo_cell_map) {
-    set_has_redo_cell_map();
-  } else {
-    clear_has_redo_cell_map();
-  }
+inline void CommandSetFilterRuleEnabledArchive::set_enabled(bool value) {
+  set_has_enabled();
+  enabled_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetFormulaTokenizationArchive
+// CommandSetFilterSetTypeArchive
 
-// required .TSK.CommandArchive super = 1;
-inline bool CommandSetFormulaTokenizationArchive::has_super() const {
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandSetFilterSetTypeArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetFormulaTokenizationArchive::set_has_super() {
+inline void CommandSetFilterSetTypeArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetFormulaTokenizationArchive::clear_has_super() {
+inline void CommandSetFilterSetTypeArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetFormulaTokenizationArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+inline void CommandSetFilterSetTypeArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSK::CommandArchive& CommandSetFormulaTokenizationArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandSetFilterSetTypeArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSK::CommandArchive* CommandSetFormulaTokenizationArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandSetFilterSetTypeArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TSK::CommandArchive* CommandSetFormulaTokenizationArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandSetFilterSetTypeArchive::release_super() {
   clear_has_super();
-  ::TSK::CommandArchive* temp = super_;
+  ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetFormulaTokenizationArchive::set_allocated_super(::TSK::CommandArchive* super) {
+inline void CommandSetFilterSetTypeArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27091,61 +29499,85 @@ inline void CommandSetFormulaTokenizationArchive::set_allocated_super(::TSK::Com
   }
 }
 
-// required bool tokenization = 2;
-inline bool CommandSetFormulaTokenizationArchive::has_tokenization() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
+// required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
+inline bool CommandSetFilterSetTypeArchive::has_old_filter_set_type() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void CommandSetFilterSetTypeArchive::set_has_old_filter_set_type() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void CommandSetFilterSetTypeArchive::clear_has_old_filter_set_type() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void CommandSetFilterSetTypeArchive::clear_old_filter_set_type() {
+  old_filter_set_type_ = 0;
+  clear_has_old_filter_set_type();
+}
+inline ::TST::FilterSetArchive_FilterSetType CommandSetFilterSetTypeArchive::old_filter_set_type() const {
+  return static_cast< ::TST::FilterSetArchive_FilterSetType >(old_filter_set_type_);
+}
+inline void CommandSetFilterSetTypeArchive::set_old_filter_set_type(::TST::FilterSetArchive_FilterSetType value) {
+  assert(::TST::FilterSetArchive_FilterSetType_IsValid(value));
+  set_has_old_filter_set_type();
+  old_filter_set_type_ = value;
+}
+
+// required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
+inline bool CommandSetFilterSetTypeArchive::has_new_filter_set_type() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetFormulaTokenizationArchive::set_has_tokenization() {
-  _has_bits_[0] |= 0x00000002u;
+inline void CommandSetFilterSetTypeArchive::set_has_new_filter_set_type() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetFormulaTokenizationArchive::clear_has_tokenization() {
-  _has_bits_[0] &= ~0x00000002u;
+inline void CommandSetFilterSetTypeArchive::clear_has_new_filter_set_type() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetFormulaTokenizationArchive::clear_tokenization() {
-  tokenization_ = false;
-  clear_has_tokenization();
+inline void CommandSetFilterSetTypeArchive::clear_new_filter_set_type() {
+  new_filter_set_type_ = 0;
+  clear_has_new_filter_set_type();
 }
-inline bool CommandSetFormulaTokenizationArchive::tokenization() const {
-  return tokenization_;
+inline ::TST::FilterSetArchive_FilterSetType CommandSetFilterSetTypeArchive::new_filter_set_type() const {
+  return static_cast< ::TST::FilterSetArchive_FilterSetType >(new_filter_set_type_);
 }
-inline void CommandSetFormulaTokenizationArchive::set_tokenization(bool value) {
-  set_has_tokenization();
-  tokenization_ = value;
+inline void CommandSetFilterSetTypeArchive::set_new_filter_set_type(::TST::FilterSetArchive_FilterSetType value) {
+  assert(::TST::FilterSetArchive_FilterSetType_IsValid(value));
+  set_has_new_filter_set_type();
+  new_filter_set_type_ = value;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetFilterEnabledArchive
+// CommandSetStyleNetworkArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandSetFilterEnabledArchive::has_super() const {
+inline bool CommandSetStyleNetworkArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetFilterEnabledArchive::set_has_super() {
+inline void CommandSetStyleNetworkArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetFilterEnabledArchive::clear_has_super() {
+inline void CommandSetStyleNetworkArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetFilterEnabledArchive::clear_super() {
+inline void CommandSetStyleNetworkArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandSetFilterEnabledArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandSetStyleNetworkArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandSetFilterEnabledArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandSetStyleNetworkArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandSetFilterEnabledArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandSetStyleNetworkArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetFilterEnabledArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandSetStyleNetworkArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27155,83 +29587,115 @@ inline void CommandSetFilterEnabledArchive::set_allocated_super(::TST::TableComm
   }
 }
 
-// required uint32 filter_index = 2;
-inline bool CommandSetFilterEnabledArchive::has_filter_index() const {
+// required .TST.TableStyleNetworkArchive old_style_network = 2;
+inline bool CommandSetStyleNetworkArchive::has_old_style_network() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetFilterEnabledArchive::set_has_filter_index() {
+inline void CommandSetStyleNetworkArchive::set_has_old_style_network() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetFilterEnabledArchive::clear_has_filter_index() {
+inline void CommandSetStyleNetworkArchive::clear_has_old_style_network() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetFilterEnabledArchive::clear_filter_index() {
-  filter_index_ = 0u;
-  clear_has_filter_index();
+inline void CommandSetStyleNetworkArchive::clear_old_style_network() {
+  if (old_style_network_ != NULL) old_style_network_->::TST::TableStyleNetworkArchive::Clear();
+  clear_has_old_style_network();
 }
-inline ::google::protobuf::uint32 CommandSetFilterEnabledArchive::filter_index() const {
-  return filter_index_;
+inline const ::TST::TableStyleNetworkArchive& CommandSetStyleNetworkArchive::old_style_network() const {
+  return old_style_network_ != NULL ? *old_style_network_ : *default_instance_->old_style_network_;
 }
-inline void CommandSetFilterEnabledArchive::set_filter_index(::google::protobuf::uint32 value) {
-  set_has_filter_index();
-  filter_index_ = value;
+inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::mutable_old_style_network() {
+  set_has_old_style_network();
+  if (old_style_network_ == NULL) old_style_network_ = new ::TST::TableStyleNetworkArchive;
+  return old_style_network_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::release_old_style_network() {
+  clear_has_old_style_network();
+  ::TST::TableStyleNetworkArchive* temp = old_style_network_;
+  old_style_network_ = NULL;
+  return temp;
+}
+inline void CommandSetStyleNetworkArchive::set_allocated_old_style_network(::TST::TableStyleNetworkArchive* old_style_network) {
+  delete old_style_network_;
+  old_style_network_ = old_style_network;
+  if (old_style_network) {
+    set_has_old_style_network();
+  } else {
+    clear_has_old_style_network();
+  }
 }
 
-// required bool enabled = 4;
-inline bool CommandSetFilterEnabledArchive::has_enabled() const {
+// required .TST.TableStyleNetworkArchive new_style_network = 3;
+inline bool CommandSetStyleNetworkArchive::has_new_style_network() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetFilterEnabledArchive::set_has_enabled() {
+inline void CommandSetStyleNetworkArchive::set_has_new_style_network() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetFilterEnabledArchive::clear_has_enabled() {
+inline void CommandSetStyleNetworkArchive::clear_has_new_style_network() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetFilterEnabledArchive::clear_enabled() {
-  enabled_ = false;
-  clear_has_enabled();
+inline void CommandSetStyleNetworkArchive::clear_new_style_network() {
+  if (new_style_network_ != NULL) new_style_network_->::TST::TableStyleNetworkArchive::Clear();
+  clear_has_new_style_network();
 }
-inline bool CommandSetFilterEnabledArchive::enabled() const {
-  return enabled_;
+inline const ::TST::TableStyleNetworkArchive& CommandSetStyleNetworkArchive::new_style_network() const {
+  return new_style_network_ != NULL ? *new_style_network_ : *default_instance_->new_style_network_;
 }
-inline void CommandSetFilterEnabledArchive::set_enabled(bool value) {
-  set_has_enabled();
-  enabled_ = value;
+inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::mutable_new_style_network() {
+  set_has_new_style_network();
+  if (new_style_network_ == NULL) new_style_network_ = new ::TST::TableStyleNetworkArchive;
+  return new_style_network_;
+}
+inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::release_new_style_network() {
+  clear_has_new_style_network();
+  ::TST::TableStyleNetworkArchive* temp = new_style_network_;
+  new_style_network_ = NULL;
+  return temp;
+}
+inline void CommandSetStyleNetworkArchive::set_allocated_new_style_network(::TST::TableStyleNetworkArchive* new_style_network) {
+  delete new_style_network_;
+  new_style_network_ = new_style_network;
+  if (new_style_network) {
+    set_has_new_style_network();
+  } else {
+    clear_has_new_style_network();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetFilterRuleEnabledArchive
+// CommandMutateCellsArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandSetFilterRuleEnabledArchive::has_super() const {
+inline bool CommandMutateCellsArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_has_super() {
+inline void CommandMutateCellsArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_has_super() {
+inline void CommandMutateCellsArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_super() {
+inline void CommandMutateCellsArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandSetFilterRuleEnabledArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandMutateCellsArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandSetFilterRuleEnabledArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandMutateCellsArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandSetFilterRuleEnabledArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandMutateCellsArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandMutateCellsArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27241,105 +29705,153 @@ inline void CommandSetFilterRuleEnabledArchive::set_allocated_super(::TST::Table
   }
 }
 
-// required uint32 filter_index = 2;
-inline bool CommandSetFilterRuleEnabledArchive::has_filter_index() const {
+// required .TST.CellMapArchive undo_cell_map = 2;
+inline bool CommandMutateCellsArchive::has_undo_cell_map() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_has_filter_index() {
+inline void CommandMutateCellsArchive::set_has_undo_cell_map() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_has_filter_index() {
+inline void CommandMutateCellsArchive::clear_has_undo_cell_map() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_filter_index() {
-  filter_index_ = 0u;
-  clear_has_filter_index();
+inline void CommandMutateCellsArchive::clear_undo_cell_map() {
+  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_undo_cell_map();
 }
-inline ::google::protobuf::uint32 CommandSetFilterRuleEnabledArchive::filter_index() const {
-  return filter_index_;
+inline const ::TST::CellMapArchive& CommandMutateCellsArchive::undo_cell_map() const {
+  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_filter_index(::google::protobuf::uint32 value) {
-  set_has_filter_index();
-  filter_index_ = value;
+inline ::TST::CellMapArchive* CommandMutateCellsArchive::mutable_undo_cell_map() {
+  set_has_undo_cell_map();
+  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
+  return undo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandMutateCellsArchive::release_undo_cell_map() {
+  clear_has_undo_cell_map();
+  ::TST::CellMapArchive* temp = undo_cell_map_;
+  undo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandMutateCellsArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
+  delete undo_cell_map_;
+  undo_cell_map_ = undo_cell_map;
+  if (undo_cell_map) {
+    set_has_undo_cell_map();
+  } else {
+    clear_has_undo_cell_map();
+  }
 }
 
-// required uint32 rule_index = 3;
-inline bool CommandSetFilterRuleEnabledArchive::has_rule_index() const {
+// required .TST.CellMapArchive redo_cell_map = 3;
+inline bool CommandMutateCellsArchive::has_redo_cell_map() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_has_rule_index() {
+inline void CommandMutateCellsArchive::set_has_redo_cell_map() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_has_rule_index() {
+inline void CommandMutateCellsArchive::clear_has_redo_cell_map() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_rule_index() {
-  rule_index_ = 0u;
-  clear_has_rule_index();
+inline void CommandMutateCellsArchive::clear_redo_cell_map() {
+  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_redo_cell_map();
 }
-inline ::google::protobuf::uint32 CommandSetFilterRuleEnabledArchive::rule_index() const {
-  return rule_index_;
+inline const ::TST::CellMapArchive& CommandMutateCellsArchive::redo_cell_map() const {
+  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_rule_index(::google::protobuf::uint32 value) {
-  set_has_rule_index();
-  rule_index_ = value;
+inline ::TST::CellMapArchive* CommandMutateCellsArchive::mutable_redo_cell_map() {
+  set_has_redo_cell_map();
+  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
+  return redo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandMutateCellsArchive::release_redo_cell_map() {
+  clear_has_redo_cell_map();
+  ::TST::CellMapArchive* temp = redo_cell_map_;
+  redo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandMutateCellsArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
+  delete redo_cell_map_;
+  redo_cell_map_ = redo_cell_map;
+  if (redo_cell_map) {
+    set_has_redo_cell_map();
+  } else {
+    clear_has_redo_cell_map();
+  }
 }
 
-// required bool enabled = 4;
-inline bool CommandSetFilterRuleEnabledArchive::has_enabled() const {
+// optional .TST.SelectionArchive selection = 4;
+inline bool CommandMutateCellsArchive::has_selection() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_has_enabled() {
+inline void CommandMutateCellsArchive::set_has_selection() {
   _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_has_enabled() {
+inline void CommandMutateCellsArchive::clear_has_selection() {
   _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandSetFilterRuleEnabledArchive::clear_enabled() {
-  enabled_ = false;
-  clear_has_enabled();
+inline void CommandMutateCellsArchive::clear_selection() {
+  if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
+  clear_has_selection();
+}
+inline const ::TST::SelectionArchive& CommandMutateCellsArchive::selection() const {
+  return selection_ != NULL ? *selection_ : *default_instance_->selection_;
+}
+inline ::TST::SelectionArchive* CommandMutateCellsArchive::mutable_selection() {
+  set_has_selection();
+  if (selection_ == NULL) selection_ = new ::TST::SelectionArchive;
+  return selection_;
 }
-inline bool CommandSetFilterRuleEnabledArchive::enabled() const {
-  return enabled_;
+inline ::TST::SelectionArchive* CommandMutateCellsArchive::release_selection() {
+  clear_has_selection();
+  ::TST::SelectionArchive* temp = selection_;
+  selection_ = NULL;
+  return temp;
 }
-inline void CommandSetFilterRuleEnabledArchive::set_enabled(bool value) {
-  set_has_enabled();
-  enabled_ = value;
+inline void CommandMutateCellsArchive::set_allocated_selection(::TST::SelectionArchive* selection) {
+  delete selection_;
+  selection_ = selection;
+  if (selection) {
+    set_has_selection();
+  } else {
+    clear_has_selection();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetFilterSetTypeArchive
+// CommandDisableFilterRulesForColumnArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandSetFilterSetTypeArchive::has_super() const {
+inline bool CommandDisableFilterRulesForColumnArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetFilterSetTypeArchive::set_has_super() {
+inline void CommandDisableFilterRulesForColumnArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetFilterSetTypeArchive::clear_has_super() {
+inline void CommandDisableFilterRulesForColumnArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetFilterSetTypeArchive::clear_super() {
+inline void CommandDisableFilterRulesForColumnArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandSetFilterSetTypeArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandDisableFilterRulesForColumnArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandSetFilterSetTypeArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandDisableFilterRulesForColumnArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandSetFilterSetTypeArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandDisableFilterRulesForColumnArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetFilterSetTypeArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandDisableFilterRulesForColumnArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27349,85 +29861,86 @@ inline void CommandSetFilterSetTypeArchive::set_allocated_super(::TST::TableComm
   }
 }
 
-// required .TST.FilterSetArchive.FilterSetType old_filter_set_type = 2;
-inline bool CommandSetFilterSetTypeArchive::has_old_filter_set_type() const {
+// required uint32 column_index = 2;
+inline bool CommandDisableFilterRulesForColumnArchive::has_column_index() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetFilterSetTypeArchive::set_has_old_filter_set_type() {
+inline void CommandDisableFilterRulesForColumnArchive::set_has_column_index() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetFilterSetTypeArchive::clear_has_old_filter_set_type() {
+inline void CommandDisableFilterRulesForColumnArchive::clear_has_column_index() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetFilterSetTypeArchive::clear_old_filter_set_type() {
-  old_filter_set_type_ = 0;
-  clear_has_old_filter_set_type();
+inline void CommandDisableFilterRulesForColumnArchive::clear_column_index() {
+  column_index_ = 0u;
+  clear_has_column_index();
 }
-inline ::TST::FilterSetArchive_FilterSetType CommandSetFilterSetTypeArchive::old_filter_set_type() const {
-  return static_cast< ::TST::FilterSetArchive_FilterSetType >(old_filter_set_type_);
+inline ::google::protobuf::uint32 CommandDisableFilterRulesForColumnArchive::column_index() const {
+  return column_index_;
 }
-inline void CommandSetFilterSetTypeArchive::set_old_filter_set_type(::TST::FilterSetArchive_FilterSetType value) {
-  assert(::TST::FilterSetArchive_FilterSetType_IsValid(value));
-  set_has_old_filter_set_type();
-  old_filter_set_type_ = value;
+inline void CommandDisableFilterRulesForColumnArchive::set_column_index(::google::protobuf::uint32 value) {
+  set_has_column_index();
+  column_index_ = value;
 }
 
-// required .TST.FilterSetArchive.FilterSetType new_filter_set_type = 3;
-inline bool CommandSetFilterSetTypeArchive::has_new_filter_set_type() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+// repeated uint32 rule_indices = 3;
+inline int CommandDisableFilterRulesForColumnArchive::rule_indices_size() const {
+  return rule_indices_.size();
 }
-inline void CommandSetFilterSetTypeArchive::set_has_new_filter_set_type() {
-  _has_bits_[0] |= 0x00000004u;
+inline void CommandDisableFilterRulesForColumnArchive::clear_rule_indices() {
+  rule_indices_.Clear();
 }
-inline void CommandSetFilterSetTypeArchive::clear_has_new_filter_set_type() {
-  _has_bits_[0] &= ~0x00000004u;
+inline ::google::protobuf::uint32 CommandDisableFilterRulesForColumnArchive::rule_indices(int index) const {
+  return rule_indices_.Get(index);
 }
-inline void CommandSetFilterSetTypeArchive::clear_new_filter_set_type() {
-  new_filter_set_type_ = 0;
-  clear_has_new_filter_set_type();
+inline void CommandDisableFilterRulesForColumnArchive::set_rule_indices(int index, ::google::protobuf::uint32 value) {
+  rule_indices_.Set(index, value);
 }
-inline ::TST::FilterSetArchive_FilterSetType CommandSetFilterSetTypeArchive::new_filter_set_type() const {
-  return static_cast< ::TST::FilterSetArchive_FilterSetType >(new_filter_set_type_);
+inline void CommandDisableFilterRulesForColumnArchive::add_rule_indices(::google::protobuf::uint32 value) {
+  rule_indices_.Add(value);
 }
-inline void CommandSetFilterSetTypeArchive::set_new_filter_set_type(::TST::FilterSetArchive_FilterSetType value) {
-  assert(::TST::FilterSetArchive_FilterSetType_IsValid(value));
-  set_has_new_filter_set_type();
-  new_filter_set_type_ = value;
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
+CommandDisableFilterRulesForColumnArchive::rule_indices() const {
+  return rule_indices_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
+CommandDisableFilterRulesForColumnArchive::mutable_rule_indices() {
+  return &rule_indices_;
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetStyleNetworkArchive
+// CommandSetTextStyleArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandSetStyleNetworkArchive::has_super() const {
+inline bool CommandSetTextStyleArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetStyleNetworkArchive::set_has_super() {
+inline void CommandSetTextStyleArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetStyleNetworkArchive::clear_has_super() {
+inline void CommandSetTextStyleArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetStyleNetworkArchive::clear_super() {
+inline void CommandSetTextStyleArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandSetStyleNetworkArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandSetTextStyleArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandSetStyleNetworkArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandSetTextStyleArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandSetStyleNetworkArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandSetTextStyleArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetStyleNetworkArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandSetTextStyleArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27437,115 +29950,233 @@ inline void CommandSetStyleNetworkArchive::set_allocated_super(::TST::TableComma
   }
 }
 
-// required .TST.TableStyleNetworkArchive old_style_network = 2;
-inline bool CommandSetStyleNetworkArchive::has_old_style_network() const {
+// required .TST.CellRegion region = 2;
+inline bool CommandSetTextStyleArchive::has_region() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetStyleNetworkArchive::set_has_old_style_network() {
+inline void CommandSetTextStyleArchive::set_has_region() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetStyleNetworkArchive::clear_has_old_style_network() {
+inline void CommandSetTextStyleArchive::clear_has_region() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetStyleNetworkArchive::clear_old_style_network() {
-  if (old_style_network_ != NULL) old_style_network_->::TST::TableStyleNetworkArchive::Clear();
-  clear_has_old_style_network();
+inline void CommandSetTextStyleArchive::clear_region() {
+  if (region_ != NULL) region_->::TST::CellRegion::Clear();
+  clear_has_region();
 }
-inline const ::TST::TableStyleNetworkArchive& CommandSetStyleNetworkArchive::old_style_network() const {
-  return old_style_network_ != NULL ? *old_style_network_ : *default_instance_->old_style_network_;
+inline const ::TST::CellRegion& CommandSetTextStyleArchive::region() const {
+  return region_ != NULL ? *region_ : *default_instance_->region_;
 }
-inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::mutable_old_style_network() {
-  set_has_old_style_network();
-  if (old_style_network_ == NULL) old_style_network_ = new ::TST::TableStyleNetworkArchive;
-  return old_style_network_;
+inline ::TST::CellRegion* CommandSetTextStyleArchive::mutable_region() {
+  set_has_region();
+  if (region_ == NULL) region_ = new ::TST::CellRegion;
+  return region_;
 }
-inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::release_old_style_network() {
-  clear_has_old_style_network();
-  ::TST::TableStyleNetworkArchive* temp = old_style_network_;
-  old_style_network_ = NULL;
+inline ::TST::CellRegion* CommandSetTextStyleArchive::release_region() {
+  clear_has_region();
+  ::TST::CellRegion* temp = region_;
+  region_ = NULL;
+  return temp;
+}
+inline void CommandSetTextStyleArchive::set_allocated_region(::TST::CellRegion* region) {
+  delete region_;
+  region_ = region;
+  if (region) {
+    set_has_region();
+  } else {
+    clear_has_region();
+  }
+}
+
+// optional .TST.CellMapArchive undo_cell_map = 3;
+inline bool CommandSetTextStyleArchive::has_undo_cell_map() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void CommandSetTextStyleArchive::set_has_undo_cell_map() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void CommandSetTextStyleArchive::clear_has_undo_cell_map() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void CommandSetTextStyleArchive::clear_undo_cell_map() {
+  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_undo_cell_map();
+}
+inline const ::TST::CellMapArchive& CommandSetTextStyleArchive::undo_cell_map() const {
+  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetTextStyleArchive::mutable_undo_cell_map() {
+  set_has_undo_cell_map();
+  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
+  return undo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetTextStyleArchive::release_undo_cell_map() {
+  clear_has_undo_cell_map();
+  ::TST::CellMapArchive* temp = undo_cell_map_;
+  undo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandSetTextStyleArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
+  delete undo_cell_map_;
+  undo_cell_map_ = undo_cell_map;
+  if (undo_cell_map) {
+    set_has_undo_cell_map();
+  } else {
+    clear_has_undo_cell_map();
+  }
+}
+
+// optional .TST.CellMapArchive redo_cell_map = 4;
+inline bool CommandSetTextStyleArchive::has_redo_cell_map() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetTextStyleArchive::set_has_redo_cell_map() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetTextStyleArchive::clear_has_redo_cell_map() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetTextStyleArchive::clear_redo_cell_map() {
+  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
+  clear_has_redo_cell_map();
+}
+inline const ::TST::CellMapArchive& CommandSetTextStyleArchive::redo_cell_map() const {
+  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetTextStyleArchive::mutable_redo_cell_map() {
+  set_has_redo_cell_map();
+  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
+  return redo_cell_map_;
+}
+inline ::TST::CellMapArchive* CommandSetTextStyleArchive::release_redo_cell_map() {
+  clear_has_redo_cell_map();
+  ::TST::CellMapArchive* temp = redo_cell_map_;
+  redo_cell_map_ = NULL;
+  return temp;
+}
+inline void CommandSetTextStyleArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
+  delete redo_cell_map_;
+  redo_cell_map_ = redo_cell_map;
+  if (redo_cell_map) {
+    set_has_redo_cell_map();
+  } else {
+    clear_has_redo_cell_map();
+  }
+}
+
+// optional .TSP.Reference subcommands = 5;
+inline bool CommandSetTextStyleArchive::has_subcommands() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSetTextStyleArchive::set_has_subcommands() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSetTextStyleArchive::clear_has_subcommands() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSetTextStyleArchive::clear_subcommands() {
+  if (subcommands_ != NULL) subcommands_->::TSP::Reference::Clear();
+  clear_has_subcommands();
+}
+inline const ::TSP::Reference& CommandSetTextStyleArchive::subcommands() const {
+  return subcommands_ != NULL ? *subcommands_ : *default_instance_->subcommands_;
+}
+inline ::TSP::Reference* CommandSetTextStyleArchive::mutable_subcommands() {
+  set_has_subcommands();
+  if (subcommands_ == NULL) subcommands_ = new ::TSP::Reference;
+  return subcommands_;
+}
+inline ::TSP::Reference* CommandSetTextStyleArchive::release_subcommands() {
+  clear_has_subcommands();
+  ::TSP::Reference* temp = subcommands_;
+  subcommands_ = NULL;
   return temp;
 }
-inline void CommandSetStyleNetworkArchive::set_allocated_old_style_network(::TST::TableStyleNetworkArchive* old_style_network) {
-  delete old_style_network_;
-  old_style_network_ = old_style_network;
-  if (old_style_network) {
-    set_has_old_style_network();
+inline void CommandSetTextStyleArchive::set_allocated_subcommands(::TSP::Reference* subcommands) {
+  delete subcommands_;
+  subcommands_ = subcommands;
+  if (subcommands) {
+    set_has_subcommands();
   } else {
-    clear_has_old_style_network();
+    clear_has_subcommands();
   }
 }
 
-// required .TST.TableStyleNetworkArchive new_style_network = 3;
-inline bool CommandSetStyleNetworkArchive::has_new_style_network() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
+// -------------------------------------------------------------------
+
+// CommandNotifyForTransformingArchive
+
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandNotifyForTransformingArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetStyleNetworkArchive::set_has_new_style_network() {
-  _has_bits_[0] |= 0x00000004u;
+inline void CommandNotifyForTransformingArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetStyleNetworkArchive::clear_has_new_style_network() {
-  _has_bits_[0] &= ~0x00000004u;
+inline void CommandNotifyForTransformingArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetStyleNetworkArchive::clear_new_style_network() {
-  if (new_style_network_ != NULL) new_style_network_->::TST::TableStyleNetworkArchive::Clear();
-  clear_has_new_style_network();
+inline void CommandNotifyForTransformingArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
 }
-inline const ::TST::TableStyleNetworkArchive& CommandSetStyleNetworkArchive::new_style_network() const {
-  return new_style_network_ != NULL ? *new_style_network_ : *default_instance_->new_style_network_;
+inline const ::TST::TableCommandArchive& CommandNotifyForTransformingArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::mutable_new_style_network() {
-  set_has_new_style_network();
-  if (new_style_network_ == NULL) new_style_network_ = new ::TST::TableStyleNetworkArchive;
-  return new_style_network_;
+inline ::TST::TableCommandArchive* CommandNotifyForTransformingArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
 }
-inline ::TST::TableStyleNetworkArchive* CommandSetStyleNetworkArchive::release_new_style_network() {
-  clear_has_new_style_network();
-  ::TST::TableStyleNetworkArchive* temp = new_style_network_;
-  new_style_network_ = NULL;
+inline ::TST::TableCommandArchive* CommandNotifyForTransformingArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
   return temp;
 }
-inline void CommandSetStyleNetworkArchive::set_allocated_new_style_network(::TST::TableStyleNetworkArchive* new_style_network) {
-  delete new_style_network_;
-  new_style_network_ = new_style_network;
-  if (new_style_network) {
-    set_has_new_style_network();
+inline void CommandNotifyForTransformingArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
   } else {
-    clear_has_new_style_network();
+    clear_has_super();
   }
 }
 
 // -------------------------------------------------------------------
 
-// CommandMutateCellsArchive
+// CommandSetStorageLanguageArchive
 
-// required .TST.TableCommandArchive super = 1;
-inline bool CommandMutateCellsArchive::has_super() const {
+// required .TSK.CommandArchive super = 1;
+inline bool CommandSetStorageLanguageArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandMutateCellsArchive::set_has_super() {
+inline void CommandSetStorageLanguageArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandMutateCellsArchive::clear_has_super() {
+inline void CommandSetStorageLanguageArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandMutateCellsArchive::clear_super() {
-  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+inline void CommandSetStorageLanguageArchive::clear_super() {
+  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandMutateCellsArchive::super() const {
+inline const ::TSK::CommandArchive& CommandSetStorageLanguageArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandMutateCellsArchive::mutable_super() {
+inline ::TSK::CommandArchive* CommandSetStorageLanguageArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandMutateCellsArchive::release_super() {
+inline ::TSK::CommandArchive* CommandSetStorageLanguageArchive::release_super() {
   clear_has_super();
-  ::TST::TableCommandArchive* temp = super_;
+  ::TSK::CommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandMutateCellsArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandSetStorageLanguageArchive::set_allocated_super(::TSK::CommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27555,153 +30186,229 @@ inline void CommandMutateCellsArchive::set_allocated_super(::TST::TableCommandAr
   }
 }
 
-// required .TST.CellMapArchive undo_cell_map = 2;
-inline bool CommandMutateCellsArchive::has_undo_cell_map() const {
+// required .TSP.Reference storage = 2;
+inline bool CommandSetStorageLanguageArchive::has_storage() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandMutateCellsArchive::set_has_undo_cell_map() {
+inline void CommandSetStorageLanguageArchive::set_has_storage() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandMutateCellsArchive::clear_has_undo_cell_map() {
+inline void CommandSetStorageLanguageArchive::clear_has_storage() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandMutateCellsArchive::clear_undo_cell_map() {
-  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-  clear_has_undo_cell_map();
+inline void CommandSetStorageLanguageArchive::clear_storage() {
+  if (storage_ != NULL) storage_->::TSP::Reference::Clear();
+  clear_has_storage();
 }
-inline const ::TST::CellMapArchive& CommandMutateCellsArchive::undo_cell_map() const {
-  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
+inline const ::TSP::Reference& CommandSetStorageLanguageArchive::storage() const {
+  return storage_ != NULL ? *storage_ : *default_instance_->storage_;
 }
-inline ::TST::CellMapArchive* CommandMutateCellsArchive::mutable_undo_cell_map() {
-  set_has_undo_cell_map();
-  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
-  return undo_cell_map_;
+inline ::TSP::Reference* CommandSetStorageLanguageArchive::mutable_storage() {
+  set_has_storage();
+  if (storage_ == NULL) storage_ = new ::TSP::Reference;
+  return storage_;
 }
-inline ::TST::CellMapArchive* CommandMutateCellsArchive::release_undo_cell_map() {
-  clear_has_undo_cell_map();
-  ::TST::CellMapArchive* temp = undo_cell_map_;
-  undo_cell_map_ = NULL;
+inline ::TSP::Reference* CommandSetStorageLanguageArchive::release_storage() {
+  clear_has_storage();
+  ::TSP::Reference* temp = storage_;
+  storage_ = NULL;
   return temp;
 }
-inline void CommandMutateCellsArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
-  delete undo_cell_map_;
-  undo_cell_map_ = undo_cell_map;
-  if (undo_cell_map) {
-    set_has_undo_cell_map();
+inline void CommandSetStorageLanguageArchive::set_allocated_storage(::TSP::Reference* storage) {
+  delete storage_;
+  storage_ = storage;
+  if (storage) {
+    set_has_storage();
   } else {
-    clear_has_undo_cell_map();
+    clear_has_storage();
   }
 }
 
-// required .TST.CellMapArchive redo_cell_map = 3;
-inline bool CommandMutateCellsArchive::has_redo_cell_map() const {
+// required string language = 3;
+inline bool CommandSetStorageLanguageArchive::has_language() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandMutateCellsArchive::set_has_redo_cell_map() {
+inline void CommandSetStorageLanguageArchive::set_has_language() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandMutateCellsArchive::clear_has_redo_cell_map() {
+inline void CommandSetStorageLanguageArchive::clear_has_language() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandMutateCellsArchive::clear_redo_cell_map() {
-  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-  clear_has_redo_cell_map();
+inline void CommandSetStorageLanguageArchive::clear_language() {
+  if (language_ != &::google::protobuf::internal::kEmptyString) {
+    language_->clear();
+  }
+  clear_has_language();
 }
-inline const ::TST::CellMapArchive& CommandMutateCellsArchive::redo_cell_map() const {
-  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
+inline const ::std::string& CommandSetStorageLanguageArchive::language() const {
+  return *language_;
 }
-inline ::TST::CellMapArchive* CommandMutateCellsArchive::mutable_redo_cell_map() {
-  set_has_redo_cell_map();
-  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
-  return redo_cell_map_;
+inline void CommandSetStorageLanguageArchive::set_language(const ::std::string& value) {
+  set_has_language();
+  if (language_ == &::google::protobuf::internal::kEmptyString) {
+    language_ = new ::std::string;
+  }
+  language_->assign(value);
 }
-inline ::TST::CellMapArchive* CommandMutateCellsArchive::release_redo_cell_map() {
-  clear_has_redo_cell_map();
-  ::TST::CellMapArchive* temp = redo_cell_map_;
-  redo_cell_map_ = NULL;
-  return temp;
+inline void CommandSetStorageLanguageArchive::set_language(const char* value) {
+  set_has_language();
+  if (language_ == &::google::protobuf::internal::kEmptyString) {
+    language_ = new ::std::string;
+  }
+  language_->assign(value);
+}
+inline void CommandSetStorageLanguageArchive::set_language(const char* value, size_t size) {
+  set_has_language();
+  if (language_ == &::google::protobuf::internal::kEmptyString) {
+    language_ = new ::std::string;
+  }
+  language_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* CommandSetStorageLanguageArchive::mutable_language() {
+  set_has_language();
+  if (language_ == &::google::protobuf::internal::kEmptyString) {
+    language_ = new ::std::string;
+  }
+  return language_;
+}
+inline ::std::string* CommandSetStorageLanguageArchive::release_language() {
+  clear_has_language();
+  if (language_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = language_;
+    language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void CommandSetStorageLanguageArchive::set_allocated_language(::std::string* language) {
+  if (language_ != &::google::protobuf::internal::kEmptyString) {
+    delete language_;
+  }
+  if (language) {
+    set_has_language();
+    language_ = language;
+  } else {
+    clear_has_language();
+    language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// required uint32 range_location = 4;
+inline bool CommandSetStorageLanguageArchive::has_range_location() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void CommandSetStorageLanguageArchive::set_has_range_location() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void CommandSetStorageLanguageArchive::clear_has_range_location() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandSetStorageLanguageArchive::clear_range_location() {
+  range_location_ = 0u;
+  clear_has_range_location();
+}
+inline ::google::protobuf::uint32 CommandSetStorageLanguageArchive::range_location() const {
+  return range_location_;
+}
+inline void CommandSetStorageLanguageArchive::set_range_location(::google::protobuf::uint32 value) {
+  set_has_range_location();
+  range_location_ = value;
+}
+
+// required uint32 range_length = 5;
+inline bool CommandSetStorageLanguageArchive::has_range_length() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void CommandSetStorageLanguageArchive::set_has_range_length() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void CommandSetStorageLanguageArchive::clear_has_range_length() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void CommandSetStorageLanguageArchive::clear_range_length() {
+  range_length_ = 0u;
+  clear_has_range_length();
 }
-inline void CommandMutateCellsArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
-  delete redo_cell_map_;
-  redo_cell_map_ = redo_cell_map;
-  if (redo_cell_map) {
-    set_has_redo_cell_map();
-  } else {
-    clear_has_redo_cell_map();
-  }
+inline ::google::protobuf::uint32 CommandSetStorageLanguageArchive::range_length() const {
+  return range_length_;
+}
+inline void CommandSetStorageLanguageArchive::set_range_length(::google::protobuf::uint32 value) {
+  set_has_range_length();
+  range_length_ = value;
 }
 
-// optional .TST.SelectionArchive selection = 4;
-inline bool CommandMutateCellsArchive::has_selection() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// optional .TSWP.UndoTransaction undo_transaction = 6;
+inline bool CommandSetStorageLanguageArchive::has_undo_transaction() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
 }
-inline void CommandMutateCellsArchive::set_has_selection() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandSetStorageLanguageArchive::set_has_undo_transaction() {
+  _has_bits_[0] |= 0x00000020u;
 }
-inline void CommandMutateCellsArchive::clear_has_selection() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandSetStorageLanguageArchive::clear_has_undo_transaction() {
+  _has_bits_[0] &= ~0x00000020u;
 }
-inline void CommandMutateCellsArchive::clear_selection() {
-  if (selection_ != NULL) selection_->::TST::SelectionArchive::Clear();
-  clear_has_selection();
+inline void CommandSetStorageLanguageArchive::clear_undo_transaction() {
+  if (undo_transaction_ != NULL) undo_transaction_->::TSWP::UndoTransaction::Clear();
+  clear_has_undo_transaction();
 }
-inline const ::TST::SelectionArchive& CommandMutateCellsArchive::selection() const {
-  return selection_ != NULL ? *selection_ : *default_instance_->selection_;
+inline const ::TSWP::UndoTransaction& CommandSetStorageLanguageArchive::undo_transaction() const {
+  return undo_transaction_ != NULL ? *undo_transaction_ : *default_instance_->undo_transaction_;
 }
-inline ::TST::SelectionArchive* CommandMutateCellsArchive::mutable_selection() {
-  set_has_selection();
-  if (selection_ == NULL) selection_ = new ::TST::SelectionArchive;
-  return selection_;
+inline ::TSWP::UndoTransaction* CommandSetStorageLanguageArchive::mutable_undo_transaction() {
+  set_has_undo_transaction();
+  if (undo_transaction_ == NULL) undo_transaction_ = new ::TSWP::UndoTransaction;
+  return undo_transaction_;
 }
-inline ::TST::SelectionArchive* CommandMutateCellsArchive::release_selection() {
-  clear_has_selection();
-  ::TST::SelectionArchive* temp = selection_;
-  selection_ = NULL;
+inline ::TSWP::UndoTransaction* CommandSetStorageLanguageArchive::release_undo_transaction() {
+  clear_has_undo_transaction();
+  ::TSWP::UndoTransaction* temp = undo_transaction_;
+  undo_transaction_ = NULL;
   return temp;
 }
-inline void CommandMutateCellsArchive::set_allocated_selection(::TST::SelectionArchive* selection) {
-  delete selection_;
-  selection_ = selection;
-  if (selection) {
-    set_has_selection();
+inline void CommandSetStorageLanguageArchive::set_allocated_undo_transaction(::TSWP::UndoTransaction* undo_transaction) {
+  delete undo_transaction_;
+  undo_transaction_ = undo_transaction;
+  if (undo_transaction) {
+    set_has_undo_transaction();
   } else {
-    clear_has_selection();
+    clear_has_undo_transaction();
   }
 }
 
 // -------------------------------------------------------------------
 
-// CommandDisableFilterRulesForColumnArchive
+// CommandSetSortOrderArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandDisableFilterRulesForColumnArchive::has_super() const {
+inline bool CommandSetSortOrderArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandDisableFilterRulesForColumnArchive::set_has_super() {
+inline void CommandSetSortOrderArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandDisableFilterRulesForColumnArchive::clear_has_super() {
+inline void CommandSetSortOrderArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandDisableFilterRulesForColumnArchive::clear_super() {
+inline void CommandSetSortOrderArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandDisableFilterRulesForColumnArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandSetSortOrderArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandDisableFilterRulesForColumnArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandSetSortOrderArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandDisableFilterRulesForColumnArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandSetSortOrderArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandDisableFilterRulesForColumnArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandSetSortOrderArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27711,86 +30418,115 @@ inline void CommandDisableFilterRulesForColumnArchive::set_allocated_super(::TST
   }
 }
 
-// required uint32 column_index = 2;
-inline bool CommandDisableFilterRulesForColumnArchive::has_column_index() const {
+// optional .TST.TableSortOrderArchive old_sort_order = 2;
+inline bool CommandSetSortOrderArchive::has_old_sort_order() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandDisableFilterRulesForColumnArchive::set_has_column_index() {
+inline void CommandSetSortOrderArchive::set_has_old_sort_order() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandDisableFilterRulesForColumnArchive::clear_has_column_index() {
+inline void CommandSetSortOrderArchive::clear_has_old_sort_order() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandDisableFilterRulesForColumnArchive::clear_column_index() {
-  column_index_ = 0u;
-  clear_has_column_index();
+inline void CommandSetSortOrderArchive::clear_old_sort_order() {
+  if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_old_sort_order();
 }
-inline ::google::protobuf::uint32 CommandDisableFilterRulesForColumnArchive::column_index() const {
-  return column_index_;
+inline const ::TST::TableSortOrderArchive& CommandSetSortOrderArchive::old_sort_order() const {
+  return old_sort_order_ != NULL ? *old_sort_order_ : *default_instance_->old_sort_order_;
 }
-inline void CommandDisableFilterRulesForColumnArchive::set_column_index(::google::protobuf::uint32 value) {
-  set_has_column_index();
-  column_index_ = value;
+inline ::TST::TableSortOrderArchive* CommandSetSortOrderArchive::mutable_old_sort_order() {
+  set_has_old_sort_order();
+  if (old_sort_order_ == NULL) old_sort_order_ = new ::TST::TableSortOrderArchive;
+  return old_sort_order_;
+}
+inline ::TST::TableSortOrderArchive* CommandSetSortOrderArchive::release_old_sort_order() {
+  clear_has_old_sort_order();
+  ::TST::TableSortOrderArchive* temp = old_sort_order_;
+  old_sort_order_ = NULL;
+  return temp;
+}
+inline void CommandSetSortOrderArchive::set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order) {
+  delete old_sort_order_;
+  old_sort_order_ = old_sort_order;
+  if (old_sort_order) {
+    set_has_old_sort_order();
+  } else {
+    clear_has_old_sort_order();
+  }
 }
 
-// repeated uint32 rule_indices = 3;
-inline int CommandDisableFilterRulesForColumnArchive::rule_indices_size() const {
-  return rule_indices_.size();
+// optional .TST.TableSortOrderArchive new_sort_order = 3;
+inline bool CommandSetSortOrderArchive::has_new_sort_order() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandDisableFilterRulesForColumnArchive::clear_rule_indices() {
-  rule_indices_.Clear();
+inline void CommandSetSortOrderArchive::set_has_new_sort_order() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline ::google::protobuf::uint32 CommandDisableFilterRulesForColumnArchive::rule_indices(int index) const {
-  return rule_indices_.Get(index);
+inline void CommandSetSortOrderArchive::clear_has_new_sort_order() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandDisableFilterRulesForColumnArchive::set_rule_indices(int index, ::google::protobuf::uint32 value) {
-  rule_indices_.Set(index, value);
+inline void CommandSetSortOrderArchive::clear_new_sort_order() {
+  if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_new_sort_order();
 }
-inline void CommandDisableFilterRulesForColumnArchive::add_rule_indices(::google::protobuf::uint32 value) {
-  rule_indices_.Add(value);
+inline const ::TST::TableSortOrderArchive& CommandSetSortOrderArchive::new_sort_order() const {
+  return new_sort_order_ != NULL ? *new_sort_order_ : *default_instance_->new_sort_order_;
 }
-inline const ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >&
-CommandDisableFilterRulesForColumnArchive::rule_indices() const {
-  return rule_indices_;
+inline ::TST::TableSortOrderArchive* CommandSetSortOrderArchive::mutable_new_sort_order() {
+  set_has_new_sort_order();
+  if (new_sort_order_ == NULL) new_sort_order_ = new ::TST::TableSortOrderArchive;
+  return new_sort_order_;
 }
-inline ::google::protobuf::RepeatedField< ::google::protobuf::uint32 >*
-CommandDisableFilterRulesForColumnArchive::mutable_rule_indices() {
-  return &rule_indices_;
+inline ::TST::TableSortOrderArchive* CommandSetSortOrderArchive::release_new_sort_order() {
+  clear_has_new_sort_order();
+  ::TST::TableSortOrderArchive* temp = new_sort_order_;
+  new_sort_order_ = NULL;
+  return temp;
+}
+inline void CommandSetSortOrderArchive::set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order) {
+  delete new_sort_order_;
+  new_sort_order_ = new_sort_order;
+  if (new_sort_order) {
+    set_has_new_sort_order();
+  } else {
+    clear_has_new_sort_order();
+  }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetTextStyleArchive
+// CommandRewriteSortOrderForTectonicShiftArchive
 
 // required .TST.TableCommandArchive super = 1;
-inline bool CommandSetTextStyleArchive::has_super() const {
+inline bool CommandRewriteSortOrderForTectonicShiftArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetTextStyleArchive::set_has_super() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetTextStyleArchive::clear_has_super() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetTextStyleArchive::clear_super() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_super() {
   if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TST::TableCommandArchive& CommandSetTextStyleArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandRewriteSortOrderForTectonicShiftArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TST::TableCommandArchive* CommandSetTextStyleArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandRewriteSortOrderForTectonicShiftArchive::mutable_super() {
   set_has_super();
   if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TST::TableCommandArchive* CommandSetTextStyleArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandRewriteSortOrderForTectonicShiftArchive::release_super() {
   clear_has_super();
   ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetTextStyleArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -27800,233 +30536,153 @@ inline void CommandSetTextStyleArchive::set_allocated_super(::TST::TableCommandA
   }
 }
 
-// required .TST.CellRegion region = 2;
-inline bool CommandSetTextStyleArchive::has_region() const {
+// required .TSCE.TectonicShiftArchive tectonic_shift = 2;
+inline bool CommandRewriteSortOrderForTectonicShiftArchive::has_tectonic_shift() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetTextStyleArchive::set_has_region() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_has_tectonic_shift() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetTextStyleArchive::clear_has_region() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_has_tectonic_shift() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetTextStyleArchive::clear_region() {
-  if (region_ != NULL) region_->::TST::CellRegion::Clear();
-  clear_has_region();
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_tectonic_shift() {
+  if (tectonic_shift_ != NULL) tectonic_shift_->::TSCE::TectonicShiftArchive::Clear();
+  clear_has_tectonic_shift();
 }
-inline const ::TST::CellRegion& CommandSetTextStyleArchive::region() const {
-  return region_ != NULL ? *region_ : *default_instance_->region_;
+inline const ::TSCE::TectonicShiftArchive& CommandRewriteSortOrderForTectonicShiftArchive::tectonic_shift() const {
+  return tectonic_shift_ != NULL ? *tectonic_shift_ : *default_instance_->tectonic_shift_;
 }
-inline ::TST::CellRegion* CommandSetTextStyleArchive::mutable_region() {
-  set_has_region();
-  if (region_ == NULL) region_ = new ::TST::CellRegion;
-  return region_;
+inline ::TSCE::TectonicShiftArchive* CommandRewriteSortOrderForTectonicShiftArchive::mutable_tectonic_shift() {
+  set_has_tectonic_shift();
+  if (tectonic_shift_ == NULL) tectonic_shift_ = new ::TSCE::TectonicShiftArchive;
+  return tectonic_shift_;
 }
-inline ::TST::CellRegion* CommandSetTextStyleArchive::release_region() {
-  clear_has_region();
-  ::TST::CellRegion* temp = region_;
-  region_ = NULL;
+inline ::TSCE::TectonicShiftArchive* CommandRewriteSortOrderForTectonicShiftArchive::release_tectonic_shift() {
+  clear_has_tectonic_shift();
+  ::TSCE::TectonicShiftArchive* temp = tectonic_shift_;
+  tectonic_shift_ = NULL;
   return temp;
 }
-inline void CommandSetTextStyleArchive::set_allocated_region(::TST::CellRegion* region) {
-  delete region_;
-  region_ = region;
-  if (region) {
-    set_has_region();
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_allocated_tectonic_shift(::TSCE::TectonicShiftArchive* tectonic_shift) {
+  delete tectonic_shift_;
+  tectonic_shift_ = tectonic_shift;
+  if (tectonic_shift) {
+    set_has_tectonic_shift();
   } else {
-    clear_has_region();
+    clear_has_tectonic_shift();
   }
 }
 
-// optional .TST.CellMapArchive undo_cell_map = 3;
-inline bool CommandSetTextStyleArchive::has_undo_cell_map() const {
+// optional .TST.TableSortOrderArchive old_sort_order = 3;
+inline bool CommandRewriteSortOrderForTectonicShiftArchive::has_old_sort_order() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetTextStyleArchive::set_has_undo_cell_map() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_has_old_sort_order() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetTextStyleArchive::clear_has_undo_cell_map() {
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_has_old_sort_order() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetTextStyleArchive::clear_undo_cell_map() {
-  if (undo_cell_map_ != NULL) undo_cell_map_->::TST::CellMapArchive::Clear();
-  clear_has_undo_cell_map();
-}
-inline const ::TST::CellMapArchive& CommandSetTextStyleArchive::undo_cell_map() const {
-  return undo_cell_map_ != NULL ? *undo_cell_map_ : *default_instance_->undo_cell_map_;
-}
-inline ::TST::CellMapArchive* CommandSetTextStyleArchive::mutable_undo_cell_map() {
-  set_has_undo_cell_map();
-  if (undo_cell_map_ == NULL) undo_cell_map_ = new ::TST::CellMapArchive;
-  return undo_cell_map_;
-}
-inline ::TST::CellMapArchive* CommandSetTextStyleArchive::release_undo_cell_map() {
-  clear_has_undo_cell_map();
-  ::TST::CellMapArchive* temp = undo_cell_map_;
-  undo_cell_map_ = NULL;
-  return temp;
-}
-inline void CommandSetTextStyleArchive::set_allocated_undo_cell_map(::TST::CellMapArchive* undo_cell_map) {
-  delete undo_cell_map_;
-  undo_cell_map_ = undo_cell_map;
-  if (undo_cell_map) {
-    set_has_undo_cell_map();
-  } else {
-    clear_has_undo_cell_map();
-  }
-}
-
-// optional .TST.CellMapArchive redo_cell_map = 4;
-inline bool CommandSetTextStyleArchive::has_redo_cell_map() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void CommandSetTextStyleArchive::set_has_redo_cell_map() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void CommandSetTextStyleArchive::clear_has_redo_cell_map() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void CommandSetTextStyleArchive::clear_redo_cell_map() {
-  if (redo_cell_map_ != NULL) redo_cell_map_->::TST::CellMapArchive::Clear();
-  clear_has_redo_cell_map();
-}
-inline const ::TST::CellMapArchive& CommandSetTextStyleArchive::redo_cell_map() const {
-  return redo_cell_map_ != NULL ? *redo_cell_map_ : *default_instance_->redo_cell_map_;
-}
-inline ::TST::CellMapArchive* CommandSetTextStyleArchive::mutable_redo_cell_map() {
-  set_has_redo_cell_map();
-  if (redo_cell_map_ == NULL) redo_cell_map_ = new ::TST::CellMapArchive;
-  return redo_cell_map_;
-}
-inline ::TST::CellMapArchive* CommandSetTextStyleArchive::release_redo_cell_map() {
-  clear_has_redo_cell_map();
-  ::TST::CellMapArchive* temp = redo_cell_map_;
-  redo_cell_map_ = NULL;
-  return temp;
-}
-inline void CommandSetTextStyleArchive::set_allocated_redo_cell_map(::TST::CellMapArchive* redo_cell_map) {
-  delete redo_cell_map_;
-  redo_cell_map_ = redo_cell_map;
-  if (redo_cell_map) {
-    set_has_redo_cell_map();
-  } else {
-    clear_has_redo_cell_map();
-  }
-}
-
-// optional .TSP.Reference subcommands = 5;
-inline bool CommandSetTextStyleArchive::has_subcommands() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void CommandSetTextStyleArchive::set_has_subcommands() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void CommandSetTextStyleArchive::clear_has_subcommands() {
-  _has_bits_[0] &= ~0x00000010u;
-}
-inline void CommandSetTextStyleArchive::clear_subcommands() {
-  if (subcommands_ != NULL) subcommands_->::TSP::Reference::Clear();
-  clear_has_subcommands();
-}
-inline const ::TSP::Reference& CommandSetTextStyleArchive::subcommands() const {
-  return subcommands_ != NULL ? *subcommands_ : *default_instance_->subcommands_;
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_old_sort_order() {
+  if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_old_sort_order();
 }
-inline ::TSP::Reference* CommandSetTextStyleArchive::mutable_subcommands() {
-  set_has_subcommands();
-  if (subcommands_ == NULL) subcommands_ = new ::TSP::Reference;
-  return subcommands_;
+inline const ::TST::TableSortOrderArchive& CommandRewriteSortOrderForTectonicShiftArchive::old_sort_order() const {
+  return old_sort_order_ != NULL ? *old_sort_order_ : *default_instance_->old_sort_order_;
 }
-inline ::TSP::Reference* CommandSetTextStyleArchive::release_subcommands() {
-  clear_has_subcommands();
-  ::TSP::Reference* temp = subcommands_;
-  subcommands_ = NULL;
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTectonicShiftArchive::mutable_old_sort_order() {
+  set_has_old_sort_order();
+  if (old_sort_order_ == NULL) old_sort_order_ = new ::TST::TableSortOrderArchive;
+  return old_sort_order_;
+}
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTectonicShiftArchive::release_old_sort_order() {
+  clear_has_old_sort_order();
+  ::TST::TableSortOrderArchive* temp = old_sort_order_;
+  old_sort_order_ = NULL;
   return temp;
 }
-inline void CommandSetTextStyleArchive::set_allocated_subcommands(::TSP::Reference* subcommands) {
-  delete subcommands_;
-  subcommands_ = subcommands;
-  if (subcommands) {
-    set_has_subcommands();
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order) {
+  delete old_sort_order_;
+  old_sort_order_ = old_sort_order;
+  if (old_sort_order) {
+    set_has_old_sort_order();
   } else {
-    clear_has_subcommands();
+    clear_has_old_sort_order();
   }
 }
 
-// -------------------------------------------------------------------
-
-// CommandNotifyForTransformingArchive
-
-// required .TST.TableCommandArchive super = 1;
-inline bool CommandNotifyForTransformingArchive::has_super() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
+// optional .TST.TableSortOrderArchive new_sort_order = 4;
+inline bool CommandRewriteSortOrderForTectonicShiftArchive::has_new_sort_order() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void CommandNotifyForTransformingArchive::set_has_super() {
-  _has_bits_[0] |= 0x00000001u;
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_has_new_sort_order() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandNotifyForTransformingArchive::clear_has_super() {
-  _has_bits_[0] &= ~0x00000001u;
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_has_new_sort_order() {
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline void CommandNotifyForTransformingArchive::clear_super() {
-  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
-  clear_has_super();
+inline void CommandRewriteSortOrderForTectonicShiftArchive::clear_new_sort_order() {
+  if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_new_sort_order();
 }
-inline const ::TST::TableCommandArchive& CommandNotifyForTransformingArchive::super() const {
-  return super_ != NULL ? *super_ : *default_instance_->super_;
+inline const ::TST::TableSortOrderArchive& CommandRewriteSortOrderForTectonicShiftArchive::new_sort_order() const {
+  return new_sort_order_ != NULL ? *new_sort_order_ : *default_instance_->new_sort_order_;
 }
-inline ::TST::TableCommandArchive* CommandNotifyForTransformingArchive::mutable_super() {
-  set_has_super();
-  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
-  return super_;
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTectonicShiftArchive::mutable_new_sort_order() {
+  set_has_new_sort_order();
+  if (new_sort_order_ == NULL) new_sort_order_ = new ::TST::TableSortOrderArchive;
+  return new_sort_order_;
 }
-inline ::TST::TableCommandArchive* CommandNotifyForTransformingArchive::release_super() {
-  clear_has_super();
-  ::TST::TableCommandArchive* temp = super_;
-  super_ = NULL;
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTectonicShiftArchive::release_new_sort_order() {
+  clear_has_new_sort_order();
+  ::TST::TableSortOrderArchive* temp = new_sort_order_;
+  new_sort_order_ = NULL;
   return temp;
 }
-inline void CommandNotifyForTransformingArchive::set_allocated_super(::TST::TableCommandArchive* super) {
-  delete super_;
-  super_ = super;
-  if (super) {
-    set_has_super();
+inline void CommandRewriteSortOrderForTectonicShiftArchive::set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order) {
+  delete new_sort_order_;
+  new_sort_order_ = new_sort_order;
+  if (new_sort_order) {
+    set_has_new_sort_order();
   } else {
-    clear_has_super();
+    clear_has_new_sort_order();
   }
 }
 
 // -------------------------------------------------------------------
 
-// CommandSetStorageLanguageArchive
+// CommandRewriteSortOrderForSortArchive
 
-// required .TSK.CommandArchive super = 1;
-inline bool CommandSetStorageLanguageArchive::has_super() const {
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandRewriteSortOrderForSortArchive::has_super() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetStorageLanguageArchive::set_has_super() {
+inline void CommandRewriteSortOrderForSortArchive::set_has_super() {
   _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetStorageLanguageArchive::clear_has_super() {
+inline void CommandRewriteSortOrderForSortArchive::clear_has_super() {
   _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetStorageLanguageArchive::clear_super() {
-  if (super_ != NULL) super_->::TSK::CommandArchive::Clear();
+inline void CommandRewriteSortOrderForSortArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
   clear_has_super();
 }
-inline const ::TSK::CommandArchive& CommandSetStorageLanguageArchive::super() const {
+inline const ::TST::TableCommandArchive& CommandRewriteSortOrderForSortArchive::super() const {
   return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline ::TSK::CommandArchive* CommandSetStorageLanguageArchive::mutable_super() {
+inline ::TST::TableCommandArchive* CommandRewriteSortOrderForSortArchive::mutable_super() {
   set_has_super();
-  if (super_ == NULL) super_ = new ::TSK::CommandArchive;
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
   return super_;
 }
-inline ::TSK::CommandArchive* CommandSetStorageLanguageArchive::release_super() {
+inline ::TST::TableCommandArchive* CommandRewriteSortOrderForSortArchive::release_super() {
   clear_has_super();
-  ::TSK::CommandArchive* temp = super_;
+  ::TST::TableCommandArchive* temp = super_;
   super_ = NULL;
   return temp;
 }
-inline void CommandSetStorageLanguageArchive::set_allocated_super(::TSK::CommandArchive* super) {
+inline void CommandRewriteSortOrderForSortArchive::set_allocated_super(::TST::TableCommandArchive* super) {
   delete super_;
   super_ = super;
   if (super) {
@@ -28036,193 +30692,235 @@ inline void CommandSetStorageLanguageArchive::set_allocated_super(::TSK::Command
   }
 }
 
-// required .TSP.Reference storage = 2;
-inline bool CommandSetStorageLanguageArchive::has_storage() const {
+// required .TSK.ShuffleMappingArchive sort_mapping = 2;
+inline bool CommandRewriteSortOrderForSortArchive::has_sort_mapping() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetStorageLanguageArchive::set_has_storage() {
+inline void CommandRewriteSortOrderForSortArchive::set_has_sort_mapping() {
   _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetStorageLanguageArchive::clear_has_storage() {
+inline void CommandRewriteSortOrderForSortArchive::clear_has_sort_mapping() {
   _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetStorageLanguageArchive::clear_storage() {
-  if (storage_ != NULL) storage_->::TSP::Reference::Clear();
-  clear_has_storage();
+inline void CommandRewriteSortOrderForSortArchive::clear_sort_mapping() {
+  if (sort_mapping_ != NULL) sort_mapping_->::TSK::ShuffleMappingArchive::Clear();
+  clear_has_sort_mapping();
 }
-inline const ::TSP::Reference& CommandSetStorageLanguageArchive::storage() const {
-  return storage_ != NULL ? *storage_ : *default_instance_->storage_;
+inline const ::TSK::ShuffleMappingArchive& CommandRewriteSortOrderForSortArchive::sort_mapping() const {
+  return sort_mapping_ != NULL ? *sort_mapping_ : *default_instance_->sort_mapping_;
 }
-inline ::TSP::Reference* CommandSetStorageLanguageArchive::mutable_storage() {
-  set_has_storage();
-  if (storage_ == NULL) storage_ = new ::TSP::Reference;
-  return storage_;
+inline ::TSK::ShuffleMappingArchive* CommandRewriteSortOrderForSortArchive::mutable_sort_mapping() {
+  set_has_sort_mapping();
+  if (sort_mapping_ == NULL) sort_mapping_ = new ::TSK::ShuffleMappingArchive;
+  return sort_mapping_;
 }
-inline ::TSP::Reference* CommandSetStorageLanguageArchive::release_storage() {
-  clear_has_storage();
-  ::TSP::Reference* temp = storage_;
-  storage_ = NULL;
+inline ::TSK::ShuffleMappingArchive* CommandRewriteSortOrderForSortArchive::release_sort_mapping() {
+  clear_has_sort_mapping();
+  ::TSK::ShuffleMappingArchive* temp = sort_mapping_;
+  sort_mapping_ = NULL;
   return temp;
 }
-inline void CommandSetStorageLanguageArchive::set_allocated_storage(::TSP::Reference* storage) {
-  delete storage_;
-  storage_ = storage;
-  if (storage) {
-    set_has_storage();
+inline void CommandRewriteSortOrderForSortArchive::set_allocated_sort_mapping(::TSK::ShuffleMappingArchive* sort_mapping) {
+  delete sort_mapping_;
+  sort_mapping_ = sort_mapping;
+  if (sort_mapping) {
+    set_has_sort_mapping();
   } else {
-    clear_has_storage();
+    clear_has_sort_mapping();
   }
 }
 
-// required string language = 3;
-inline bool CommandSetStorageLanguageArchive::has_language() const {
+// optional .TST.TableSortOrderArchive old_sort_order = 3;
+inline bool CommandRewriteSortOrderForSortArchive::has_old_sort_order() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetStorageLanguageArchive::set_has_language() {
+inline void CommandRewriteSortOrderForSortArchive::set_has_old_sort_order() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetStorageLanguageArchive::clear_has_language() {
+inline void CommandRewriteSortOrderForSortArchive::clear_has_old_sort_order() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetStorageLanguageArchive::clear_language() {
-  if (language_ != &::google::protobuf::internal::kEmptyString) {
-    language_->clear();
-  }
-  clear_has_language();
+inline void CommandRewriteSortOrderForSortArchive::clear_old_sort_order() {
+  if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_old_sort_order();
 }
-inline const ::std::string& CommandSetStorageLanguageArchive::language() const {
-  return *language_;
+inline const ::TST::TableSortOrderArchive& CommandRewriteSortOrderForSortArchive::old_sort_order() const {
+  return old_sort_order_ != NULL ? *old_sort_order_ : *default_instance_->old_sort_order_;
 }
-inline void CommandSetStorageLanguageArchive::set_language(const ::std::string& value) {
-  set_has_language();
-  if (language_ == &::google::protobuf::internal::kEmptyString) {
-    language_ = new ::std::string;
-  }
-  language_->assign(value);
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForSortArchive::mutable_old_sort_order() {
+  set_has_old_sort_order();
+  if (old_sort_order_ == NULL) old_sort_order_ = new ::TST::TableSortOrderArchive;
+  return old_sort_order_;
 }
-inline void CommandSetStorageLanguageArchive::set_language(const char* value) {
-  set_has_language();
-  if (language_ == &::google::protobuf::internal::kEmptyString) {
-    language_ = new ::std::string;
-  }
-  language_->assign(value);
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForSortArchive::release_old_sort_order() {
+  clear_has_old_sort_order();
+  ::TST::TableSortOrderArchive* temp = old_sort_order_;
+  old_sort_order_ = NULL;
+  return temp;
 }
-inline void CommandSetStorageLanguageArchive::set_language(const char* value, size_t size) {
-  set_has_language();
-  if (language_ == &::google::protobuf::internal::kEmptyString) {
-    language_ = new ::std::string;
+inline void CommandRewriteSortOrderForSortArchive::set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order) {
+  delete old_sort_order_;
+  old_sort_order_ = old_sort_order;
+  if (old_sort_order) {
+    set_has_old_sort_order();
+  } else {
+    clear_has_old_sort_order();
   }
-  language_->assign(reinterpret_cast<const char*>(value), size);
 }
-inline ::std::string* CommandSetStorageLanguageArchive::mutable_language() {
-  set_has_language();
-  if (language_ == &::google::protobuf::internal::kEmptyString) {
-    language_ = new ::std::string;
-  }
-  return language_;
+
+// optional .TST.TableSortOrderArchive new_sort_order = 4;
+inline bool CommandRewriteSortOrderForSortArchive::has_new_sort_order() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline ::std::string* CommandSetStorageLanguageArchive::release_language() {
-  clear_has_language();
-  if (language_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = language_;
-    language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
+inline void CommandRewriteSortOrderForSortArchive::set_has_new_sort_order() {
+  _has_bits_[0] |= 0x00000008u;
 }
-inline void CommandSetStorageLanguageArchive::set_allocated_language(::std::string* language) {
-  if (language_ != &::google::protobuf::internal::kEmptyString) {
-    delete language_;
-  }
-  if (language) {
-    set_has_language();
-    language_ = language;
+inline void CommandRewriteSortOrderForSortArchive::clear_has_new_sort_order() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void CommandRewriteSortOrderForSortArchive::clear_new_sort_order() {
+  if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_new_sort_order();
+}
+inline const ::TST::TableSortOrderArchive& CommandRewriteSortOrderForSortArchive::new_sort_order() const {
+  return new_sort_order_ != NULL ? *new_sort_order_ : *default_instance_->new_sort_order_;
+}
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForSortArchive::mutable_new_sort_order() {
+  set_has_new_sort_order();
+  if (new_sort_order_ == NULL) new_sort_order_ = new ::TST::TableSortOrderArchive;
+  return new_sort_order_;
+}
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForSortArchive::release_new_sort_order() {
+  clear_has_new_sort_order();
+  ::TST::TableSortOrderArchive* temp = new_sort_order_;
+  new_sort_order_ = NULL;
+  return temp;
+}
+inline void CommandRewriteSortOrderForSortArchive::set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order) {
+  delete new_sort_order_;
+  new_sort_order_ = new_sort_order;
+  if (new_sort_order) {
+    set_has_new_sort_order();
   } else {
-    clear_has_language();
-    language_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    clear_has_new_sort_order();
   }
 }
 
-// required uint32 range_location = 4;
-inline bool CommandSetStorageLanguageArchive::has_range_location() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
+// -------------------------------------------------------------------
+
+// CommandRewriteSortOrderForTableResizeArchive
+
+// required .TST.TableCommandArchive super = 1;
+inline bool CommandRewriteSortOrderForTableResizeArchive::has_super() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void CommandSetStorageLanguageArchive::set_has_range_location() {
-  _has_bits_[0] |= 0x00000008u;
+inline void CommandRewriteSortOrderForTableResizeArchive::set_has_super() {
+  _has_bits_[0] |= 0x00000001u;
 }
-inline void CommandSetStorageLanguageArchive::clear_has_range_location() {
-  _has_bits_[0] &= ~0x00000008u;
+inline void CommandRewriteSortOrderForTableResizeArchive::clear_has_super() {
+  _has_bits_[0] &= ~0x00000001u;
 }
-inline void CommandSetStorageLanguageArchive::clear_range_location() {
-  range_location_ = 0u;
-  clear_has_range_location();
+inline void CommandRewriteSortOrderForTableResizeArchive::clear_super() {
+  if (super_ != NULL) super_->::TST::TableCommandArchive::Clear();
+  clear_has_super();
 }
-inline ::google::protobuf::uint32 CommandSetStorageLanguageArchive::range_location() const {
-  return range_location_;
+inline const ::TST::TableCommandArchive& CommandRewriteSortOrderForTableResizeArchive::super() const {
+  return super_ != NULL ? *super_ : *default_instance_->super_;
 }
-inline void CommandSetStorageLanguageArchive::set_range_location(::google::protobuf::uint32 value) {
-  set_has_range_location();
-  range_location_ = value;
+inline ::TST::TableCommandArchive* CommandRewriteSortOrderForTableResizeArchive::mutable_super() {
+  set_has_super();
+  if (super_ == NULL) super_ = new ::TST::TableCommandArchive;
+  return super_;
+}
+inline ::TST::TableCommandArchive* CommandRewriteSortOrderForTableResizeArchive::release_super() {
+  clear_has_super();
+  ::TST::TableCommandArchive* temp = super_;
+  super_ = NULL;
+  return temp;
+}
+inline void CommandRewriteSortOrderForTableResizeArchive::set_allocated_super(::TST::TableCommandArchive* super) {
+  delete super_;
+  super_ = super;
+  if (super) {
+    set_has_super();
+  } else {
+    clear_has_super();
+  }
 }
 
-// required uint32 range_length = 5;
-inline bool CommandSetStorageLanguageArchive::has_range_length() const {
-  return (_has_bits_[0] & 0x00000010u) != 0;
+// optional .TST.TableSortOrderArchive old_sort_order = 2;
+inline bool CommandRewriteSortOrderForTableResizeArchive::has_old_sort_order() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void CommandSetStorageLanguageArchive::set_has_range_length() {
-  _has_bits_[0] |= 0x00000010u;
+inline void CommandRewriteSortOrderForTableResizeArchive::set_has_old_sort_order() {
+  _has_bits_[0] |= 0x00000002u;
 }
-inline void CommandSetStorageLanguageArchive::clear_has_range_length() {
-  _has_bits_[0] &= ~0x00000010u;
+inline void CommandRewriteSortOrderForTableResizeArchive::clear_has_old_sort_order() {
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline void CommandSetStorageLanguageArchive::clear_range_length() {
-  range_length_ = 0u;
-  clear_has_range_length();
+inline void CommandRewriteSortOrderForTableResizeArchive::clear_old_sort_order() {
+  if (old_sort_order_ != NULL) old_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_old_sort_order();
 }
-inline ::google::protobuf::uint32 CommandSetStorageLanguageArchive::range_length() const {
-  return range_length_;
+inline const ::TST::TableSortOrderArchive& CommandRewriteSortOrderForTableResizeArchive::old_sort_order() const {
+  return old_sort_order_ != NULL ? *old_sort_order_ : *default_instance_->old_sort_order_;
 }
-inline void CommandSetStorageLanguageArchive::set_range_length(::google::protobuf::uint32 value) {
-  set_has_range_length();
-  range_length_ = value;
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTableResizeArchive::mutable_old_sort_order() {
+  set_has_old_sort_order();
+  if (old_sort_order_ == NULL) old_sort_order_ = new ::TST::TableSortOrderArchive;
+  return old_sort_order_;
+}
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTableResizeArchive::release_old_sort_order() {
+  clear_has_old_sort_order();
+  ::TST::TableSortOrderArchive* temp = old_sort_order_;
+  old_sort_order_ = NULL;
+  return temp;
+}
+inline void CommandRewriteSortOrderForTableResizeArchive::set_allocated_old_sort_order(::TST::TableSortOrderArchive* old_sort_order) {
+  delete old_sort_order_;
+  old_sort_order_ = old_sort_order;
+  if (old_sort_order) {
+    set_has_old_sort_order();
+  } else {
+    clear_has_old_sort_order();
+  }
 }
 
-// optional .TSWP.UndoTransaction undo_transaction = 6;
-inline bool CommandSetStorageLanguageArchive::has_undo_transaction() const {
-  return (_has_bits_[0] & 0x00000020u) != 0;
+// optional .TST.TableSortOrderArchive new_sort_order = 3;
+inline bool CommandRewriteSortOrderForTableResizeArchive::has_new_sort_order() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void CommandSetStorageLanguageArchive::set_has_undo_transaction() {
-  _has_bits_[0] |= 0x00000020u;
+inline void CommandRewriteSortOrderForTableResizeArchive::set_has_new_sort_order() {
+  _has_bits_[0] |= 0x00000004u;
 }
-inline void CommandSetStorageLanguageArchive::clear_has_undo_transaction() {
-  _has_bits_[0] &= ~0x00000020u;
+inline void CommandRewriteSortOrderForTableResizeArchive::clear_has_new_sort_order() {
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline void CommandSetStorageLanguageArchive::clear_undo_transaction() {
-  if (undo_transaction_ != NULL) undo_transaction_->::TSWP::UndoTransaction::Clear();
-  clear_has_undo_transaction();
+inline void CommandRewriteSortOrderForTableResizeArchive::clear_new_sort_order() {
+  if (new_sort_order_ != NULL) new_sort_order_->::TST::TableSortOrderArchive::Clear();
+  clear_has_new_sort_order();
 }
-inline const ::TSWP::UndoTransaction& CommandSetStorageLanguageArchive::undo_transaction() const {
-  return undo_transaction_ != NULL ? *undo_transaction_ : *default_instance_->undo_transaction_;
+inline const ::TST::TableSortOrderArchive& CommandRewriteSortOrderForTableResizeArchive::new_sort_order() const {
+  return new_sort_order_ != NULL ? *new_sort_order_ : *default_instance_->new_sort_order_;
 }
-inline ::TSWP::UndoTransaction* CommandSetStorageLanguageArchive::mutable_undo_transaction() {
-  set_has_undo_transaction();
-  if (undo_transaction_ == NULL) undo_transaction_ = new ::TSWP::UndoTransaction;
-  return undo_transaction_;
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTableResizeArchive::mutable_new_sort_order() {
+  set_has_new_sort_order();
+  if (new_sort_order_ == NULL) new_sort_order_ = new ::TST::TableSortOrderArchive;
+  return new_sort_order_;
 }
-inline ::TSWP::UndoTransaction* CommandSetStorageLanguageArchive::release_undo_transaction() {
-  clear_has_undo_transaction();
-  ::TSWP::UndoTransaction* temp = undo_transaction_;
-  undo_transaction_ = NULL;
+inline ::TST::TableSortOrderArchive* CommandRewriteSortOrderForTableResizeArchive::release_new_sort_order() {
+  clear_has_new_sort_order();
+  ::TST::TableSortOrderArchive* temp = new_sort_order_;
+  new_sort_order_ = NULL;
   return temp;
 }
-inline void CommandSetStorageLanguageArchive::set_allocated_undo_transaction(::TSWP::UndoTransaction* undo_transaction) {
-  delete undo_transaction_;
-  undo_transaction_ = undo_transaction;
-  if (undo_transaction) {
-    set_has_undo_transaction();
+inline void CommandRewriteSortOrderForTableResizeArchive::set_allocated_new_sort_order(::TST::TableSortOrderArchive* new_sort_order) {
+  delete new_sort_order_;
+  new_sort_order_ = new_sort_order;
+  if (new_sort_order) {
+    set_has_new_sort_order();
   } else {
-    clear_has_undo_transaction();
+    clear_has_new_sort_order();
   }
 }
 
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.cc b/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.cc
index a63671f..417a30d 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.cc
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.cc
@@ -1069,12 +1069,15 @@ void protobuf_AssignDesc_TSWPArchives_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(TOCSettingsArchive_TOCEntryData));
   TOCEntryInstanceArchive_descriptor_ = file->message_type(28);
-  static const int TOCEntryInstanceArchive_offsets_[5] = {
+  static const int TOCEntryInstanceArchive_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, paragraph_index_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, page_number_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, number_format_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, heading_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, indexed_style_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, indexed_list_style_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, indexed_list_start_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(TOCEntryInstanceArchive, indexed_paragraph_level_),
   };
   TOCEntryInstanceArchive_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -2339,7 +2342,7 @@ void protobuf_AddDesc_TSWPArchives_2eproto() {
     "e_count\030\n \001(\r:\0010\022>\n\017char_properties\030\013 \001("
     "\0132%.TSWP.CharacterStylePropertiesArchive"
     "\022>\n\017para_properties\030\014 \001(\0132%.TSWP.Paragra"
-    "phStylePropertiesArchive\"\211\030\n\020ListStyleAr"
+    "phStylePropertiesArchive\"\360\030\n\020ListStyleAr"
     "chive\022 \n\005super\030\001 \002(\0132\021.TSS.StyleArchive\022"
     "\031\n\016override_count\030\n \001(\r:\0010\0225\n\013label_type"
     "s\030\013 \003(\0162 .TSWP.ListStyleArchive.LabelTyp"
@@ -2361,7 +2364,7 @@ void protobuf_AddDesc_TSWPArchives_2eproto() {
     "ge\030\003 \001(\0132\022.TSP.DataReference\022\022\n\nimage_nu"
     "ll\030\002 \001(\010\022&\n\016database_image\030\001 \001(\0132\016.TSP.R"
     "eference\"<\n\tLabelType\022\t\n\005kNone\020\000\022\n\n\006kIma"
-    "ge\020\001\022\013\n\007kString\020\002\022\013\n\007kNumber\020\003\"\223\021\n\nNumbe"
+    "ge\020\001\022\013\n\007kString\020\002\022\013\n\007kNumber\020\003\"\372\021\n\nNumbe"
     "rType\022\023\n\017kNumericDecimal\020\000\022\027\n\023kNumericDo"
     "ubleParen\020\001\022\026\n\022kNumericRightParen\020\002\022\026\n\022k"
     "RomanUpperDecimal\020\003\022\032\n\026kRomanUpperDouble"
@@ -2416,256 +2419,261 @@ void protobuf_AddDesc_TSWPArchives_2eproto() {
     "AbjadRightParenKind\0209\022\033\n\027kHebrewAlphaDec"
     "imalKind\020:\022\037\n\033kHebrewAlphaDoubleParenKin"
     "d\020;\022\036\n\032kHebrewAlphaRightParenKind\020<\022\037\n\033k"
-    "HebrewBiblicalStandardKind\020=\"\200\001\n\026TextSty"
-    "lePresetArchive\022\031\n\021preset_identifier\030\001 \001"
-    "(\t\022\'\n\017paragraph_style\030\002 \001(\0132\016.TSP.Refere"
-    "nce\022\"\n\nlist_style\030\003 \001(\0132\016.TSP.Reference\""
-    "\365\002\n\016ColumnsArchive\022\?\n\requal_columns\030\001 \001("
-    "\0132(.TSWP.ColumnsArchive.EqualColumnsArch"
-    "ive\022F\n\021non_equal_columns\030\002 \001(\0132+.TSWP.Co"
-    "lumnsArchive.NonEqualColumnsArchive\0321\n\023E"
-    "qualColumnsArchive\022\r\n\005count\030\001 \001(\r\022\013\n\003gap"
-    "\030\002 \001(\002\032\246\001\n\026NonEqualColumnsArchive\022\r\n\005fir"
-    "st\030\001 \002(\002\022N\n\tfollowing\030\002 \003(\0132;.TSWP.Colum"
-    "nsArchive.NonEqualColumnsArchive.GapWidt"
-    "hArchive\032-\n\017GapWidthArchive\022\013\n\003gap\030\001 \002(\002"
-    "\022\r\n\005width\030\002 \002(\002\"J\n\016PaddingArchive\022\014\n\004lef"
-    "t\030\001 \001(\002\022\013\n\003top\030\002 \001(\002\022\r\n\005right\030\003 \001(\002\022\016\n\006b"
-    "ottom\030\004 \001(\002\"\317\004\n\034ColumnStylePropertiesArc"
-    "hive\022\022\n\ncontinuous\030\001 \001(\010\022\025\n\rshrink_to_fi"
-    "t\030\002 \001(\010\022\025\n\rvertical_text\030\003 \001(\010\022\034\n\024min_ho"
-    "rizontal_inset\030\004 \001(\002\022T\n\022vertical_alignme"
-    "nt\030\005 \001(\01628.TSWP.ColumnStylePropertiesArc"
-    "hive.VerticalAlignmentType\022\024\n\014columns_nu"
-    "ll\030\006 \001(\010\022%\n\007columns\030\007 \001(\0132\024.TSWP.Columns"
-    "Archive\022\024\n\014margins_null\030\010 \001(\010\022%\n\007margins"
-    "\030\t \001(\0132\024.TSWP.PaddingArchive\022\024\n\014padding_"
-    "null\030\n \001(\010\022%\n\007padding\030\013 \001(\0132\024.TSWP.Paddi"
-    "ngArchive\022O\n\021writing_direction\030\014 \001(\0162\032.T"
-    "SWP.WritingDirectionType:\030kWritingDirect"
-    "ionNatural\"q\n\025VerticalAlignmentType\022\022\n\016k"
-    "FrameAlignTop\020\000\022\025\n\021kFrameAlignMiddle\020\001\022\025"
-    "\n\021kFrameAlignBottom\020\002\022\026\n\022kFrameAlignJust"
-    "ify\020\003\"\220\001\n\022ColumnStyleArchive\022 \n\005super\030\001 "
-    "\002(\0132\021.TSS.StyleArchive\022\031\n\016override_count"
-    "\030\n \001(\r:\0010\022=\n\021column_properties\030\013 \001(\0132\".T"
-    "SWP.ColumnStylePropertiesArchive\"\367\003\n\033Sha"
-    "peStylePropertiesArchive\022\025\n\rshrink_to_fi"
-    "t\030\001 \001(\010\022S\n\022vertical_alignment\030\002 \001(\01627.TS"
-    "WP.ShapeStylePropertiesArchive.VerticalA"
-    "lignmentType\022\024\n\014columns_null\030\003 \001(\010\022%\n\007co"
-    "lumns\030\004 \001(\0132\024.TSWP.ColumnsArchive\022\024\n\014pad"
-    "ding_null\030\005 \001(\010\022%\n\007padding\030\006 \001(\0132\024.TSWP."
-    "PaddingArchive\022!\n\031default_text_preset_in"
-    "dex\030\007 \001(\r\022\025\n\rvertical_text\030\010 \001(\010\022\034\n\024para"
-    "graph_style_null\030\t \001(\010\022\'\n\017paragraph_styl"
-    "e\030\n \001(\0132\016.TSP.Reference\"q\n\025VerticalAlign"
-    "mentType\022\022\n\016kFrameAlignTop\020\000\022\025\n\021kFrameAl"
-    "ignMiddle\020\001\022\025\n\021kFrameAlignBottom\020\002\022\026\n\022kF"
-    "rameAlignJustify\020\003\"\222\001\n\021ShapeStyleArchive"
-    "\022%\n\005super\030\001 \002(\0132\026.TSD.ShapeStyleArchive\022"
-    "\031\n\016override_count\030\n \001(\r:\0010\022;\n\020shape_prop"
-    "erties\030\013 \001(\0132!.TSWP.ShapeStyleProperties"
-    "Archive\"\244\003\n\023ThemePresetsArchive\022*\n\022list_"
-    "style_presets\030\001 \003(\0132\016.TSP.Reference\022*\n\022t"
-    "ext_style_presets\030\002 \003(\0132\016.TSP.Reference\022"
-    "3\n\033imported_text_style_presets\030\003 \003(\0132\016.T"
-    "SP.Reference\022/\n\027toc_entry_style_presets\030"
-    "\004 \003(\0132\016.TSP.Reference\022,\n\024toc_settings_pr"
-    "esets\030\005 \003(\0132\016.TSP.Reference\022/\n\027character"
-    "_style_presets\030\006 \003(\0132\016.TSP.Reference\022/\n\027"
-    "paragraph_style_presets\030\007 \003(\0132\016.TSP.Refe"
-    "rence2\?\n\textension\022\021.TSS.ThemeArchive\030n "
-    "\002(\0132\031.TSWP.ThemePresetsArchive\"T\n\034TextPr"
-    "esetDisplayItemArchive\022\036\n\006preset\030\001 \002(\0132\016"
-    ".TSP.Reference\022\024\n\014display_name\030\002 \002(\t\"\205\001\n"
-    "\036TOCEntryStylePropertiesArchive\022\036\n\026page_"
-    "number_style_null\030\001 \001(\010\022)\n\021page_number_s"
-    "tyle\030\002 \001(\0132\016.TSP.Reference\022\030\n\020show_page_"
-    "number\030\003 \001(\010\"\200\001\n\024TOCEntryStyleArchive\022*\n"
-    "\005super\030\001 \002(\0132\033.TSWP.ParagraphStyleArchiv"
-    "e\022<\n\016toc_properties\030\002 \001(\0132$.TSWP.TOCEntr"
-    "yStylePropertiesArchive\"\350\001\n\022TOCSettingsA"
-    "rchive\022\020\n\010toc_name\030\001 \001(\t\022\021\n\ttoc_scope\030\002 "
-    "\001(\r\0226\n\007entries\030\003 \003(\0132%.TSWP.TOCSettingsA"
-    "rchive.TOCEntryData\032u\n\014TOCEntryData\022\'\n\017p"
-    "aragraph_style\030\001 \001(\0132\016.TSP.Reference\022\'\n\017"
-    "toc_entry_style\030\002 \001(\0132\016.TSP.Reference\022\023\n"
-    "\013show_in_toc\030\003 \001(\010\"\226\001\n\027TOCEntryInstanceA"
-    "rchive\022\027\n\017paragraph_index\030\001 \002(\r\022\023\n\013page_"
-    "number\030\002 \002(\r\022\025\n\rnumber_format\030\003 \002(\r\022\017\n\007h"
-    "eading\030\004 \002(\t\022%\n\rindexed_style\030\005 \002(\0132\016.TS"
-    "P.Reference\"\274\020\n\017UndoTransaction\0227\n\007entri"
-    "es\030\001 \003(\0132&.TSWP.UndoTransaction.UnionTra"
-    "nsaction\032D\n\022GenericTransaction\022\016\n\006value1"
-    "\030\001 \002(\r\022\016\n\006value2\030\002 \002(\r\022\016\n\006value3\030\003 \002(\r\032["
-    "\n\017TextTransaction\022\027\n\017insert_location\030\001 \002"
-    "(\r\022\025\n\rinsert_length\030\002 \002(\r\022\030\n\020string_to_d"
-    "elete\030\003 \001(\t\032Y\n\024CharIndexTransaction\022\022\n\nc"
-    "har_index\030\001 \002(\r\022\r\n\005count\030\002 \002(\r\022\036\n\006object"
-    "\030\003 \001(\0132\016.TSP.Reference\032J\n\033ReplaceCharInd"
-    "exTransaction\022\027\n\017attribute_index\030\001 \002(\r\022\022"
-    "\n\nchar_index\030\002 \002(\r\032x\n\031AttributeIndexTran"
-    "saction\022\027\n\017attribute_index\030\001 \002(\r\022\022\n\nchar"
-    "_index\030\002 \002(\r\022\036\n\006object\030\003 \001(\0132\016.TSP.Refer"
-    "ence\022\016\n\006string\030\004 \001(\t\032~\n\032InsertAttributeT"
-    "ransaction\022\027\n\017attribute_index\030\001 \002(\r\022\027\n\017a"
-    "ttribute_count\030\002 \002(\r\022\036\n\006object\030\003 \001(\0132\016.T"
-    "SP.Reference\022\016\n\006string\030\004 \001(\t\032H\n\024InsertNi"
-    "lTransaction\022\027\n\017attribute_index\030\001 \002(\r\022\027\n"
-    "\017attribute_count\030\002 \002(\r\032W\n\024CharDeltaTrans"
-    "action\022\022\n\nchar_index\030\001 \002(\r\022\027\n\017attribute_"
-    "index\030\002 \002(\r\022\022\n\nchar_delta\030\003 \002(\021\032f\n\030Parag"
-    "raphDataTransaction\022\027\n\017attribute_index\030\001"
-    " \002(\r\022\r\n\005first\030\002 \002(\r\022\016\n\006second\030\003 \002(\r\022\022\n\nc"
-    "har_index\030\004 \002(\r\032F\n\025ObjectDOLCTransaction"
-    "\022\r\n\005flags\030\001 \002(\r\022\036\n\006object\030\002 \001(\0132\016.TSP.Re"
-    "ference\032E\n\021CTDateTransaction\022\027\n\017attribut"
-    "e_index\030\001 \002(\r\022\027\n\004date\030\002 \001(\0132\t.TSP.Date\032\250"
-    "\006\n\020UnionTransaction\022,\n\004kind\030\001 \002(\0162\036.TSWP"
-    ".UndoTransaction.UndoKind\022\r\n\005table\030\002 \001(\r"
-    "\0229\n\007generic\030\005 \001(\0132(.TSWP.UndoTransaction"
-    ".GenericTransaction\0223\n\004text\030\006 \001(\0132%.TSWP"
-    ".UndoTransaction.TextTransaction\022>\n\nchar"
-    "_index\030\007 \001(\0132*.TSWP.UndoTransaction.Char"
-    "IndexTransaction\022M\n\022replace_char_index\030\010"
-    " \001(\01321.TSWP.UndoTransaction.ReplaceCharI"
-    "ndexTransaction\022H\n\017attribute_index\030\t \001(\013"
-    "2/.TSWP.UndoTransaction.AttributeIndexTr"
-    "ansaction\022>\n\ninsert_nil\030\n \001(\0132*.TSWP.Und"
-    "oTransaction.InsertNilTransaction\022J\n\020ins"
-    "ert_attribute\030\013 \001(\01320.TSWP.UndoTransacti"
-    "on.InsertAttributeTransaction\022>\n\nchar_de"
-    "lta\030\014 \001(\0132*.TSWP.UndoTransaction.CharDel"
-    "taTransaction\022F\n\016paragraph_data\030\r \001(\0132.."
-    "TSWP.UndoTransaction.ParagraphDataTransa"
-    "ction\022@\n\013object_dolc\030\016 \001(\0132+.TSWP.UndoTr"
-    "ansaction.ObjectDOLCTransaction\0228\n\007ct_da"
-    "te\030\017 \001(\0132\'.TSWP.UndoTransaction.CTDateTr"
-    "ansaction\"\346\001\n\010UndoKind\022\020\n\014REPLACE_TEXT\020\001"
-    "\022\024\n\020INSERT_ATTRIBUTE\020\002\022\024\n\020DELETE_ATTRIBU"
-    "TE\020\003\022\027\n\023ADJUST_CHAR_INDEXES\020\004\022\035\n\031COMPR_A"
-    "DJUST_CHAR_INDEXES\020\005\022\026\n\022REPLACE_CHAR_IND"
-    "EX\020\006\022\022\n\016REPLACE_OBJECT\020\007\022\032\n\026REPLACE_PARA"
-    "GRAPH_DATA\020\010\022\017\n\013OBJECT_DOLC\020\t\022\013\n\007CT_DATE"
-    "\020\n\"P\n\035UndoTransactionWrapperArchive\022/\n\020u"
-    "ndo_transaction\030\001 \002(\0132\025.TSWP.UndoTransac"
-    "tion\"^\n\020ShapeInfoArchive\022 \n\005super\030\001 \002(\0132"
-    "\021.TSD.ShapeArchive\022(\n\020containedStorage\030\002"
-    " \001(\0132\016.TSP.Reference\"d\n\022CommentInfoArchi"
-    "ve\022%\n\005super\030\001 \002(\0132\026.TSWP.ShapeInfoArchiv"
-    "e\022\'\n\017comment_storage\030\002 \001(\0132\016.TSP.Referen"
-    "ce\"\255\001\n\016TOCInfoArchive\022%\n\005super\030\001 \002(\0132\026.T"
-    "SWP.ShapeInfoArchive\022$\n\014toc_settings\030\002 \001"
-    "(\0132\016.TSP.Reference\022&\n\016toc_entry_data\030\003 \003"
-    "(\0132\016.TSP.Reference\022&\n\022page_number_ranges"
-    "\030\004 \003(\0132\n.TSP.Range\"5\n\024TOCLayoutHintArchi"
-    "ve\022\035\n\tcharRange\030\001 \002(\0132\n.TSP.Range\"\260\001\n\030Te"
-    "xtualAttachmentArchive\022\031\n\021string_equival"
-    "ent\030\001 \001(\t\0221\n\004kind\030\002 \001(\0162#.TSWP.TextualAt"
-    "tachmentArchive.Kind\"F\n\004Kind\022\023\n\017kKindPag"
-    "eNumber\020\000\022\022\n\016kKindPageCount\020\001\022\025\n\021kKindFo"
-    "otnoteMark\020\002\"\177\n\"TSWPTOCPageNumberAttachm"
-    "entArchive\022-\n\005super\030\001 \001(\0132\036.TSWP.Textual"
-    "AttachmentArchive\022\023\n\013page_number\030\002 \001(\t\022\025"
-    "\n\rbookmark_name\030\003 \001(\t\"\027\n\025UIGraphicalAtta"
-    "chment\"\217\001\n\031DrawableAttachmentArchive\022 \n\010"
-    "drawable\030\001 \001(\0132\016.TSP.Reference\022\025\n\rh_offs"
-    "et_type\030\002 \001(\r\022\020\n\010h_offset\030\003 \001(\002\022\025\n\rv_off"
-    "set_type\030\004 \001(\r\022\020\n\010v_offset\030\005 \001(\002\"F\n\024TOCA"
-    "ttachmentArchive\022.\n\005super\030\001 \002(\0132\037.TSWP.D"
-    "rawableAttachmentArchive\"\232\001\n\"FootnoteRef"
-    "erenceAttachmentArchive\022-\n\005super\030\001 \001(\0132\036"
-    ".TSWP.TextualAttachmentArchive\022)\n\021contai"
-    "ned_storage\030\002 \001(\0132\016.TSP.Reference\022\032\n\022cus"
-    "tom_mark_string\030\003 \001(\t\"u\n\027NumberAttachmen"
-    "tArchive\022-\n\005super\030\001 \001(\0132\036.TSWP.TextualAt"
-    "tachmentArchive\022\025\n\rnumber_format\030\002 \001(\r\022\024"
-    "\n\014string_value\030\003 \001(\t\"\023\n\021SmartFieldArchiv"
-    "e\"P\n\025HyperlinkFieldArchive\022&\n\005super\030\001 \001("
-    "\0132\027.TSWP.SmartFieldArchive\022\017\n\007url_ref\030\002 "
-    "\001(\t\"[\n\034PlaceholderSmartFieldArchive\022&\n\005s"
-    "uper\030\001 \001(\0132\027.TSWP.SmartFieldArchive\022\023\n\013l"
-    "ocalizable\030\002 \001(\010\"f\n UnsupportedHyperlink"
-    "FieldArchive\0221\n\005super\030\001 \001(\0132\".TSWP.Place"
-    "holderSmartFieldArchive\022\017\n\007url_ref\030\002 \001(\t"
-    "\"\275\001\n\035BibliographySmartFieldArchive\022&\n\005su"
-    "per\030\003 \001(\0132\027.TSWP.SmartFieldArchive\022(\n\020ci"
-    "tation_records\030\002 \003(\0132\016.TSP.Reference\022\023\n\013"
-    "localizable\030\004 \001(\010\0225\n\told_super\030\001 \001(\0132\".T"
-    "SWP.PlaceholderSmartFieldArchive\"\321\001\n\025Cit"
-    "ationRecordArchive\022\023\n\013endnote_xml\030\001 \001(\t\022"
-    "\031\n\021hide_author_names\030\002 \001(\010\022\021\n\thide_year\030"
-    "\003 \001(\010\022\022\n\npage_range\030\004 \001(\t\022\016\n\006prefix\030\005 \001("
-    "\t\022\016\n\006suffix\030\006 \001(\t\022\026\n\016authors_string\030\007 \001("
-    "\t\022\r\n\005title\030\010 \001(\t\022\014\n\004year\030\t \001(\t\022\014\n\004type\030\n"
-    " \001(\t\"\271\001\n\031CitationSmartFieldArchive\022&\n\005su"
-    "per\030\003 \001(\0132\027.TSWP.SmartFieldArchive\022(\n\020ci"
-    "tation_records\030\002 \003(\0132\016.TSP.Reference\022\023\n\013"
-    "localizable\030\004 \001(\010\0225\n\told_super\030\001 \001(\0132\".T"
-    "SWP.PlaceholderSmartFieldArchive\"\257\005\n\031Dat"
-    "eTimeSmartFieldArchive\022&\n\005super\030\001 \001(\0132\027."
-    "TSWP.SmartFieldArchive\022\016\n\006format\030\002 \001(\t\022\031"
-    "\n\021locale_identifier\030\003 \001(\t\022J\n\ndate_style\030"
-    "\004 \001(\01626.TSWP.DateTimeSmartFieldArchive.D"
-    "ateTimeFormatterStyle\022J\n\ntime_style\030\005 \001("
-    "\01626.TSWP.DateTimeSmartFieldArchive.DateT"
-    "imeFormatterStyle\022G\n\013update_plan\030\006 \001(\01622"
-    ".TSWP.DateTimeSmartFieldArchive.DateTime"
-    "UpdatePlan\022\024\n\014needs_update\030\007 \001(\010\022\027\n\004date"
-    "\030\010 \001(\0132\t.TSP.Date\"l\n\022DateTimeUpdatePlan\022"
-    "\034\n\030kDateTimeUpdatePlanNever\020\000\022\033\n\027kDateTi"
-    "meUpdatePlanAuto\020\001\022\033\n\027kDateTimeUpdatePla"
-    "nOnce\020\002\"\300\001\n\026DateTimeFormatterStyle\022\037\n\033kD"
-    "ateTimeFormatterStyleNone\020\000\022 \n\034kDateTime"
-    "FormatterStyleShort\020\001\022!\n\035kDateTimeFormat"
-    "terStyleMedium\020\002\022\037\n\033kDateTimeFormatterSt"
-    "yleLong\020\003\022\037\n\033kDateTimeFormatterStyleFull"
-    "\020\004\"l\n\024BookmarkFieldArchive\022&\n\005super\030\001 \001("
-    "\0132\027.TSWP.SmartFieldArchive\022\014\n\004name\030\002 \001(\t"
-    "\022\016\n\006ranged\030\003 \001(\r\022\016\n\006hidden\030\004 \001(\r\"e\n\031File"
-    "nameSmartFieldArchive\0221\n\005super\030\001 \001(\0132\".T"
-    "SWP.PlaceholderSmartFieldArchive\022\025\n\rdisp"
-    "lay_flags\030\002 \001(\r\"\324\002\n\026MergeSmartFieldArchi"
-    "ve\0221\n\005super\030\001 \001(\0132\".TSWP.PlaceholderSmar"
-    "tFieldArchive\022\020\n\010property\030\002 \001(\t\022\r\n\005label"
-    "\030\003 \001(\t\022\013\n\003key\030\004 \001(\t\022<\n\010category\030\005 \001(\0162*."
-    "TSWP.MergeSmartFieldArchive.MergeCategor"
-    "y\022%\n\035requires_following_whitespace\030\006 \001(\010"
-    "\022\022\n\nwhitespace\030\007 \001(\t\022\014\n\004guid\030\010 \001(\t\022\023\n\013ta"
-    "ble_field\030\t \001(\t\"=\n\rMergeCategory\022\024\n\020kMer"
-    "geCategoryTo\020\000\022\026\n\022kMergeCategoryFrom\020\001\"\347"
-    "\001\n\024TOCSmartFieldArchive\0221\n\005super\030\001 \001(\0132\""
-    ".TSWP.PlaceholderSmartFieldArchive\0228\n\013to"
-    "c_entries\030\002 \003(\0132#.TSWP.TOCSmartFieldArch"
-    "ive.TOCEntry\032b\n\010TOCEntry\022\025\n\rbookmark_nam"
-    "e\030\001 \001(\t\022$\n\014target_style\030\002 \001(\0132\016.TSP.Refe"
-    "rence\022\031\n\005range\030\003 \001(\0132\n.TSP.Range\"M\n\020Ruby"
-    "FieldArchive\022&\n\005super\030\001 \001(\0132\027.TSWP.Smart"
-    "FieldArchive\022\021\n\truby_text\030\002 \001(\t\"\310\001\n\rChan"
-    "geArchive\022,\n\004kind\030\001 \001(\0162\036.TSWP.ChangeArc"
-    "hive.ChangeKind\022\037\n\007session\030\002 \001(\0132\016.TSP.R"
-    "eference\022\027\n\004date\030\003 \001(\0132\t.TSP.Date\022\016\n\006hid"
-    "den\030\004 \001(\010\"\?\n\nChangeKind\022\030\n\024kChangeKindIn"
-    "sertion\020\001\022\027\n\023kChangeKindDeletion\020\002\"d\n\024Ch"
-    "angeSessionArchive\022\023\n\013session_uid\030\001 \001(\r\022"
-    "\036\n\006author\030\002 \001(\0132\016.TSP.Reference\022\027\n\004date\030"
-    "\003 \001(\0132\t.TSP.Date\"\033\n\031SectionPlaceholderAr"
-    "chive*\364\001\n\rSelectionType\022\030\n\024SelectionType"
-    "_Normal\020\000\022\033\n\027SelectionType_ListLabel\020\001\022\033"
-    "\n\027SelectionType_ListTopic\020\002\022\031\n\025Selection"
-    "Type_Replace\020\003\022 \n\034SelectionType_CopyPast"
-    "eStyle\020\004\022\032\n\026SelectionType_Replace2\020\005\022\034\n\030"
-    "SelectionType_SmartField\020\006\022\030\n\024SelectionT"
-    "ype_Visual\020\007*\206\001\n\026StyleInsertionBehavior\022"
-    "!\n\035StyleInsertionBehavior_NoGrow\020\000\022#\n\037St"
-    "yleInsertionBehavior_GrowLeft\020\001\022$\n Style"
-    "InsertionBehavior_GrowRight\020\002*\?\n\rCaretAf"
-    "finity\022\027\n\023CaretAffinity_Start\020\000\022\025\n\021Caret"
-    "Affinity_End\020\001*\201\001\n\024WritingDirectionType\022"
-    "%\n\030kWritingDirectionNatural\020\377\377\377\377\377\377\377\377\377\001\022 "
-    "\n\034kWritingDirectionLeftToRight\020\000\022 \n\034kWri"
-    "tingDirectionRightToLeft\020\001", 19706);
+    "HebrewBiblicalStandardKind\020=\022\036\n\032kHebrewB"
+    "iblicalDecimalKind\020>\022\"\n\036kHebrewBiblicalD"
+    "oubleParenKind\020\?\022!\n\035kHebrewBiblicalRight"
+    "ParenKind\020@\"\200\001\n\026TextStylePresetArchive\022\031"
+    "\n\021preset_identifier\030\001 \001(\t\022\'\n\017paragraph_s"
+    "tyle\030\002 \001(\0132\016.TSP.Reference\022\"\n\nlist_style"
+    "\030\003 \001(\0132\016.TSP.Reference\"\365\002\n\016ColumnsArchiv"
+    "e\022\?\n\requal_columns\030\001 \001(\0132(.TSWP.ColumnsA"
+    "rchive.EqualColumnsArchive\022F\n\021non_equal_"
+    "columns\030\002 \001(\0132+.TSWP.ColumnsArchive.NonE"
+    "qualColumnsArchive\0321\n\023EqualColumnsArchiv"
+    "e\022\r\n\005count\030\001 \001(\r\022\013\n\003gap\030\002 \001(\002\032\246\001\n\026NonEqu"
+    "alColumnsArchive\022\r\n\005first\030\001 \002(\002\022N\n\tfollo"
+    "wing\030\002 \003(\0132;.TSWP.ColumnsArchive.NonEqua"
+    "lColumnsArchive.GapWidthArchive\032-\n\017GapWi"
+    "dthArchive\022\013\n\003gap\030\001 \002(\002\022\r\n\005width\030\002 \002(\002\"J"
+    "\n\016PaddingArchive\022\014\n\004left\030\001 \001(\002\022\013\n\003top\030\002 "
+    "\001(\002\022\r\n\005right\030\003 \001(\002\022\016\n\006bottom\030\004 \001(\002\"\317\004\n\034C"
+    "olumnStylePropertiesArchive\022\022\n\ncontinuou"
+    "s\030\001 \001(\010\022\025\n\rshrink_to_fit\030\002 \001(\010\022\025\n\rvertic"
+    "al_text\030\003 \001(\010\022\034\n\024min_horizontal_inset\030\004 "
+    "\001(\002\022T\n\022vertical_alignment\030\005 \001(\01628.TSWP.C"
+    "olumnStylePropertiesArchive.VerticalAlig"
+    "nmentType\022\024\n\014columns_null\030\006 \001(\010\022%\n\007colum"
+    "ns\030\007 \001(\0132\024.TSWP.ColumnsArchive\022\024\n\014margin"
+    "s_null\030\010 \001(\010\022%\n\007margins\030\t \001(\0132\024.TSWP.Pad"
+    "dingArchive\022\024\n\014padding_null\030\n \001(\010\022%\n\007pad"
+    "ding\030\013 \001(\0132\024.TSWP.PaddingArchive\022O\n\021writ"
+    "ing_direction\030\014 \001(\0162\032.TSWP.WritingDirect"
+    "ionType:\030kWritingDirectionNatural\"q\n\025Ver"
+    "ticalAlignmentType\022\022\n\016kFrameAlignTop\020\000\022\025"
+    "\n\021kFrameAlignMiddle\020\001\022\025\n\021kFrameAlignBott"
+    "om\020\002\022\026\n\022kFrameAlignJustify\020\003\"\220\001\n\022ColumnS"
+    "tyleArchive\022 \n\005super\030\001 \002(\0132\021.TSS.StyleAr"
+    "chive\022\031\n\016override_count\030\n \001(\r:\0010\022=\n\021colu"
+    "mn_properties\030\013 \001(\0132\".TSWP.ColumnStylePr"
+    "opertiesArchive\"\367\003\n\033ShapeStyleProperties"
+    "Archive\022\025\n\rshrink_to_fit\030\001 \001(\010\022S\n\022vertic"
+    "al_alignment\030\002 \001(\01627.TSWP.ShapeStyleProp"
+    "ertiesArchive.VerticalAlignmentType\022\024\n\014c"
+    "olumns_null\030\003 \001(\010\022%\n\007columns\030\004 \001(\0132\024.TSW"
+    "P.ColumnsArchive\022\024\n\014padding_null\030\005 \001(\010\022%"
+    "\n\007padding\030\006 \001(\0132\024.TSWP.PaddingArchive\022!\n"
+    "\031default_text_preset_index\030\007 \001(\r\022\025\n\rvert"
+    "ical_text\030\010 \001(\010\022\034\n\024paragraph_style_null\030"
+    "\t \001(\010\022\'\n\017paragraph_style\030\n \001(\0132\016.TSP.Ref"
+    "erence\"q\n\025VerticalAlignmentType\022\022\n\016kFram"
+    "eAlignTop\020\000\022\025\n\021kFrameAlignMiddle\020\001\022\025\n\021kF"
+    "rameAlignBottom\020\002\022\026\n\022kFrameAlignJustify\020"
+    "\003\"\222\001\n\021ShapeStyleArchive\022%\n\005super\030\001 \002(\0132\026"
+    ".TSD.ShapeStyleArchive\022\031\n\016override_count"
+    "\030\n \001(\r:\0010\022;\n\020shape_properties\030\013 \001(\0132!.TS"
+    "WP.ShapeStylePropertiesArchive\"\244\003\n\023Theme"
+    "PresetsArchive\022*\n\022list_style_presets\030\001 \003"
+    "(\0132\016.TSP.Reference\022*\n\022text_style_presets"
+    "\030\002 \003(\0132\016.TSP.Reference\0223\n\033imported_text_"
+    "style_presets\030\003 \003(\0132\016.TSP.Reference\022/\n\027t"
+    "oc_entry_style_presets\030\004 \003(\0132\016.TSP.Refer"
+    "ence\022,\n\024toc_settings_presets\030\005 \003(\0132\016.TSP"
+    ".Reference\022/\n\027character_style_presets\030\006 "
+    "\003(\0132\016.TSP.Reference\022/\n\027paragraph_style_p"
+    "resets\030\007 \003(\0132\016.TSP.Reference2\?\n\textensio"
+    "n\022\021.TSS.ThemeArchive\030n \002(\0132\031.TSWP.ThemeP"
+    "resetsArchive\"T\n\034TextPresetDisplayItemAr"
+    "chive\022\036\n\006preset\030\001 \002(\0132\016.TSP.Reference\022\024\n"
+    "\014display_name\030\002 \002(\t\"\205\001\n\036TOCEntryStylePro"
+    "pertiesArchive\022\036\n\026page_number_style_null"
+    "\030\001 \001(\010\022)\n\021page_number_style\030\002 \001(\0132\016.TSP."
+    "Reference\022\030\n\020show_page_number\030\003 \001(\010\"\200\001\n\024"
+    "TOCEntryStyleArchive\022*\n\005super\030\001 \002(\0132\033.TS"
+    "WP.ParagraphStyleArchive\022<\n\016toc_properti"
+    "es\030\002 \001(\0132$.TSWP.TOCEntryStylePropertiesA"
+    "rchive\"\350\001\n\022TOCSettingsArchive\022\020\n\010toc_nam"
+    "e\030\001 \001(\t\022\021\n\ttoc_scope\030\002 \001(\r\0226\n\007entries\030\003 "
+    "\003(\0132%.TSWP.TOCSettingsArchive.TOCEntryDa"
+    "ta\032u\n\014TOCEntryData\022\'\n\017paragraph_style\030\001 "
+    "\001(\0132\016.TSP.Reference\022\'\n\017toc_entry_style\030\002"
+    " \001(\0132\016.TSP.Reference\022\023\n\013show_in_toc\030\003 \001("
+    "\010\"\377\001\n\027TOCEntryInstanceArchive\022\027\n\017paragra"
+    "ph_index\030\001 \002(\r\022\023\n\013page_number\030\002 \002(\r\022\025\n\rn"
+    "umber_format\030\003 \002(\r\022\017\n\007heading\030\004 \002(\t\022%\n\ri"
+    "ndexed_style\030\005 \002(\0132\016.TSP.Reference\022*\n\022in"
+    "dexed_list_style\030\006 \001(\0132\016.TSP.Reference\022\032"
+    "\n\022indexed_list_start\030\007 \001(\r\022\037\n\027indexed_pa"
+    "ragraph_level\030\010 \001(\r\"\274\020\n\017UndoTransaction\022"
+    "7\n\007entries\030\001 \003(\0132&.TSWP.UndoTransaction."
+    "UnionTransaction\032D\n\022GenericTransaction\022\016"
+    "\n\006value1\030\001 \002(\r\022\016\n\006value2\030\002 \002(\r\022\016\n\006value3"
+    "\030\003 \002(\r\032[\n\017TextTransaction\022\027\n\017insert_loca"
+    "tion\030\001 \002(\r\022\025\n\rinsert_length\030\002 \002(\r\022\030\n\020str"
+    "ing_to_delete\030\003 \001(\t\032Y\n\024CharIndexTransact"
+    "ion\022\022\n\nchar_index\030\001 \002(\r\022\r\n\005count\030\002 \002(\r\022\036"
+    "\n\006object\030\003 \001(\0132\016.TSP.Reference\032J\n\033Replac"
+    "eCharIndexTransaction\022\027\n\017attribute_index"
+    "\030\001 \002(\r\022\022\n\nchar_index\030\002 \002(\r\032x\n\031AttributeI"
+    "ndexTransaction\022\027\n\017attribute_index\030\001 \002(\r"
+    "\022\022\n\nchar_index\030\002 \002(\r\022\036\n\006object\030\003 \001(\0132\016.T"
+    "SP.Reference\022\016\n\006string\030\004 \001(\t\032~\n\032InsertAt"
+    "tributeTransaction\022\027\n\017attribute_index\030\001 "
+    "\002(\r\022\027\n\017attribute_count\030\002 \002(\r\022\036\n\006object\030\003"
+    " \001(\0132\016.TSP.Reference\022\016\n\006string\030\004 \001(\t\032H\n\024"
+    "InsertNilTransaction\022\027\n\017attribute_index\030"
+    "\001 \002(\r\022\027\n\017attribute_count\030\002 \002(\r\032W\n\024CharDe"
+    "ltaTransaction\022\022\n\nchar_index\030\001 \002(\r\022\027\n\017at"
+    "tribute_index\030\002 \002(\r\022\022\n\nchar_delta\030\003 \002(\021\032"
+    "f\n\030ParagraphDataTransaction\022\027\n\017attribute"
+    "_index\030\001 \002(\r\022\r\n\005first\030\002 \002(\r\022\016\n\006second\030\003 "
+    "\002(\r\022\022\n\nchar_index\030\004 \002(\r\032F\n\025ObjectDOLCTra"
+    "nsaction\022\r\n\005flags\030\001 \002(\r\022\036\n\006object\030\002 \001(\0132"
+    "\016.TSP.Reference\032E\n\021CTDateTransaction\022\027\n\017"
+    "attribute_index\030\001 \002(\r\022\027\n\004date\030\002 \001(\0132\t.TS"
+    "P.Date\032\250\006\n\020UnionTransaction\022,\n\004kind\030\001 \002("
+    "\0162\036.TSWP.UndoTransaction.UndoKind\022\r\n\005tab"
+    "le\030\002 \001(\r\0229\n\007generic\030\005 \001(\0132(.TSWP.UndoTra"
+    "nsaction.GenericTransaction\0223\n\004text\030\006 \001("
+    "\0132%.TSWP.UndoTransaction.TextTransaction"
+    "\022>\n\nchar_index\030\007 \001(\0132*.TSWP.UndoTransact"
+    "ion.CharIndexTransaction\022M\n\022replace_char"
+    "_index\030\010 \001(\01321.TSWP.UndoTransaction.Repl"
+    "aceCharIndexTransaction\022H\n\017attribute_ind"
+    "ex\030\t \001(\0132/.TSWP.UndoTransaction.Attribut"
+    "eIndexTransaction\022>\n\ninsert_nil\030\n \001(\0132*."
+    "TSWP.UndoTransaction.InsertNilTransactio"
+    "n\022J\n\020insert_attribute\030\013 \001(\01320.TSWP.UndoT"
+    "ransaction.InsertAttributeTransaction\022>\n"
+    "\nchar_delta\030\014 \001(\0132*.TSWP.UndoTransaction"
+    ".CharDeltaTransaction\022F\n\016paragraph_data\030"
+    "\r \001(\0132..TSWP.UndoTransaction.ParagraphDa"
+    "taTransaction\022@\n\013object_dolc\030\016 \001(\0132+.TSW"
+    "P.UndoTransaction.ObjectDOLCTransaction\022"
+    "8\n\007ct_date\030\017 \001(\0132\'.TSWP.UndoTransaction."
+    "CTDateTransaction\"\346\001\n\010UndoKind\022\020\n\014REPLAC"
+    "E_TEXT\020\001\022\024\n\020INSERT_ATTRIBUTE\020\002\022\024\n\020DELETE"
+    "_ATTRIBUTE\020\003\022\027\n\023ADJUST_CHAR_INDEXES\020\004\022\035\n"
+    "\031COMPR_ADJUST_CHAR_INDEXES\020\005\022\026\n\022REPLACE_"
+    "CHAR_INDEX\020\006\022\022\n\016REPLACE_OBJECT\020\007\022\032\n\026REPL"
+    "ACE_PARAGRAPH_DATA\020\010\022\017\n\013OBJECT_DOLC\020\t\022\013\n"
+    "\007CT_DATE\020\n\"P\n\035UndoTransactionWrapperArch"
+    "ive\022/\n\020undo_transaction\030\001 \002(\0132\025.TSWP.Und"
+    "oTransaction\"^\n\020ShapeInfoArchive\022 \n\005supe"
+    "r\030\001 \002(\0132\021.TSD.ShapeArchive\022(\n\020containedS"
+    "torage\030\002 \001(\0132\016.TSP.Reference\"d\n\022CommentI"
+    "nfoArchive\022%\n\005super\030\001 \002(\0132\026.TSWP.ShapeIn"
+    "foArchive\022\'\n\017comment_storage\030\002 \001(\0132\016.TSP"
+    ".Reference\"\255\001\n\016TOCInfoArchive\022%\n\005super\030\001"
+    " \002(\0132\026.TSWP.ShapeInfoArchive\022$\n\014toc_sett"
+    "ings\030\002 \001(\0132\016.TSP.Reference\022&\n\016toc_entry_"
+    "data\030\003 \003(\0132\016.TSP.Reference\022&\n\022page_numbe"
+    "r_ranges\030\004 \003(\0132\n.TSP.Range\"5\n\024TOCLayoutH"
+    "intArchive\022\035\n\tcharRange\030\001 \002(\0132\n.TSP.Rang"
+    "e\"\260\001\n\030TextualAttachmentArchive\022\031\n\021string"
+    "_equivalent\030\001 \001(\t\0221\n\004kind\030\002 \001(\0162#.TSWP.T"
+    "extualAttachmentArchive.Kind\"F\n\004Kind\022\023\n\017"
+    "kKindPageNumber\020\000\022\022\n\016kKindPageCount\020\001\022\025\n"
+    "\021kKindFootnoteMark\020\002\"\177\n\"TSWPTOCPageNumbe"
+    "rAttachmentArchive\022-\n\005super\030\001 \001(\0132\036.TSWP"
+    ".TextualAttachmentArchive\022\023\n\013page_number"
+    "\030\002 \001(\t\022\025\n\rbookmark_name\030\003 \001(\t\"\027\n\025UIGraph"
+    "icalAttachment\"\217\001\n\031DrawableAttachmentArc"
+    "hive\022 \n\010drawable\030\001 \001(\0132\016.TSP.Reference\022\025"
+    "\n\rh_offset_type\030\002 \001(\r\022\020\n\010h_offset\030\003 \001(\002\022"
+    "\025\n\rv_offset_type\030\004 \001(\r\022\020\n\010v_offset\030\005 \001(\002"
+    "\"F\n\024TOCAttachmentArchive\022.\n\005super\030\001 \002(\0132"
+    "\037.TSWP.DrawableAttachmentArchive\"\232\001\n\"Foo"
+    "tnoteReferenceAttachmentArchive\022-\n\005super"
+    "\030\001 \001(\0132\036.TSWP.TextualAttachmentArchive\022)"
+    "\n\021contained_storage\030\002 \001(\0132\016.TSP.Referenc"
+    "e\022\032\n\022custom_mark_string\030\003 \001(\t\"u\n\027NumberA"
+    "ttachmentArchive\022-\n\005super\030\001 \001(\0132\036.TSWP.T"
+    "extualAttachmentArchive\022\025\n\rnumber_format"
+    "\030\002 \001(\r\022\024\n\014string_value\030\003 \001(\t\"\023\n\021SmartFie"
+    "ldArchive\"P\n\025HyperlinkFieldArchive\022&\n\005su"
+    "per\030\001 \001(\0132\027.TSWP.SmartFieldArchive\022\017\n\007ur"
+    "l_ref\030\002 \001(\t\"[\n\034PlaceholderSmartFieldArch"
+    "ive\022&\n\005super\030\001 \001(\0132\027.TSWP.SmartFieldArch"
+    "ive\022\023\n\013localizable\030\002 \001(\010\"f\n UnsupportedH"
+    "yperlinkFieldArchive\0221\n\005super\030\001 \001(\0132\".TS"
+    "WP.PlaceholderSmartFieldArchive\022\017\n\007url_r"
+    "ef\030\002 \001(\t\"\275\001\n\035BibliographySmartFieldArchi"
+    "ve\022&\n\005super\030\003 \001(\0132\027.TSWP.SmartFieldArchi"
+    "ve\022(\n\020citation_records\030\002 \003(\0132\016.TSP.Refer"
+    "ence\022\023\n\013localizable\030\004 \001(\010\0225\n\told_super\030\001"
+    " \001(\0132\".TSWP.PlaceholderSmartFieldArchive"
+    "\"\321\001\n\025CitationRecordArchive\022\023\n\013endnote_xm"
+    "l\030\001 \001(\t\022\031\n\021hide_author_names\030\002 \001(\010\022\021\n\thi"
+    "de_year\030\003 \001(\010\022\022\n\npage_range\030\004 \001(\t\022\016\n\006pre"
+    "fix\030\005 \001(\t\022\016\n\006suffix\030\006 \001(\t\022\026\n\016authors_str"
+    "ing\030\007 \001(\t\022\r\n\005title\030\010 \001(\t\022\014\n\004year\030\t \001(\t\022\014"
+    "\n\004type\030\n \001(\t\"\271\001\n\031CitationSmartFieldArchi"
+    "ve\022&\n\005super\030\003 \001(\0132\027.TSWP.SmartFieldArchi"
+    "ve\022(\n\020citation_records\030\002 \003(\0132\016.TSP.Refer"
+    "ence\022\023\n\013localizable\030\004 \001(\010\0225\n\told_super\030\001"
+    " \001(\0132\".TSWP.PlaceholderSmartFieldArchive"
+    "\"\257\005\n\031DateTimeSmartFieldArchive\022&\n\005super\030"
+    "\001 \001(\0132\027.TSWP.SmartFieldArchive\022\016\n\006format"
+    "\030\002 \001(\t\022\031\n\021locale_identifier\030\003 \001(\t\022J\n\ndat"
+    "e_style\030\004 \001(\01626.TSWP.DateTimeSmartFieldA"
+    "rchive.DateTimeFormatterStyle\022J\n\ntime_st"
+    "yle\030\005 \001(\01626.TSWP.DateTimeSmartFieldArchi"
+    "ve.DateTimeFormatterStyle\022G\n\013update_plan"
+    "\030\006 \001(\01622.TSWP.DateTimeSmartFieldArchive."
+    "DateTimeUpdatePlan\022\024\n\014needs_update\030\007 \001(\010"
+    "\022\027\n\004date\030\010 \001(\0132\t.TSP.Date\"l\n\022DateTimeUpd"
+    "atePlan\022\034\n\030kDateTimeUpdatePlanNever\020\000\022\033\n"
+    "\027kDateTimeUpdatePlanAuto\020\001\022\033\n\027kDateTimeU"
+    "pdatePlanOnce\020\002\"\300\001\n\026DateTimeFormatterSty"
+    "le\022\037\n\033kDateTimeFormatterStyleNone\020\000\022 \n\034k"
+    "DateTimeFormatterStyleShort\020\001\022!\n\035kDateTi"
+    "meFormatterStyleMedium\020\002\022\037\n\033kDateTimeFor"
+    "matterStyleLong\020\003\022\037\n\033kDateTimeFormatterS"
+    "tyleFull\020\004\"l\n\024BookmarkFieldArchive\022&\n\005su"
+    "per\030\001 \001(\0132\027.TSWP.SmartFieldArchive\022\014\n\004na"
+    "me\030\002 \001(\t\022\016\n\006ranged\030\003 \001(\r\022\016\n\006hidden\030\004 \001(\r"
+    "\"e\n\031FilenameSmartFieldArchive\0221\n\005super\030\001"
+    " \001(\0132\".TSWP.PlaceholderSmartFieldArchive"
+    "\022\025\n\rdisplay_flags\030\002 \001(\r\"\324\002\n\026MergeSmartFi"
+    "eldArchive\0221\n\005super\030\001 \001(\0132\".TSWP.Placeho"
+    "lderSmartFieldArchive\022\020\n\010property\030\002 \001(\t\022"
+    "\r\n\005label\030\003 \001(\t\022\013\n\003key\030\004 \001(\t\022<\n\010category\030"
+    "\005 \001(\0162*.TSWP.MergeSmartFieldArchive.Merg"
+    "eCategory\022%\n\035requires_following_whitespa"
+    "ce\030\006 \001(\010\022\022\n\nwhitespace\030\007 \001(\t\022\014\n\004guid\030\010 \001"
+    "(\t\022\023\n\013table_field\030\t \001(\t\"=\n\rMergeCategory"
+    "\022\024\n\020kMergeCategoryTo\020\000\022\026\n\022kMergeCategory"
+    "From\020\001\"\347\001\n\024TOCSmartFieldArchive\0221\n\005super"
+    "\030\001 \001(\0132\".TSWP.PlaceholderSmartFieldArchi"
+    "ve\0228\n\013toc_entries\030\002 \003(\0132#.TSWP.TOCSmartF"
+    "ieldArchive.TOCEntry\032b\n\010TOCEntry\022\025\n\rbook"
+    "mark_name\030\001 \001(\t\022$\n\014target_style\030\002 \001(\0132\016."
+    "TSP.Reference\022\031\n\005range\030\003 \001(\0132\n.TSP.Range"
+    "\"M\n\020RubyFieldArchive\022&\n\005super\030\001 \001(\0132\027.TS"
+    "WP.SmartFieldArchive\022\021\n\truby_text\030\002 \001(\t\""
+    "\310\001\n\rChangeArchive\022,\n\004kind\030\001 \001(\0162\036.TSWP.C"
+    "hangeArchive.ChangeKind\022\037\n\007session\030\002 \001(\013"
+    "2\016.TSP.Reference\022\027\n\004date\030\003 \001(\0132\t.TSP.Dat"
+    "e\022\016\n\006hidden\030\004 \001(\010\"\?\n\nChangeKind\022\030\n\024kChan"
+    "geKindInsertion\020\001\022\027\n\023kChangeKindDeletion"
+    "\020\002\"d\n\024ChangeSessionArchive\022\023\n\013session_ui"
+    "d\030\001 \001(\r\022\036\n\006author\030\002 \001(\0132\016.TSP.Reference\022"
+    "\027\n\004date\030\003 \001(\0132\t.TSP.Date\"\033\n\031SectionPlace"
+    "holderArchive*\364\001\n\rSelectionType\022\030\n\024Selec"
+    "tionType_Normal\020\000\022\033\n\027SelectionType_ListL"
+    "abel\020\001\022\033\n\027SelectionType_ListTopic\020\002\022\031\n\025S"
+    "electionType_Replace\020\003\022 \n\034SelectionType_"
+    "CopyPasteStyle\020\004\022\032\n\026SelectionType_Replac"
+    "e2\020\005\022\034\n\030SelectionType_SmartField\020\006\022\030\n\024Se"
+    "lectionType_Visual\020\007*\206\001\n\026StyleInsertionB"
+    "ehavior\022!\n\035StyleInsertionBehavior_NoGrow"
+    "\020\000\022#\n\037StyleInsertionBehavior_GrowLeft\020\001\022"
+    "$\n StyleInsertionBehavior_GrowRight\020\002*\?\n"
+    "\rCaretAffinity\022\027\n\023CaretAffinity_Start\020\000\022"
+    "\025\n\021CaretAffinity_End\020\001*\201\001\n\024WritingDirect"
+    "ionType\022%\n\030kWritingDirectionNatural\020\377\377\377\377"
+    "\377\377\377\377\377\001\022 \n\034kWritingDirectionLeftToRight\020\000"
+    "\022 \n\034kWritingDirectionRightToLeft\020\001", 19914);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "TSWPArchives.proto", &protobuf_RegisterTypes);
   SelectionArchive::default_instance_ = new SelectionArchive();
@@ -12511,6 +12519,9 @@ bool ListStyleArchive_NumberType_IsValid(int value) {
     case 59:
     case 60:
     case 61:
+    case 62:
+    case 63:
+    case 64:
       return true;
     default:
       return false;
@@ -12580,6 +12591,9 @@ const ListStyleArchive_NumberType ListStyleArchive::kHebrewAlphaDecimalKind;
 const ListStyleArchive_NumberType ListStyleArchive::kHebrewAlphaDoubleParenKind;
 const ListStyleArchive_NumberType ListStyleArchive::kHebrewAlphaRightParenKind;
 const ListStyleArchive_NumberType ListStyleArchive::kHebrewBiblicalStandardKind;
+const ListStyleArchive_NumberType ListStyleArchive::kHebrewBiblicalDecimalKind;
+const ListStyleArchive_NumberType ListStyleArchive::kHebrewBiblicalDoubleParenKind;
+const ListStyleArchive_NumberType ListStyleArchive::kHebrewBiblicalRightParenKind;
 const ListStyleArchive_NumberType ListStyleArchive::NumberType_MIN;
 const ListStyleArchive_NumberType ListStyleArchive::NumberType_MAX;
 const int ListStyleArchive::NumberType_ARRAYSIZE;
@@ -19601,6 +19615,9 @@ const int TOCEntryInstanceArchive::kPageNumberFieldNumber;
 const int TOCEntryInstanceArchive::kNumberFormatFieldNumber;
 const int TOCEntryInstanceArchive::kHeadingFieldNumber;
 const int TOCEntryInstanceArchive::kIndexedStyleFieldNumber;
+const int TOCEntryInstanceArchive::kIndexedListStyleFieldNumber;
+const int TOCEntryInstanceArchive::kIndexedListStartFieldNumber;
+const int TOCEntryInstanceArchive::kIndexedParagraphLevelFieldNumber;
 #endif  // !_MSC_VER
 
 TOCEntryInstanceArchive::TOCEntryInstanceArchive()
@@ -19610,6 +19627,7 @@ TOCEntryInstanceArchive::TOCEntryInstanceArchive()
 
 void TOCEntryInstanceArchive::InitAsDefaultInstance() {
   indexed_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
+  indexed_list_style_ = const_cast< ::TSP::Reference*>(&::TSP::Reference::default_instance());
 }
 
 TOCEntryInstanceArchive::TOCEntryInstanceArchive(const TOCEntryInstanceArchive& from)
@@ -19625,6 +19643,9 @@ void TOCEntryInstanceArchive::SharedCtor() {
   number_format_ = 0u;
   heading_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   indexed_style_ = NULL;
+  indexed_list_style_ = NULL;
+  indexed_list_start_ = 0u;
+  indexed_paragraph_level_ = 0u;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -19638,6 +19659,7 @@ void TOCEntryInstanceArchive::SharedDtor() {
   }
   if (this != default_instance_) {
     delete indexed_style_;
+    delete indexed_list_style_;
   }
 }
 
@@ -19675,6 +19697,11 @@ void TOCEntryInstanceArchive::Clear() {
     if (has_indexed_style()) {
       if (indexed_style_ != NULL) indexed_style_->::TSP::Reference::Clear();
     }
+    if (has_indexed_list_style()) {
+      if (indexed_list_style_ != NULL) indexed_list_style_->::TSP::Reference::Clear();
+    }
+    indexed_list_start_ = 0u;
+    indexed_paragraph_level_ = 0u;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -19760,6 +19787,52 @@ bool TOCEntryInstanceArchive::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(50)) goto parse_indexed_list_style;
+        break;
+      }
+
+      // optional .TSP.Reference indexed_list_style = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_indexed_list_style:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_indexed_list_style()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_indexed_list_start;
+        break;
+      }
+
+      // optional uint32 indexed_list_start = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_indexed_list_start:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &indexed_list_start_)));
+          set_has_indexed_list_start();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_indexed_paragraph_level;
+        break;
+      }
+
+      // optional uint32 indexed_paragraph_level = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_indexed_paragraph_level:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
+                 input, &indexed_paragraph_level_)));
+          set_has_indexed_paragraph_level();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -19812,6 +19885,22 @@ void TOCEntryInstanceArchive::SerializeWithCachedSizes(
       5, this->indexed_style(), output);
   }
 
+  // optional .TSP.Reference indexed_list_style = 6;
+  if (has_indexed_list_style()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      6, this->indexed_list_style(), output);
+  }
+
+  // optional uint32 indexed_list_start = 7;
+  if (has_indexed_list_start()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(7, this->indexed_list_start(), output);
+  }
+
+  // optional uint32 indexed_paragraph_level = 8;
+  if (has_indexed_paragraph_level()) {
+    ::google::protobuf::internal::WireFormatLite::WriteUInt32(8, this->indexed_paragraph_level(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -19852,6 +19941,23 @@ ::google::protobuf::uint8* TOCEntryInstanceArchive::SerializeWithCachedSizesToAr
         5, this->indexed_style(), target);
   }
 
+  // optional .TSP.Reference indexed_list_style = 6;
+  if (has_indexed_list_style()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        6, this->indexed_list_style(), target);
+  }
+
+  // optional uint32 indexed_list_start = 7;
+  if (has_indexed_list_start()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(7, this->indexed_list_start(), target);
+  }
+
+  // optional uint32 indexed_paragraph_level = 8;
+  if (has_indexed_paragraph_level()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(8, this->indexed_paragraph_level(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -19898,6 +20004,27 @@ int TOCEntryInstanceArchive::ByteSize() const {
           this->indexed_style());
     }
 
+    // optional .TSP.Reference indexed_list_style = 6;
+    if (has_indexed_list_style()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->indexed_list_style());
+    }
+
+    // optional uint32 indexed_list_start = 7;
+    if (has_indexed_list_start()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->indexed_list_start());
+    }
+
+    // optional uint32 indexed_paragraph_level = 8;
+    if (has_indexed_paragraph_level()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::UInt32Size(
+          this->indexed_paragraph_level());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -19940,6 +20067,15 @@ void TOCEntryInstanceArchive::MergeFrom(const TOCEntryInstanceArchive& from) {
     if (from.has_indexed_style()) {
       mutable_indexed_style()->::TSP::Reference::MergeFrom(from.indexed_style());
     }
+    if (from.has_indexed_list_style()) {
+      mutable_indexed_list_style()->::TSP::Reference::MergeFrom(from.indexed_list_style());
+    }
+    if (from.has_indexed_list_start()) {
+      set_indexed_list_start(from.indexed_list_start());
+    }
+    if (from.has_indexed_paragraph_level()) {
+      set_indexed_paragraph_level(from.indexed_paragraph_level());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -19962,6 +20098,9 @@ bool TOCEntryInstanceArchive::IsInitialized() const {
   if (has_indexed_style()) {
     if (!this->indexed_style().IsInitialized()) return false;
   }
+  if (has_indexed_list_style()) {
+    if (!this->indexed_list_style().IsInitialized()) return false;
+  }
   return true;
 }
 
@@ -19972,6 +20111,9 @@ void TOCEntryInstanceArchive::Swap(TOCEntryInstanceArchive* other) {
     std::swap(number_format_, other->number_format_);
     std::swap(heading_, other->heading_);
     std::swap(indexed_style_, other->indexed_style_);
+    std::swap(indexed_list_style_, other->indexed_list_style_);
+    std::swap(indexed_list_start_, other->indexed_list_start_);
+    std::swap(indexed_paragraph_level_, other->indexed_paragraph_level_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.h b/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.h
index 962c966..f42f402 100644
--- a/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.h
+++ b/iWorkFileInspector/iWorkFileInspector/Messages/TSWPArchives.pb.h
@@ -438,11 +438,14 @@ enum ListStyleArchive_NumberType {
   ListStyleArchive_NumberType_kHebrewAlphaDecimalKind = 58,
   ListStyleArchive_NumberType_kHebrewAlphaDoubleParenKind = 59,
   ListStyleArchive_NumberType_kHebrewAlphaRightParenKind = 60,
-  ListStyleArchive_NumberType_kHebrewBiblicalStandardKind = 61
+  ListStyleArchive_NumberType_kHebrewBiblicalStandardKind = 61,
+  ListStyleArchive_NumberType_kHebrewBiblicalDecimalKind = 62,
+  ListStyleArchive_NumberType_kHebrewBiblicalDoubleParenKind = 63,
+  ListStyleArchive_NumberType_kHebrewBiblicalRightParenKind = 64
 };
 bool ListStyleArchive_NumberType_IsValid(int value);
 const ListStyleArchive_NumberType ListStyleArchive_NumberType_NumberType_MIN = ListStyleArchive_NumberType_kNumericDecimal;
-const ListStyleArchive_NumberType ListStyleArchive_NumberType_NumberType_MAX = ListStyleArchive_NumberType_kHebrewBiblicalStandardKind;
+const ListStyleArchive_NumberType ListStyleArchive_NumberType_NumberType_MAX = ListStyleArchive_NumberType_kHebrewBiblicalRightParenKind;
 const int ListStyleArchive_NumberType_NumberType_ARRAYSIZE = ListStyleArchive_NumberType_NumberType_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* ListStyleArchive_NumberType_descriptor();
@@ -4252,6 +4255,9 @@ class ListStyleArchive : public ::google::protobuf::Message {
   static const NumberType kHebrewAlphaDoubleParenKind = ListStyleArchive_NumberType_kHebrewAlphaDoubleParenKind;
   static const NumberType kHebrewAlphaRightParenKind = ListStyleArchive_NumberType_kHebrewAlphaRightParenKind;
   static const NumberType kHebrewBiblicalStandardKind = ListStyleArchive_NumberType_kHebrewBiblicalStandardKind;
+  static const NumberType kHebrewBiblicalDecimalKind = ListStyleArchive_NumberType_kHebrewBiblicalDecimalKind;
+  static const NumberType kHebrewBiblicalDoubleParenKind = ListStyleArchive_NumberType_kHebrewBiblicalDoubleParenKind;
+  static const NumberType kHebrewBiblicalRightParenKind = ListStyleArchive_NumberType_kHebrewBiblicalRightParenKind;
   static inline bool NumberType_IsValid(int value) {
     return ListStyleArchive_NumberType_IsValid(value);
   }
@@ -6521,6 +6527,29 @@ class TOCEntryInstanceArchive : public ::google::protobuf::Message {
   inline ::TSP::Reference* release_indexed_style();
   inline void set_allocated_indexed_style(::TSP::Reference* indexed_style);
 
+  // optional .TSP.Reference indexed_list_style = 6;
+  inline bool has_indexed_list_style() const;
+  inline void clear_indexed_list_style();
+  static const int kIndexedListStyleFieldNumber = 6;
+  inline const ::TSP::Reference& indexed_list_style() const;
+  inline ::TSP::Reference* mutable_indexed_list_style();
+  inline ::TSP::Reference* release_indexed_list_style();
+  inline void set_allocated_indexed_list_style(::TSP::Reference* indexed_list_style);
+
+  // optional uint32 indexed_list_start = 7;
+  inline bool has_indexed_list_start() const;
+  inline void clear_indexed_list_start();
+  static const int kIndexedListStartFieldNumber = 7;
+  inline ::google::protobuf::uint32 indexed_list_start() const;
+  inline void set_indexed_list_start(::google::protobuf::uint32 value);
+
+  // optional uint32 indexed_paragraph_level = 8;
+  inline bool has_indexed_paragraph_level() const;
+  inline void clear_indexed_paragraph_level();
+  static const int kIndexedParagraphLevelFieldNumber = 8;
+  inline ::google::protobuf::uint32 indexed_paragraph_level() const;
+  inline void set_indexed_paragraph_level(::google::protobuf::uint32 value);
+
   // @@protoc_insertion_point(class_scope:TSWP.TOCEntryInstanceArchive)
  private:
   inline void set_has_paragraph_index();
@@ -6533,6 +6562,12 @@ class TOCEntryInstanceArchive : public ::google::protobuf::Message {
   inline void clear_has_heading();
   inline void set_has_indexed_style();
   inline void clear_has_indexed_style();
+  inline void set_has_indexed_list_style();
+  inline void clear_has_indexed_list_style();
+  inline void set_has_indexed_list_start();
+  inline void clear_has_indexed_list_start();
+  inline void set_has_indexed_paragraph_level();
+  inline void clear_has_indexed_paragraph_level();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -6541,9 +6576,12 @@ class TOCEntryInstanceArchive : public ::google::protobuf::Message {
   ::std::string* heading_;
   ::TSP::Reference* indexed_style_;
   ::google::protobuf::uint32 number_format_;
+  ::google::protobuf::uint32 indexed_list_start_;
+  ::TSP::Reference* indexed_list_style_;
+  ::google::protobuf::uint32 indexed_paragraph_level_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
 
   friend void  protobuf_AddDesc_TSWPArchives_2eproto();
   friend void protobuf_AssignDesc_TSWPArchives_2eproto();
@@ -18420,6 +18458,88 @@ inline void TOCEntryInstanceArchive::set_allocated_indexed_style(::TSP::Referenc
   }
 }
 
+// optional .TSP.Reference indexed_list_style = 6;
+inline bool TOCEntryInstanceArchive::has_indexed_list_style() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void TOCEntryInstanceArchive::set_has_indexed_list_style() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void TOCEntryInstanceArchive::clear_has_indexed_list_style() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void TOCEntryInstanceArchive::clear_indexed_list_style() {
+  if (indexed_list_style_ != NULL) indexed_list_style_->::TSP::Reference::Clear();
+  clear_has_indexed_list_style();
+}
+inline const ::TSP::Reference& TOCEntryInstanceArchive::indexed_list_style() const {
+  return indexed_list_style_ != NULL ? *indexed_list_style_ : *default_instance_->indexed_list_style_;
+}
+inline ::TSP::Reference* TOCEntryInstanceArchive::mutable_indexed_list_style() {
+  set_has_indexed_list_style();
+  if (indexed_list_style_ == NULL) indexed_list_style_ = new ::TSP::Reference;
+  return indexed_list_style_;
+}
+inline ::TSP::Reference* TOCEntryInstanceArchive::release_indexed_list_style() {
+  clear_has_indexed_list_style();
+  ::TSP::Reference* temp = indexed_list_style_;
+  indexed_list_style_ = NULL;
+  return temp;
+}
+inline void TOCEntryInstanceArchive::set_allocated_indexed_list_style(::TSP::Reference* indexed_list_style) {
+  delete indexed_list_style_;
+  indexed_list_style_ = indexed_list_style;
+  if (indexed_list_style) {
+    set_has_indexed_list_style();
+  } else {
+    clear_has_indexed_list_style();
+  }
+}
+
+// optional uint32 indexed_list_start = 7;
+inline bool TOCEntryInstanceArchive::has_indexed_list_start() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void TOCEntryInstanceArchive::set_has_indexed_list_start() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void TOCEntryInstanceArchive::clear_has_indexed_list_start() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void TOCEntryInstanceArchive::clear_indexed_list_start() {
+  indexed_list_start_ = 0u;
+  clear_has_indexed_list_start();
+}
+inline ::google::protobuf::uint32 TOCEntryInstanceArchive::indexed_list_start() const {
+  return indexed_list_start_;
+}
+inline void TOCEntryInstanceArchive::set_indexed_list_start(::google::protobuf::uint32 value) {
+  set_has_indexed_list_start();
+  indexed_list_start_ = value;
+}
+
+// optional uint32 indexed_paragraph_level = 8;
+inline bool TOCEntryInstanceArchive::has_indexed_paragraph_level() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void TOCEntryInstanceArchive::set_has_indexed_paragraph_level() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void TOCEntryInstanceArchive::clear_has_indexed_paragraph_level() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void TOCEntryInstanceArchive::clear_indexed_paragraph_level() {
+  indexed_paragraph_level_ = 0u;
+  clear_has_indexed_paragraph_level();
+}
+inline ::google::protobuf::uint32 TOCEntryInstanceArchive::indexed_paragraph_level() const {
+  return indexed_paragraph_level_;
+}
+inline void TOCEntryInstanceArchive::set_indexed_paragraph_level(::google::protobuf::uint32 value) {
+  set_has_indexed_paragraph_level();
+  indexed_paragraph_level_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // UndoTransaction_GenericTransaction