diff --git a/README.md b/README.md
index a3936323..d37773e3 100644
--- a/README.md
+++ b/README.md
@@ -212,7 +212,7 @@ String path = "vital_signs.xml"
 File file = new File(getClass().getResource(path).toURI())
 String xml = file.text
 def parser = new OpenEhrXmlParser()
-Composition c = (Composition)parser.parseXml(xml)
+Composition c = (Composition)parser.parseLocatable(xml)
 ```
 
 ### Serialize a COMPOSITION to XML
@@ -249,7 +249,7 @@ report.errors.each { error ->
 ```groovy
 String xml = ...
 def parser = new OpenEhrXmlParser()
-Composition c = (Composition)parser.parseXml(xml)
+Composition c = (Composition)parser.parseLocatable(xml)
 def serializer = new OpenEhrJsonSerializer()
 String json = serializer.serialize(c)
 ```
diff --git a/gradle.properties b/gradle.properties
index c5bafd6e..9bb5bda9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-version = 1.9.10
+version = 1.9.11
 group = com.cabolabs
\ No newline at end of file
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
index 49eeb772..db02607f 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonParser.groovy
@@ -162,6 +162,7 @@ class OpenEhrJsonParser {
       return ehr
    }
 
+   // FIXME: this should be parseLocatable
    // used to parse compositions and other descendant from Locatable
    // TODO: FOLDER and EHR_STATUS are above, we might need to use this one instead
    Locatable parseJson(String json)
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
index b6103e07..a3768122 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrJsonSerializer.groovy
@@ -186,6 +186,8 @@ class OpenEhrJsonSerializer {
    {
       this.fillPartyDto(a, out)
 
+      def method
+
       // optional
       if (a.languages)
       {
@@ -218,6 +220,8 @@ class OpenEhrJsonSerializer {
    {
       this.fillParty(a, out)
 
+      def method
+
       // optional
       if (a.languages)
       {
@@ -674,8 +678,7 @@ class OpenEhrJsonSerializer {
 
       out.system_id = a.system_id
 
-      String method
-      method = this.method(a.committer)
+      String method = this.method(a.committer)
       out.committer = [_type: this.openEhrType(a.committer)] + this."$method"(a.committer)
 
       out.time_committed = this.serializeDvDateTime(a.time_committed)
@@ -698,8 +701,7 @@ class OpenEhrJsonSerializer {
       // AuditDetails fields
       out.system_id = a.system_id
 
-      def method
-      method = this.method(a.committer)
+      def method = this.method(a.committer)
       out.committer = [_type: this.openEhrType(a.committer)] + this."$method"(a.committer)
 
       out.time_committed = this.serializeDvDateTime(a.time_committed)
@@ -911,9 +913,11 @@ class OpenEhrJsonSerializer {
    {
       this.fillEntry(o, out)
 
+      String method
+
       if (o.protocol)
       {
-         String method = this.method(o.protocol)
+         method = this.method(o.protocol)
          out.protocol = [_type: this.openEhrType(o.protocol)] + this."$method"(o.protocol)
 
          // TODO: check if this is needed
diff --git a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
index 3c05dbe6..bc896d4a 100644
--- a/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/formats/OpenEhrXmlParser.groovy
@@ -215,7 +215,7 @@ class OpenEhrXmlParser {
       catch (Exception e)
       {
          println e.message
-         throw new XmlParseException("Can't parse XML, check ${type} is a VERSION type. If you tried to parse a LOCATABLE, use the parseXml method", e)
+         throw new XmlParseException("Can't parse XML, check ${type} is a VERSION type. If you tried to parse a LOCATABLE, use the parseLocatable method", e)
       }
       return out
    }
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/Main.groovy b/src/main/groovy/com/cabolabs/openehr/opt/Main.groovy
index 4888e3dd..0f30bdeb 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/Main.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/Main.groovy
@@ -115,7 +115,6 @@ class Main {
             def destination_path = args[2]
             verifyFolder(destination_path)
 
-            // TODO: separate xml/json from the composition/version in two params
             def format = 'json'
             def generate = 'locatable'
 
@@ -282,6 +281,7 @@ class Main {
                   printer.flush()
                   printer.close()
                break
+               // TODO: trans FOLDER, EHR_STATUS, ACTOR, PARTY_RELATIONSHIP
                case "composition":
 
                   String path = args[2] // composition
@@ -302,7 +302,7 @@ class Main {
                      // Parse XML
                      String xml = f.text
                      def parser = new OpenEhrXmlParser()
-                     Composition c = (Composition)parser.parseXml(xml)
+                     Composition c = (Composition)parser.parseLocatable(xml)
 
                      // debug
                      // out = JsonOutput.toJson(c)
@@ -457,7 +457,7 @@ class Main {
    static validateXMLWithOPT(File xml)
    {
       def parser = new OpenEhrXmlParser()
-      def instance = parser.parseXml(xml.text) // should be a composition, if the file is a version it won't parse
+      def instance = parser.parseLocatable(xml.text) // xml should be a locatable
       validateCompositionWithOPT(instance)
    }
 
diff --git a/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy b/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy
index 1e8d94a4..562052f2 100644
--- a/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy
+++ b/src/main/groovy/com/cabolabs/openehr/opt/instance_generator/RmInstanceGenerator.groovy
@@ -930,7 +930,7 @@ class RmInstanceGenerator {
             _denominator = 1
          break
          case 2: // percent
-            _numerator = (random_gen.nextFloat() * (num_hi - num_lo) + num_lo).round(1)
+            _numerator = (random_gen.nextFloat() * 100).round(1) // NOTE: for a percentage, 100 is the high value
             _denominator = 100
          break
          case [3,4]: // fraction, integer_fraction
diff --git a/src/main/resources/opts/com.cabolabs.openehr_opt.namespaces.default/monitoreo_de_signos_vitales.opt b/src/main/resources/opts/com.cabolabs.openehr_opt.namespaces.default/monitoreo_de_signos_vitales.opt
new file mode 100644
index 00000000..14f39365
--- /dev/null
+++ b/src/main/resources/opts/com.cabolabs.openehr_opt.namespaces.default/monitoreo_de_signos_vitales.opt
@@ -0,0 +1,833 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Operational template XML automatically generated by Ocean Template Designer Version 2.8.94Beta-->
+<template xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.openehr.org/v1">
+  <language>
+    <terminology_id>
+      <value>ISO_639-1</value>
+    </terminology_id>
+    <code_string>es</code_string>
+  </language>
+  <description>
+    <original_author id="Original Author">Not Specified</original_author>
+    <lifecycle_state>Initial</lifecycle_state>
+    <other_details id="MetaDataSet:Sample Set ">Template metadata sample set </other_details>
+    <other_details id="Acknowledgements"></other_details>
+    <other_details id="Business Process Level"></other_details>
+    <other_details id="Care setting"></other_details>
+    <other_details id="Client group"></other_details>
+    <other_details id="Clinical Record Element"></other_details>
+    <other_details id="Copyright"></other_details>
+    <other_details id="Issues"></other_details>
+    <other_details id="Owner"></other_details>
+    <other_details id="Sign off"></other_details>
+    <other_details id="Speciality"></other_details>
+    <other_details id="User roles"></other_details>
+    <details>
+      <language>
+        <terminology_id>
+          <value>ISO_639-1</value>
+        </terminology_id>
+        <code_string>es</code_string>
+      </language>
+      <purpose>Not Specified</purpose>
+    </details>
+  </description>
+  <uid>
+    <value>617f4691-2626-467b-8d2d-ad86a0b54128</value>
+  </uid>
+  <template_id>
+    <value>Monitoreo de signos vitales</value>
+  </template_id>
+  <concept>Monitoreo de signos vitales</concept>
+  <definition>
+    <rm_type_name>COMPOSITION</rm_type_name>
+    <occurrences>
+      <lower_included>true</lower_included>
+      <upper_included>true</upper_included>
+      <lower_unbounded>false</lower_unbounded>
+      <upper_unbounded>false</upper_unbounded>
+      <lower>1</lower>
+      <upper>1</upper>
+    </occurrences>
+    <node_id>at0000</node_id>
+    <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+      <rm_attribute_name>category</rm_attribute_name>
+      <existence>
+        <lower_included>true</lower_included>
+        <upper_included>true</upper_included>
+        <lower_unbounded>false</lower_unbounded>
+        <upper_unbounded>false</upper_unbounded>
+        <lower>1</lower>
+        <upper>1</upper>
+      </existence>
+      <children xsi:type="C_COMPLEX_OBJECT">
+        <rm_type_name>DV_CODED_TEXT</rm_type_name>
+        <occurrences>
+          <lower_included>true</lower_included>
+          <upper_included>true</upper_included>
+          <lower_unbounded>false</lower_unbounded>
+          <upper_unbounded>false</upper_unbounded>
+          <lower>1</lower>
+          <upper>1</upper>
+        </occurrences>
+        <node_id />
+        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+          <rm_attribute_name>defining_code</rm_attribute_name>
+          <existence>
+            <lower_included>true</lower_included>
+            <upper_included>true</upper_included>
+            <lower_unbounded>false</lower_unbounded>
+            <upper_unbounded>false</upper_unbounded>
+            <lower>1</lower>
+            <upper>1</upper>
+          </existence>
+          <children xsi:type="C_CODE_PHRASE">
+            <rm_type_name>CODE_PHRASE</rm_type_name>
+            <occurrences>
+              <lower_included>true</lower_included>
+              <upper_included>true</upper_included>
+              <lower_unbounded>false</lower_unbounded>
+              <upper_unbounded>false</upper_unbounded>
+              <lower>1</lower>
+              <upper>1</upper>
+            </occurrences>
+            <node_id />
+            <terminology_id>
+              <value>openehr</value>
+            </terminology_id>
+            <code_list>433</code_list>
+          </children>
+        </attributes>
+      </children>
+    </attributes>
+    <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+      <rm_attribute_name>content</rm_attribute_name>
+      <existence>
+        <lower_included>true</lower_included>
+        <upper_included>true</upper_included>
+        <lower_unbounded>false</lower_unbounded>
+        <upper_unbounded>false</upper_unbounded>
+        <lower>0</lower>
+        <upper>1</upper>
+      </existence>
+      <children xsi:type="C_ARCHETYPE_ROOT">
+        <rm_type_name>OBSERVATION</rm_type_name>
+        <occurrences>
+          <lower_included>true</lower_included>
+          <lower_unbounded>false</lower_unbounded>
+          <upper_unbounded>true</upper_unbounded>
+          <lower>0</lower>
+        </occurrences>
+        <node_id>at0000</node_id>
+        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+          <rm_attribute_name>data</rm_attribute_name>
+          <existence>
+            <lower_included>true</lower_included>
+            <upper_included>true</upper_included>
+            <lower_unbounded>false</lower_unbounded>
+            <upper_unbounded>false</upper_unbounded>
+            <lower>1</lower>
+            <upper>1</upper>
+          </existence>
+          <children xsi:type="C_COMPLEX_OBJECT">
+            <rm_type_name>HISTORY</rm_type_name>
+            <occurrences>
+              <lower_included>true</lower_included>
+              <upper_included>true</upper_included>
+              <lower_unbounded>false</lower_unbounded>
+              <upper_unbounded>false</upper_unbounded>
+              <lower>1</lower>
+              <upper>1</upper>
+            </occurrences>
+            <node_id>at0001</node_id>
+            <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+              <rm_attribute_name>events</rm_attribute_name>
+              <existence>
+                <lower_included>true</lower_included>
+                <upper_included>true</upper_included>
+                <lower_unbounded>false</lower_unbounded>
+                <upper_unbounded>false</upper_unbounded>
+                <lower>0</lower>
+                <upper>1</upper>
+              </existence>
+              <children xsi:type="C_COMPLEX_OBJECT">
+                <rm_type_name>EVENT</rm_type_name>
+                <occurrences>
+                  <lower_included>true</lower_included>
+                  <upper_included>true</upper_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>false</upper_unbounded>
+                  <lower>0</lower>
+                  <upper>1</upper>
+                </occurrences>
+                <node_id>at0002</node_id>
+                <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                  <rm_attribute_name>data</rm_attribute_name>
+                  <existence>
+                    <lower_included>true</lower_included>
+                    <upper_included>true</upper_included>
+                    <lower_unbounded>false</lower_unbounded>
+                    <upper_unbounded>false</upper_unbounded>
+                    <lower>1</lower>
+                    <upper>1</upper>
+                  </existence>
+                  <children xsi:type="C_COMPLEX_OBJECT">
+                    <rm_type_name>ITEM_TREE</rm_type_name>
+                    <occurrences>
+                      <lower_included>true</lower_included>
+                      <upper_included>true</upper_included>
+                      <lower_unbounded>false</lower_unbounded>
+                      <upper_unbounded>false</upper_unbounded>
+                      <lower>1</lower>
+                      <upper>1</upper>
+                    </occurrences>
+                    <node_id>at0003</node_id>
+                    <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+                      <rm_attribute_name>items</rm_attribute_name>
+                      <existence>
+                        <lower_included>true</lower_included>
+                        <upper_included>true</upper_included>
+                        <lower_unbounded>false</lower_unbounded>
+                        <upper_unbounded>false</upper_unbounded>
+                        <lower>0</lower>
+                        <upper>1</upper>
+                      </existence>
+                      <children xsi:type="C_COMPLEX_OBJECT">
+                        <rm_type_name>ELEMENT</rm_type_name>
+                        <occurrences>
+                          <lower_included>true</lower_included>
+                          <upper_included>true</upper_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>false</upper_unbounded>
+                          <lower>0</lower>
+                          <upper>1</upper>
+                        </occurrences>
+                        <node_id>at0004</node_id>
+                        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                          <rm_attribute_name>value</rm_attribute_name>
+                          <existence>
+                            <lower_included>true</lower_included>
+                            <upper_included>true</upper_included>
+                            <lower_unbounded>false</lower_unbounded>
+                            <upper_unbounded>false</upper_unbounded>
+                            <lower>0</lower>
+                            <upper>1</upper>
+                          </existence>
+                          <children xsi:type="C_DV_QUANTITY">
+                            <rm_type_name>DV_QUANTITY</rm_type_name>
+                            <occurrences>
+                              <lower_included>true</lower_included>
+                              <upper_included>true</upper_included>
+                              <lower_unbounded>false</lower_unbounded>
+                              <upper_unbounded>false</upper_unbounded>
+                              <lower>1</lower>
+                              <upper>1</upper>
+                            </occurrences>
+                            <node_id />
+                            <property>
+                              <terminology_id>
+                                <value>openehr</value>
+                              </terminology_id>
+                              <code_string>125</code_string>
+                            </property>
+                            <list>
+                              <magnitude>
+                                <lower_included>true</lower_included>
+                                <upper_included>true</upper_included>
+                                <lower_unbounded>false</lower_unbounded>
+                                <upper_unbounded>false</upper_unbounded>
+                                <lower>0</lower>
+                                <upper>250</upper>
+                              </magnitude>
+                              <units>mm[Hg]</units>
+                            </list>
+                          </children>
+                        </attributes>
+                      </children>
+                      <children xsi:type="C_COMPLEX_OBJECT">
+                        <rm_type_name>ELEMENT</rm_type_name>
+                        <occurrences>
+                          <lower_included>true</lower_included>
+                          <upper_included>true</upper_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>false</upper_unbounded>
+                          <lower>0</lower>
+                          <upper>1</upper>
+                        </occurrences>
+                        <node_id>at0005</node_id>
+                        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                          <rm_attribute_name>value</rm_attribute_name>
+                          <existence>
+                            <lower_included>true</lower_included>
+                            <upper_included>true</upper_included>
+                            <lower_unbounded>false</lower_unbounded>
+                            <upper_unbounded>false</upper_unbounded>
+                            <lower>0</lower>
+                            <upper>1</upper>
+                          </existence>
+                          <children xsi:type="C_DV_QUANTITY">
+                            <rm_type_name>DV_QUANTITY</rm_type_name>
+                            <occurrences>
+                              <lower_included>true</lower_included>
+                              <upper_included>true</upper_included>
+                              <lower_unbounded>false</lower_unbounded>
+                              <upper_unbounded>false</upper_unbounded>
+                              <lower>1</lower>
+                              <upper>1</upper>
+                            </occurrences>
+                            <node_id />
+                            <property>
+                              <terminology_id>
+                                <value>openehr</value>
+                              </terminology_id>
+                              <code_string>125</code_string>
+                            </property>
+                            <list>
+                              <magnitude>
+                                <lower_included>true</lower_included>
+                                <upper_included>true</upper_included>
+                                <lower_unbounded>false</lower_unbounded>
+                                <upper_unbounded>false</upper_unbounded>
+                                <lower>0</lower>
+                                <upper>250</upper>
+                              </magnitude>
+                              <units>mm[Hg]</units>
+                            </list>
+                          </children>
+                        </attributes>
+                      </children>
+                      <cardinality>
+                        <is_ordered>false</is_ordered>
+                        <is_unique>false</is_unique>
+                        <interval>
+                          <lower_included>true</lower_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>true</upper_unbounded>
+                          <lower>0</lower>
+                        </interval>
+                      </cardinality>
+                    </attributes>
+                  </children>
+                </attributes>
+              </children>
+              <cardinality>
+                <is_ordered>false</is_ordered>
+                <is_unique>false</is_unique>
+                <interval>
+                  <lower_included>true</lower_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>true</upper_unbounded>
+                  <lower>1</lower>
+                </interval>
+              </cardinality>
+            </attributes>
+          </children>
+        </attributes>
+        <archetype_id>
+          <value>openEHR-EHR-OBSERVATION.presion_arterial.v1</value>
+        </archetype_id>
+        <term_definitions code="at0000">
+          <items id="description">unknown</items>
+          <items id="text">Presion arterial</items>
+        </term_definitions>
+        <term_definitions code="at0001">
+          <items id="description">@ internal @</items>
+          <items id="text">Event Series</items>
+        </term_definitions>
+        <term_definitions code="at0002">
+          <items id="description">*</items>
+          <items id="text">Cualquier evento</items>
+        </term_definitions>
+        <term_definitions code="at0003">
+          <items id="description">@ internal @</items>
+          <items id="text">Arbol</items>
+        </term_definitions>
+        <term_definitions code="at0004">
+          <items id="description">*</items>
+          <items id="text">Sistolica</items>
+        </term_definitions>
+        <term_definitions code="at0005">
+          <items id="description">*</items>
+          <items id="text">Diastolica</items>
+        </term_definitions>
+      </children>
+      <children xsi:type="C_ARCHETYPE_ROOT">
+        <rm_type_name>OBSERVATION</rm_type_name>
+        <occurrences>
+          <lower_included>true</lower_included>
+          <lower_unbounded>false</lower_unbounded>
+          <upper_unbounded>true</upper_unbounded>
+          <lower>0</lower>
+        </occurrences>
+        <node_id>at0000</node_id>
+        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+          <rm_attribute_name>data</rm_attribute_name>
+          <existence>
+            <lower_included>true</lower_included>
+            <upper_included>true</upper_included>
+            <lower_unbounded>false</lower_unbounded>
+            <upper_unbounded>false</upper_unbounded>
+            <lower>1</lower>
+            <upper>1</upper>
+          </existence>
+          <children xsi:type="C_COMPLEX_OBJECT">
+            <rm_type_name>HISTORY</rm_type_name>
+            <occurrences>
+              <lower_included>true</lower_included>
+              <upper_included>true</upper_included>
+              <lower_unbounded>false</lower_unbounded>
+              <upper_unbounded>false</upper_unbounded>
+              <lower>1</lower>
+              <upper>1</upper>
+            </occurrences>
+            <node_id>at0001</node_id>
+            <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+              <rm_attribute_name>events</rm_attribute_name>
+              <existence>
+                <lower_included>true</lower_included>
+                <upper_included>true</upper_included>
+                <lower_unbounded>false</lower_unbounded>
+                <upper_unbounded>false</upper_unbounded>
+                <lower>0</lower>
+                <upper>1</upper>
+              </existence>
+              <children xsi:type="C_COMPLEX_OBJECT">
+                <rm_type_name>EVENT</rm_type_name>
+                <occurrences>
+                  <lower_included>true</lower_included>
+                  <upper_included>true</upper_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>false</upper_unbounded>
+                  <lower>0</lower>
+                  <upper>1</upper>
+                </occurrences>
+                <node_id>at0002</node_id>
+                <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                  <rm_attribute_name>data</rm_attribute_name>
+                  <existence>
+                    <lower_included>true</lower_included>
+                    <upper_included>true</upper_included>
+                    <lower_unbounded>false</lower_unbounded>
+                    <upper_unbounded>false</upper_unbounded>
+                    <lower>1</lower>
+                    <upper>1</upper>
+                  </existence>
+                  <children xsi:type="C_COMPLEX_OBJECT">
+                    <rm_type_name>ITEM_TREE</rm_type_name>
+                    <occurrences>
+                      <lower_included>true</lower_included>
+                      <upper_included>true</upper_included>
+                      <lower_unbounded>false</lower_unbounded>
+                      <upper_unbounded>false</upper_unbounded>
+                      <lower>1</lower>
+                      <upper>1</upper>
+                    </occurrences>
+                    <node_id>at0003</node_id>
+                    <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+                      <rm_attribute_name>items</rm_attribute_name>
+                      <existence>
+                        <lower_included>true</lower_included>
+                        <upper_included>true</upper_included>
+                        <lower_unbounded>false</lower_unbounded>
+                        <upper_unbounded>false</upper_unbounded>
+                        <lower>0</lower>
+                        <upper>1</upper>
+                      </existence>
+                      <children xsi:type="C_COMPLEX_OBJECT">
+                        <rm_type_name>ELEMENT</rm_type_name>
+                        <occurrences>
+                          <lower_included>true</lower_included>
+                          <upper_included>true</upper_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>false</upper_unbounded>
+                          <lower>0</lower>
+                          <upper>1</upper>
+                        </occurrences>
+                        <node_id>at0004</node_id>
+                        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                          <rm_attribute_name>value</rm_attribute_name>
+                          <existence>
+                            <lower_included>true</lower_included>
+                            <upper_included>true</upper_included>
+                            <lower_unbounded>false</lower_unbounded>
+                            <upper_unbounded>false</upper_unbounded>
+                            <lower>0</lower>
+                            <upper>1</upper>
+                          </existence>
+                          <children xsi:type="C_DV_QUANTITY">
+                            <rm_type_name>DV_QUANTITY</rm_type_name>
+                            <occurrences>
+                              <lower_included>true</lower_included>
+                              <upper_included>true</upper_included>
+                              <lower_unbounded>false</lower_unbounded>
+                              <upper_unbounded>false</upper_unbounded>
+                              <lower>1</lower>
+                              <upper>1</upper>
+                            </occurrences>
+                            <node_id />
+                            <property>
+                              <terminology_id>
+                                <value>openehr</value>
+                              </terminology_id>
+                              <code_string>382</code_string>
+                            </property>
+                            <list>
+                              <magnitude>
+                                <lower_included>true</lower_included>
+                                <upper_included>true</upper_included>
+                                <lower_unbounded>false</lower_unbounded>
+                                <upper_unbounded>false</upper_unbounded>
+                                <lower>0</lower>
+                                <upper>300</upper>
+                              </magnitude>
+                              <units>/min</units>
+                            </list>
+                          </children>
+                        </attributes>
+                      </children>
+                      <children xsi:type="C_COMPLEX_OBJECT">
+                        <rm_type_name>ELEMENT</rm_type_name>
+                        <occurrences>
+                          <lower_included>true</lower_included>
+                          <upper_included>true</upper_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>false</upper_unbounded>
+                          <lower>0</lower>
+                          <upper>1</upper>
+                        </occurrences>
+                        <node_id>at0005</node_id>
+                        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                          <rm_attribute_name>value</rm_attribute_name>
+                          <existence>
+                            <lower_included>true</lower_included>
+                            <upper_included>true</upper_included>
+                            <lower_unbounded>false</lower_unbounded>
+                            <upper_unbounded>false</upper_unbounded>
+                            <lower>0</lower>
+                            <upper>1</upper>
+                          </existence>
+                          <children xsi:type="C_COMPLEX_OBJECT">
+                            <rm_type_name>DV_TEXT</rm_type_name>
+                            <occurrences>
+                              <lower_included>true</lower_included>
+                              <upper_included>true</upper_included>
+                              <lower_unbounded>false</lower_unbounded>
+                              <upper_unbounded>false</upper_unbounded>
+                              <lower>1</lower>
+                              <upper>1</upper>
+                            </occurrences>
+                            <node_id />
+                          </children>
+                        </attributes>
+                      </children>
+                      <cardinality>
+                        <is_ordered>false</is_ordered>
+                        <is_unique>false</is_unique>
+                        <interval>
+                          <lower_included>true</lower_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>true</upper_unbounded>
+                          <lower>0</lower>
+                        </interval>
+                      </cardinality>
+                    </attributes>
+                  </children>
+                </attributes>
+              </children>
+              <cardinality>
+                <is_ordered>false</is_ordered>
+                <is_unique>false</is_unique>
+                <interval>
+                  <lower_included>true</lower_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>true</upper_unbounded>
+                  <lower>1</lower>
+                </interval>
+              </cardinality>
+            </attributes>
+          </children>
+        </attributes>
+        <archetype_id>
+          <value>openEHR-EHR-OBSERVATION.frecuencia_cardiaca.v1</value>
+        </archetype_id>
+        <term_definitions code="at0000">
+          <items id="description">unknown</items>
+          <items id="text">Frecuencia cardiaca</items>
+        </term_definitions>
+        <term_definitions code="at0001">
+          <items id="description">@ internal @</items>
+          <items id="text">Event Series</items>
+        </term_definitions>
+        <term_definitions code="at0002">
+          <items id="description">*</items>
+          <items id="text">Cualquier evento</items>
+        </term_definitions>
+        <term_definitions code="at0003">
+          <items id="description">@ internal @</items>
+          <items id="text">Arbol</items>
+        </term_definitions>
+        <term_definitions code="at0004">
+          <items id="description">*</items>
+          <items id="text">Medida de frecuencia cardiaca</items>
+        </term_definitions>
+        <term_definitions code="at0005">
+          <items id="description">*</items>
+          <items id="text">Comentario</items>
+        </term_definitions>
+      </children>
+      <children xsi:type="C_ARCHETYPE_ROOT">
+        <rm_type_name>OBSERVATION</rm_type_name>
+        <occurrences>
+          <lower_included>true</lower_included>
+          <lower_unbounded>false</lower_unbounded>
+          <upper_unbounded>true</upper_unbounded>
+          <lower>0</lower>
+        </occurrences>
+        <node_id>at0000</node_id>
+        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+          <rm_attribute_name>data</rm_attribute_name>
+          <existence>
+            <lower_included>true</lower_included>
+            <upper_included>true</upper_included>
+            <lower_unbounded>false</lower_unbounded>
+            <upper_unbounded>false</upper_unbounded>
+            <lower>1</lower>
+            <upper>1</upper>
+          </existence>
+          <children xsi:type="C_COMPLEX_OBJECT">
+            <rm_type_name>HISTORY</rm_type_name>
+            <occurrences>
+              <lower_included>true</lower_included>
+              <upper_included>true</upper_included>
+              <lower_unbounded>false</lower_unbounded>
+              <upper_unbounded>false</upper_unbounded>
+              <lower>1</lower>
+              <upper>1</upper>
+            </occurrences>
+            <node_id>at0001</node_id>
+            <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+              <rm_attribute_name>events</rm_attribute_name>
+              <existence>
+                <lower_included>true</lower_included>
+                <upper_included>true</upper_included>
+                <lower_unbounded>false</lower_unbounded>
+                <upper_unbounded>false</upper_unbounded>
+                <lower>0</lower>
+                <upper>1</upper>
+              </existence>
+              <children xsi:type="C_COMPLEX_OBJECT">
+                <rm_type_name>EVENT</rm_type_name>
+                <occurrences>
+                  <lower_included>true</lower_included>
+                  <upper_included>true</upper_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>false</upper_unbounded>
+                  <lower>0</lower>
+                  <upper>1</upper>
+                </occurrences>
+                <node_id>at0002</node_id>
+                <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                  <rm_attribute_name>data</rm_attribute_name>
+                  <existence>
+                    <lower_included>true</lower_included>
+                    <upper_included>true</upper_included>
+                    <lower_unbounded>false</lower_unbounded>
+                    <upper_unbounded>false</upper_unbounded>
+                    <lower>1</lower>
+                    <upper>1</upper>
+                  </existence>
+                  <children xsi:type="C_COMPLEX_OBJECT">
+                    <rm_type_name>ITEM_TREE</rm_type_name>
+                    <occurrences>
+                      <lower_included>true</lower_included>
+                      <upper_included>true</upper_included>
+                      <lower_unbounded>false</lower_unbounded>
+                      <upper_unbounded>false</upper_unbounded>
+                      <lower>1</lower>
+                      <upper>1</upper>
+                    </occurrences>
+                    <node_id>at0003</node_id>
+                    <attributes xsi:type="C_MULTIPLE_ATTRIBUTE">
+                      <rm_attribute_name>items</rm_attribute_name>
+                      <existence>
+                        <lower_included>true</lower_included>
+                        <upper_included>true</upper_included>
+                        <lower_unbounded>false</lower_unbounded>
+                        <upper_unbounded>false</upper_unbounded>
+                        <lower>0</lower>
+                        <upper>1</upper>
+                      </existence>
+                      <children xsi:type="C_COMPLEX_OBJECT">
+                        <rm_type_name>ELEMENT</rm_type_name>
+                        <occurrences>
+                          <lower_included>true</lower_included>
+                          <upper_included>true</upper_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>false</upper_unbounded>
+                          <lower>0</lower>
+                          <upper>1</upper>
+                        </occurrences>
+                        <node_id>at0005</node_id>
+                        <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                          <rm_attribute_name>value</rm_attribute_name>
+                          <existence>
+                            <lower_included>true</lower_included>
+                            <upper_included>true</upper_included>
+                            <lower_unbounded>false</lower_unbounded>
+                            <upper_unbounded>false</upper_unbounded>
+                            <lower>0</lower>
+                            <upper>1</upper>
+                          </existence>
+                          <children xsi:type="C_COMPLEX_OBJECT">
+                            <rm_type_name>DV_PROPORTION</rm_type_name>
+                            <occurrences>
+                              <lower_included>true</lower_included>
+                              <upper_included>true</upper_included>
+                              <lower_unbounded>false</lower_unbounded>
+                              <upper_unbounded>false</upper_unbounded>
+                              <lower>1</lower>
+                              <upper>1</upper>
+                            </occurrences>
+                            <node_id />
+                            <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                              <rm_attribute_name>is_integral</rm_attribute_name>
+                              <existence>
+                                <lower_included>true</lower_included>
+                                <upper_included>true</upper_included>
+                                <lower_unbounded>false</lower_unbounded>
+                                <upper_unbounded>false</upper_unbounded>
+                                <lower>1</lower>
+                                <upper>1</upper>
+                              </existence>
+                              <children xsi:type="C_PRIMITIVE_OBJECT">
+                                <rm_type_name>BOOLEAN</rm_type_name>
+                                <occurrences>
+                                  <lower_included>true</lower_included>
+                                  <upper_included>true</upper_included>
+                                  <lower_unbounded>false</lower_unbounded>
+                                  <upper_unbounded>false</upper_unbounded>
+                                  <lower>1</lower>
+                                  <upper>1</upper>
+                                </occurrences>
+                                <node_id />
+                                <item xsi:type="C_BOOLEAN">
+                                  <true_valid>true</true_valid>
+                                  <false_valid>false</false_valid>
+                                </item>
+                              </children>
+                            </attributes>
+                            <attributes xsi:type="C_SINGLE_ATTRIBUTE">
+                              <rm_attribute_name>type</rm_attribute_name>
+                              <existence>
+                                <lower_included>true</lower_included>
+                                <upper_included>true</upper_included>
+                                <lower_unbounded>false</lower_unbounded>
+                                <upper_unbounded>false</upper_unbounded>
+                                <lower>1</lower>
+                                <upper>1</upper>
+                              </existence>
+                              <children xsi:type="C_PRIMITIVE_OBJECT">
+                                <rm_type_name>INTEGER</rm_type_name>
+                                <occurrences>
+                                  <lower_included>true</lower_included>
+                                  <upper_included>true</upper_included>
+                                  <lower_unbounded>false</lower_unbounded>
+                                  <upper_unbounded>false</upper_unbounded>
+                                  <lower>1</lower>
+                                  <upper>1</upper>
+                                </occurrences>
+                                <node_id />
+                                <item xsi:type="C_INTEGER">
+                                  <list>2</list>
+                                </item>
+                              </children>
+                            </attributes>
+                          </children>
+                        </attributes>
+                      </children>
+                      <cardinality>
+                        <is_ordered>false</is_ordered>
+                        <is_unique>false</is_unique>
+                        <interval>
+                          <lower_included>true</lower_included>
+                          <lower_unbounded>false</lower_unbounded>
+                          <upper_unbounded>true</upper_unbounded>
+                          <lower>0</lower>
+                        </interval>
+                      </cardinality>
+                    </attributes>
+                  </children>
+                </attributes>
+              </children>
+              <cardinality>
+                <is_ordered>false</is_ordered>
+                <is_unique>false</is_unique>
+                <interval>
+                  <lower_included>true</lower_included>
+                  <lower_unbounded>false</lower_unbounded>
+                  <upper_unbounded>true</upper_unbounded>
+                  <lower>1</lower>
+                </interval>
+              </cardinality>
+            </attributes>
+          </children>
+        </attributes>
+        <archetype_id>
+          <value>openEHR-EHR-OBSERVATION.saturacion_de_oxigeno.v1</value>
+        </archetype_id>
+        <term_definitions code="at0000">
+          <items id="description">unknown</items>
+          <items id="text">Saturacion de oxigeno</items>
+        </term_definitions>
+        <term_definitions code="at0001">
+          <items id="description">@ internal @</items>
+          <items id="text">Event Series</items>
+        </term_definitions>
+        <term_definitions code="at0002">
+          <items id="description">*</items>
+          <items id="text">Cualquier evento</items>
+        </term_definitions>
+        <term_definitions code="at0003">
+          <items id="description">@ internal @</items>
+          <items id="text">Arbol</items>
+        </term_definitions>
+        <term_definitions code="at0005">
+          <items id="description">*</items>
+          <items id="text">SpO2</items>
+        </term_definitions>
+      </children>
+      <cardinality>
+        <is_ordered>false</is_ordered>
+        <is_unique>false</is_unique>
+        <interval>
+          <lower_included>true</lower_included>
+          <lower_unbounded>false</lower_unbounded>
+          <upper_unbounded>true</upper_unbounded>
+          <lower>0</lower>
+        </interval>
+      </cardinality>
+    </attributes>
+    <archetype_id>
+      <value>openEHR-EHR-COMPOSITION.monitoreo_de_signos_vitales.v1</value>
+    </archetype_id>
+    <template_id>
+      <value>Monitoreo de signos vitales</value>
+    </template_id>
+    <term_definitions code="at0000">
+      <items id="description">unknown</items>
+      <items id="text">Monitoreo de signos vitales</items>
+    </term_definitions>
+    <term_definitions code="at0001">
+      <items id="description">*</items>
+      <items id="text">Presion arterial</items>
+    </term_definitions>
+    <term_definitions code="at0002">
+      <items id="description">*</items>
+      <items id="text">Frecuencia cardiaca</items>
+    </term_definitions>
+    <term_definitions code="at0003">
+      <items id="description">*</items>
+      <items id="text">Saturacion de oxigeno</items>
+    </term_definitions>
+  </definition>
+</template>
\ No newline at end of file
diff --git a/src/test/groovy/com/cabolabs/openehr/opt/RmValidationTest.groovy b/src/test/groovy/com/cabolabs/openehr/opt/RmValidationTest.groovy
index c789e8f3..c460e3b2 100644
--- a/src/test/groovy/com/cabolabs/openehr/opt/RmValidationTest.groovy
+++ b/src/test/groovy/com/cabolabs/openehr/opt/RmValidationTest.groovy
@@ -11,15 +11,13 @@ class RmValidationTest extends GroovyTestCase {
 
    private static String PS = System.getProperty("file.separator")
 
-   /*
-
    void testValidationFromXmlComposition()
    {
       String path = "/canonical_xml/test_all_datatypes.composition.en.xml"
       File file = new File(getClass().getResource(path).toURI())
       String xml = file.text
       def parser = new OpenEhrXmlParser()
-      Composition c = (Composition)parser.parseXml(xml)
+      Composition c = (Composition)parser.parseLocatable(xml)
 
       // TODO: add support for S3 repo
       String opt_repo_path = "/opts"
@@ -36,13 +34,14 @@ class RmValidationTest extends GroovyTestCase {
       }
    }
 
+   /*
    void testValidationFromXmlComposition2()
    {
       String path = "/canonical_xml/test_all_datatypes.composition.en.xml"
       File file = new File(getClass().getResource(path).toURI())
       String xml = file.text
       def parser = new OpenEhrXmlParser() // TODO: create a quick parser that doesn't calculate paths
-      Composition c = (Composition)parser.parseXml(xml)
+      Composition c = (Composition)parser.parseLocatable(xml)
 
       // TODO: add support for S3 repo
       String opt_repo_path = "/opts"