diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java
index 9ffdedd488831fb894e3ddd122bc2988fec71099..87a599a82936aa48e55632e3095ceca675b2ec47 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/DataSet.java
@@ -32,7 +32,6 @@ import ch.systemsx.cisd.common.api.retry.RetryProxyFactory;
 import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
 import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
 import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet.Connections;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind;
 
 /**
  * A class that provides uniform access to data set metadata (from the openBIS AS) and data (from
@@ -161,12 +160,39 @@ public class DataSet
     }
 
     /**
-     * @see ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet#getDataSetKind()
+     * @see ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet#isContainerDataSet()
      */
     @Retry
     public boolean isContainerDataSet()
     {
-        return DataSetKind.CONTAINER.name().equals(getMetadata().getDataSetKind());
+        return getMetadata().isContainerDataSet();
+    }
+
+    /**
+     * @see ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet#isLinkDataSet()
+     */
+    @Retry
+    public boolean isLinkDataSet()
+    {
+        return getMetadata().isLinkDataSet();
+    }
+
+    /**
+     * @see ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet#getExternalDataSetCode()
+     */
+    @Retry
+    public String getExternalDataSetCode()
+    {
+        return getMetadata().getExternalDataSetCode();
+    }
+
+    /**
+     * @see ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.DataSet#getExternalDataSetLink()
+     */
+    @Retry
+    public String getExternalDataSetLink()
+    {
+        return getMetadata().getExternalDataSetLink();
     }
 
     /**