diff --git a/wherehows-dao/src/main/java/wherehows/dao/table/DatasetComplianceDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetComplianceDao.java
index 0ce3b6a4e8..31aac20f57 100644
--- a/wherehows-dao/src/main/java/wherehows/dao/table/DatasetComplianceDao.java
+++ b/wherehows-dao/src/main/java/wherehows/dao/table/DatasetComplianceDao.java
@@ -57,7 +57,7 @@ public class DatasetComplianceDao extends BaseDao {
     return dsComplianceToDatasetCompliance(findComplianceById(datasetId));
   }
 
-  @Nullable
+  @Nonnull
   public DatasetCompliance getDatasetComplianceByUrn(@Nonnull String datasetUrn) throws Exception {
     throw new UnsupportedOperationException("Not implemented yet, use getDatasetComplianceByDatasetId");
   }
diff --git a/wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java b/wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java
index fcc642ce7a..9e6f27a614 100644
--- a/wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java
+++ b/wherehows-dao/src/main/java/wherehows/dao/table/FieldDetailDao.java
@@ -82,12 +82,11 @@ public class FieldDetailDao extends BaseDao {
   /**
    * Insert or update Schemaless from MetadataChangeEvent
    * @param identifier DatasetIdentifier
-   * @param dataset DictDataset
    * @param auditStamp ChangeAuditStamp
    * @throws Exception
    */
-  public void insertUpdateSchemaless(@Nonnull DatasetIdentifier identifier, @Nullable DictDataset dataset,
-      @Nonnull ChangeAuditStamp auditStamp) throws Exception {
+  public void insertUpdateSchemaless(@Nonnull DatasetIdentifier identifier, @Nonnull ChangeAuditStamp auditStamp)
+      throws Exception {
     throw new UnsupportedOperationException("Support for Schemaless not yet implemented.");
   }
 
diff --git a/wherehows-dao/src/main/java/wherehows/dao/view/DatasetViewDao.java b/wherehows-dao/src/main/java/wherehows/dao/view/DatasetViewDao.java
index afdb825be7..3c034acd18 100644
--- a/wherehows-dao/src/main/java/wherehows/dao/view/DatasetViewDao.java
+++ b/wherehows-dao/src/main/java/wherehows/dao/view/DatasetViewDao.java
@@ -101,15 +101,18 @@ public class DatasetViewDao extends BaseViewDao {
     return view;
   }
 
+  @Nonnull
   public PagedCollection<DatasetView> listDatasets(@Nullable String platform, @Nullable String origin,
       @Nonnull String prefix, int start, int count) throws Exception {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Nonnull
   public List<String> listSegments(@Nonnull String platform, @Nullable String origin, @Nonnull String prefix) throws Exception {
     throw new UnsupportedOperationException("Not implemented yet");
   }
 
+  @Nonnull
   public List<String> listFullNames(@Nonnull String platform, @Nullable String origin, @Nonnull String prefix) throws Exception {
     throw new UnsupportedOperationException("Not implemented yet");
   }
diff --git a/wherehows-dao/src/main/java/wherehows/models/view/DatasetCompliance.java b/wherehows-dao/src/main/java/wherehows/models/view/DatasetCompliance.java
index aea83ccf48..5e0cf07fc3 100644
--- a/wherehows-dao/src/main/java/wherehows/models/view/DatasetCompliance.java
+++ b/wherehows-dao/src/main/java/wherehows/models/view/DatasetCompliance.java
@@ -42,4 +42,6 @@ public class DatasetCompliance {
   private String modifiedBy;
 
   private Long modifiedTime;
+
+  private Boolean fromUpstream;
 }
diff --git a/wherehows-frontend/conf/routes b/wherehows-frontend/conf/routes
index b8ca03f28e..fd832021b7 100644
--- a/wherehows-frontend/conf/routes
+++ b/wherehows-frontend/conf/routes
@@ -266,6 +266,10 @@ GET           /api/v1/jira/tickets/:managerId
 
 POST          /api/v1/tracking                                                  controllers.api.v1.Tracking.addTrackingEvent()
 
+GET           /api/v2/list/platforms                                            controllers.api.v2.Dataset.getDataPlatforms
+
+GET           /api/v2/list/complianceDataTypes                                  controllers.api.v2.Dataset.getComplianceDataTypes
+
 GET           /api/v2/platforms/:platform/prefix/:prefix                        controllers.api.v2.Dataset.listSegments(platform: String, prefix: String)
 
 GET           /api/v2/platforms/:platform                                       controllers.api.v2.Dataset.listSegments(platform: String, prefix = "")
@@ -284,10 +288,6 @@ GET           /api/v2/datasets/count/platform/:platform
 
 GET           /api/v2/datasets/count                                            controllers.api.v2.Dataset.countDatasets(platform = null, prefix = "")
 
-GET           /api/v2/list/platforms                                            controllers.api.v2.Dataset.getDataPlatforms
-
-GET           /api/v2/list/complianceDataTypes                                  controllers.api.v2.Dataset.getComplianceDataTypes
-
 GET           /api/v2/datasets/:urn                                             controllers.api.v2.Dataset.getDataset(urn: String)
 
 PUT           /api/v2/datasets/:urn/deprecate                                   controllers.api.v2.Dataset.updateDatasetDeprecation(urn: String)
diff --git a/wherehows-kafka/src/main/java/wherehows/processors/MetadataChangeProcessor.java b/wherehows-kafka/src/main/java/wherehows/processors/MetadataChangeProcessor.java
index 2d82851ae5..696b537103 100644
--- a/wherehows-kafka/src/main/java/wherehows/processors/MetadataChangeProcessor.java
+++ b/wherehows-kafka/src/main/java/wherehows/processors/MetadataChangeProcessor.java
@@ -125,7 +125,7 @@ public class MetadataChangeProcessor extends KafkaMessageProcessor {
     if (dsSchema != null) { // if instanceof DatasetSchema
       _fieldDetailDao.insertUpdateDatasetFields(identifier, dataset, event.datasetProperty, changeAuditStamp, dsSchema);
     } else if (event.schema instanceof Schemaless) { // if instanceof Schemaless
-      _fieldDetailDao.insertUpdateSchemaless(identifier, dataset, changeAuditStamp);
+      _fieldDetailDao.insertUpdateSchemaless(identifier, changeAuditStamp);
     }
 
     // if owners are not null, insert or update owner