diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3155b0d..e881c7e 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1,103 +1,107 @@
 <?php
 
 /**
  * This file is automatically generated. Use 'arc liberate' to rebuild it.
  *
  * @generated
  * @phutil-library-version 2
  */
 phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' => array(
     'SemiStructuredBaseController' => 'applications/semistruct/controller/SemiStructuredBaseController.php',
     'SemiStructuredDAO' => 'applications/semistruct/storage/SemiStructuredDAO.php',
     'SemiStructuredDataApplication' => 'applications/semistruct/application/SemiStructuredDataApplication.php',
     'SemiStructuredObjectInstance' => 'applications/semistruct/storage/SemiStructuredObjectInstance.php',
     'SemiStructuredObjectInstanceClassTransaction' => 'applications/semistruct/xaction/instance/SemiStructuredObjectInstanceClassTransaction.php',
     'SemiStructuredObjectInstanceController' => 'applications/semistruct/controller/instance/SemiStructuredObjectInstanceController.php',
     'SemiStructuredObjectInstanceDescriptionTransaction' => 'applications/semistruct/xaction/instance/SemiStructuredObjectInstanceDescriptionTransaction.php',
     'SemiStructuredObjectInstanceEditController' => 'applications/semistruct/controller/instance/SemiStructuredObjectInstanceEditController.php',
     'SemiStructuredObjectInstanceEditEngine' => 'applications/semistruct/editor/SemiStructuredObjectInstanceEditEngine.php',
     'SemiStructuredObjectInstanceNameTransaction' => 'applications/semistruct/xaction/instance/SemiStructuredObjectInstanceNameTransaction.php',
     'SemiStructuredObjectInstancePHIDType' => 'applications/semistruct/phid/SemiStructuredObjectInstancePHIDType.php',
     'SemiStructuredObjectInstanceQuery' => 'applications/semistruct/query/SemiStructuredObjectInstanceQuery.php',
     'SemiStructuredObjectInstanceRawDataTransaction' => 'applications/semistruct/xaction/instance/SemiStructuredObjectInstanceRawDataTransaction.php',
     'SemiStructuredObjectInstanceSearchEngine' => 'applications/semistruct/query/SemiStructuredObjectInstanceSearchEngine.php',
     'SemiStructuredObjectInstanceTransaction' => 'applications/semistruct/storage/SemiStructuredObjectInstanceTransaction.php',
+    'SemiStructuredObjectInstanceTransactionComment' => 'applications/semistruct/storage/SemiStructuredObjectInstanceTransactionComment.php',
     'SemiStructuredObjectInstanceTransactionEditor' => 'applications/semistruct/editor/SemiStructuredObjectInstanceTransactionEditor.php',
     'SemiStructuredObjectInstanceTransactionQuery' => 'applications/semistruct/query/SemiStructuredObjectInstanceTransactionQuery.php',
     'SemiStructuredObjectInstanceTransactionType' => 'applications/semistruct/xaction/instance/SemiStructuredObjectInstanceTransactionType.php',
     'SemiStructuredObjectInstanceViewController' => 'applications/semistruct/controller/instance/SemiStructuredObjectInstanceViewController.php',
     'SemiStructuredObjectNewInstanceController' => 'applications/semistruct/controller/class/SemiStructuredObjectNewInstanceController.php',
     'SemiStructuredObjectType' => 'applications/semistruct/storage/SemiStructuredObjectType.php',
     'SemiStructuredObjectTypeController' => 'applications/semistruct/controller/class/SemiStructuredObjectTypeController.php',
     'SemiStructuredObjectTypeDescriptionTransaction' => 'applications/semistruct/xaction/class/SemiStructuredObjectTypeDescriptionTransaction.php',
     'SemiStructuredObjectTypeEditController' => 'applications/semistruct/controller/class/SemiStructuredObjectTypeEditController.php',
     'SemiStructuredObjectTypeEditEngine' => 'applications/semistruct/editor/SemiStructuredObjectTypeEditEngine.php',
     'SemiStructuredObjectTypeFerretEngine' => 'applications/semistruct/engine/SemiStructuredObjectTypeFerretEngine.php',
     'SemiStructuredObjectTypeListController' => 'applications/semistruct/controller/class/SemiStructuredObjectTypeListController.php',
     'SemiStructuredObjectTypeNameTransaction' => 'applications/semistruct/xaction/class/SemiStructuredObjectTypeNameTransaction.php',
     'SemiStructuredObjectTypePHIDType' => 'applications/semistruct/phid/SemiStructuredObjectTypePHIDType.php',
     'SemiStructuredObjectTypeQuery' => 'applications/semistruct/query/SemiStructuredObjectTypeQuery.php',
     'SemiStructuredObjectTypeSearchEngine' => 'applications/semistruct/query/SemiStructuredObjectTypeSearchEngine.php',
     'SemiStructuredObjectTypeTransaction' => 'applications/semistruct/storage/SemiStructuredObjectTypeTransaction.php',
+    'SemiStructuredObjectTypeTransactionComment' => 'applications/semistruct/storage/SemiStructuredObjectTypeTransactionComment.php',
     'SemiStructuredObjectTypeTransactionEditor' => 'applications/semistruct/editor/SemiStructuredObjectTypeTransactionEditor.php',
     'SemiStructuredObjectTypeTransactionQuery' => 'applications/semistruct/query/SemiStructuredObjectTypeTransactionQuery.php',
     'SemiStructuredObjectTypeTransactionType' => 'applications/semistruct/xaction/class/SemiStructuredObjectTypeTransactionType.php',
     'SemiStructuredObjectTypeViewController' => 'applications/semistruct/controller/class/SemiStructuredObjectTypeViewController.php',
     'SemiStructuredPatchList' => 'applications/semistruct/storage/SemiStructuredPatchList.php',
   ),
   'function' => array(),
   'xmap' => array(
     'SemiStructuredBaseController' => 'PhabricatorController',
     'SemiStructuredDAO' => 'PhabricatorLiskDAO',
     'SemiStructuredDataApplication' => 'PhabricatorApplication',
     'SemiStructuredObjectInstance' => array(
       'SemiStructuredDAO',
       'PhabricatorPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorFlaggableInterface',
       'PhabricatorDestructibleInterface',
     ),
     'SemiStructuredObjectInstanceClassTransaction' => 'SemiStructuredObjectInstanceTransactionType',
     'SemiStructuredObjectInstanceController' => 'SemiStructuredBaseController',
     'SemiStructuredObjectInstanceDescriptionTransaction' => 'SemiStructuredObjectInstanceTransactionType',
     'SemiStructuredObjectInstanceEditController' => 'SemiStructuredBaseController',
     'SemiStructuredObjectInstanceEditEngine' => 'PhabricatorEditEngine',
     'SemiStructuredObjectInstanceNameTransaction' => 'SemiStructuredObjectInstanceTransactionType',
     'SemiStructuredObjectInstancePHIDType' => 'PhabricatorPHIDType',
     'SemiStructuredObjectInstanceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'SemiStructuredObjectInstanceRawDataTransaction' => 'SemiStructuredObjectInstanceTransactionType',
     'SemiStructuredObjectInstanceSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'SemiStructuredObjectInstanceTransaction' => 'PhabricatorModularTransaction',
+    'SemiStructuredObjectInstanceTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'SemiStructuredObjectInstanceTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'SemiStructuredObjectInstanceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'SemiStructuredObjectInstanceTransactionType' => 'PhabricatorModularTransactionType',
     'SemiStructuredObjectInstanceViewController' => 'SemiStructuredObjectInstanceController',
     'SemiStructuredObjectNewInstanceController' => 'SemiStructuredObjectTypeController',
     'SemiStructuredObjectType' => array(
       'SemiStructuredDAO',
       'PhabricatorPolicyInterface',
       'PhabricatorApplicationTransactionInterface',
       'PhabricatorFlaggableInterface',
       'PhabricatorDestructibleInterface',
       'PhabricatorFerretInterface',
     ),
     'SemiStructuredObjectTypeController' => 'SemiStructuredBaseController',
     'SemiStructuredObjectTypeDescriptionTransaction' => 'SemiStructuredObjectTypeTransactionType',
     'SemiStructuredObjectTypeEditController' => 'SemiStructuredBaseController',
     'SemiStructuredObjectTypeEditEngine' => 'PhabricatorEditEngine',
     'SemiStructuredObjectTypeFerretEngine' => 'PhabricatorFerretEngine',
     'SemiStructuredObjectTypeListController' => 'SemiStructuredBaseController',
     'SemiStructuredObjectTypeNameTransaction' => 'SemiStructuredObjectTypeTransactionType',
     'SemiStructuredObjectTypePHIDType' => 'PhabricatorPHIDType',
     'SemiStructuredObjectTypeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'SemiStructuredObjectTypeSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'SemiStructuredObjectTypeTransaction' => 'PhabricatorModularTransaction',
+    'SemiStructuredObjectTypeTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'SemiStructuredObjectTypeTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'SemiStructuredObjectTypeTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'SemiStructuredObjectTypeTransactionType' => 'PhabricatorModularTransactionType',
     'SemiStructuredObjectTypeViewController' => 'SemiStructuredObjectTypeController',
     'SemiStructuredPatchList' => 'PhabricatorSQLPatchList',
   ),
 ));
diff --git a/src/editor/SemiStructuredObjectInstanceEditEngine.php b/src/editor/SemiStructuredObjectInstanceEditEngine.php
index 84d62a5..bde4aa7 100644
--- a/src/editor/SemiStructuredObjectInstanceEditEngine.php
+++ b/src/editor/SemiStructuredObjectInstanceEditEngine.php
@@ -1,133 +1,133 @@
 <?php
 
 final class SemiStructuredObjectInstanceEditEngine
   extends PhabricatorEditEngine {
 
   const ENGINECONST = 'sst:objectinstance';
 
   private $objectType;
 
   public function isEngineConfigurable() {
     return false;
   }
 
   public function getEngineName() {
     return pht('Object Instance');
   }
 
   public function getSummaryHeader() {
     return pht('Edit Object Instance');
   }
 
   public function getSummaryText() {
     return pht('This engine is used to modify object instances.');
   }
 
   public function getEngineApplicationClass() {
     return 'SemiStructuredDataApplication';
   }
 
   public function setObjectType(SemiStructuredObjectType $object_type) {
     $this->objectType = $object_type;
     return $this;
   }
 
   protected function newEditableObject() {
     $viewer = $this->getViewer();
     return SemiStructuredObjectInstance::initializeNewObjectInstance(
         $viewer,
         $this->objectType);
   }
 
   protected function newObjectQuery() {
     return new SemiStructuredObjectInstanceQuery();
   }
 
   protected function getObjectCreateTitleText($object) {
     return pht('Create Object Instance');
   }
 
   protected function getObjectCreateButtonText($object) {
     return pht('Create Object Instance');
   }
 
   protected function getObjectCreateCancelURI($object) {
     // TODO if objjec has link to class - go to that class
     return '/semistructured/';
   }
 
   protected function getEditorURI() {
-    return $this->getApplication()->getApplicationURI('editobject/');
+    return $this->getApplication()->getApplicationURI('editinstance/');
   }
 
   protected function getObjectEditTitleText($object) {
     return pht('Edit Object: %d', $object->getID());
   }
 
   protected function getObjectEditShortText($object) {
     return pht('Edit Object');
   }
 
   protected function getObjectCreateShortText() {
     return pht('Create Object Instance');
   }
 
   protected function getObjectName() {
     return pht('Object Instance');
   }
 
   protected function getObjectViewURI($object) {
     return $object->getURI();
   }
 
   protected function buildCustomEditFields($object) {
 
     $fields = array(
       id(id(new PhabricatorStaticEditField())
         ->setKey('objecttype')
         ->setLabel(pht("Object Type"))
         ->setValue($object->getClass()->getName())),
       id(new PhabricatorIntEditField())
         ->setKey('classID')
         ->setLabel(pht('Object Type'))
         ->setDescription(pht('Type of the object.'))
         ->setConduitDescription(pht('Set type of object.'))
         ->setIsHidden(true)
         ->setTransactionType(
           SemiStructuredObjectInstanceClassTransaction::TRANSACTIONTYPE)
         ->setIsRequired(true)
         ->setValue($object->getClassID()),
       id(new PhabricatorTextEditField())
         ->setKey('name')
         ->setLabel(pht('Name'))
         ->setDescription(pht('Name of the object.'))
         ->setConduitDescription(pht('Rename the object.'))
         ->setConduitTypeDescription(pht('New object name.'))
         ->setTransactionType(
           SemiStructuredObjectInstanceNameTransaction::TRANSACTIONTYPE)
         ->setValue($object->getName()),
         id(new PhabricatorRemarkupEditField())
         ->setKey('description')
         ->setLabel(pht('Free text'))
         ->setDescription(pht('Object instance free text (Remarkup).'))
         ->setConduitTypeDescription(pht('New object free type.'))
         ->setTransactionType(
           SemiStructuredObjectInstanceDescriptionTransaction::TRANSACTIONTYPE)
         ->setValue($object->getDescription()),
 
       id(new PhabricatorTextAreaEditField())
         ->setKey('rawdata')
         ->setLabel(pht('Structured content'))
         ->setDescription(pht('Object structured data (JSON).'))
         ->setConduitTypeDescription(pht('Object body (JSON).'))
         ->setMonospaced(true)
         ->setIsRequired(true)
         ->setTransactionType(
           SemiStructuredObjectInstanceRawDataTransaction::TRANSACTIONTYPE)
         ->setValue($object->getRawData()),
     );
 
     return $fields;
   }
 
 }
diff --git a/src/storage/SemiStructuredObjectInstanceTransaction.php b/src/storage/SemiStructuredObjectInstanceTransaction.php
index 92fe112..e42d059 100644
--- a/src/storage/SemiStructuredObjectInstanceTransaction.php
+++ b/src/storage/SemiStructuredObjectInstanceTransaction.php
@@ -1,18 +1,22 @@
 <?php
 
 final class SemiStructuredObjectInstanceTransaction
   extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'semistructured';
   }
 
   public function getApplicationTransactionType() {
     return SemiStructuredObjectTypePHIDType::TYPECONST;
   }
 
+  public function getApplicationTransactionCommentObject() {
+    return new SemiStructuredObjectInstanceTransactionComment();
+  }
+
   public function getBaseTransactionClass() {
     return 'SemiStructuredObjectInstanceTransactionType';
   }
 
 }
diff --git a/src/storage/SemiStructuredObjectInstanceTransactionComment.php b/src/storage/SemiStructuredObjectInstanceTransactionComment.php
new file mode 100644
index 0000000..9fc91e6
--- /dev/null
+++ b/src/storage/SemiStructuredObjectInstanceTransactionComment.php
@@ -0,0 +1,10 @@
+<?php
+
+final class SemiStructuredObjectInstanceTransactionComment
+  extends PhabricatorApplicationTransactionComment {
+
+  public function getApplicationTransactionObject() {
+    return new SemiStructuredObjectInstanceTransaction();
+  }
+
+}
diff --git a/src/storage/SemiStructuredObjectTypeTransaction.php b/src/storage/SemiStructuredObjectTypeTransaction.php
index eea9346..a9bfd95 100644
--- a/src/storage/SemiStructuredObjectTypeTransaction.php
+++ b/src/storage/SemiStructuredObjectTypeTransaction.php
@@ -1,18 +1,22 @@
 <?php
 
 final class SemiStructuredObjectTypeTransaction
   extends PhabricatorModularTransaction {
 
   public function getApplicationName() {
     return 'semistructured';
   }
 
   public function getApplicationTransactionType() {
     return SemiStructuredObjectTypePHIDType::TYPECONST;
   }
 
+  public function getApplicationTransactionCommentObject() {
+    return new SemiStructuredObjectTypeTransactionComment();
+  }
+
   public function getBaseTransactionClass() {
     return 'SemiStructuredObjectTypeTransactionType';
   }
 
 }
diff --git a/src/storage/SemiStructuredObjectTypeTransactionComment.php b/src/storage/SemiStructuredObjectTypeTransactionComment.php
new file mode 100644
index 0000000..32ba699
--- /dev/null
+++ b/src/storage/SemiStructuredObjectTypeTransactionComment.php
@@ -0,0 +1,10 @@
+<?php
+
+final class SemiStructuredObjectTypeTransactionComment
+  extends PhabricatorApplicationTransactionComment {
+
+  public function getApplicationTransactionObject() {
+    return new SemiStructuredObjectTypeTransaction();
+  }
+
+}