diff --git a/plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Tdl.tdltx b/plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Tdl.tdltx
index 4565e66d2e2b99ea59c6c193c676ac32606c1f60..32260bf95c211407e95321a2f093c812ae241fd8 100644
--- a/plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Tdl.tdltx
+++ b/plugins/org.etsi.mts.tdl.library/src/org/etsi/mts/tdl/library/Tdl.tdltx
@@ -1,5 +1,6 @@
-Package Tdl {
-	//TODO: extract to standard library
+@Version: "1.8.1"
+Package TDL {
+
 	Constraint length
 	Constraint minLength
 	Constraint maxLength
@@ -13,7 +14,6 @@ Package Tdl {
 	Type String
 	Type Verdict
 	
-	//TODO: these do not work at present -> literal values take precedence?
 	Boolean ^true
 	Boolean ^false
 	Boolean True
@@ -27,6 +27,10 @@ Package Tdl {
 	
 	Annotation Master
 	Annotation MappingName
+	Annotation Version
+	Annotation check
+	Annotation where
+	Annotation PICS
 
     //standard annotations for STO
     Annotation Initial conditions
diff --git a/plugins/org.etsi.mts.tdl.tx.ui/templates/TDL.tdltx b/plugins/org.etsi.mts.tdl.tx.ui/templates/TDL.tdltx
index fa0b687a6f6c0da0f016c0e2f657d033bd6b3ac9..d063a4c43d63b296fc10fe667643080402009915 100644
--- a/plugins/org.etsi.mts.tdl.tx.ui/templates/TDL.tdltx
+++ b/plugins/org.etsi.mts.tdl.tx.ui/templates/TDL.tdltx
@@ -1,6 +1,5 @@
 @Version: "1.8.1"
 Package TDL {
-	//TODO: extract to standard library
 	Constraint length
 	Constraint minLength
 	Constraint maxLength
@@ -14,9 +13,8 @@ Package TDL {
 	Type String
 	Type Verdict
 	
-	//TODO: these do not work at present -> literal values take precedence?
-//	Boolean true
-//	Boolean false
+	Boolean ^true
+	Boolean ^false
 	Boolean True
 	Boolean False
 	
@@ -31,6 +29,7 @@ Package TDL {
 	Annotation Version
 	Annotation check
 	Annotation where
+	Annotation PICS
 
     //standard annotations for STO
     Annotation Initial conditions