diff --git a/src/main/java/org/eclipse/basyx/submodel/metamodel/map/dataspecification/EmbeddedDataSpecification.java b/src/main/java/org/eclipse/basyx/submodel/metamodel/map/dataspecification/EmbeddedDataSpecification.java
index 79520d67..291dd88d 100644
--- a/src/main/java/org/eclipse/basyx/submodel/metamodel/map/dataspecification/EmbeddedDataSpecification.java
+++ b/src/main/java/org/eclipse/basyx/submodel/metamodel/map/dataspecification/EmbeddedDataSpecification.java
@@ -27,7 +27,6 @@
 import java.util.Map;
 
 import org.eclipse.basyx.submodel.metamodel.api.dataspecification.IDataSpecificationContent;
-import org.eclipse.basyx.submodel.metamodel.api.dataspecification.IDataSpecificationIEC61360Content;
 import org.eclipse.basyx.submodel.metamodel.api.dataspecification.IEmbeddedDataSpecification;
 import org.eclipse.basyx.submodel.metamodel.api.reference.IReference;
 import org.eclipse.basyx.submodel.metamodel.map.reference.Reference;
@@ -68,12 +67,10 @@ public void setDataSpecificationTemplate(IReference ref) {
 	@SuppressWarnings("unchecked")
 	@Override
 	public IDataSpecificationContent getContent() {
-		// Assume the concent complies to the IEC61360 template
-		// => only this template is supported currently
-		return DataSpecificationIEC61360Content.createAsFacade((Map<String, Object>) get(CONTENT));
+		return DataSpecificationContent.createAsFacade((Map<String, Object>) get(CONTENT));
 	}
 
-	public void setContent(IDataSpecificationIEC61360Content content) {
+	public void setContent(IDataSpecificationContent content) {
 		put(CONTENT, content);
 	}
 }