From 527746e06ee3605e31d916068d0ddf0df45acbcf Mon Sep 17 00:00:00 2001
From: Harshvardhan Pandit <me@harshp.com>
Date: Fri, 28 Oct 2022 15:55:52 +0100
Subject: [PATCH] Updates .owl files for previously commits

---
 documentation-generator/test.ttl            |  39 --
 dpv-owl/dpv-gdpr/dpv-gdpr.owl               |  84 +++-
 dpv-owl/dpv-gdpr/modules/compliance.owl     |  50 +++
 dpv-owl/dpv-gdpr/modules/dpia.owl           |  54 +++
 dpv-owl/dpv-legal/dpv-legal.owl             |  28 +-
 dpv-owl/dpv-legal/modules/laws.owl          |   4 +-
 dpv-owl/dpv-pd/dpv-pd.owl                   |  18 +-
 dpv-owl/dpv-tech/dpv-tech.owl               | 447 +++++++++++++-------
 dpv-owl/dpv-tech/modules/actors.owl         |  78 ++++
 dpv-owl/dpv-tech/modules/comms.owl          |  86 ++++
 dpv-owl/dpv-tech/modules/core.owl           | 120 ++++++
 dpv-owl/dpv-tech/modules/data.owl           |  99 +++++
 dpv-owl/dpv-tech/modules/ops.owl            |  50 +++
 dpv-owl/dpv-tech/modules/provision.owl      |  89 ++++
 dpv-owl/dpv-tech/modules/security.owl       |  64 +++
 dpv-owl/dpv-tech/modules/surveillance.owl   |  41 ++
 dpv-owl/dpv-tech/modules/tools.owl          |  74 ++++
 dpv-owl/dpv.owl                             | 377 +++++++++++++++--
 dpv-owl/modules/base.owl                    |   1 +
 dpv-owl/modules/context.owl                 |  14 +-
 dpv-owl/modules/jurisdiction.owl            |  30 ++
 dpv-owl/modules/legal_basis.owl             |  10 +
 dpv-owl/modules/organisational_measures.owl |  19 +-
 dpv-owl/modules/personal_data.owl           |   6 +-
 dpv-owl/modules/processing.owl              |   6 +-
 dpv-owl/modules/processing_context.owl      |  20 +
 dpv-owl/modules/purposes.owl                |   9 +-
 dpv-owl/modules/rights.owl                  |  97 +++++
 dpv-owl/modules/rules.owl                   |  99 +++++
 dpv-owl/modules/status.owl                  |  86 ++++
 dpv-owl/modules/technical_measures.owl      |  37 +-
 dpv-owl/rights/eu/rights-eu.owl             |  21 -
 dpv-owl/risk/modules/risk_consequences.owl  |  21 +
 dpv-owl/risk/risk.owl                       |  21 +
 34 files changed, 2008 insertions(+), 291 deletions(-)
 delete mode 100644 documentation-generator/test.ttl
 create mode 100644 dpv-owl/dpv-gdpr/modules/compliance.owl
 create mode 100644 dpv-owl/dpv-tech/modules/actors.owl
 create mode 100644 dpv-owl/dpv-tech/modules/comms.owl
 create mode 100644 dpv-owl/dpv-tech/modules/core.owl
 create mode 100644 dpv-owl/dpv-tech/modules/data.owl
 create mode 100644 dpv-owl/dpv-tech/modules/ops.owl
 create mode 100644 dpv-owl/dpv-tech/modules/provision.owl
 create mode 100644 dpv-owl/dpv-tech/modules/security.owl
 create mode 100644 dpv-owl/dpv-tech/modules/surveillance.owl
 create mode 100644 dpv-owl/dpv-tech/modules/tools.owl
 create mode 100644 dpv-owl/modules/rights.owl
 create mode 100644 dpv-owl/modules/rules.owl

diff --git a/documentation-generator/test.ttl b/documentation-generator/test.ttl
deleted file mode 100644
index 676bc7882..000000000
--- a/documentation-generator/test.ttl
+++ /dev/null
@@ -1,39 +0,0 @@
-@prefix dct: <http://purl.org/dc/terms/> .
-@prefix ucr: <https://w3id.org/dpv/use-cases#> .
-
-ucr:R1 a ucr:Requirement ;
-    dct:description "This requirement does not entail anything" ;
-    dct:identifier "R1" ;
-    dct:subject <U1> ;
-    dct:title "Dummy Requirement" .
-
-ucr:R2 a ucr:Requirement ;
-    dct:description "The encapsulation of concepts must be in a form that is machine-readable, consistent, and using a formal specification - ideally a standard. This will ensure the concepts are correctly parsed, interpreted, and used by machines across use-cases, and will assist in the automation of information and information-based tasks." ;
-    dct:identifier "R2" ;
-    dct:references <dpv:Concept>,
-        <dpv:Relation> ;
-    dct:subject <U2>,
-        <U3> ;
-    dct:title "Provide concepts in standardised, consistent, machine-readable form" .
-
-ucr:R3 a ucr:Requirement ;
-    dct:description "The concepts should be bundled together and provided as a vocabulary or thesauri with distinct parts or sections (or sub-vocabularies) that relate to specific contextual details. For example, providing purposes as a separate taxonomy enables use of only purposes elsewhere." ;
-    dct:identifier "R3" ;
-    dct:subject <U3> ;
-    dct:title "Provide concepts as a dictionary or thesauri with contextual parts" .
-
-ucr:U1 a ucr:UseCase ;
-    dct:description "Description of the use-case - a short summary of what/who/how/where/when etc. goes here. This can be as detailed as you want." ;
-    dct:identifier "U1" ;
-    dct:title "Example - An Information Title" .
-
-ucr:U2 a ucr:UseCase ;
-    dct:description "There are a vast number of concepts associated with data processing, with differences and variations across jurisdictions, domains, and sectors. A common dictionary of concepts with information on how they relate to other concepts across such differences would be an invaluable resource on its own. This could be a simple list, a dictionary, or a thesauri." ;
-    dct:identifier "U2" ;
-    dct:title "Example #2 Dictionary of Concepts" .
-
-ucr:U3 a ucr:UseCase ;
-    dct:description "The concepts associated with a particular task can be considered the vocabulary necessary for representing information for that particular task. For example choosing the appropriate legal basis requires the concept associated with legal basis as well as the specific legal bases that can be utilised. In order to assist in providing the appropriate contextual vocabulary, the concepts should be encoded in a form that can be automatically queried or retrieved depending on the context." ;
-    dct:identifier "U3" ;
-    dct:title "Example Automating DPVCG usage" .
-
diff --git a/dpv-owl/dpv-gdpr/dpv-gdpr.owl b/dpv-owl/dpv-gdpr/dpv-gdpr.owl
index 9faf07d17..a486c6c7c 100644
--- a/dpv-owl/dpv-gdpr/dpv-gdpr.owl
+++ b/dpv-owl/dpv-gdpr/dpv-gdpr.owl
@@ -15,7 +15,7 @@ Ontology: <https://w3id.org/dpv/dpv-owl/dpv-gdpr>
 Import: <https://w3id.org/dpv/dpv-owl>
 
 Annotations: 
-    owl:versionInfo "0.8.2"
+    owl:versionInfo "0.9"
 
 AnnotationProperty: owl:versionInfo
 
@@ -453,6 +453,13 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#CodesOfConductForDataTransfers>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DataTransferTool>
     
     
+Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformity>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Conformity"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANecessityAssessment>
 
     Annotations: 
@@ -488,6 +495,13 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcedure>
         rdfs:label "DPIA Procedure"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcessingRecommendation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Processing Recommendation"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARiskStatus>
 
     Annotations: 
@@ -502,6 +516,13 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DataTransferTool>
         rdfs:label "Data Transfer Tool"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRLawfulness>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Lawfulness"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#SCCByCommission>
 
     Annotations: 
@@ -544,6 +565,16 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#SupplementaryMeasure>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DataTransferTool>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Conformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformity>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAIndicatesHighRisk>
 
     Annotations: 
@@ -574,6 +605,16 @@ Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAIndicatesNoRisk>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARiskStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANonConformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Non-Conformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformity>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANotRequired>
 
     Annotations: 
@@ -614,6 +655,26 @@ Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAOutcomeRisksMitigated>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAOutcomeStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARecommendsProcessingContinue>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Recommends Processing Continue"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcessingRecommendation>
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARecommendsProcessingNotContinue>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Recommends Processing Not Continue"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcessingRecommendation>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARequired>
 
     Annotations: 
@@ -624,3 +685,24 @@ Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARequired>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANecessityStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRComplianceUnknown>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Compliance Unknown"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRCompliant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Compliant"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRNonCompliant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Non-compliant"@en
+    
+    
diff --git a/dpv-owl/dpv-gdpr/modules/compliance.owl b/dpv-owl/dpv-gdpr/modules/compliance.owl
new file mode 100644
index 000000000..fc049043b
--- /dev/null
+++ b/dpv-owl/dpv-gdpr/modules/compliance.owl
@@ -0,0 +1,50 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRLawfulness>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Lawfulness"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRComplianceUnknown>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Compliance Unknown"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRCompliant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Compliant"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#GDPRNonCompliant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "GDPR Non-compliant"@en
+    
+    
diff --git a/dpv-owl/dpv-gdpr/modules/dpia.owl b/dpv-owl/dpv-gdpr/modules/dpia.owl
index 43be194ac..b7019c3da 100644
--- a/dpv-owl/dpv-gdpr/modules/dpia.owl
+++ b/dpv-owl/dpv-gdpr/modules/dpia.owl
@@ -20,6 +20,13 @@ AnnotationProperty: rdfs:label
 Datatype: rdf:langString
 
     
+Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformity>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Conformity"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANecessityAssessment>
 
     Annotations: 
@@ -55,6 +62,13 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcedure>
         rdfs:label "DPIA Procedure"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcessingRecommendation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Processing Recommendation"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARiskStatus>
 
     Annotations: 
@@ -62,6 +76,16 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARiskStatus>
         rdfs:label "DPIA Risk Status"@en
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Conformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformity>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAIndicatesHighRisk>
 
     Annotations: 
@@ -92,6 +116,16 @@ Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAIndicatesNoRisk>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARiskStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANonConformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Non-Conformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAConformity>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIANotRequired>
 
     Annotations: 
@@ -132,6 +166,26 @@ Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAOutcomeRisksMitigated>
         <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAOutcomeStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARecommendsProcessingContinue>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Recommends Processing Continue"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcessingRecommendation>
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARecommendsProcessingNotContinue>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-gdpr#>,
+        rdfs:label "DPIA Recommends Processing Not Continue"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIAProcessingRecommendation>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl/dpv-gdpr#DPIARequired>
 
     Annotations: 
diff --git a/dpv-owl/dpv-legal/dpv-legal.owl b/dpv-owl/dpv-legal/dpv-legal.owl
index 49fecb5a8..973ac1bd5 100644
--- a/dpv-owl/dpv-legal/dpv-legal.owl
+++ b/dpv-owl/dpv-legal/dpv-legal.owl
@@ -1391,6 +1391,20 @@ Individual: dpvo-legal:GB
         rdfs:label "United Kingdom of Great Britain and Northern Ireland"@en
     
     
+Individual: dpvo-legal:GB-DPA-2018
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-legal#>,
+        rdfs:label "Data Protection Act (DPA)"@en
+    
+    
+Individual: dpvo-legal:GB-GDPR
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-legal#>,
+        rdfs:label "General Data Protection Regulation (GDPR)"@en
+    
+    
 Individual: dpvo-legal:GD
 
     Annotations: 
@@ -2581,20 +2595,6 @@ Individual: dpvo-legal:UG
         rdfs:label "Uganda"@en
     
     
-Individual: dpvo-legal:UK-DPA-2018
-
-    Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-legal#>,
-        rdfs:label "Data Protection Act (DPA)"@en
-    
-    
-Individual: dpvo-legal:UK-GDPR
-
-    Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-legal#>,
-        rdfs:label "General Data Protection Regulation (GDPR)"@en
-    
-    
 Individual: dpvo-legal:UM
 
     Annotations: 
diff --git a/dpv-owl/dpv-legal/modules/laws.owl b/dpv-owl/dpv-legal/modules/laws.owl
index 91ec05bc3..669ea1a28 100644
--- a/dpv-owl/dpv-legal/modules/laws.owl
+++ b/dpv-owl/dpv-legal/modules/laws.owl
@@ -166,14 +166,14 @@ Individual: <https://w3id.org/dpv/dpv-owl/dpv-legal#EU-GDPR>
         rdfs:label "General Data Protection Regulation (GDPR)"@en
     
     
-Individual: <https://w3id.org/dpv/dpv-owl/dpv-legal#UK-DPA-2018>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-legal#GB-DPA-2018>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-legal#>,
         rdfs:label "Data Protection Act (DPA)"@en
     
     
-Individual: <https://w3id.org/dpv/dpv-owl/dpv-legal#UK-GDPR>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-legal#GB-GDPR>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-legal#>,
diff --git a/dpv-owl/dpv-pd/dpv-pd.owl b/dpv-owl/dpv-pd/dpv-pd.owl
index e772bcf3d..ff9df32c5 100644
--- a/dpv-owl/dpv-pd/dpv-pd.owl
+++ b/dpv-owl/dpv-pd/dpv-pd.owl
@@ -14,7 +14,7 @@ Ontology: <https://w3id.org/dpv/dpv-owl/dpv-pd>
 
 
 Annotations: 
-    owl:versionInfo "0.8.2"
+    owl:versionInfo "0.9"
 
 AnnotationProperty: owl:versionInfo
 
@@ -429,6 +429,16 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-pd#CriminalConviction>
         <https://w3id.org/dpv/dpv-owl/dpv-pd#Criminal>
     
     
+Class: <https://w3id.org/dpv/dpv-owl/dpv-pd#CriminalOffense>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-pd#>,
+        rdfs:label "Criminal Offense"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-pd#Criminal>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/dpv-pd#CriminalPardon>
 
     Annotations: 
@@ -1138,7 +1148,7 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-pd#LinkClicked>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-pd#>,
-        rdfs:label "LinkClicked"@en,
+        rdfs:label "Link Clicked"@en,
         rdfs:seeAlso <https://specialprivacy.ercim.eu/vocabs/data#Navigation>
     
     SubClassOf: 
@@ -1200,7 +1210,7 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-pd#MedicalHealth>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-pd#>,
-        rdfs:label "MedicalHealth"@en
+        rdfs:label "Medical Health"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl/dpv-pd#External>
@@ -1423,7 +1433,7 @@ Class: <https://w3id.org/dpv/dpv-owl/dpv-pd#PhysicalCharacteristic>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-pd#>,
-        rdfs:label "PhysicalCharacteristic"@en,
+        rdfs:label "Physical Characteristic"@en,
         rdfs:seeAlso <https://specialprivacy.ercim.eu/vocabs/data#Demographic>
     
     SubClassOf: 
diff --git a/dpv-owl/dpv-tech/dpv-tech.owl b/dpv-owl/dpv-tech/dpv-tech.owl
index d28665c46..47980bfa5 100644
--- a/dpv-owl/dpv-tech/dpv-tech.owl
+++ b/dpv-owl/dpv-tech/dpv-tech.owl
@@ -34,496 +34,631 @@ Datatype: rdf:langString
 Datatype: xsd:string
 
     
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasCommunicationMechanism>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasCommunicationMechanism>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
-        rdfs:label "hasCommunicationMechanism"@en
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "has communication mechanism"@en
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#CommunicationMechanism>
     
-    
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasDeveloper>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasDeveloper>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "hasDeveloper"@en
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#TechnologyDeveloper>
-    
     
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasProvider>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasProvider>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "hasProvider"@en
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#TechnologyProvider>
     
-    
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasProvisionMethod>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasProvisionMethod>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "hasProvisionMethod"@en
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#TechnologyProvisionMethod>
-    
     
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasSubject>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasSubject>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "hasSubject"@en
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#TechnologySubject>
     
-    
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasTRL>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasTRL>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
-        rdfs:label "hasTRL"@en
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "has TRL"@en
+    
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#TechnologyReadinessLevel>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasTechnologyActor>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "has technology actor"@en
     
     
-ObjectProperty: <https://w3id.org/dpv/dpv-tech#hasUser>
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasUser>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "hasUser"@en
     
-    Range: 
-        <https://w3id.org/dpv/dpv-tech#TechnologyUser>
     
-    
-Class: <https://w3id.org/dpv/dpv-tech#Application>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Application>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Application"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationalTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#Bluetooth>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Bluetooth>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Bluetooth"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
     
-Class: <https://w3id.org/dpv/dpv-tech#CellularNetwork>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#CellularNetwork>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "CellularNetwork"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#CommunicationMechanism>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#CommunicationMechanism>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "CommunicationMechanism"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#Cookie>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Cookie>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Cookie"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#CovertSurveillanceTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#CovertSurveillanceTechnology>
 
     Annotations: 
         rdfs:comment "For example, a web resource that performs tracking in the background"@en,
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Covert SurveillanceTechnology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SurveillanceTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#DataCopyingTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataCopyingTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Copying Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#DataDisclosureTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataDisclosureTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Disclosure Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#DataManagementTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataManagementTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Management Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>,
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#ManagementTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#DataObtainingTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataObtainingTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Obtaining Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#DataOrganisingTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataOrganisingTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Organising Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#DataRemovalTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataRemovalTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Removal Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#DataSecurityTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataSecurityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Security Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>,
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#DataStorageTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataStorageTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Storage Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#DataTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Technology"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#DataTransferTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTransferTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Transfer Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#DataTransformationTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTransformationTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Transformation Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#DataUsageTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataUsageTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Data Usage Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#Database>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Database>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Database"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataStorageTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#DetectionSecurityTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DetectionSecurityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Detection Security Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#FileSystem>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#FileSystem>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "FileSystem"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataStorageTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#GPS>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#GPS>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "GPS"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#CommunicationMechanism>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#IdentityManagementTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityManagementTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "IdentityManagementTechnology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityTechnology>,
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#ManagementTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#IdentityTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Identity Technology"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#IdentityWallet>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityWallet>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "IdentityWallet"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataStorageTechnology>,
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityManagementTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#Internet>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Internet>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Internet"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#LocalNetwork>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#LocalNetwork>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "LocalNetwork"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
     
-Class: <https://w3id.org/dpv/dpv-tech#ManagementTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#ManagementTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Management Technology"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#MitigationSecurityTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#MitigationSecurityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Mitigation Security Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#MonitoringSecurityTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#MonitoringSecurityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Monitoring Security Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#Networking>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Networking"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#CommunicationMechanism>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#OperationDevice>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationDevice>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Operation Device"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationalTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#OperationEnvironment>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationEnvironment>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Operation Environment"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationalTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#OperationManagement>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationManagement>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Operation Management"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationalTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#OperationalTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationalTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Operational Technology"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#OvertSurveillanceTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OvertSurveillanceTechnology>
 
     Annotations: 
         rdfs:comment "For example, a CCTV with a notice"@en,
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Overt Surveillance Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SurveillanceTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#PET>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#PET>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "PET (Privacy Enhancing Technology)"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#PersonalInformationManagementSystem>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#PersonalInformationManagementSystem>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "PersonalInformationManagementSystem"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#DataManagementTechnology>
     
-Class: <https://w3id.org/dpv/dpv-tech#PreventionSecurityTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#PreventionSecurityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Prevention Security Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#SecurityManagementTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityManagementTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Security Management Technology"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#ManagementTechnology>,
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#SecurityTechnology>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Security Technology"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#SmartphoneApplication>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SmartphoneApplication>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "SmartphoneApplication"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Application>
     
-Class: <https://w3id.org/dpv/dpv-tech#SurveillanceTechnology>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SurveillanceTechnology>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Surveillance Technology"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyActor>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyActor>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologyActor"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyDeveloper>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyDeveloper>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologyDeveloper"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyActor>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyProvider>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvider>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologyProvider"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyActor>
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyProvisionMethod>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Technology Provision Method"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyReadinessLevel>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyReadinessLevel>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologyReadinessLevel"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologySubject>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologySubject>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologySubject"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyActor>
+    
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyUsageLocation>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyUsageLocation>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologyUsageLocation"@en
     
     
-Class: <https://w3id.org/dpv/dpv-tech#TechnologyUser>
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyUser>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "TechnologyUser"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyActor>
     
-Class: <https://w3id.org/dpv/dpv-tech#WiFi>
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#WiFi>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "WiFi"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
     
-Individual: <https://w3id.org/dpv/dpv-tech#Algorithmic>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Algorithmic>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Algorithmic"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
+    
     
-Individual: <https://w3id.org/dpv/dpv-tech#Component>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Component>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Component"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
     
-Individual: <https://w3id.org/dpv/dpv-tech#FixedUse>
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#FixedUse>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "FixedUse"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
+    
     
-Individual: <https://w3id.org/dpv/dpv-tech#Goods>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Goods>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Goods"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
     
-Individual: <https://w3id.org/dpv/dpv-tech#Product>
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Product>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Product"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
+    
     
-Individual: <https://w3id.org/dpv/dpv-tech#Service>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Service>
 
     Annotations: 
         rdfs:comment "Removed plural suffix for consistency in terms"@en,
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Service"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
     
-Individual: <https://w3id.org/dpv/dpv-tech#Subscription>
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Subscription>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "Subscription"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
+    
     
-Individual: <https://w3id.org/dpv/dpv-tech#System>
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#System>
 
     Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-tech#>,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
         rdfs:label "System"@en
     
+    Types: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
+    
     
diff --git a/dpv-owl/dpv-tech/modules/actors.owl b/dpv-owl/dpv-tech/modules/actors.owl
new file mode 100644
index 000000000..99027809d
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/actors.owl
@@ -0,0 +1,78 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasDeveloper>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "hasDeveloper"@en
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasProvider>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "hasProvider"@en
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "hasSubject"@en
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasUser>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "hasUser"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyDeveloper>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologyDeveloper"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvider>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologyProvider"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologySubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologySubject"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyUser>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologyUser"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/comms.owl b/dpv-owl/dpv-tech/modules/comms.owl
new file mode 100644
index 000000000..e7885b3dd
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/comms.owl
@@ -0,0 +1,86 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Bluetooth>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Bluetooth"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#CellularNetwork>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "CellularNetwork"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#GPS>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "GPS"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Internet>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Internet"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#LocalNetwork>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "LocalNetwork"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Networking"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#WiFi>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "WiFi"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#Networking>
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/core.owl b/dpv-owl/dpv-tech/modules/core.owl
new file mode 100644
index 000000000..53a5d544d
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/core.owl
@@ -0,0 +1,120 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasCommunicationMechanism>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "has communication mechanism"@en
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasTRL>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "has TRL"@en
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasTechnologyActor>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "has technology actor"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#CommunicationMechanism>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "CommunicationMechanism"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Identity Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#ManagementTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Management Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationalTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Operational Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Security Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SurveillanceTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Surveillance Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyActor>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologyActor"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyProvisionMethod>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Technology Provision Method"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyReadinessLevel>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologyReadinessLevel"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#TechnologyUsageLocation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "TechnologyUsageLocation"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/data.owl b/dpv-owl/dpv-tech/modules/data.owl
new file mode 100644
index 000000000..ff2429f05
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/data.owl
@@ -0,0 +1,99 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataCopyingTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Copying Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataDisclosureTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Disclosure Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataManagementTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Management Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataObtainingTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Obtaining Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataOrganisingTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Organising Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataRemovalTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Removal Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataSecurityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Security Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataStorageTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Storage Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTransferTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Transfer Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataTransformationTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Transformation Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DataUsageTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Data Usage Technology"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/ops.owl b/dpv-owl/dpv-tech/modules/ops.owl
new file mode 100644
index 000000000..8e61d89bb
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/ops.owl
@@ -0,0 +1,50 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Application>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Application"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationDevice>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Operation Device"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationEnvironment>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Operation Environment"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OperationManagement>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Operation Management"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/provision.owl b/dpv-owl/dpv-tech/modules/provision.owl
new file mode 100644
index 000000000..1885777a6
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/provision.owl
@@ -0,0 +1,89 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:comment
+
+    
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl/dpv-tech#hasProvisionMethod>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "hasProvisionMethod"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Algorithmic>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Algorithmic"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Component>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Component"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#FixedUse>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "FixedUse"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Goods>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Goods"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Product>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Product"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Service>
+
+    Annotations: 
+        rdfs:comment "Removed plural suffix for consistency in terms"@en,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Service"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#Subscription>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Subscription"@en
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl/dpv-tech#System>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "System"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/security.owl b/dpv-owl/dpv-tech/modules/security.owl
new file mode 100644
index 000000000..85721fb28
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/security.owl
@@ -0,0 +1,64 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#DetectionSecurityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Detection Security Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#MitigationSecurityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Mitigation Security Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#MonitoringSecurityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Monitoring Security Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#PET>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "PET (Privacy Enhancing Technology)"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#PreventionSecurityTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Prevention Security Technology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SecurityManagementTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Security Management Technology"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/surveillance.owl b/dpv-owl/dpv-tech/modules/surveillance.owl
new file mode 100644
index 000000000..4af9788c2
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/surveillance.owl
@@ -0,0 +1,41 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:comment
+
+    
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#CovertSurveillanceTechnology>
+
+    Annotations: 
+        rdfs:comment "For example, a web resource that performs tracking in the background"@en,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Covert SurveillanceTechnology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#OvertSurveillanceTechnology>
+
+    Annotations: 
+        rdfs:comment "For example, a CCTV with a notice"@en,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Overt Surveillance Technology"@en
+    
+    
diff --git a/dpv-owl/dpv-tech/modules/tools.owl b/dpv-owl/dpv-tech/modules/tools.owl
new file mode 100644
index 000000000..86bdd3f9f
--- /dev/null
+++ b/dpv-owl/dpv-tech/modules/tools.owl
@@ -0,0 +1,74 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Cookie>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Cookie"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#Database>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "Database"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#FileSystem>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "FileSystem"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityManagementTechnology>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "IdentityManagementTechnology"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityWallet>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "IdentityWallet"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl/dpv-tech#IdentityManagementTechnology>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#PersonalInformationManagementSystem>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "PersonalInformationManagementSystem"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/dpv-tech#SmartphoneApplication>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/dpv-tech#>,
+        rdfs:label "SmartphoneApplication"@en
+    
+    
diff --git a/dpv-owl/dpv.owl b/dpv-owl/dpv.owl
index e71c748dd..24520d3db 100644
--- a/dpv-owl/dpv.owl
+++ b/dpv-owl/dpv.owl
@@ -14,7 +14,7 @@ Ontology: <https://w3id.org/dpv/dpv-owl>
 
 
 Annotations: 
-    owl:versionInfo "0.8.2"
+    owl:versionInfo "0.9"
 
 AnnotationProperty: <https://w3id.org/dpv/dpv-owl#hasConsentNotice>
 
@@ -592,6 +592,22 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasJustification>
         <https://w3id.org/dpv/dpv-owl#Justification>
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasLawfulness>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has lawfulness"@en
+    
+    SubPropertyOf: 
+        <https://w3id.org/dpv/dpv-owl#hasComplianceStatus>
+    
+    Domain: 
+        owl:Thing
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasLegalBasis>
 
     Annotations: 
@@ -660,6 +676,19 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasNotice>
         <https://w3id.org/dpv/dpv-owl#Notice>
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasObligation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has obligation"@en
+    
+    Domain: 
+        <https://w3id.org/dpv/dpv-owl#Context>
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Obligation>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasOrganisationalMeasure>
 
     Annotations: 
@@ -689,6 +718,19 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasOutcome>
         owl:Thing
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasPermission>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has permission"@en
+    
+    Domain: 
+        <https://w3id.org/dpv/dpv-owl#Context>
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Permission>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasPersonalData>
 
     Annotations: 
@@ -760,6 +802,19 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasProcessingAutomation>
         <https://w3id.org/dpv/dpv-owl#AutomationOfProcessing>
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasProhibition>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has prohibition"@en
+    
+    Domain: 
+        <https://w3id.org/dpv/dpv-owl#Context>
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Prohibition>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasProvisionBy>
 
     Annotations: 
@@ -932,6 +987,19 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasRiskLevel>
         <https://w3id.org/dpv/dpv-owl#RiskLevel>
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasRule>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has rule"@en
+    
+    Domain: 
+        <https://w3id.org/dpv/dpv-owl#Context>
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasScale>
 
     Annotations: 
@@ -1105,6 +1173,16 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#isBefore>
         owl:Thing
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#isExercisedAt>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "is exercised at"@en
+    
+    Domain: 
+        <https://w3id.org/dpv/dpv-owl#ActiveRight>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#isExplicit>
 
     Annotations: 
@@ -1280,6 +1358,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Acquire>
         <https://w3id.org/dpv/dpv-owl#Obtain>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ActiveRight>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Active Right"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Right>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#ActivityMonitoring>
 
     Annotations: 
@@ -1397,7 +1485,7 @@ Class: <https://w3id.org/dpv/dpv-owl#Anonymise>
 Class: <https://w3id.org/dpv/dpv-owl#AnonymisedData>
 
     Annotations: 
-        rdfs:comment "It is advised to carefully consider indicating data is fully or completely anonymised by determining whether the data by itself or in combination with other data can identify a person. Failing this condition, the data should be denoted as PseudoAnonymisedData. To indicate data is anonymised only for a specified entity (e.g. within an organisation), the concept AnonymisedDataWithinScope (as subclass of PseudoAnonymisedData) should be used instead of AnonymisedData."@en,
+        rdfs:comment "It is advised to carefully consider indicating data is fully or completely anonymised by determining whether the data by itself or in combination with other data can identify a person. Failing this condition, the data should be denoted as PseudonymisedData. To indicate data is anonymised only for a specified entity (e.g. within an organisation), the concept AnonymisedDataWithinScope (as subclass of PseudonymisedData) should be used instead of AnonymisedData."@en,
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Anonymised Data"@en
     
@@ -1651,6 +1739,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Citizen>
         <https://w3id.org/dpv/dpv-owl#DataSubject>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#City>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "City"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Location>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Client>
 
     Annotations: 
@@ -1767,6 +1865,16 @@ Class: <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
         <https://w3id.org/dpv/dpv-owl#Status>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ConformanceStatus>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Conformance Status"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Status>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Consent>
 
     Annotations: 
@@ -1915,6 +2023,16 @@ Class: <https://w3id.org/dpv/dpv-owl#ConsultationWithDataSubject>
         <https://w3id.org/dpv/dpv-owl#Consultation>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ConsultationWithDataSubjectRepresentative>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Consultation with Data Subject Representative"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ConsultationWithDataSubject>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Consumer>
 
     Annotations: 
@@ -1967,7 +2085,7 @@ Class: <https://w3id.org/dpv/dpv-owl#ContractualTerms>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "ContractualTerms"@en
+        rdfs:label "Contractual Terms"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#LegalAgreement>
@@ -2022,14 +2140,14 @@ Class: <https://w3id.org/dpv/dpv-owl#CreateEventRecommendations>
         rdfs:label "Create Event Recommendations"@en
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#CreatePersonalizedRecommendations>
+        <https://w3id.org/dpv/dpv-owl#CreatePersonalisedRecommendations>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#CreatePersonalizedRecommendations>
+Class: <https://w3id.org/dpv/dpv-owl#CreatePersonalisedRecommendations>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Create Personalized Recommendations"@en
+        rdfs:label "Create Personalised Recommendations"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#ServicePersonalization>
@@ -2043,7 +2161,7 @@ Class: <https://w3id.org/dpv/dpv-owl#CreateProductRecommendations>
         rdfs:seeAlso <https://specialprivacy.ercim.eu/vocabs/purposes#Marketing>
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#CreatePersonalizedRecommendations>
+        <https://w3id.org/dpv/dpv-owl#CreatePersonalisedRecommendations>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#CredentialManagement>
@@ -2486,7 +2604,7 @@ Class: <https://w3id.org/dpv/dpv-owl#Derive>
         rdfs:seeAlso <https://specialprivacy.ercim.eu/vocabs/processing#Derive>
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#Transform>
+        <https://w3id.org/dpv/dpv-owl#Obtain>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#DerivedPersonalData>
@@ -2527,6 +2645,9 @@ Class: <https://w3id.org/dpv/dpv-owl#DeterministicPseudonymisation>
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Deterministic Pseudonymisation"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+    
     
 Class: <https://w3id.org/dpv/dpv-owl#Detriment>
 
@@ -2644,6 +2765,9 @@ Class: <https://w3id.org/dpv/dpv-owl#DocumentRandomisedPseudonymisation>
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Document Randomised Pseudonymisation"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+    
     
 Class: <https://w3id.org/dpv/dpv-owl#DocumentSecurity>
 
@@ -2725,11 +2849,11 @@ Class: <https://w3id.org/dpv/dpv-owl#Encryption>
         <https://w3id.org/dpv/dpv-owl#TechnicalMeasure>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#EncryptionInRest>
+Class: <https://w3id.org/dpv/dpv-owl#EncryptionAtRest>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Encryption in Rest"@en
+        rdfs:label "Encryption at Rest"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Encryption>
@@ -2745,6 +2869,16 @@ Class: <https://w3id.org/dpv/dpv-owl#EncryptionInTransfer>
         <https://w3id.org/dpv/dpv-owl#Encryption>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#EncryptionInUse>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Encryption in Use"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Encryption>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#EndToEndEncryption>
 
     Annotations: 
@@ -2805,6 +2939,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Erase>
         <https://w3id.org/dpv/dpv-owl#Remove>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#EvaluationOfIndividuals>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Evaluation of Individuals"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ProcessingContext>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#EvaluationScoring>
 
     Annotations: 
@@ -2891,7 +3035,7 @@ Class: <https://w3id.org/dpv/dpv-owl#FixedOccurencesDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "FixedOccurencesDuration"@en
+        rdfs:label "Fixed Occurences Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -2944,6 +3088,9 @@ Class: <https://w3id.org/dpv/dpv-owl#FullyRandomisedPseudonymisation>
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Fully Randomised Pseudonymisation"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+    
     
 Class: <https://w3id.org/dpv/dpv-owl#Generate>
 
@@ -3375,6 +3522,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Law>
         rdfs:label "Law"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl#Lawfulness>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Lawfulness (alt title: LegalComplianceStatus)"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#LegalAgreement>
 
     Annotations: 
@@ -3453,6 +3610,16 @@ Class: <https://w3id.org/dpv/dpv-owl#LegitimateInterestOfController>
         <https://w3id.org/dpv/dpv-owl#LegitimateInterest>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#LegitimateInterestOfDataSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Legitimate Interest of Data Subject"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#LegitimateInterest>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#LegitimateInterestOfThirdParty>
 
     Annotations: 
@@ -3667,11 +3834,14 @@ Class: <https://w3id.org/dpv/dpv-owl#MonitoringPolicies>
         <https://w3id.org/dpv/dpv-owl#GovernanceProcedures>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#MonotonicCounterPseudoanonymisation>
+Class: <https://w3id.org/dpv/dpv-owl#MonotonicCounterPseudonymisation>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Monotonic Counter Pseudoanonymisation"@en
+        rdfs:label "Monotonic Counter Pseudonymisation"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#Move>
@@ -3827,6 +3997,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Notice>
         <https://w3id.org/dpv/dpv-owl#OrganisationalMeasure>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#Obligation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Obligation"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Observe>
 
     Annotations: 
@@ -4018,6 +4198,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Participant>
         <https://w3id.org/dpv/dpv-owl#DataSubject>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#PassiveRight>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Passive Right"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Right>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#PasswordAuthentication>
 
     Annotations: 
@@ -4058,6 +4248,16 @@ Class: <https://w3id.org/dpv/dpv-owl#PenetrationTestingMethods>
         <https://w3id.org/dpv/dpv-owl#SecurityMethod>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#Permission>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Permission"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#PersonalData>
 
     Annotations: 
@@ -4207,6 +4407,16 @@ Class: <https://w3id.org/dpv/dpv-owl#PrivateInformationRetrieval>
         rdfs:label "Private Information Retrieval"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl#PrivateLocation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Private Location"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#LocalLocation>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Processing>
 
     Annotations: 
@@ -4256,34 +4466,44 @@ Class: <https://w3id.org/dpv/dpv-owl#Profiling>
         <https://w3id.org/dpv/dpv-owl#Use>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#PseudoAnonymise>
+Class: <https://w3id.org/dpv/dpv-owl#Prohibition>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Pseudo-Anonymise"@en
+        rdfs:label "Prohibition"@en
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#Transform>
+        <https://w3id.org/dpv/dpv-owl#Rule>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#PseudoAnonymisedData>
+Class: <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Pseudo-anonymised Data"@en
+        rdfs:label "Pseudonymisation"@en
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#PersonalData>
+        <https://w3id.org/dpv/dpv-owl#DataAnonymisationTechnique>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+Class: <https://w3id.org/dpv/dpv-owl#Pseudonymise>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Pseudonymisation"@en
+        rdfs:label "Pseudonymise"@en
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#DataAnonymisationTechnique>
+        <https://w3id.org/dpv/dpv-owl#Transform>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#PseudonymisedData>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Pseudonymised Data"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#PersonalData>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#PublicInterest>
@@ -4306,6 +4526,16 @@ Class: <https://w3id.org/dpv/dpv-owl#PublicRelations>
         <https://w3id.org/dpv/dpv-owl#Marketing>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#PubliclyLocation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Publicly Accessible Location"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#LocalLocation>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Purpose>
 
     Annotations: 
@@ -4331,11 +4561,14 @@ Class: <https://w3id.org/dpv/dpv-owl#Query>
         <https://w3id.org/dpv/dpv-owl#Consult>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#RNGPseudoanonymisation>
+Class: <https://w3id.org/dpv/dpv-owl#RNGPseudonymisation>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "RNG Pseudoanonymisation"@en
+        rdfs:label "RNG Pseudonymisation"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#Recipient>
@@ -4501,6 +4734,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Retrieve>
         <https://w3id.org/dpv/dpv-owl#Use>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ReviewProcedure>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Review Procedure"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#OrganisationalMeasure>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Right>
 
     Annotations: 
@@ -4509,6 +4752,13 @@ Class: <https://w3id.org/dpv/dpv-owl#Right>
         rdfs:label "Right"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl#RightExercise>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Right Exercise"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Risk>
 
     Annotations: 
@@ -4566,6 +4816,13 @@ Class: <https://w3id.org/dpv/dpv-owl#RiskMitigationMeasure>
         <https://w3id.org/dpv/dpv-owl#TechnicalOrganisationalMeasure>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#Rule>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Rule"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Safeguard>
 
     Annotations: 
@@ -4608,6 +4865,16 @@ Class: <https://w3id.org/dpv/dpv-owl#Scope>
         <https://w3id.org/dpv/dpv-owl#Context>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ScoringOfIndividuals>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Scoring of Individuals"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ProcessingContext>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Screen>
 
     Annotations: 
@@ -4842,7 +5109,7 @@ Class: <https://w3id.org/dpv/dpv-owl#SingularFrequency>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "SingularFrequency"@en
+        rdfs:label "Singular Frequency"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Frequency>
@@ -4873,7 +5140,7 @@ Class: <https://w3id.org/dpv/dpv-owl#SporadicFrequency>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "SporadicFrequency"@en
+        rdfs:label "Sporadic Frequency"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Frequency>
@@ -5108,7 +5375,7 @@ Class: <https://w3id.org/dpv/dpv-owl#TemporalDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "TemporalDuration"@en
+        rdfs:label "Temporal Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -5233,7 +5500,7 @@ Class: <https://w3id.org/dpv/dpv-owl#UntilEventDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "UntilEventDuration"@en
+        rdfs:label "Until Event Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -5243,7 +5510,7 @@ Class: <https://w3id.org/dpv/dpv-owl#UntilTimeDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "UntilTimeDuration"@en
+        rdfs:label "Until Time Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -5680,6 +5947,16 @@ Individual: <https://w3id.org/dpv/dpv-owl#Compliant>
         <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#Conformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Conformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#ConformanceStatus>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl#ConsentExpired>
 
     Annotations: 
@@ -5794,7 +6071,7 @@ Individual: <https://w3id.org/dpv/dpv-owl#EndlessDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "EndlessDuration"@en
+        rdfs:label "Endless Duration"@en
     
     Types: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -5901,6 +6178,26 @@ Individual: <https://w3id.org/dpv/dpv-owl#LargeScaleProcessing>
         <https://w3id.org/dpv/dpv-owl#ProcessingScale>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#Lawful>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Lawful"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl#LawfulnessUnkown>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Lawfulness Unknown"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl#LocalEnvironmentScale>
 
     Annotations: 
@@ -5994,6 +6291,16 @@ Individual: <https://w3id.org/dpv/dpv-owl#NonCompliant>
         <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#NonConformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "NonConformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#ConformanceStatus>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl#NonPublicDataSource>
 
     Annotations: 
@@ -6187,3 +6494,13 @@ Individual: <https://w3id.org/dpv/dpv-owl#SporadicScaleOfDataSubjects>
         <https://w3id.org/dpv/dpv-owl#DataSubjectScale>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#Unlawful>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Unlawful"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
diff --git a/dpv-owl/modules/base.owl b/dpv-owl/modules/base.owl
index f40248dc4..b8d4bf124 100644
--- a/dpv-owl/modules/base.owl
+++ b/dpv-owl/modules/base.owl
@@ -3,6 +3,7 @@ Prefix: owl: <http://www.w3.org/2002/07/owl#>
 Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: vann: <http://purl.org/vocab/vann/>
 Prefix: xml: <http://www.w3.org/XML/1998/namespace>
 Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
 Prefix: : <urn:absoluteiri:defaultvalue#>
diff --git a/dpv-owl/modules/context.owl b/dpv-owl/modules/context.owl
index 5acd00502..6e1ec8f39 100644
--- a/dpv-owl/modules/context.owl
+++ b/dpv-owl/modules/context.owl
@@ -196,7 +196,7 @@ Class: <https://w3id.org/dpv/dpv-owl#FixedOccurencesDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "FixedOccurencesDuration"@en
+        rdfs:label "Fixed Occurences Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -268,7 +268,7 @@ Class: <https://w3id.org/dpv/dpv-owl#SingularFrequency>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "SingularFrequency"@en
+        rdfs:label "Singular Frequency"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Frequency>
@@ -278,7 +278,7 @@ Class: <https://w3id.org/dpv/dpv-owl#SporadicFrequency>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "SporadicFrequency"@en
+        rdfs:label "Sporadic Frequency"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Frequency>
@@ -296,7 +296,7 @@ Class: <https://w3id.org/dpv/dpv-owl#TemporalDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "TemporalDuration"@en
+        rdfs:label "Temporal Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -306,7 +306,7 @@ Class: <https://w3id.org/dpv/dpv-owl#UntilEventDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "UntilEventDuration"@en
+        rdfs:label "Until Event Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -316,7 +316,7 @@ Class: <https://w3id.org/dpv/dpv-owl#UntilTimeDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "UntilTimeDuration"@en
+        rdfs:label "Until Time Duration"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Duration>
@@ -329,7 +329,7 @@ Individual: <https://w3id.org/dpv/dpv-owl#EndlessDuration>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "EndlessDuration"@en
+        rdfs:label "Endless Duration"@en
     
     Types: 
         <https://w3id.org/dpv/dpv-owl#Duration>
diff --git a/dpv-owl/modules/jurisdiction.owl b/dpv-owl/modules/jurisdiction.owl
index 4ed3b2f07..0837eb71f 100644
--- a/dpv-owl/modules/jurisdiction.owl
+++ b/dpv-owl/modules/jurisdiction.owl
@@ -94,6 +94,16 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasThirdCountry>
         <https://w3id.org/dpv/dpv-owl#ThirdCountry>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#City>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "City"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Location>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#CloudLocation>
 
     Annotations: 
@@ -217,6 +227,26 @@ Class: <https://w3id.org/dpv/dpv-owl#LocationLocality>
         <https://w3id.org/dpv/dpv-owl#Location>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#PrivateLocation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Private Location"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#LocalLocation>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#PubliclyLocation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Publicly Accessible Location"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#LocalLocation>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Region>
 
     Annotations: 
diff --git a/dpv-owl/modules/legal_basis.owl b/dpv-owl/modules/legal_basis.owl
index b4288dfd8..bd2734c19 100644
--- a/dpv-owl/modules/legal_basis.owl
+++ b/dpv-owl/modules/legal_basis.owl
@@ -124,6 +124,16 @@ Class: <https://w3id.org/dpv/dpv-owl#LegitimateInterestOfController>
         <https://w3id.org/dpv/dpv-owl#LegitimateInterest>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#LegitimateInterestOfDataSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Legitimate Interest of Data Subject"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#LegitimateInterest>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#LegitimateInterestOfThirdParty>
 
     Annotations: 
diff --git a/dpv-owl/modules/organisational_measures.owl b/dpv-owl/modules/organisational_measures.owl
index 41dc55e9e..00d29bac9 100644
--- a/dpv-owl/modules/organisational_measures.owl
+++ b/dpv-owl/modules/organisational_measures.owl
@@ -149,11 +149,21 @@ Class: <https://w3id.org/dpv/dpv-owl#ConsultationWithDataSubject>
         <https://w3id.org/dpv/dpv-owl#Consultation>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ConsultationWithDataSubjectRepresentative>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Consultation with Data Subject Representative"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ConsultationWithDataSubject>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#ContractualTerms>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "ContractualTerms"@en
+        rdfs:label "Contractual Terms"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#LegalAgreement>
@@ -498,6 +508,13 @@ Class: <https://w3id.org/dpv/dpv-owl#RegularityOfRecertification>
         rdfs:label "Regularity of Re-certification"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ReviewProcedure>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Review Procedure"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#RiskManagementPlan>
 
     Annotations: 
diff --git a/dpv-owl/modules/personal_data.owl b/dpv-owl/modules/personal_data.owl
index 41db23245..fc90e85dc 100644
--- a/dpv-owl/modules/personal_data.owl
+++ b/dpv-owl/modules/personal_data.owl
@@ -58,7 +58,7 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasPersonalData>
 Class: <https://w3id.org/dpv/dpv-owl#AnonymisedData>
 
     Annotations: 
-        rdfs:comment "It is advised to carefully consider indicating data is fully or completely anonymised by determining whether the data by itself or in combination with other data can identify a person. Failing this condition, the data should be denoted as PseudoAnonymisedData. To indicate data is anonymised only for a specified entity (e.g. within an organisation), the concept AnonymisedDataWithinScope (as subclass of PseudoAnonymisedData) should be used instead of AnonymisedData."@en,
+        rdfs:comment "It is advised to carefully consider indicating data is fully or completely anonymised by determining whether the data by itself or in combination with other data can identify a person. Failing this condition, the data should be denoted as PseudonymisedData. To indicate data is anonymised only for a specified entity (e.g. within an organisation), the concept AnonymisedDataWithinScope (as subclass of PseudonymisedData) should be used instead of AnonymisedData."@en,
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Anonymised Data"@en
     
@@ -152,11 +152,11 @@ Class: <https://w3id.org/dpv/dpv-owl#PersonalData>
         <https://w3id.org/dpv/dpv-owl#Data>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#PseudoAnonymisedData>
+Class: <https://w3id.org/dpv/dpv-owl#PseudonymisedData>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Pseudo-anonymised Data"@en
+        rdfs:label "Pseudonymised Data"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#PersonalData>
diff --git a/dpv-owl/modules/processing.owl b/dpv-owl/modules/processing.owl
index 5265fdcf9..85ffea58b 100644
--- a/dpv-owl/modules/processing.owl
+++ b/dpv-owl/modules/processing.owl
@@ -174,7 +174,7 @@ Class: <https://w3id.org/dpv/dpv-owl#Derive>
         rdfs:seeAlso <https://specialprivacy.ercim.eu/vocabs/processing#Derive>
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#Transform>
+        <https://w3id.org/dpv/dpv-owl#Obtain>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#Destruct>
@@ -357,11 +357,11 @@ Class: <https://w3id.org/dpv/dpv-owl#Profiling>
         <https://w3id.org/dpv/dpv-owl#Use>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#PseudoAnonymise>
+Class: <https://w3id.org/dpv/dpv-owl#Pseudonymise>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Pseudo-Anonymise"@en
+        rdfs:label "Pseudonymise"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Transform>
diff --git a/dpv-owl/modules/processing_context.owl b/dpv-owl/modules/processing_context.owl
index afc6dec74..a70f103f7 100644
--- a/dpv-owl/modules/processing_context.owl
+++ b/dpv-owl/modules/processing_context.owl
@@ -144,6 +144,16 @@ Class: <https://w3id.org/dpv/dpv-owl#DecisionMaking>
         <https://w3id.org/dpv/dpv-owl#ProcessingContext>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#EvaluationOfIndividuals>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Evaluation of Individuals"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ProcessingContext>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#EvaluationScoring>
 
     Annotations: 
@@ -182,6 +192,16 @@ Class: <https://w3id.org/dpv/dpv-owl#ProcessingContext>
         rdfs:label "Processing Context"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ScoringOfIndividuals>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Scoring of Individuals"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ProcessingContext>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#StorageCondition>
 
     Annotations: 
diff --git a/dpv-owl/modules/purposes.owl b/dpv-owl/modules/purposes.owl
index b1b2932de..4874ff7aa 100644
--- a/dpv-owl/modules/purposes.owl
+++ b/dpv-owl/modules/purposes.owl
@@ -3,6 +3,7 @@ Prefix: owl: <http://www.w3.org/2002/07/owl#>
 Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: vann: <http://purl.org/vocab/vann/>
 Prefix: xml: <http://www.w3.org/XML/1998/namespace>
 Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
 Prefix: : <urn:absoluteiri:defaultvalue#>
@@ -144,14 +145,14 @@ Class: <https://w3id.org/dpv/dpv-owl#CreateEventRecommendations>
         rdfs:label "Create Event Recommendations"@en
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#CreatePersonalizedRecommendations>
+        <https://w3id.org/dpv/dpv-owl#CreatePersonalisedRecommendations>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#CreatePersonalizedRecommendations>
+Class: <https://w3id.org/dpv/dpv-owl#CreatePersonalisedRecommendations>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Create Personalized Recommendations"@en
+        rdfs:label "Create Personalised Recommendations"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#ServicePersonalization>
@@ -165,7 +166,7 @@ Class: <https://w3id.org/dpv/dpv-owl#CreateProductRecommendations>
         rdfs:seeAlso <https://specialprivacy.ercim.eu/vocabs/purposes#Marketing>
     
     SubClassOf: 
-        <https://w3id.org/dpv/dpv-owl#CreatePersonalizedRecommendations>
+        <https://w3id.org/dpv/dpv-owl#CreatePersonalisedRecommendations>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#CreditChecking>
diff --git a/dpv-owl/modules/rights.owl b/dpv-owl/modules/rights.owl
new file mode 100644
index 000000000..96e381bf0
--- /dev/null
+++ b/dpv-owl/modules/rights.owl
@@ -0,0 +1,97 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:comment
+
+    
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasRight>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has right"@en
+    
+    Domain: 
+        owl:Thing
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Right>
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#isExercisedAt>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "is exercised at"@en
+    
+    Domain: 
+        <https://w3id.org/dpv/dpv-owl#ActiveRight>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#ActiveRight>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Active Right"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Right>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#DataSubjectRight>
+
+    Annotations: 
+        rdfs:comment "Based on use of definitions, the notion of 'Data Subject Right' can be equivalent to 'Individual Right' or 'Right of a Person'"@en,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Data Subject Right"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Right>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#PassiveRight>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Passive Right"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Right>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#Right>
+
+    Annotations: 
+        rdfs:comment "A 'right' is a legal, social, or ethical principle of freedom or entitlement which dictate the norms regarding what is allowed or owed.. Rights as a concept encompass a broad area of norms and entities, and are not specific to Individuals or Data Protection / Privacy. For individual specific rights, see dpv:DataSubjectRight"@en,
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Right"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#RightExercise>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Right Exercise"@en
+    
+    
+Class: owl:Thing
+
+    
diff --git a/dpv-owl/modules/rules.owl b/dpv-owl/modules/rules.owl
new file mode 100644
index 000000000..e5ecf879b
--- /dev/null
+++ b/dpv-owl/modules/rules.owl
@@ -0,0 +1,99 @@
+Prefix: dct: <http://purl.org/dc/terms/>
+Prefix: owl: <http://www.w3.org/2002/07/owl#>
+Prefix: rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+Prefix: rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+Prefix: sw: <http://www.w3.org/2003/06/sw-vocab-status/ns#>
+Prefix: xml: <http://www.w3.org/XML/1998/namespace>
+Prefix: xsd: <http://www.w3.org/2001/XMLSchema#>
+Prefix: : <urn:absoluteiri:defaultvalue#>
+
+
+
+Ontology: 
+
+AnnotationProperty: rdfs:isDefinedBy
+
+    
+AnnotationProperty: rdfs:label
+
+    
+Datatype: rdf:langString
+
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasObligation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has obligation"@en
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Obligation>
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasPermission>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has permission"@en
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Permission>
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasProhibition>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has prohibition"@en
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Prohibition>
+    
+    
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasRule>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has rule"@en
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#Obligation>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Obligation"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#Permission>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Permission"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#Prohibition>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Prohibition"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Rule>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#Rule>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Rule"@en
+    
+    
diff --git a/dpv-owl/modules/status.owl b/dpv-owl/modules/status.owl
index 270c8b0da..7a45433a5 100644
--- a/dpv-owl/modules/status.owl
+++ b/dpv-owl/modules/status.owl
@@ -71,6 +71,22 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasComplianceStatus>
         <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
     
     
+ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasLawfulness>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "has lawfulness"@en
+    
+    SubPropertyOf: 
+        <https://w3id.org/dpv/dpv-owl#hasComplianceStatus>
+    
+    Domain: 
+        owl:Thing
+    
+    Range: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl#hasStatus>
 
     Annotations: 
@@ -114,6 +130,26 @@ Class: <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
         <https://w3id.org/dpv/dpv-owl#Status>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#ConformanceStatus>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Conformance Status"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Status>
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl#Lawfulness>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Lawfulness (alt title: LegalComplianceStatus)"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#Status>
 
     Annotations: 
@@ -266,6 +302,36 @@ Individual: <https://w3id.org/dpv/dpv-owl#Compliant>
         <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#Conformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Conformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#ConformanceStatus>
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl#Lawful>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Lawful"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
+Individual: <https://w3id.org/dpv/dpv-owl#LawfulnessUnkown>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Lawfulness Unknown"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl#NonCompliant>
 
     Annotations: 
@@ -277,6 +343,16 @@ Individual: <https://w3id.org/dpv/dpv-owl#NonCompliant>
         <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#NonConformant>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "NonConformant"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#ConformanceStatus>
+    
+    
 Individual: <https://w3id.org/dpv/dpv-owl#PartiallyCompliant>
 
     Annotations: 
@@ -287,3 +363,13 @@ Individual: <https://w3id.org/dpv/dpv-owl#PartiallyCompliant>
         <https://w3id.org/dpv/dpv-owl#ComplianceStatus>
     
     
+Individual: <https://w3id.org/dpv/dpv-owl#Unlawful>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Unlawful"@en
+    
+    Types: 
+        <https://w3id.org/dpv/dpv-owl#Lawfulness>
+    
+    
diff --git a/dpv-owl/modules/technical_measures.owl b/dpv-owl/modules/technical_measures.owl
index 5598ede4f..1647267aa 100644
--- a/dpv-owl/modules/technical_measures.owl
+++ b/dpv-owl/modules/technical_measures.owl
@@ -186,6 +186,9 @@ Class: <https://w3id.org/dpv/dpv-owl#DeterministicPseudonymisation>
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Deterministic Pseudonymisation"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+    
     
 Class: <https://w3id.org/dpv/dpv-owl#DifferentialPrivacy>
 
@@ -230,6 +233,9 @@ Class: <https://w3id.org/dpv/dpv-owl#DocumentRandomisedPseudonymisation>
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Document Randomised Pseudonymisation"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+    
     
 Class: <https://w3id.org/dpv/dpv-owl#DocumentSecurity>
 
@@ -248,11 +254,11 @@ Class: <https://w3id.org/dpv/dpv-owl#Encryption>
         rdfs:label "Encryption"@en
     
     
-Class: <https://w3id.org/dpv/dpv-owl#EncryptionInRest>
+Class: <https://w3id.org/dpv/dpv-owl#EncryptionAtRest>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Encryption in Rest"@en
+        rdfs:label "Encryption at Rest"@en
     
     SubClassOf: 
         <https://w3id.org/dpv/dpv-owl#Encryption>
@@ -268,6 +274,16 @@ Class: <https://w3id.org/dpv/dpv-owl#EncryptionInTransfer>
         <https://w3id.org/dpv/dpv-owl#Encryption>
     
     
+Class: <https://w3id.org/dpv/dpv-owl#EncryptionInUse>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
+        rdfs:label "Encryption in Use"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Encryption>
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl#EndToEndEncryption>
 
     Annotations: 
@@ -294,6 +310,9 @@ Class: <https://w3id.org/dpv/dpv-owl#FullyRandomisedPseudonymisation>
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
         rdfs:label "Fully Randomised Pseudonymisation"@en
     
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
+    
     
 Class: <https://w3id.org/dpv/dpv-owl#HardwareSecurityProtocols>
 
@@ -372,11 +391,14 @@ Class: <https://w3id.org/dpv/dpv-owl#MobilePlatformSecurity>
         <https://w3id.org/dpv/dpv-owl#SecurityMethod>
     
     
-Class: <https://w3id.org/dpv/dpv-owl#MonotonicCounterPseudoanonymisation>
+Class: <https://w3id.org/dpv/dpv-owl#MonotonicCounterPseudonymisation>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "Monotonic Counter Pseudoanonymisation"@en
+        rdfs:label "Monotonic Counter Pseudonymisation"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#MultiFactorAuthentication>
@@ -487,11 +509,14 @@ Class: <https://w3id.org/dpv/dpv-owl#QuantumCryptography>
         rdfs:label "Quantum Cryptography"@en
     
     
-Class: <https://w3id.org/dpv/dpv-owl#RNGPseudoanonymisation>
+Class: <https://w3id.org/dpv/dpv-owl#RNGPseudonymisation>
 
     Annotations: 
         rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl#>,
-        rdfs:label "RNG Pseudoanonymisation"@en
+        rdfs:label "RNG Pseudonymisation"@en
+    
+    SubClassOf: 
+        <https://w3id.org/dpv/dpv-owl#Pseudonymisation>
     
     
 Class: <https://w3id.org/dpv/dpv-owl#SecretSharingSchemes>
diff --git a/dpv-owl/rights/eu/rights-eu.owl b/dpv-owl/rights/eu/rights-eu.owl
index 9aa3e6d73..77d7f9505 100644
--- a/dpv-owl/rights/eu/rights-eu.owl
+++ b/dpv-owl/rights/eu/rights-eu.owl
@@ -31,13 +31,6 @@ Datatype: rdf:langString
 Datatype: xsd:string
 
     
-ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasCommunicationMechanism>
-
-    Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/rights/eu#>,
-        rdfs:label "hasCommunicationMechanism"@en
-    
-    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasDeveloper>
 
     Annotations: 
@@ -52,13 +45,6 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasProvider>
         rdfs:label "hasProvider"@en
     
     
-ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasProvisionMethod>
-
-    Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/rights/eu#>,
-        rdfs:label "hasProvisionMethod"@en
-    
-    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasSubject>
 
     Annotations: 
@@ -66,13 +52,6 @@ ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasSubject>
         rdfs:label "hasSubject"@en
     
     
-ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasTRL>
-
-    Annotations: 
-        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/rights/eu#>,
-        rdfs:label "hasTRL"@en
-    
-    
 ObjectProperty: <https://w3id.org/dpv/dpv-owl/rights/eu#hasUser>
 
     Annotations: 
diff --git a/dpv-owl/risk/modules/risk_consequences.owl b/dpv-owl/risk/modules/risk_consequences.owl
index 6abf8aaac..073b7bf4f 100644
--- a/dpv-owl/risk/modules/risk_consequences.owl
+++ b/dpv-owl/risk/modules/risk_consequences.owl
@@ -132,6 +132,20 @@ Class: <https://w3id.org/dpv/dpv-owl/risk#ConfidentialityBreach>
         rdfs:label "Confidentiality Breach"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/risk#ConsequenceForDataSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/risk#>,
+        rdfs:label "Consequence for Data Subject"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/risk#ConsequenceOnDataSecurity>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/risk#>,
+        rdfs:label "Consequence on Data Security"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/risk#CopyrightViolation>
 
     Annotations: 
@@ -426,6 +440,13 @@ Class: <https://w3id.org/dpv/dpv-owl/risk#IllegalProcessingData>
         rdfs:label "Illegal Processing of Data"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/risk#ImpactOnDataSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/risk#>,
+        rdfs:label "Impact on Data Subject"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/risk#ImpacttoRights>
 
     Annotations: 
diff --git a/dpv-owl/risk/risk.owl b/dpv-owl/risk/risk.owl
index cf52d9754..994d5b02c 100644
--- a/dpv-owl/risk/risk.owl
+++ b/dpv-owl/risk/risk.owl
@@ -240,6 +240,20 @@ Class: <https://w3id.org/dpv/dpv-owl/risk#ConfidentialityBreach>
         rdfs:label "Confidentiality Breach"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/risk#ConsequenceForDataSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/risk#>,
+        rdfs:label "Consequence for Data Subject"@en
+    
+    
+Class: <https://w3id.org/dpv/dpv-owl/risk#ConsequenceOnDataSecurity>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/risk#>,
+        rdfs:label "Consequence on Data Security"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/risk#ControlConsequence>
 
     Annotations: 
@@ -566,6 +580,13 @@ Class: <https://w3id.org/dpv/dpv-owl/risk#IllegalProcessingData>
         rdfs:label "Illegal Processing of Data"@en
     
     
+Class: <https://w3id.org/dpv/dpv-owl/risk#ImpactOnDataSubject>
+
+    Annotations: 
+        rdfs:isDefinedBy <https://w3id.org/dpv/dpv-owl/risk#>,
+        rdfs:label "Impact on Data Subject"@en
+    
+    
 Class: <https://w3id.org/dpv/dpv-owl/risk#ImpacttoRights>
 
     Annotations: