diff --git a/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts b/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts
index bc82b2cd54..077b9b9741 100644
--- a/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts
+++ b/ui/projects/streampipes/platform-services/src/lib/model/types/data-type.ts
@@ -16,6 +16,8 @@
  *
  */
 
+import { SemanticType } from './semantic-type';
+
 export class DataType {
     public static readonly XSD: string = 'http://www.w3.org/2001/XMLSchema#';
 
@@ -25,7 +27,6 @@ export class DataType {
     public static readonly BOOLEAN = this.XSD + 'boolean';
     public static readonly STRING = this.XSD + 'string';
     public static readonly DOUBLE = this.XSD + 'double';
-    public static readonly NUMBER = this.XSD + 'number';
 
     public static isNumberType(datatype: string): boolean {
         return (
@@ -33,7 +34,7 @@ export class DataType {
             datatype === DataType.INTEGER ||
             datatype === DataType.LONG ||
             datatype === DataType.FLOAT ||
-            datatype === DataType.NUMBER
+            datatype === SemanticType.SO_NUMBER
         );
     }
 
diff --git a/ui/src/app/dashboard/sdk/ep-requirements.ts b/ui/src/app/dashboard/sdk/ep-requirements.ts
index 583902b3a5..3196a11ced 100644
--- a/ui/src/app/dashboard/sdk/ep-requirements.ts
+++ b/ui/src/app/dashboard/sdk/ep-requirements.ts
@@ -67,7 +67,7 @@ export class EpRequirements {
     }
 
     static numberReq(): EventPropertyUnion {
-        return EpRequirements.datatypeReq(DataType.NUMBER);
+        return EpRequirements.datatypeReq(SemanticType.SO_NUMBER);
     }
 
     static stringReq(): EventPropertyUnion {
diff --git a/ui/src/app/dashboard/sdk/matching/datatype-match.ts b/ui/src/app/dashboard/sdk/matching/datatype-match.ts
index 8b7119021b..2d46b9079f 100644
--- a/ui/src/app/dashboard/sdk/matching/datatype-match.ts
+++ b/ui/src/app/dashboard/sdk/matching/datatype-match.ts
@@ -16,7 +16,7 @@
  *
  */
 
-import { DataType } from '@streampipes/platform-services';
+import { DataType, SemanticType } from '@streampipes/platform-services';
 
 export class DatatypeMatch {
     match(datatypeRequirement: string, datatypeOffer: string) {
@@ -31,7 +31,7 @@ export class DatatypeMatch {
     }
 
     subClassOf(offer: string, requirement: string): boolean {
-        if (!(requirement === DataType.NUMBER)) {
+        if (!(requirement === SemanticType.SO_NUMBER)) {
             return false;
         } else {
             if (