diff --git a/evm.rdfs b/evm.rdfs
new file mode 100644
index 0000000..1e3d575
--- /dev/null
+++ b/evm.rdfs
@@ -0,0 +1,14 @@
+@base <https://defalsify.org/rdf-eth/0.1/evm.rdfs> .
+@prefix xsd:	<http://www.w3.org/2001/XMLSchema#> .
+@prefix	rdfs:	<https://www.w3.org/TR/rdf-schema/#> .
+
+<#location>	a	rdfs:Class .
+<#tx>	a	rdfs:Class .
+<#account>	rdfs:subClassOf	<#location> .
+<#contract>	rdfs:subClassOf	<#location> .
+<#voucherContract>	rdfs:subClassOf	<#contract> .
+<#nftContract>	rdfs:subClassOf	<#contract> .
+<#gasTransfer>	rdfs:subClassOf	<#tx> .
+<#voucherTransfer>	rdfs:subClassOf	<#tx> .
+<#nftTransfer>	rdfs:subClassOf	<#tx> .
+<#id>	rdfs:Datatype	xsd:hexBinary .
diff --git a/test_tx.rdf b/test_tx.rdf
index f4d557a..4b09388 100644
--- a/test_tx.rdf
+++ b/test_tx.rdf
@@ -1,13 +1,12 @@
-@prefix evm: <https://defalsify.org/rdf-eth/0.1/> .
+@prefix evm: <https://defalsify.org/rdf-eth/0.1/#> .
 @prefix cic: <https://cicnet.org/rdf/0.1/> .
 @prefix ge: <https://grassrootseconomics.net/rdf/0.1/ge#> .
 @prefix redcross: <https://redcross.com/cic-def/0.1/> .
 @prefix un: <https://un.com/esg/0.1/> .
+@prefix xsd:	<http://www.w3.org/2001/XMLSchema#> .
 
-evm:tx
-	evm:id	"0x6f4ed36c11345a9a48353cd2f93f1f92958c96df15f3112a192bc994250e8d03"^^<http://www.w3.org/2001/XMLSchema#token> ;
-	a	cic:fungibleVoucher ;
-	evm:address	"0xeb3907ecad74a0013c259d5874ae7f22dcbcc95c"^^<http://www.w3.org/2001/XMLSchema#token> ;
+evm:voucherTransfer
+	evm:id	"0x6f4ed36c11345a9a48353cd2f93f1f92958c96df15f3112a192bc994250e8d03"^^xsd:hexBinary ;
 	ge:approvedActor	<URN:uuid:18daebc7-23b9-41e4-af00-2559f7840f78> ;
 	redcross:interest	ge:foodforest ;
 	un:esg	"deforestation" ;
diff --git a/test_voucher.rdf b/test_voucher.rdf
index 90d0c9c..3a877bd 100644
--- a/test_voucher.rdf
+++ b/test_voucher.rdf
@@ -2,13 +2,13 @@
 @prefix cic: <https://cicnet.org/rdf/0.1/> .
 @prefix ge: <https://grassrootseconomics.net/rdf/0.1/ge#> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix xsd:	<http://www.w3.org/2001/XMLSchema#> .
 
-evm:address
-	evm:id	"0x1f92958c96df15f3112a192bc994250e8defef93f"^^<http://www.w3.org/2001/XMLSchema#token> ;
-	a	cic:fungibleVoucher ;
+evm:voucherContract
+	evm:id	"0x1f92958c96df15f3112a192bc994250e8defef93f"^^xsd:hexBinary ; 
 	cic:unitOfAccount	cic:ref:wampum ;
-	cic:validFrom	"2023-03-05T19:04:40+00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
-	cic:validUntil	"2024-03-05T19:04:40+00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
+	cic:validFrom	"2023-03-05T19:04:40+00:00"^^xsd:dateTime ; 
+	cic:validUntil	"2024-03-05T19:04:40+00:00"^^xsd:dateTime ;
 	foaf:name	"John Doe" ;
 	cic:humanDescription	<URN:sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae> ;
 	ge:areaSovereign	"Kenya" ;
@@ -16,10 +16,9 @@ evm:address
 	ge:areaLesser	"Mnarani" ;
 	ge:community	"Foo tribe" .
 
-evm:address
-	evm:id	"0x58c96df15f3112a192bc994250e8defef93f12345"^^<http://www.w3.org/2001/XMLSchema#token> ;
-	a	cic:fungibleVoucher ;
+evm:voucherContract
+	evm:id	"0x58c96df15f3112a192bc994250e8defef93f12345"^^xsd:hexBinary ;
 	cic:unitOfAccount	"seashells" ;
-	cic:validFrom	"2023-03-04T09:34:33+00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
-	foaf:name	"Busy Bee" ;
+	cic:validFrom	"2023-03-04T09:34:33+00:00"^^xsd:dateTime ;
+	foaf:name	"Busy Bee" 
 	ge:approvedActor	<URN:uuid:18daebc7-23b9-41e4-af00-2559f7840f78> .