diff --git a/gradle.properties b/gradle.properties
index f8e5e31..a86f38a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version = 2.0.1
+version = 2.0.2
 group = com.cabolabs
\ No newline at end of file
diff --git a/opt.bat b/opt.bat
index 10e441b..476b8b3 100644
--- a/opt.bat
+++ b/opt.bat
@@ -1 +1 @@
-java -cp "./lib/*;%GROOVY_HOME%/embeddable/groovy-all-2.4.7.jar;build/libs/opt-2.0.1.jar" com.cabolabs.openehr.opt.Main %1 %2 %3 %4 %5 %6 %7
\ No newline at end of file
+java -cp "./lib/*;%GROOVY_HOME%/embeddable/groovy-all-2.4.7.jar;build/libs/opt-2.0.2.jar" com.cabolabs.openehr.opt.Main %1 %2 %3 %4 %5 %6 %7
\ No newline at end of file
diff --git a/opt.sh b/opt.sh
index 254e877..069ab7c 100755
--- a/opt.sh
+++ b/opt.sh
@@ -1 +1 @@
-java -cp "./lib/*:$GROOVY_HOME/lib/*:build/libs/opt-2.0.1.jar" com.cabolabs.openehr.opt.Main $1 $2 $3 $4 $5 $6 $7
+java -cp "./lib/*:$GROOVY_HOME/lib/*:build/libs/opt-2.0.2.jar" com.cabolabs.openehr.opt.Main $1 $2 $3 $4 $5 $6 $7
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
index 7e4efcb..3cf6c5d 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
@@ -35,7 +35,7 @@ import com.cabolabs.openehr.dto_1_0_2.demographic.*
 import com.cabolabs.openehr.opt.instance_validation.JsonInstanceValidation
 import groovy.json.JsonSlurper
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OpenEhrJsonParser {
 
    def jsonValidator
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParserQuick.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParserQuick.groovy
index 556b8aa..61d6f04 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParserQuick.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParserQuick.groovy
@@ -39,7 +39,7 @@ import groovy.json.JsonSlurper
  * This is the same as the original JsonParser but doesn't generate the paths for pathable, those can be
  * calculated later. So for uses that don't require the paths in the RM instances, this will be faster.
  */
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OpenEhrJsonParserQuick {
 
    //private Logger log = LogManager.getLogger(getClass())
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
index d296a59..b2ee750 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
@@ -41,7 +41,6 @@ import com.cabolabs.openehr.opt.instance_validation.*
 //import groovy.xml.XmlSlurper
 //import groovy.xml.slurpersupport.GPathResult
 
-@groovy.util.logging.Log4j2
 class OpenEhrXmlParser {
 
    def schemaValidate = false
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/manager/OptManager.groovy b/src/main/groovy/com/cabolabs/openehr/opt/manager/OptManager.groovy
index 036ee19..486a492 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/manager/OptManager.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/manager/OptManager.groovy
@@ -9,7 +9,7 @@ import groovy.transform.Synchronized
 import groovy.time.TimeCategory
 import groovy.time.TimeDuration
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OptManager {
 
    //private Logger log = LogManager.getLogger(getClass())
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/manager/OptRepositoryFSImpl.groovy b/src/main/groovy/com/cabolabs/openehr/opt/manager/OptRepositoryFSImpl.groovy
index 2931d2f..08de12b 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/manager/OptRepositoryFSImpl.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/manager/OptRepositoryFSImpl.groovy
@@ -5,7 +5,7 @@ import net.pempek.unicode.UnicodeBOMInputStream
 // import org.apache.logging.log4j.LogManager
 import java.io.FileNotFoundException
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OptRepositoryFSImpl implements OptRepository {
 
    private static String PS = File.separator
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/ArchetypeSlot.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/ArchetypeSlot.groovy
index 1c80c0c..fb5b8d7 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/ArchetypeSlot.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/ArchetypeSlot.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model
 
 import com.cabolabs.openehr.opt.model.primitive.CPrimitive
 
-@groovy.util.logging.Log4j2
 class ArchetypeSlot extends ObjectNode {
 
    // TODO: assertion
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/AttributeNode.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/AttributeNode.groovy
index 2fefbed..d2cc2eb 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/AttributeNode.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/AttributeNode.groovy
@@ -1,6 +1,5 @@
 package com.cabolabs.openehr.opt.model
 
-@groovy.util.logging.Log4j2
 class AttributeNode extends Constraint {
 
    // AOM type
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/ObjectNode.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/ObjectNode.groovy
index 6252f60..8dc3b29 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/ObjectNode.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/ObjectNode.groovy
@@ -3,7 +3,7 @@ package com.cabolabs.openehr.opt.model
 import java.util.Map
 import groovy.util.slurpersupport.GPathResult
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class ObjectNode extends Constraint {
 
    OperationalTemplate owner
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/OperationalTemplate.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/OperationalTemplate.groovy
index 7670469..da77a8b 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/OperationalTemplate.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/OperationalTemplate.groovy
@@ -4,7 +4,7 @@ package com.cabolabs.openehr.opt.model
 import com.cabolabs.openehr.rm_1_0_2.Model
 import com.cabolabs.openehr.opt.model.primitive.*
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class OperationalTemplate {
 
    String uid
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/PrimitiveObjectNode.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/PrimitiveObjectNode.groovy
index 30d37ef..a8e0971 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/PrimitiveObjectNode.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/PrimitiveObjectNode.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model
 
 import com.cabolabs.openehr.opt.model.primitive.CPrimitive
 
-@groovy.util.logging.Log4j2
 class PrimitiveObjectNode extends ObjectNode {
 
    CPrimitive item
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CCodePhrase.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CCodePhrase.groovy
index 0eb7e4c..043360a 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CCodePhrase.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CCodePhrase.groovy
@@ -5,8 +5,6 @@ import com.cabolabs.openehr.opt.model.validation.ValidationResult
 //import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 import com.cabolabs.openehr.rm_1_0_2.data_types.text.CodePhrase
 
-
-@groovy.util.logging.Log4j2
 class CCodePhrase extends ObjectNode {
 
    // CODE LIST CONSTRAINT
@@ -64,8 +62,6 @@ class CCodePhrase extends ObjectNode {
 
       if (this.terminologyId)
       {
-         //log.info("CCodePhrase isValid")
-
          if (_terminologyId != this.terminologyId)
          {
             return new ValidationResult(isValid: false, message: "terminology_id '${_terminologyId}' doesn't match '${this.terminologyId}'")
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinal.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinal.groovy
index bd2eec8..a2ce935 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinal.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinal.groovy
@@ -4,7 +4,6 @@ import com.cabolabs.openehr.opt.model.ObjectNode
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 import com.cabolabs.openehr.rm_1_0_2.data_types.quantity.DvOrdinal
 
-@groovy.util.logging.Log4j2
 class CDvOrdinal extends ObjectNode {
 
    // List<CDvOrdinalItem>
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinalItem.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinalItem.groovy
index ab8c0ca..91fc8c3 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinalItem.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvOrdinalItem.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model.domain
 
 import com.cabolabs.openehr.opt.model.datatypes.CodePhrase
 
-@groovy.util.logging.Log4j2
 class CDvOrdinalItem {
 
    int value
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvQuantity.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvQuantity.groovy
index e7bda53..5c68f7b 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvQuantity.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CDvQuantity.groovy
@@ -5,8 +5,6 @@ import com.cabolabs.openehr.opt.model.datatypes.CodePhrase
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 import com.cabolabs.openehr.rm_1_0_2.data_types.quantity.DvQuantity
 
-
-@groovy.util.logging.Log4j2
 class CDvQuantity extends ObjectNode {
 
    // property: CODE_PHRASE
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CQuantityItem.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CQuantityItem.groovy
index 2f1efef..14fb389 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CQuantityItem.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/domain/CQuantityItem.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.domain
 import com.cabolabs.openehr.opt.model.IntervalBigDecimal
 import com.cabolabs.openehr.opt.model.IntervalInt
 
-@groovy.util.logging.Log4j2
 class CQuantityItem {
 
    IntervalBigDecimal magnitude // can be null
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CBoolean.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CBoolean.groovy
index 6321861..66be7f9 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CBoolean.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CBoolean.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.primitive
 import com.cabolabs.openehr.opt.model.IntervalInt
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CBoolean extends CPrimitive {
 
    Boolean trueValid
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDate.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDate.groovy
index 6e2ee53..3c2c880 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDate.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDate.groovy
@@ -7,7 +7,6 @@ import java.text.SimpleDateFormat
 import java.text.ParseException
 import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 
-@groovy.util.logging.Log4j2
 class CDate extends CPrimitive {
 
    // TODO: list constraint (this is not commonly used)
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDateTime.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDateTime.groovy
index bcbc0e6..b229681 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDateTime.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDateTime.groovy
@@ -7,7 +7,6 @@ import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 import java.text.SimpleDateFormat
 import java.text.ParseException
 
-@groovy.util.logging.Log4j2
 class CDateTime extends CPrimitive {
 
    // TODO: list constraint (this is not commonly used)
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDuration.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDuration.groovy
index 6e490d4..67e02fc 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDuration.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CDuration.groovy
@@ -4,7 +4,6 @@ import com.cabolabs.openehr.opt.model.IntervalDuration
 import com.cabolabs.openehr.opt.model.datatypes.Duration
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CDuration extends CPrimitive {
 
    String pattern
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CInteger.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CInteger.groovy
index 6736076..0a688b3 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CInteger.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CInteger.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.primitive
 import com.cabolabs.openehr.opt.model.IntervalInt
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CInteger extends CPrimitive {
 
    // list constraint (this is not commonly used)
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CPrimitive.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CPrimitive.groovy
index 4c740c3..8451568 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CPrimitive.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CPrimitive.groovy
@@ -1,6 +1,5 @@
 package com.cabolabs.openehr.opt.model.primitive
 
-@groovy.util.logging.Log4j2
 class CPrimitive {
 
 }
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CReal.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CReal.groovy
index 090cc20..8a78fb8 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CReal.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CReal.groovy
@@ -3,7 +3,6 @@ package com.cabolabs.openehr.opt.model.primitive
 import com.cabolabs.openehr.opt.model.IntervalBigDecimal
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CReal extends CPrimitive {
 
    // TODO: list constraint (this is not commonly used)
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CString.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CString.groovy
index cfaa203..8324697 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CString.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CString.groovy
@@ -2,7 +2,6 @@ package com.cabolabs.openehr.opt.model.primitive
 
 import com.cabolabs.openehr.opt.model.validation.ValidationResult
 
-@groovy.util.logging.Log4j2
 class CString extends CPrimitive {
 
    String pattern
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CTime.groovy b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CTime.groovy
index 5ca2ac7..32a03a5 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CTime.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/model/primitive/CTime.groovy
@@ -7,7 +7,6 @@ import com.cabolabs.openehr.rm_1_0_2.common.archetyped.Pathable
 import java.text.ParseException
 import java.text.SimpleDateFormat
 
-@groovy.util.logging.Log4j2
 class CTime extends CPrimitive {
 
    // TODO: range constraint
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/parser/OperationalTemplateParser.groovy b/src/main/groovy/com/cabolabs/openehr/opt/parser/OperationalTemplateParser.groovy
index e882986..3e60793 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/parser/OperationalTemplateParser.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/parser/OperationalTemplateParser.groovy
@@ -9,7 +9,6 @@ import groovy.util.slurpersupport.GPathResult
 // import org.apache.logging.log4j.LogManager
 // import org.apache.logging.log4j.Logger
 
-@groovy.util.logging.Log4j2
 class OperationalTemplateParser {
 
    //private Logger log = LogManager.getLogger(getClass())
diff --git a/src/main/groovy/com/cabolabs/openehr/terminology/TerminologyParser.groovy b/src/main/groovy/com/cabolabs/openehr/terminology/TerminologyParser.groovy
index 9e72cc3..5d192b8 100644
--- a/src/main/groovy/com/cabolabs/openehr/terminology/TerminologyParser.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/terminology/TerminologyParser.groovy
@@ -6,7 +6,7 @@ import groovy.util.slurpersupport.GPathResult
 // import org.apache.logging.log4j.LogManager
 // import org.apache.logging.log4j.Logger
 
-@groovy.util.logging.Log4j2
+@groovy.util.logging.Slf4j
 class TerminologyParser {
 
    private static TerminologyParser instance = null