diff --git a/code/java/FlintParser/src/main/kotlin/org/discipl/flint/Models.kt b/code/java/FlintParser/src/main/kotlin/org/discipl/flint/Models.kt
index 11ccfa2..f0217e4 100644
--- a/code/java/FlintParser/src/main/kotlin/org/discipl/flint/Models.kt
+++ b/code/java/FlintParser/src/main/kotlin/org/discipl/flint/Models.kt
@@ -21,6 +21,7 @@ data class Language(
val claimant: String,
val create: String,
val terminate: String,
+ val enforce: String,
val dutyComponents: String,
val explanation: String,
val actor: String,
diff --git a/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintLanguageParserTest.kt b/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintLanguageParserTest.kt
index e20bf87..28fcb2a 100644
--- a/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintLanguageParserTest.kt
+++ b/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintLanguageParserTest.kt
@@ -17,7 +17,7 @@ class FlintLanguageParserTest {
val language = languageParser.importedLanguage
val correctLanguage: Language = Language("Dutch","naam","daden","feiten",
"plichten","functie","referentie","taak-eigenaar","eiser",
- "maak","beindig","taak-onderdelen","uitleg","actie-ondernemer",
+ "maak","beindig","handhaven","taak-onderdelen","uitleg","actie-ondernemer",
"actie","object","ontvanger","pre-conditie","taal","bronnen",
"tekst","Vind lijn in Bron","geldig vanaf","geldig tot","labels",
"versie","geverifieerd","gevalideerd","gepubliceerd","selecteer versie")
diff --git a/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintParserTest.kt b/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintParserTest.kt
index fc1e6e6..6802e17 100644
--- a/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintParserTest.kt
+++ b/code/java/FlintParser/src/test/kotlin/org/discpl/flint/FlintParserTest.kt
@@ -222,7 +222,7 @@ internal class FlintParserTest {
val language = flintParser.getLanguage()
val correctLanguage: Language = Language("Dutch","naam","daden","feiten",
"plichten","functie","referentie","taak-eigenaar","eiser",
- "maak","beindig","taak-onderdelen","uitleg","actie-ondernemer",
+ "maak","beindig","handhaven","taak-onderdelen","uitleg","actie-ondernemer",
"actie","object","ontvanger","pre-conditie","taal","bronnen",
"tekst","Vind lijn in Bron","geldig vanaf","geldig tot","labels",
"versie","geverifieerd","gevalideerd","gepubliceerd","selecteer versie")
@@ -237,7 +237,7 @@ internal class FlintParserTest {
val language = flintParser.getLanguage()
val correctLanguage: Language = Language("English","name","acts","facts",
"duties","function","references","duty-holder","claimaint",
- "create","terminate","duty-components","explanation","actor",
+ "create","terminate","enforce","duty-components","explanation","actor",
"action","object","recipient","preconditions","language","sources",
"text","Find line in Source","valid from","valid to","tags",
"version","verified","validated","publicized","select version")
diff --git a/code/java/FlintParser/src/test/resources/Dutch.flint.language.json b/code/java/FlintParser/src/test/resources/Dutch.flint.language.json
index 3e46764..5c9fd79 100644
--- a/code/java/FlintParser/src/test/resources/Dutch.flint.language.json
+++ b/code/java/FlintParser/src/test/resources/Dutch.flint.language.json
@@ -10,6 +10,7 @@
"claimant": "eiser",
"create": "maak",
"terminate": "beindig",
+ "enforce": "handhaven",
"dutyComponents": "taak-onderdelen",
"explanation": "uitleg",
"actor": "actie-ondernemer",
diff --git a/code/java/FlintParser/src/test/resources/projection-and-create.flint.json b/code/java/FlintParser/src/test/resources/projection-and-create.flint.json
index 5868289..592a169 100644
--- a/code/java/FlintParser/src/test/resources/projection-and-create.flint.json
+++ b/code/java/FlintParser/src/test/resources/projection-and-create.flint.json
@@ -11,6 +11,7 @@
"claimant": "eiser",
"create": "maak",
"terminate": "beindig",
+ "enforce": "handhaven",
"dutyComponents": "taak-onderdelen",
"explanation": "uitleg",
"actor": "actie-ondernemer",
diff --git a/code/java/FlintParser/src/test/resources/test-ANLb.flint.json b/code/java/FlintParser/src/test/resources/test-ANLb.flint.json
index 66ad4af..02d8362 100644
--- a/code/java/FlintParser/src/test/resources/test-ANLb.flint.json
+++ b/code/java/FlintParser/src/test/resources/test-ANLb.flint.json
@@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
+ "enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
diff --git a/code/java/FlintParser/src/test/resources/test-Vreemdelingenwet.flint.json b/code/java/FlintParser/src/test/resources/test-Vreemdelingenwet.flint.json
index 00a639b..8643a71 100644
--- a/code/java/FlintParser/src/test/resources/test-Vreemdelingenwet.flint.json
+++ b/code/java/FlintParser/src/test/resources/test-Vreemdelingenwet.flint.json
@@ -12,6 +12,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
+ "enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
diff --git a/code/java/FlintParser/src/test/resources/test-covid19.flint.json b/code/java/FlintParser/src/test/resources/test-covid19.flint.json
index 421d0a8..5d93cef 100644
--- a/code/java/FlintParser/src/test/resources/test-covid19.flint.json
+++ b/code/java/FlintParser/src/test/resources/test-covid19.flint.json
@@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
+ "enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
diff --git a/code/java/FlintParser/src/test/resources/test-lerarenbeurs.flint.json b/code/java/FlintParser/src/test/resources/test-lerarenbeurs.flint.json
index f1c0dd1..683deab 100644
--- a/code/java/FlintParser/src/test/resources/test-lerarenbeurs.flint.json
+++ b/code/java/FlintParser/src/test/resources/test-lerarenbeurs.flint.json
@@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
+ "enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
diff --git a/code/java/FlintParser/src/test/resources/test-tegemoetkoming-schade-covid19.flint.json b/code/java/FlintParser/src/test/resources/test-tegemoetkoming-schade-covid19.flint.json
index b3e4042..52fbdd7 100644
--- a/code/java/FlintParser/src/test/resources/test-tegemoetkoming-schade-covid19.flint.json
+++ b/code/java/FlintParser/src/test/resources/test-tegemoetkoming-schade-covid19.flint.json
@@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
+ "enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
diff --git a/code/solutions/Flint.plugin/models/Flint.plugin.plugin.mps b/code/solutions/Flint.plugin/models/Flint.plugin.plugin.mps
index 17149e9..f0f1c6b 100644
--- a/code/solutions/Flint.plugin/models/Flint.plugin.plugin.mps
+++ b/code/solutions/Flint.plugin/models/Flint.plugin.plugin.mps
@@ -6073,8 +6073,8 @@
-
-
+
+
@@ -23463,8 +23463,8 @@
-
-
+
+
diff --git a/code/solutions/Flint.test/models/Flint.test.mpstest.mps b/code/solutions/Flint.test/models/Flint.test.mpstest.mps
index 7b702cb..cb5986c 100644
--- a/code/solutions/Flint.test/models/Flint.test.mpstest.mps
+++ b/code/solutions/Flint.test/models/Flint.test.mpstest.mps
@@ -45,8 +45,10 @@
+
+
+
-
@@ -247,9 +249,11 @@
+
+
@@ -2502,77 +2506,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2646,6 +2606,543 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/code/test-resources/test-model.flint.json b/code/test-resources/test-model.flint.json
index 2a82c55..66e66ea 100644
--- a/code/test-resources/test-model.flint.json
+++ b/code/test-resources/test-model.flint.json
@@ -11,6 +11,7 @@
"claimant": "claimaint",
"create": "create",
"terminate": "terminate",
+ "enforce": "enforce",
"dutyComponents": "duty-components",
"explanation": "explanation",
"actor": "actor",
@@ -23,7 +24,13 @@
"text": "text",
"findLineInSource": "Find line in Source",
"validFrom": "valid from",
- "validTo": "valid to"
+ "validTo": "valid to",
+ "tags": "tags",
+ "version": "version",
+ "verified": "verified",
+ "validated": "validated",
+ "publicized": "publicized",
+ "selectVersion": "select version"
},
"acts": [
{