diff --git a/.gitignore b/.gitignore
index 994284d..e8ff60f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,9 @@
 lib/__pychache__
 .idea
 venv
-.pytest_cache
\ No newline at end of file
+.pytest_cache
+src/build
+src/dist
+src/yatter.egg-info
+api
+.coverage
\ No newline at end of file
diff --git a/src/yatter/constants.py b/src/yatter/constants.py
index 6f363dd..03b39b5 100644
--- a/src/yatter/constants.py
+++ b/src/yatter/constants.py
@@ -21,7 +21,7 @@
 VOID_URI = 'http://rdfs.org/ns/void#'
 FNML_URI = 'http://semweb.mmlab.be/ns/fnml#'
 GREL_URI = 'http://users.ugent.be/~bjdmeest/function/grel.ttl#'
-SD_URI = 'https://w3id.org/okn/o/sd/'
+SD_URI = 'https://w3id.org/okn/o/sd#'
 
 RML_PREFIX = '@prefix'
 RML_BASE = '@base'
diff --git a/test/rml-in-memory/IMTC001/mapping.ttl b/test/rml-in-memory/IMTC001/mapping.ttl
index 16303fb..197b791 100644
--- a/test/rml-in-memory/IMTC001/mapping.ttl
+++ b/test/rml-in-memory/IMTC001/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC001/mapping.yml b/test/rml-in-memory/IMTC001/mapping.yml
index d7551b1..c956729 100644
--- a/test/rml-in-memory/IMTC001/mapping.yml
+++ b/test/rml-in-memory/IMTC001/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC001/mappings-new.rml.ttl b/test/rml-in-memory/IMTC001/mappings-new.rml.ttl
index d48e50d..4e6f25d 100644
--- a/test/rml-in-memory/IMTC001/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC001/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC002/mapping.ttl b/test/rml-in-memory/IMTC002/mapping.ttl
index 6d3f2b7..b77c09b 100644
--- a/test/rml-in-memory/IMTC002/mapping.ttl
+++ b/test/rml-in-memory/IMTC002/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC002/mapping.yml b/test/rml-in-memory/IMTC002/mapping.yml
index 51528fb..f2f6fd7 100644
--- a/test/rml-in-memory/IMTC002/mapping.yml
+++ b/test/rml-in-memory/IMTC002/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC002/mappings-new.rml.ttl b/test/rml-in-memory/IMTC002/mappings-new.rml.ttl
index 1a44182..5dc51aa 100644
--- a/test/rml-in-memory/IMTC002/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC002/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC003/mapping.ttl b/test/rml-in-memory/IMTC003/mapping.ttl
index 6d3f2b7..b77c09b 100644
--- a/test/rml-in-memory/IMTC003/mapping.ttl
+++ b/test/rml-in-memory/IMTC003/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC003/mapping.yml b/test/rml-in-memory/IMTC003/mapping.yml
index 78cb547..19595be 100644
--- a/test/rml-in-memory/IMTC003/mapping.yml
+++ b/test/rml-in-memory/IMTC003/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC003/mappings-new.rml.ttl b/test/rml-in-memory/IMTC003/mappings-new.rml.ttl
index 1a44182..5dc51aa 100644
--- a/test/rml-in-memory/IMTC003/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC003/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC004/mapping.ttl b/test/rml-in-memory/IMTC004/mapping.ttl
index e56a280..13ca897 100644
--- a/test/rml-in-memory/IMTC004/mapping.ttl
+++ b/test/rml-in-memory/IMTC004/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC004/mapping.yml b/test/rml-in-memory/IMTC004/mapping.yml
index b919fb7..6e695d7 100644
--- a/test/rml-in-memory/IMTC004/mapping.yml
+++ b/test/rml-in-memory/IMTC004/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC004/mappings-new.rml.ttl b/test/rml-in-memory/IMTC004/mappings-new.rml.ttl
index 2779035..0949f7d 100644
--- a/test/rml-in-memory/IMTC004/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC004/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC005/mapping.ttl b/test/rml-in-memory/IMTC005/mapping.ttl
index 54f3dba..113879c 100644
--- a/test/rml-in-memory/IMTC005/mapping.ttl
+++ b/test/rml-in-memory/IMTC005/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC005/mapping.yml b/test/rml-in-memory/IMTC005/mapping.yml
index 5a3dba6..bdbec0e 100644
--- a/test/rml-in-memory/IMTC005/mapping.yml
+++ b/test/rml-in-memory/IMTC005/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC005/mappings-new.rml.ttl b/test/rml-in-memory/IMTC005/mappings-new.rml.ttl
index 3953d07..46dfc70 100644
--- a/test/rml-in-memory/IMTC005/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC005/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC006/mapping.ttl b/test/rml-in-memory/IMTC006/mapping.ttl
index 10bcbeb..61fda5e 100644
--- a/test/rml-in-memory/IMTC006/mapping.ttl
+++ b/test/rml-in-memory/IMTC006/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC006/mapping.yml b/test/rml-in-memory/IMTC006/mapping.yml
index 81d3d52..0e52a71 100644
--- a/test/rml-in-memory/IMTC006/mapping.yml
+++ b/test/rml-in-memory/IMTC006/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC006/mappings-new.rml.ttl b/test/rml-in-memory/IMTC006/mappings-new.rml.ttl
index ecc798e..8bbe25a 100644
--- a/test/rml-in-memory/IMTC006/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC006/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC007/mapping.ttl b/test/rml-in-memory/IMTC007/mapping.ttl
index 496db03..d06c9fd 100644
--- a/test/rml-in-memory/IMTC007/mapping.ttl
+++ b/test/rml-in-memory/IMTC007/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC007/mapping.yml b/test/rml-in-memory/IMTC007/mapping.yml
index 619cbb0..4c0d55e 100644
--- a/test/rml-in-memory/IMTC007/mapping.yml
+++ b/test/rml-in-memory/IMTC007/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC007/mappings-new.rml.ttl b/test/rml-in-memory/IMTC007/mappings-new.rml.ttl
index 9e4fb4e..58390df 100644
--- a/test/rml-in-memory/IMTC007/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC007/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.
 
 
diff --git a/test/rml-in-memory/IMTC008/mapping.ttl b/test/rml-in-memory/IMTC008/mapping.ttl
index a6e0541..3be8c29 100644
--- a/test/rml-in-memory/IMTC008/mapping.ttl
+++ b/test/rml-in-memory/IMTC008/mapping.ttl
@@ -4,7 +4,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/>.
 @prefix ql: <http://semweb.mmlab.be/ns/ql#>.
 @base <http://example.com/ns#>.
diff --git a/test/rml-in-memory/IMTC008/mapping.yml b/test/rml-in-memory/IMTC008/mapping.yml
index 7fb2e38..e98b72c 100644
--- a/test/rml-in-memory/IMTC008/mapping.yml
+++ b/test/rml-in-memory/IMTC008/mapping.yml
@@ -6,7 +6,7 @@ prefixes:
   rdfs: "http://www.w3.org/2000/01/rdf-schema#"
   xsd: "http://www.w3.org/2001/XMLSchema#"
   foaf: "http://xmlns.com/foaf/0.1/"
-  sd: "https://w3id.org/okn/o/sd/"
+  sd: "https://w3id.org/okn/o/sd#"
   kg4di: "https://w3id.org/kg4di/"
 
 mappings:
diff --git a/test/rml-in-memory/IMTC008/mappings-new.rml.ttl b/test/rml-in-memory/IMTC008/mappings-new.rml.ttl
index d66c7f2..34dbd67 100644
--- a/test/rml-in-memory/IMTC008/mappings-new.rml.ttl
+++ b/test/rml-in-memory/IMTC008/mappings-new.rml.ttl
@@ -3,7 +3,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix sd: <https://w3id.org/okn/o/sd/>.
+@prefix sd: <https://w3id.org/okn/o/sd#>.
 @prefix kg4di: <https://w3id.org/kg4di/definedBy>.