armodel 1.7.0__py3-none-any.whl → 1.7.2__py3-none-any.whl

armodel/writer/arxml_writer.py

@@ -2,10 +2,7 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
-
-
-
-
+from ..models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
 from ..models.M2.MSR.AsamHdo.AdminData import AdminData
 from ..models.M2.MSR.AsamHdo.BaseTypes import BaseTypeDirectDefinition, SwBaseType
 from ..models.M2.MSR.AsamHdo.ComputationMethod import CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
@@ -19,8 +16,10 @@ from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis, Sw
 from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
 from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
 from ..models.M2.MSR.Documentation.Annotation import Annotation
-from ..models.M2.MSR.Documentation.BlockElements import DocumentationBlock
-from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultilanguageLongName
+from ..models.M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
+from ..models.M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
+from ..models.M2.MSR.Documentation.TextModel.LanguageDataModel import LLongName, LPlainText, LanguageSpecific
+from ..models.M2.MSR.Documentation.TextModel.MultilanguageData import MultiLanguageOverviewParagraph, MultiLanguageParagraph, MultiLanguagePlainText, MultilanguageLongName
 
 from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
@@ -33,7 +32,7 @@ from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMap
 from ..models.M2.AUTOSARTemplates.CommonStructure.Implementation import Code, Implementation
 from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.TimingExtensions import SwcTiming, TimingExtension
 from ..models.M2.AUTOSARTemplates.CommonStructure.Timing.TimingConstraint.ExecutionOrderConstraint import EOCExecutableEntityRef, ExecutionOrderConstraint
-from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import NvBlockNeeds, RoleBasedDataAssignment, ServiceDependency
+from ..models.M2.AUTOSARTemplates.CommonStructure.ServiceNeeds import CryptoServiceNeeds, DiagEventDebounceMonitorInternal, DiagnosticCommunicationManagerNeeds, DiagnosticEventNeeds, DiagnosticRoutineNeeds, DiagnosticValueNeeds, NvBlockNeeds, RoleBasedDataAssignment, RoleBasedDataTypeAssignment, ServiceDependency
 from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import ExecutableEntity
 from ..models.M2.AUTOSARTemplates.CommonStructure.ImplementationDataTypes import ImplementationDataType
 from ..models.M2.AUTOSARTemplates.CommonStructure.InternalBehavior import InternalBehavior
@@ -44,19 +43,19 @@ from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractRef
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
 from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyInstanceRef
-from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage
+from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.ARPackage import ARPackage, ReferenceBase
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.PrimitiveTypes import RefType, ARLiteral, Limit
 
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.PortAPIOptions import PortAPIOption
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.RTEEvents import AsynchronousServerCallReturnsEvent, DataReceivedEvent, InitEvent, InternalTriggerOccurredEvent, OperationInvokedEvent, RTEEvent, SwcModeSwitchEvent, TimingEvent
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.IncludedDataTypes import IncludedDataTypeSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import ApplicationArrayDataType, ApplicationCompositeDataType, ApplicationDataType, ApplicationPrimitiveDataType, ApplicationRecordDataType, AutosarDataType
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndDescription, EndToEndProtection, EndToEndProtectionVariablePrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ModeDeclarationGroup import IncludedModeDeclarationGroupSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Communication import CompositeNetworkRepresentation, TransmissionAcknowledgementRequest
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import AbstractProvidedPortPrototype, AbstractRequiredPortPrototype, ApplicationSwComponentType, AtomicSwComponentType, ComplexDeviceDriverSwComponentType, CompositionSwComponentType, EcuAbstractionSwComponentType, PRPortPrototype, PortGroup, SwComponentType, PPortPrototype, PortPrototype, RPortPrototype
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components.InstanceRefs import InnerPortGroupInCompositionInstanceRef, PModeGroupInAtomicSwcInstanceRef, RModeGroupInAtomicSWCInstanceRef, RModeInAtomicSwcInstanceRef, RVariableInAtomicSwcInstanceRef
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import RunnableEntity, RunnableEntityArgument, SwcInternalBehavior, SynchronousServerCallPoint
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior import AsynchronousServerCallPoint, RunnableEntity, RunnableEntityArgument, SwcInternalBehavior, SynchronousServerCallPoint
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.ServerCall import ServerCallPoint
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcInternalBehavior.DataElements import ParameterAccess, VariableAccess
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Composition import AssemblySwConnector, DelegationSwConnector, SwComponentPrototype, SwConnector
@@ -108,13 +107,15 @@ class ARXMLWriter(AbstractARXMLWriter):
     def writeSds(self, parent: ET.Element, sdg: Sdg):
         for sd in sdg.getSds():
             sd_tag = ET.SubElement(parent, "SD")
-            sd_tag.attrib['GID'] = sd.gid
+            if sd.gid is not None:
+                sd_tag.attrib['GID'] = sd.gid
             sd_tag.text = sd.value
 
     def setSdg(self, parent: ET.Element, sdg: Sdg):
         if sdg is not None:
             sdg_tag = ET.SubElement(parent, "SDG")
-            sdg_tag.attrib['GID'] = sdg.gid
+            if sdg.gid is not None and sdg.gid != "":
+                sdg_tag.attrib['GID'] = sdg.gid
             self.writeSds(sdg_tag, sdg)
             for sdg_item in sdg.getSdgContentsTypes():
                 self.setSdg(sdg_tag, sdg_item)
@@ -136,46 +137,64 @@ class ARXMLWriter(AbstractARXMLWriter):
     
     def setReferable(self, element: ET.Element, referrable: Referrable):
         self.setARObjectAttributes(element, referrable)
-        self.setShortName(element, referrable.short_name)
+        self.setShortName(element, referrable.getShortName())
+
+    def setLanguageSpecific(self, element: ET.Element, key: str, specific: LanguageSpecific):
+        child_element = ET.SubElement(element, key)
+        self.setARObjectAttributes(child_element, specific)
+        if specific.l is not None:
+            child_element.attrib['L'] = specific.l
+        child_element.text = specific.value
+
+    def setLLongName(self, element: ET.Element, name: LLongName):
+        self.setLanguageSpecific(element, "L-4", name)
 
     def setMultiLongName(self, element: ET.Element, key: str, long_name: MultilanguageLongName):
         if long_name is not None:
-            long_name_tag = ET.SubElement(element, key)
-            self.setARObjectAttributes(long_name_tag, long_name)
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, long_name)
             for l4 in long_name.getL4s():
-                l4_tag = ET.SubElement(long_name_tag, "L-4")
-                self.setARObjectAttributes(l4_tag, l4)
-                if l4.l is not None:
-                    l4_tag.attrib['L'] = l4.l
-                l4_tag.text = l4.value
+                self.setLLongName(child_element, l4)
+
+    def setLOverviewParagraph(self, element: ET.Element, name: LLongName):
+        self.setLanguageSpecific(element, "L-2", name)
 
     def setMultiLanguageOverviewParagraph(self, element: ET.Element, key: str, paragraph: MultiLanguageOverviewParagraph):
         if paragraph is not None:
-            long_name_tag = ET.SubElement(element, key)
-            self.setARObjectAttributes(long_name_tag, paragraph)
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, paragraph)
             for l2 in paragraph.getL2s():
-                l2_tag = ET.SubElement(long_name_tag, "L-2")
-                self.setARObjectAttributes(l2_tag, l2)
-                if l2.l is not None:
-                    l2_tag.attrib['L'] = l2.l
-                l2_tag.text = l2.value
+                self.setLOverviewParagraph(child_element, l2)
 
     def setMultilanguageReferrable(self, element: ET.Element, referrable: MultilanguageReferrable):
         self.setReferable(element, referrable)
         if referrable.longName is not None:
             self.setMultiLongName(element, "LONG-NAME", referrable.longName)
 
+    def setLPlainText(self, element: ET.Element, text: LPlainText):
+        self.setLanguageSpecific(element, "L-10", text)
+
+    def setMultiLanguagePlainText(self, element: ET.Element, key: str, paragraph: MultiLanguagePlainText):
+        if paragraph is not None:
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, paragraph)
+            for l10 in paragraph.getL10s():
+                self.setLPlainText(child_element, l10)
+
     def setAdminData(self, element: ET.Element, admin_data: AdminData):
-        element = ET.SubElement(element, "ADMIN-DATA")
-        self.writeSdgs(element, admin_data)
+        if admin_data is not None:
+            child_element = ET.SubElement(element, "ADMIN-DATA")
+            self.setChildElementOptionalLiteral(child_element, "LANGUAGE", admin_data.getLanguage())
+            self.setMultiLanguagePlainText(child_element, "USED-LANGUAGES", admin_data.getUsedLanguages())
+            self.writeSdgs(child_element, admin_data)
 
     def setIdentifiable(self, element: ET.Element, identifiable: Identifiable):
         self.setMultilanguageReferrable(element, identifiable)
         self.setAnnotations(element, identifiable.getAnnotations())
         self.setMultiLanguageOverviewParagraph(element, "DESC", identifiable.getDesc())
         self.setChildElementOptionalLiteral(element, "CATEGORY", identifiable.getCategory())
-        if identifiable.getAdminData() is not None:
-            self.setAdminData(element, identifiable.getAdminData())
+        self.setDocumentationBlock(element, "INTRODUCTION", identifiable.getIntroduction())
+        self.setAdminData(element, identifiable.getAdminData())
 
     def setARElement(self, parent: ET.Element, ar_element: ARElement):
         self.setIdentifiable(parent, ar_element)
@@ -232,7 +251,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         elif isinstance(com_spec, ModeSwitchSenderComSpec):
             self.setModeSwitchSenderComSpec(com_specs_tag, com_spec)
         else:
-            raise NotImplementedError("Unsupported PPortComSpec %s" % type(com_spec))
+            self.notImplemented("Unsupported PPortComSpec %s" % type(com_spec))
         
     def setApplicationCompositeElementInPortInterfaceInstanceRef(self, element: ET.Element, key:str, iref: ApplicationCompositeElementInPortInterfaceInstanceRef):
         if iref is not None:
@@ -245,8 +264,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         if representation is not None:
             self.logger.debug("setCompositeNetworkRepresentation")
             child_element = ET.SubElement(element, "COMPOSITE-NETWORK-REPRESENTATION")
-            self.setApplicationCompositeElementInPortInterfaceInstanceRef(child_element, "LEAF-ELEMENT-IREF", representation.leaf_element_iref)
-            self.setSwDataDefProps(child_element, "NETWORK-REPRESENTATION", representation.network_representation)
+            self.setApplicationCompositeElementInPortInterfaceInstanceRef(child_element, "LEAF-ELEMENT-IREF", representation.getLeafElementIRef())
+            self.setSwDataDefProps(child_element, "NETWORK-REPRESENTATION", representation.getNetworkRepresentation())
         
     def writeReceiverComSpec(self, element: ET.Element, com_spec: ReceiverComSpec):
         representations = com_spec.getCompositeNetworkRepresentations()
@@ -254,10 +273,11 @@ class ARXMLWriter(AbstractARXMLWriter):
             child_element = ET.SubElement(element, "COMPOSITE-NETWORK-REPRESENTATIONS")
             for representation in representations:
                 self.setCompositeNetworkRepresentation(child_element, representation)
-        self.setChildElementOptionalRefType(element, "DATA-ELEMENT-REF", com_spec.dataElementRef)
-        self.setSwDataDefProps(element, "NETWORK-REPRESENTATION", com_spec.networkRepresentation)
-        self.setChildElementOptionalLiteral(element, "HANDLE-OUT-OF-RANGE", com_spec.handleOutOfRange)
-        self.setChildElementOptionalBooleanValue(element, "USES-END-TO-END-PROTECTION", com_spec.usesEndToEndProtection)
+        self.setChildElementOptionalRefType(element, "DATA-ELEMENT-REF", com_spec.getDataElementRef())
+        self.setSwDataDefProps(element, "NETWORK-REPRESENTATION", com_spec.getNetworkRepresentation())
+        self.setChildElementOptionalLiteral(element, "HANDLE-OUT-OF-RANGE", com_spec.getHandleOutOfRange())
+        self.setChildElementOptionalLiteral(element, "HANDLE-OUT-OF-RANGE-STATUS", com_spec.getHandleOutOfRangeStatus())
+        self.setChildElementOptionalBooleanValue(element, "USES-END-TO-END-PROTECTION", com_spec.getUsesEndToEndProtection())
 
     def setSwValues(self, element: ET.Element, key: str, sw_values: SwValues):
         if sw_values is not None:
@@ -274,37 +294,41 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalFloatValue(child_element, "V", value_list.v)
 
     def writeSwValueCont(self, element: ET.Element, cont: SwValueCont):
-        child_element = ET.SubElement(element, "SW-VALUE-CONT")
-        self.setARObjectAttributes(child_element, cont)
-        self.setChildElementOptionalRefType(child_element, "UNIT-REF", cont.unit_ref)
-        self.setValueList(child_element, "SW-ARRAYSIZE", cont.sw_arraysize)
-        self.setSwValues(child_element, "SW-VALUES-PHYS", cont.sw_values_phys)
+        if cont is not None:
+            child_element = ET.SubElement(element, "SW-VALUE-CONT")
+            self.setARObjectAttributes(child_element, cont)
+            self.setChildElementOptionalRefType(child_element, "UNIT-REF", cont.unit_ref)
+            self.setValueList(child_element, "SW-ARRAYSIZE", cont.sw_arraysize)
+            self.setSwValues(child_element, "SW-VALUES-PHYS", cont.sw_values_phys)
 
     def writeValueSpecification(self, element: ET.Element, value_spec: ValueSpecification):
-        self.setARObjectAttributes(element, value_spec)
-        if value_spec.short_label is not None:
-            self.setChildElementOptionalLiteral(element, "SHORT-LABEL", value_spec.short_label)                                
+        if value_spec is not None:
+            self.setARObjectAttributes(element, value_spec)
+            self.setChildElementOptionalLiteral(element, "SHORT-LABEL", value_spec.getShortLabel())                                
 
     def setApplicationValueSpecification(self, element: ET.Element, value_spec: ApplicationValueSpecification):
-        value_spec_tag = ET.SubElement(element, "APPLICATION-VALUE-SPECIFICATION")
-        self.writeValueSpecification(value_spec_tag, value_spec)
-        self.setChildElementOptionalLiteral(value_spec_tag, "CATEGORY", value_spec.category)
-        self.writeSwValueCont(value_spec_tag, value_spec.sw_value_cont)
+        if value_spec is not None:
+            value_spec_tag = ET.SubElement(element, "APPLICATION-VALUE-SPECIFICATION")
+            self.writeValueSpecification(value_spec_tag, value_spec)
+            self.setChildElementOptionalLiteral(value_spec_tag, "CATEGORY", value_spec.getCategory())
+            self.writeSwValueCont(value_spec_tag, value_spec.getSwValueCont())
 
     def setTextValueSpecification(self, element: ET.Element, value_spec: TextValueSpecification):
-        value_spec_tag = ET.SubElement(element, "TEXT-VALUE-SPECIFICATION")
-        self.writeValueSpecification(value_spec_tag, value_spec)
-        self.setChildElementOptionalLiteral(value_spec_tag, "VALUE", value_spec.value)
+        if value_spec is not None:
+            value_spec_tag = ET.SubElement(element, "TEXT-VALUE-SPECIFICATION")
+            self.writeValueSpecification(value_spec_tag, value_spec)
+            self.setChildElementOptionalLiteral(value_spec_tag, "VALUE", value_spec.getValue())
 
     def setNumericalValueSpecification(self, element: ET.Element, value_spec: NumericalValueSpecification):
-        value_spec_tag = ET.SubElement(element, "NUMERICAL-VALUE-SPECIFICATION")
-        self.writeValueSpecification(value_spec_tag, value_spec)
-        self.setChildElementOptionalFloatValue(value_spec_tag, "VALUE", value_spec.value)
+        if value_spec is not None:
+            value_spec_tag = ET.SubElement(element, "NUMERICAL-VALUE-SPECIFICATION")
+            self.writeValueSpecification(value_spec_tag, value_spec)
+            self.setChildElementOptionalFloatValue(value_spec_tag, "VALUE", value_spec.getValue())
 
     def setArrayValueSpecification(self, element: ET.Element, value_spec: ArrayValueSpecification):
         value_spec_tag = ET.SubElement(element, "ARRAY-VALUE-SPECIFICATION")
         self.writeValueSpecification(value_spec_tag, value_spec)
-        sub_elements = value_spec.get_elements()
+        sub_elements = value_spec.getElements()
         if len(sub_elements) > 0:
             elements_tag = ET.SubElement(value_spec_tag, "ELEMENTS")
             for sub_element in sub_elements:
@@ -312,8 +336,14 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setNumericalValueSpecification(elements_tag, sub_element)
                 elif isinstance(sub_element, ApplicationValueSpecification):
                     self.setApplicationValueSpecification(elements_tag, sub_element)
+                elif isinstance(sub_element, TextValueSpecification):
+                    self.setTextValueSpecification(elements_tag, sub_element)
+                elif isinstance(sub_element, ArrayValueSpecification):
+                    self.setArrayValueSpecification(elements_tag, sub_element)
+                elif isinstance(sub_element, RecordValueSpecification):
+                    self.setRecordValueSpecification(elements_tag, sub_element)
                 else:
-                    raise NotImplementedError("Unsupported element type of <%s> of ArrayValueSpecification" % type(sub_element))
+                    self.notImplemented("Unsupported element type of <%s> of ArrayValueSpecification" % type(sub_element))
                 
     def setConstantReference(self, element: ET.Element, value_spec: ConstantReference):
         value_spec_tag = ET.SubElement(element, "CONSTANT-REFERENCE")
@@ -335,7 +365,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             elif isinstance(value_spec, RecordValueSpecification):
                 self.setRecordValueSpecification(element, value_spec)
             else:
-                raise NotImplementedError("Unsupported ValueSpecification %s" % type(value_spec))
+                self.notImplemented("Unsupported ValueSpecification %s" % type(value_spec))
 
     def setInitValue(self, element: ET.Element, init_value: ValueSpecification):
         if init_value is not None:
@@ -390,31 +420,43 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeParameterRequireComSpec(element, com_spec)
         else:
             raise ValueError("Unsupported RPortComSpec %s" % type(com_spec))
+        
+    def setAbstractProvidedPortPrototype(self, element: ET.Element, prototype: AbstractProvidedPortPrototype):
+        com_specs = prototype.getProvidedComSpecs()
+        if len(com_specs):
+            com_specs_tag = ET.SubElement(element, "PROVIDED-COM-SPECS")
+            for com_spec in com_specs:
+                self.writePPortComSpec(com_specs_tag, com_spec)
     
     def writePPortPrototype(self, ports_tag: ET.Element, prototype: PPortPrototype):
         prototype_tag = ET.SubElement(ports_tag, "P-PORT-PROTOTYPE")
 
         self.setIdentifiable(prototype_tag, prototype)
-        self.logger.debug("writePPortPrototype %s" % prototype.short_name)
+        self.logger.debug("write PPortPrototype %s" % prototype.short_name)
+        self.setAbstractProvidedPortPrototype(prototype_tag, prototype)
+        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-INTERFACE-TREF", prototype.getProvidedInterfaceTRef())
 
-        com_specs = prototype.getProvidedComSpecs()
-        if len(com_specs):
-            com_specs_tag = ET.SubElement(prototype_tag, "PROVIDED-COM-SPECS")
+    def setAbstractRequiredPortPrototype(self, element: ET.Element, prototype: AbstractRequiredPortPrototype):
+        com_specs = prototype.getRequiredComSpecs()
+        if len(com_specs) > 0:
+            com_specs_tag = ET.SubElement(element, "REQUIRED-COM-SPECS")
             for com_spec in com_specs:
-                self.writePPortComSpec(com_specs_tag, com_spec)
-
-        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-INTERFACE-TREF", prototype.getProvidedInterfaceTRef())
+                self.writeRPortComSpec(com_specs_tag, com_spec)  
 
     def writeRPortPrototype(self, ports_tag: ET.Element, prototype: RPortPrototype):
-        self.logger.debug("writeRPortPrototype %s" % prototype.short_name)
+        self.logger.debug("write RPortPrototype %s" % prototype.short_name)
         prototype_tag = ET.SubElement(ports_tag, "R-PORT-PROTOTYPE")
         self.setIdentifiable(prototype_tag, prototype)
-        com_specs = prototype.getRequiredComSpecs()
-        if len(com_specs) > 0:
-            com_specs_tag = ET.SubElement(prototype_tag, "REQUIRED-COM-SPECS")
-            for com_spec in com_specs:
-                self.writeRPortComSpec(com_specs_tag, com_spec)
+        self.setAbstractRequiredPortPrototype(prototype_tag, prototype)
         self.setChildElementOptionalRefType(prototype_tag, "REQUIRED-INTERFACE-TREF", prototype.getRequiredInterfaceTRef())
+
+    def writePRPortPrototype(self, ports_tag: ET.Element, prototype: PRPortPrototype):
+        self.logger.debug("write PRPortPrototype %s" % prototype.short_name)
+        prototype_tag = ET.SubElement(ports_tag, "PR-PORT-PROTOTYPE")
+        self.setIdentifiable(prototype_tag, prototype)
+        self.setAbstractProvidedPortPrototype(prototype_tag, prototype)
+        self.setAbstractRequiredPortPrototype(prototype_tag, prototype)
+        self.setChildElementOptionalRefType(prototype_tag, "PROVIDED-REQUIRED-INTERFACE-TREF", prototype.getProvidedRequiredInterface())
     
     def writePortPrototypes(self, ports_tag: ET.Element, port_prototypes: List[PortPrototype]):
         for port_prototype in port_prototypes:
@@ -422,6 +464,8 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.writePPortPrototype(ports_tag, port_prototype)
             elif isinstance(port_prototype, RPortPrototype):
                 self.writeRPortPrototype(ports_tag, port_prototype)
+            elif isinstance(port_prototype, PRPortPrototype):
+                self.writePRPortPrototype(ports_tag, port_prototype)
             else:
                 self._raiseError("Invalid PortPrototype")
 
@@ -525,7 +569,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         elif isinstance(sw_connector, DelegationSwConnector):
             self.writeDelegationSwConnector(element, sw_connector)
         else:
-            raise NotImplementedError("Unsupported Sw Connector %s")
+            self.notImplemented("Unsupported Sw Connector %s")
 
     def writeSwConnectors(self, element: ET.Element, sw_component: CompositionSwComponentType):
         sw_connectors = sw_component.getSwConnectors()
@@ -573,12 +617,23 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setARObjectAttributes(child_element, paragraph)
             self.writeLParagraphs(child_element, paragraph)
         return paragraphs
+    
+    def setListElement(self, element: ET.Element, key: str, list: ListElement):
+        if list is not None:
+            child_element = ET.SubElement(element, key)
+            type = list.getType()
+            if type is not None:
+                child_element.attrib['TYPE'] = type
+            for item in list.getItems():
+                self.setDocumentationBlock(child_element, "ITEM", item)
 
     def setDocumentationBlock(self, element: ET.Element, key: str, block: DocumentationBlock):
         if block is not None:
             child_element = ET.SubElement(element, key)
             self.setARObjectAttributes(child_element, block)
             self.setMultiLanguageParagraphs(child_element, "P", block.getPs())
+            for list in block.getLists():
+                self.setListElement(child_element, "LIST", list)
 
     def writeGeneralAnnotation(self, element: ET.Element, annotation: Annotation):
         self.setMultiLongName(element, "LABEL", annotation.getLabel())
@@ -644,30 +699,32 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalLiteral(sw_data_def_props_conditional_tag, "SW-CALIBRATION-ACCESS", sw_data_def_props.getSwCalibrationAccess())
             self.setSwCalprmAxisSet(sw_data_def_props_conditional_tag, "SW-CALPRM-AXIS-SET", sw_data_def_props.getSwCalprmAxisSet())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "COMPU-METHOD-REF", sw_data_def_props.getCompuMethodRef())
+            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "DATA-CONSTR-REF", sw_data_def_props.getDataConstrRef())
+            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "SW-ADDR-METHOD-REF", sw_data_def_props.getSwAddrMethodRef())
             self.setChildElementOptionalLiteral(sw_data_def_props_conditional_tag, "SW-IMPL-POLICY", sw_data_def_props.getSwImplPolicy())
+            self.setChildElementOptionalNumericalValue(sw_data_def_props_conditional_tag, "SW-INTENDED-RESOLUTION", sw_data_def_props.getSwIntendedResolution())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "IMPLEMENTATION-DATA-TYPE-REF", sw_data_def_props.getImplementationDataTypeRef())
-            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "DATA-CONSTR-REF", sw_data_def_props.getDataConstrRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "SW-RECORD-LAYOUT-REF", sw_data_def_props.getSwRecordLayoutRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "VALUE-AXIS-DATA-TYPE-REF", sw_data_def_props.getValueAxisDataTypeRef())
             self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "UNIT-REF", sw_data_def_props.getUnitRef())
 
-    def writeApplicationDataType(self, element: ET.Element, data_type: ApplicationDataType):
-        self.writeAutosarDataType(element, data_type)
+    def setApplicationDataType(self, element: ET.Element, data_type: ApplicationDataType):
+        self.setAutosarDataType(element, data_type)
 
-    def writeApplicationCompositeDataType(self, element: ET.Element, data_type: ApplicationCompositeDataType):
-        self.writeApplicationDataType(element, data_type)
+    def setApplicationCompositeDataType(self, element: ET.Element, data_type: ApplicationCompositeDataType):
+        self.setApplicationDataType(element, data_type)
 
-    def writeAutosarDataType(self, element: ET.Element, data_type: AutosarDataType):
+    def setAutosarDataType(self, element: ET.Element, data_type: AutosarDataType):
         self.setARElement(element, data_type)
-        self.setSwDataDefProps(element, "SW-DATA-DEF-PROPS", data_type.swDataDefProps)
+        self.setSwDataDefProps(element, "SW-DATA-DEF-PROPS", data_type.getSwDataDefProps())
 
     def writeApplicationPrimitiveDataType(self, element: ET.Element, data_type: ApplicationPrimitiveDataType):
-        self.logger.debug("writeApplicationPrimitiveDataType %s" % data_type.short_name)
+        self.logger.debug("writeApplicationPrimitiveDataType %s" % data_type.getShortName())
         data_type_tag = ET.SubElement(element, "APPLICATION-PRIMITIVE-DATA-TYPE")
-        self.writeApplicationDataType(data_type_tag, data_type)
+        self.setApplicationDataType(data_type_tag, data_type)
 
     def setDataPrototype(self, element: ET.Element, prototype: DataPrototype):
-        self.setIdentifiable(element, prototype)
+        self.setSwDataDefProps(element, "SW-DATA-DEF-PROPS", prototype.getSwDataDefProps())
 
     def setApplicationCompositeElementDataPrototype(self, element: ET.Element, prototype: ApplicationCompositeElementDataPrototype):
         self.setDataPrototype(element, prototype)
@@ -686,7 +743,7 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def writeApplicationRecordDataType(self, element: ET.Element, data_type: ApplicationRecordDataType):
         data_type_tag = ET.SubElement(element, "APPLICATION-RECORD-DATA-TYPE")
-        self.writeApplicationDataType(data_type_tag, data_type)
+        self.setApplicationDataType(data_type_tag, data_type)
         self.writeApplicationRecordElements(data_type_tag, data_type)
 
     def writeApplicationDataTypes(self, parent: ET.Element, ar_package: ARPackage):
@@ -696,7 +753,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             elif isinstance(data_type, ApplicationRecordDataType):
                 self.writeApplicationRecordDataType(parent, data_type)
             else:
-                raise NotImplementedError("Unsupported ApplicationDataType <%s>" % type(data_type))
+                self.notImplemented("Unsupported ApplicationDataType <%s>" % type(data_type))
 
     def writeBaseTypeDirectDefinition(self, element: ET.Element, base_type_definition: BaseTypeDirectDefinition):
         self.setChildElementOptionalNumericalValue(element, "BASE-TYPE-SIZE", base_type_definition.baseTypeSize)
@@ -711,8 +768,8 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def writeCompuScaleConstantContents(self, element: ET.Element, contents: CompuScaleConstantContents):
         compu_const_tag = ET.SubElement(element, "COMPU-CONST")
-        if isinstance(contents.compu_const.compu_const_content_type, CompuConstTextContent):
-            self.setChildElementOptionalLiteral(compu_const_tag, "VT", contents.compu_const.compu_const_content_type.vt)
+        if isinstance(contents.compuConst.compuConstContentType, CompuConstTextContent):
+            self.setChildElementOptionalLiteral(compu_const_tag, "VT", contents.compuConst.compuConstContentType.vt)
 
     def writeCompuNominatorDenominator(self, element: ET.Element, key: str, parent: CompuNominatorDenominator):
         child_element = ET.SubElement(element, key)
@@ -721,12 +778,12 @@ class ARXMLWriter(AbstractARXMLWriter):
             v_tag.text = v
 
     def writeCompuScaleRationalFormula(self, element: ET.Element, contents: CompuScaleRationalFormula):
-        if contents.compu_rational_coeffs is not None:
+        if contents.compuRationalCoeffs is not None:
             coeffs_tag = ET.SubElement(element, "COMPU-RATIONAL-COEFFS")
-            if contents.compu_rational_coeffs.compu_numerator:
-                self.writeCompuNominatorDenominator(coeffs_tag, "COMPU-NUMERATOR", contents.compu_rational_coeffs.compu_numerator)
-            if contents.compu_rational_coeffs.compu_denominator:
-                self.writeCompuNominatorDenominator(coeffs_tag, "COMPU-DENOMINATOR", contents.compu_rational_coeffs.compu_denominator)
+            if contents.compuRationalCoeffs.compuNumerator:
+                self.writeCompuNominatorDenominator(coeffs_tag, "COMPU-NUMERATOR", contents.compuRationalCoeffs.compuNumerator)
+            if contents.compuRationalCoeffs.compuDenominator:
+                self.writeCompuNominatorDenominator(coeffs_tag, "COMPU-DENOMINATOR", contents.compuRationalCoeffs.compuDenominator)
 
     def writeCompuScaleContents(self, element: ET.Element, compu_scale: CompuScale):
         if isinstance(compu_scale.compuScaleContents, CompuScaleConstantContents):
@@ -734,44 +791,62 @@ class ARXMLWriter(AbstractARXMLWriter):
         elif isinstance(compu_scale.compuScaleContents, CompuScaleRationalFormula):
             self.writeCompuScaleRationalFormula(element, compu_scale.compuScaleContents)
         else:
-            raise NotImplementedError("Unsupported CompuScaleContents %s" % type(compu_scale.compuScaleContents))
+            self.notImplemented("Unsupported CompuScaleContents %s" % type(compu_scale.compuScaleContents))
 
     def writeCompuScales(self, element: ET.Element, compu_scales: CompuScales):
         compu_scales_tag = ET.SubElement(element, "COMPU-SCALES")
         for compu_scale in compu_scales.getCompuScales():
             child_element = ET.SubElement(compu_scales_tag, "COMPU-SCALE")
             self.setARObjectAttributes(child_element, compu_scale)
-            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", compu_scale.short_label)
-            self.setChildElementOptionalLiteral(child_element, "SYMBOL", compu_scale.symbol)
-            self.writeChildLimitElement(child_element, "LOWER-LIMIT", compu_scale.lowerLimit)
-            self.writeChildLimitElement(child_element, "UPPER-LIMIT", compu_scale.upperLimit)
+            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", compu_scale.getShortLabel())
+            self.setChildElementOptionalLiteral(child_element, "SYMBOL", compu_scale.getSymbol())
+            self.writeChildLimitElement(child_element, "LOWER-LIMIT", compu_scale.getLowerLimit())
+            self.writeChildLimitElement(child_element, "UPPER-LIMIT", compu_scale.getUpperLimit())
             self.writeCompuScaleContents(child_element, compu_scale)
 
     def writeCompuInternalToPhys(self, element: ET.Element, compu_method: CompuMethod):
-        if compu_method.compu_internal_to_phys is not None:
-            compu_internal_to_phys_tag = ET.SubElement(element, "COMPU-INTERNAL-TO-PHYS")
-            self.setARObjectAttributes(compu_internal_to_phys_tag, compu_method.compu_internal_to_phys)
-            if isinstance(compu_method.compu_internal_to_phys.compu_content, CompuScales):
-                self.writeCompuScales(compu_internal_to_phys_tag, compu_method.compu_internal_to_phys.compu_content)
+        compu = compu_method.getCompuInternalToPhys()
+        if  compu is not None:
+            child_element = ET.SubElement(element, "COMPU-INTERNAL-TO-PHYS")
+            self.setARObjectAttributes(child_element, compu)
+            compu_content = compu.getCompuContent()
+            if compu_content is not None:
+                if isinstance(compu_content, CompuScales):
+                    self.writeCompuScales(child_element, compu_content)
+                else:
+                    self.notImplemented("Unsupported CompuContent <%s>" % type(compu_content))
+
+    def writeCompuPhysToInternal(self, element: ET.Element, compu_method: CompuMethod):
+        compu = compu_method.getCompuPhysToInternal()
+        if  compu is not None:
+            child_element = ET.SubElement(element, "COMPU-PHYS-TO-INTERNAL")
+            self.setARObjectAttributes(child_element, compu)
+            compu_content = compu.getCompuContent()
+            if compu_content is not None:
+                if isinstance(compu_content, CompuScales):
+                    self.writeCompuScales(child_element, compu_content)
+                else:
+                    self.notImplemented("Unsupported CompuContent <%s>" % type(compu_content))
 
     def writeCompuMethod(self, element: ET.Element, compu_method: CompuMethod):
-        compu_method_tag = ET.SubElement(element, "COMPU-METHOD")
-        self.logger.debug("writeCompuMethods %s" % compu_method.short_name)
-        self.setIdentifiable(compu_method_tag, compu_method)
-        self.setChildElementOptionalRefType(compu_method_tag, "UNIT-REF", compu_method.unit_ref)
-        self.writeCompuInternalToPhys(compu_method_tag, compu_method)
+        child_element = ET.SubElement(element, "COMPU-METHOD")
+        self.logger.debug("writeCompuMethods %s" % compu_method.getShortName())
+        self.setIdentifiable(child_element, compu_method)
+        self.setChildElementOptionalRefType(child_element, "UNIT-REF", compu_method.getUnitRef())
+        self.writeCompuInternalToPhys(child_element, compu_method)
+        self.writeCompuPhysToInternal(child_element, compu_method)
 
     def setApplicationValueSpecification(self, element: ET.Element, spec: ApplicationValueSpecification):
         spec_tag = ET.SubElement(element, "APPLICATION-VALUE-SPECIFICATION")
-        self.setChildElementOptionalLiteral(spec_tag, "SHORT-LABEL", spec.short_label)
+        self.setChildElementOptionalLiteral(spec_tag, "SHORT-LABEL", spec.getShortLabel())
         self.setChildElementOptionalLiteral(spec_tag, "CATEGORY", spec.category)
-        self.writeSwValueCont(spec_tag, spec.sw_value_cont)
+        self.writeSwValueCont(spec_tag, spec.getSwValueCont())
 
     def setRecordValueSpecification(self, element: ET.Element, spec: RecordValueSpecification):
         child_element = ET.SubElement(element, "RECORD-VALUE-SPECIFICATION")
         self.setARObjectAttributes(child_element, spec)
-        self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", spec.short_label)
-        fields = spec.get_fields()
+        self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", spec.getShortLabel())
+        fields = spec.getFields()
         if len(fields) > 0:
             fields_tag = ET.SubElement(child_element, "FIELDS")
             for field in fields:
@@ -783,8 +858,10 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setTextValueSpecification(fields_tag, field)
                 elif isinstance(field, ArrayValueSpecification):
                     self.setArrayValueSpecification(fields_tag, field)
+                elif isinstance(field, RecordValueSpecification):
+                    self.setRecordValueSpecification(fields_tag, field)
                 else:
-                    raise NotImplementedError("Unsupported Field <%s>" % type(field))
+                    self.notImplemented("Unsupported Field <%s>" % type(field))
 
     def writeConstantSpecification(self, element: ET.Element, spec: ConstantSpecification):
         spec_tag = ET.SubElement(element, "CONSTANT-SPECIFICATION")
@@ -840,15 +917,18 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def setRModeInAtomicSwcInstanceRef(self, element: ET.Element, key: str, iref: RModeInAtomicSwcInstanceRef):
         child_element = ET.SubElement(element, key)
+        self.setARObjectAttributes(child_element, iref)
         self.setChildElementOptionalRefType(child_element, "BASE", iref.getBaseRef())
         self.setChildElementOptionalRefType(child_element, "CONTEXT-PORT-REF", iref.getContextPortRef())
         self.setChildElementOptionalRefType(child_element, "CONTEXT-MODE-DECLARATION-GROUP-PROTOTYPE-REF", iref.getContextModeDeclarationGroupPrototypeRef())
         self.setChildElementOptionalRefType(child_element, "TARGET-MODE-DECLARATION-REF", iref.getTargetModeDeclarationRef())
 
     def setPOperationInAtomicSwcInstanceRef(self, element: ET.Element, key: str, iref: POperationInAtomicSwcInstanceRef):
-        child_element = ET.SubElement(element, key)
-        self.setChildElementOptionalRefType(child_element, "CONTEXT-P-PORT-REF", iref.context_p_port_ref)
-        self.setChildElementOptionalRefType(child_element, "TARGET-PROVIDED-OPERATION-REF", iref.target_provided_operation_ref)
+        if iref is not None:
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, iref)
+            self.setChildElementOptionalRefType(child_element, "CONTEXT-P-PORT-REF", iref.getContextPPortRef())
+            self.setChildElementOptionalRefType(child_element, "TARGET-PROVIDED-OPERATION-REF", iref.getTargetProvidedOperationRef())
 
     def setRTEEvent(self, element: ET.Element, event: RTEEvent):
         self.setIdentifiable(element, event)
@@ -863,7 +943,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         if event is not None:
             child_element = ET.SubElement(element, "TIMING-EVENT")
             self.setRTEEvent(child_element, event)
-            self.setChildElementOptionalFloatValue(child_element, "PERIOD", event.period)
+            self.setChildElementOptionalTimeValue(child_element, "OFFSET", event.getOffset())
+            self.setChildElementOptionalTimeValue(child_element, "PERIOD", event.getPeriod())
 
     def setOperationInvokedEvent(self, element: ET.Element, event: OperationInvokedEvent):
         if event is not None:
@@ -902,6 +983,12 @@ class ARXMLWriter(AbstractARXMLWriter):
             child_element = ET.SubElement(element, "INIT-EVENT")
             self.setRTEEvent(child_element, event)
 
+    def setAsynchronousServerCallReturnsEvent(self, element: ET.Element, event: InitEvent):
+        if event is not None:
+            child_element = ET.SubElement(element, "ASYNCHRONOUS-SERVER-CALL-RETURNS-EVENT")
+            self.setRTEEvent(child_element, event)
+            self.setChildElementOptionalRefType(child_element, "EVENT-SOURCE-REF", event.getActivationReasonRepresentationRef())
+
     def writeRTEEvents(self, element: ET.Element, parent: SwcInternalBehavior):
         events = parent.getRteEvents()
         if len(events) > 0:
@@ -920,8 +1007,10 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setInternalTriggerOccurredEvent(child_element, event)
                 elif isinstance(event, InitEvent):
                     self.setInitEvent(child_element, event)
+                elif isinstance(event, AsynchronousServerCallReturnsEvent):
+                    self.setAsynchronousServerCallReturnsEvent(child_element, event)
                 else:
-                    raise NotImplementedError("Unsupported Event <%s>" % type(event))
+                    self.notImplemented("Unsupported Event <%s>" % type(event))
                 
     def writeExclusiveAreas(self, element: ET.Element, behavior: InternalBehavior):
         areas = behavior.getExclusiveAreas()
@@ -957,6 +1046,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setARObjectAttributes(child_element, ref)
             if ref.getAutosarVariableIRef() is not None:
                 child_element = ET.SubElement(child_element, "AUTOSAR-VARIABLE-IREF")
+                #self.setARObjectAttributes(child_element, ref)
                 self.setChildElementOptionalRefType(child_element, "PORT-PROTOTYPE-REF", ref.getAutosarVariableIRef().getPortPrototypeRef())
                 self.setChildElementOptionalRefType(child_element, "TARGET-DATA-PROTOTYPE-REF", ref.getAutosarVariableIRef().getTargetDataPrototypeRef())
             self.setChildElementOptionalRefType(child_element, "LOCAL-VARIABLE-REF", ref.getLocalVariableRef())
@@ -1026,8 +1116,9 @@ class ARXMLWriter(AbstractARXMLWriter):
     def setROperationInAtomicSwcInstanceRef(self, element: ET.Element, key: str, iref: ROperationInAtomicSwcInstanceRef):
         if iref is not None:
             child_element = ET.SubElement(element, key)
-            self.setChildElementOptionalRefType(child_element, "CONTEXT-R-PORT-REF", iref.context_r_port_ref)
-            self.setChildElementOptionalRefType(child_element, "TARGET-REQUIRED-OPERATION-REF", iref.target_required_operation_ref)
+            self.setARObjectAttributes(child_element, iref)
+            self.setChildElementOptionalRefType(child_element, "CONTEXT-R-PORT-REF", iref.getContextRPortRef())
+            self.setChildElementOptionalRefType(child_element, "TARGET-REQUIRED-OPERATION-REF", iref.getTargetRequiredOperationRef())
         
     def setServerCallPoint(self, element: ET.Element, call_point: ServerCallPoint):
         self.setROperationInAtomicSwcInstanceRef(element, "OPERATION-IREF", call_point.getOperationIRef())
@@ -1038,6 +1129,11 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setIdentifiable(child_element, call_point)
         self.setServerCallPoint(child_element, call_point)
 
+    def setAsynchronousServerCallPoint(self, element: ET.Element, call_point: SynchronousServerCallPoint):
+        child_element = ET.SubElement(element, "ASYNCHRONOUS-SERVER-CALL-POINT")
+        self.setIdentifiable(child_element, call_point)
+        self.setServerCallPoint(child_element, call_point)
+
     def writeServerCallPoints(self, element: ET.Element, entity: RunnableEntity):
         call_points = entity.getServerCallPoints()
         if len(call_points) > 0:
@@ -1045,6 +1141,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             for call_point in call_points:
                 if isinstance(call_point, SynchronousServerCallPoint):
                     self.setSynchronousServerCallPoint(child_element, call_point)
+                elif isinstance(call_point, AsynchronousServerCallPoint):
+                    self.setAsynchronousServerCallPoint(child_element, call_point)
                 else:
                     self._raiseError("Unsupported ServerCallPoint type <%s>" % type(call_point))
 
@@ -1097,13 +1195,23 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(argument, RunnableEntityArgument):
                     self.setRunnableEntityArgument(child_element, argument)
                 else:
-                    raise NotImplementedError("Unsupported argument of Runnable Entity <%s>" % type(argument))
+                    self.notImplemented("Unsupported argument of Runnable Entity <%s>" % type(argument))
+
+    def writeAsynchronousServerCallResultPoint(self, element: ET.Element, entity: RunnableEntity):
+        points = entity.getAsynchronousServerCallResultPoints()
+        if len(points) > 0:
+            points_tag = ET.SubElement(element, "ASYNCHRONOUS-SERVER-CALL-RESULT-POINTS")
+            for point in points:
+                child_element = ET.SubElement(points_tag, "ASYNCHRONOUS-SERVER-CALL-RESULT-POINT")
+                self.setIdentifiable(child_element, point)
+                self.setChildElementOptionalRefType(child_element, "ASYNCHRONOUS-SERVER-CALL-POINT-REF", point.getAsynchronousServerCallPointRef())
 
     def writeRunnableEntity(self, element: ET.Element, entity: RunnableEntity):
         if entity is not None:
             child_element = ET.SubElement(element, "RUNNABLE-ENTITY")
             self.setExecutableEntity(child_element, entity)
             self.writeRunnableEntityArguments(child_element, entity)
+            self.writeAsynchronousServerCallResultPoint(child_element, entity)
             self.setChildElementOptionalBooleanValue(child_element, "CAN-BE-INVOKED-CONCURRENTLY", entity.getCanBeInvokedConcurrently())
             self.writeParameterAccesses(child_element, entity)
             self.writeDataReceivePointByArguments(child_element, entity)
@@ -1124,7 +1232,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(entity, RunnableEntity):
                     self.writeRunnableEntity(runnables_tag, entity)
                 else:
-                    raise NotImplementedError("Unsupported RunnableEntity <%s>" % type(entity))
+                    self.notImplemented("Unsupported RunnableEntity <%s>" % type(entity))
                 
     def writeExplicitInterRunnableVariables(self, element: ET.Element, behavior: SwcInternalBehavior):
         prototypes = behavior.getExplicitInterRunnableVariables()
@@ -1143,18 +1251,18 @@ class ARXMLWriter(AbstractARXMLWriter):
             for memory in memories:
                 child_element = ET.SubElement(memories_tag, "PER-INSTANCE-MEMORY")
                 self.setIdentifiable(child_element, memory)
-                self.setChildElementOptionalLiteral(child_element, "INIT-VALUE", memory.initValue)
-                self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", memory.swDataDefProps)
-                self.setChildElementOptionalLiteral(child_element, "TYPE", memory.type)
-                self.setChildElementOptionalLiteral (child_element, "TYPE-DEFINITION", memory.typeDefinition)
+                self.setChildElementOptionalLiteral(child_element, "INIT-VALUE", memory.getInitValue())
+                self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", memory.getSwDataDefProps())
+                self.setChildElementOptionalLiteral(child_element, "TYPE", memory.getType())
+                self.setChildElementOptionalLiteral (child_element, "TYPE-DEFINITION", memory.getTypeDefinition())
 
     def writeParameterDataPrototype(self, element: ET.Element, prototype: ParameterDataPrototype):
         child_element = ET.SubElement(element, "PARAMETER-DATA-PROTOTYPE")
         self.setIdentifiable(child_element, prototype)
-        self.writeAutosarDataPrototype(child_element, prototype)
-        self.setInitValue(child_element, prototype.initValue)
+        self.setAutosarDataPrototype(child_element, prototype)
+        self.setInitValue(child_element, prototype.getInitValue())
 
-    def writeParameterDataPrototypes(self, element: ET.Element, behavior: SwcInternalBehavior):
+    def writePerInstanceParameters(self, element: ET.Element, behavior: SwcInternalBehavior):
         prototypes = behavior.getPerInstanceParameters()
         if len(prototypes) > 0:
             child_element = ET.SubElement(element, "PER-INSTANCE-PARAMETERS")
@@ -1183,14 +1291,30 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.writePortDefinedArgumentValues(child_element, option)
                 self.setChildElementOptionalRefType(child_element, "PORT-REF", option.portRef)
 
+    def writeRoleBasedDataTypeAssignment(self, element: ET.Element, assignment: RoleBasedDataTypeAssignment):
+        child_element = ET.SubElement(element, "ROLE-BASED-DATA-TYPE-ASSIGNMENT")
+        self.setChildElementOptionalLiteral(child_element, "ROLE", assignment.role)
+        self.setChildElementOptionalRefType(child_element, "USED-IMPLEMENTATION-DATA-TYPE-REF", assignment.usedImplementationDataTypeRef)
+
+    def writeServiceDependencyAssignedDataType(self, element: ET.Element, dependency: ServiceDependency):
+        assigned_data = dependency.getAssignedDataTypes()
+        if len(assigned_data) > 0:
+            child_element = ET.SubElement(element, "ASSIGNED-DATA-TYPES")
+            for data in assigned_data:
+                if isinstance(data, RoleBasedDataTypeAssignment):
+                    self.writeRoleBasedDataTypeAssignment(child_element, data)
+                else:
+                    self._raiseError("Unsupported Assigned Data <%s>" % type(data))
+
     def writeServiceDependency(self, element: ET.Element, dependency: ServiceDependency):
         self.setIdentifiable(element, dependency)
+        self.writeServiceDependencyAssignedDataType(element, dependency)
 
     def writeRoleBasedDataAssignment(self, element: ET.Element, assignment: RoleBasedDataAssignment):
         child_element = ET.SubElement(element, "ROLE-BASED-DATA-ASSIGNMENT")
         self.setChildElementOptionalLiteral(child_element, "ROLE", assignment.role)
-        self.setAutosarParameterRef(child_element, "USED-PARAMETER-ELEMENT", assignment.used_parameter_element)
-        self.setChildElementOptionalRefType(child_element, "USED-PIM-REF", assignment.used_pim_ref)
+        self.setAutosarParameterRef(child_element, "USED-PARAMETER-ELEMENT", assignment.getUsedParameterElement())
+        self.setChildElementOptionalRefType(child_element, "USED-PIM-REF", assignment.getUsedPimRef())
 
     def writeRoleBasedPortAssignment(self, element: ET.Element, assignment: RoleBasedPortAssignment):
         child_element = ET.SubElement(element, "ROLE-BASED-PORT-ASSIGNMENT")
@@ -1219,20 +1343,76 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def writeNvBlockNeeds(self, element: ET.Element, needs: NvBlockNeeds):
         child_element = ET.SubElement(element, "NV-BLOCK-NEEDS")
-        self.logger.debug("writeNvBlockNeeds %s" % needs.short_name)
+        self.logger.debug("write NvBlockNeeds %s" % needs.short_name)
+        self.setIdentifiable(child_element, needs)
+        self.setChildElementOptionalBooleanValue(child_element, "CALC-RAM-BLOCK-CRC", needs.getCalcRamBlockCrc())
+        self.setChildElementOptionalBooleanValue(child_element, "CHECK-STATIC-BLOCK-ID", needs.getCheckStaticBlockId())
+        self.setChildElementOptionalNumericalValue(child_element, "N-DATA-SETS", needs.getNDataSets())
+        self.setChildElementOptionalNumericalValue(child_element, "N-ROM-BLOCKS", needs.getNRomBlocks())
+        self.setChildElementOptionalLiteral(child_element, "RAM-BLOCK-STATUS-CONTROL", needs.getRamBlockStatusControl())
+        self.setChildElementOptionalBooleanValue(child_element, "READONLY", needs.getReadonly())
+        self.setChildElementOptionalLiteral(child_element, "RELIABILITY", needs.getReliability())
+        self.setChildElementOptionalBooleanValue(child_element, "RESISTANT-TO-CHANGED-SW", needs.getResistantToChangedSw())
+        self.setChildElementOptionalBooleanValue(child_element, "RESTORE-AT-START", needs.getRestoreAtStart())
+        self.setChildElementOptionalBooleanValue(child_element, "STORE-AT-SHUTDOWN", needs.getStoreAtShutdown())
+        self.setChildElementOptionalBooleanValue(child_element, "STORE-CYCLIC", needs.getStoreCyclic())
+        self.setChildElementOptionalBooleanValue(child_element, "STORE-EMERGENCY", needs.getStoreEmergency())
+        self.setChildElementOptionalBooleanValue(child_element, "STORE-IMMEDIATE", needs.getStoreImmediate())
+        self.setChildElementOptionalBooleanValue(child_element, "USE-AUTO-VALIDATION-AT-SHUT-DOWN", needs.getUseAutoValidationAtShutDown())
+        self.setChildElementOptionalBooleanValue(child_element, "USE-CRC-COMP-MECHANISM", needs.getUseCRCCompMechanism())
+        self.setChildElementOptionalBooleanValue(child_element, "WRITE-ONLY-ONCE", needs.getWriteOnlyOnce())
+        self.setChildElementOptionalBooleanValue(child_element, "WRITE-VERIFICATION", needs.getWriteVerification())
+        self.setChildElementOptionalLiteral(child_element, "WRITING-PRIORITY", needs.getWritingPriority())
+
+    def writeDiagnosticCommunicationManagerNeeds(self, element: ET.Element, needs: DiagnosticCommunicationManagerNeeds):
+        child_element = ET.SubElement(element, "DIAGNOSTIC-COMMUNICATION-MANAGER-NEEDS")
+        self.logger.debug("write DiagnosticCommunicationManagerNeeds %s" % needs.short_name)
         self.setIdentifiable(child_element, needs)
-        self.setChildElementOptionalBooleanValue(child_element, "CALC-RAM-BLOCK-CRC", needs.calc_ram_block_crc)
-        self.setChildElementOptionalBooleanValue(child_element, "CHECK-STATIC-BLOCK-ID", needs.check_static_block_id)
-        self.setChildElementOptionalNumericalValue(child_element, "N-DATA-SETS", needs.n_data_sets)
-        self.setChildElementOptionalNumericalValue(child_element, "N-ROM-BLOCKS", needs.n_rom_blocks)
-        self.setChildElementOptionalBooleanValue(child_element, "READONLY", needs.readonly)
-        self.setChildElementOptionalLiteral(child_element, "RELIABILITY", needs.reliability)
-        self.setChildElementOptionalBooleanValue(child_element, "RESISTANT-TO-CHANGED-SW", needs.resistant_to_changed_sw)
-        self.setChildElementOptionalBooleanValue(child_element, "RESTORE-AT-START", needs.restore_at_start)
-        self.setChildElementOptionalBooleanValue(child_element, "STORE-AT-SHUTDOWN", needs.store_at_shutdown)
-        self.setChildElementOptionalBooleanValue(child_element, "WRITE-ONLY-ONCE", needs.write_only_once)
-        self.setChildElementOptionalBooleanValue(child_element, "WRITE-VERIFICATION", needs.write_verification)
-        self.setChildElementOptionalLiteral(child_element, "WRITING-PRIORITY", needs.writing_priority)      
+        self.setChildElementOptionalLiteral(child_element, "SERVICE-REQUEST-CALLBACK-TYPE", needs.getServiceRequestCallbackType()) 
+    
+    def writeDiagnosticRoutineNeeds(self, element: ET.Element, needs: DiagnosticRoutineNeeds):
+        child_element = ET.SubElement(element, "DIAGNOSTIC-ROUTINE-NEEDS")
+        self.logger.debug("write DiagnosticRoutineNeeds %s" % needs.short_name)
+        self.setIdentifiable(child_element, needs)
+        self.setChildElementOptionalLiteral(child_element, "DIAG-ROUTINE-TYPE", needs.getDiagRoutineType())
+        self.setChildElementOptionalIntegerValue(child_element, "RID-NUMBER", needs.getRidNumber())
+
+    def writeDiagnosticValueNeeds(self, element: ET.Element, needs: DiagnosticValueNeeds):
+        child_element = ET.SubElement(element, "DIAGNOSTIC-VALUE-NEEDS")
+        self.logger.debug("write DiagnosticValueNeeds %s" % needs.short_name)
+        self.setIdentifiable(child_element, needs)
+        self.setChildElementOptionalPositiveInteger(child_element, "DATA-LENGTH", needs.getDataLength())
+        self.setChildElementOptionalLiteral(child_element, "DIAGNOSTIC-VALUE-ACCESS", needs.getDiagnosticValueAccess())
+        self.setChildElementOptionalIntegerValue(child_element, "DID-NUMBER", needs.getDidNumber())
+        self.setChildElementOptionalBooleanValue(child_element, "FIXED-LENGTH", needs.getFixedLength())
+        self.setChildElementOptionalLiteral(child_element, "PROCESSING-STYLE", needs.getProcessingStyle())
+
+    def setDiagEventDebounceMonitorInternal(self, element: ET.Element, algorithm: DiagEventDebounceMonitorInternal):
+        child_element = ET.SubElement(element, "DIAG-EVENT-DEBOUNCE-MONITOR-INTERNAL")
+        self.setIdentifiable(child_element, algorithm)
+        
+    def writeDiagEventDebounceAlgorithm(self, element: ET.Element, needs: DiagnosticEventNeeds):
+        algorithm = needs.getDiagEventDebounceAlgorithm()
+        if algorithm is not None:
+            child_element = ET.SubElement(element, "DIAG-EVENT-DEBOUNCE-ALGORITHM")
+            if isinstance(algorithm, DiagEventDebounceMonitorInternal):
+                self.setDiagEventDebounceMonitorInternal(child_element, algorithm)
+            else:
+                self.notImplemented("Unsupported DiagEventDebounceAlgorithm <%s>" % type(algorithm))
+
+    def writeDiagnosticEventNeeds(self, element: ET.Element, needs: DiagnosticEventNeeds):
+        child_element = ET.SubElement(element, "DIAGNOSTIC-EVENT-NEEDS")
+        self.logger.debug("write DiagnosticEventNeeds %s" % needs.short_name)
+        self.setIdentifiable(child_element, needs)
+        self.writeDiagEventDebounceAlgorithm(child_element, needs)
+        self.setChildElementOptionalLiteral(child_element, "DTC-KIND", needs.getDtcKind())
+        self.setChildElementOptionalIntegerValue(child_element, "UDS-DTC-NUMBER", needs.getUdsDtcNumber())
+    
+    def writeCryptoServiceNeeds(self, element: ET.Element, needs: CryptoServiceNeeds):
+        child_element = ET.SubElement(element, "CRYPTO-SERVICE-NEEDS")
+        self.logger.debug("write CryptoServiceNeeds %s" % needs.short_name)
+        self.setIdentifiable(child_element, needs)
+        self.setChildElementOptionalPositiveInteger(child_element, "MAXIMUM-KEY-LENGTH", needs.getMaximumKeyLength())
 
     def writeSwcServiceDependencyServiceNeeds(self, element: ET.Element, parent: SwcServiceDependency):
         needs = parent.getServiceNeeds()
@@ -1240,7 +1420,17 @@ class ARXMLWriter(AbstractARXMLWriter):
             child_element = ET.SubElement(element, "SERVICE-NEEDS")
             for need in needs:
                 if isinstance(need, NvBlockNeeds):
-                    self.writeNvBlockNeeds(child_element, need)    
+                    self.writeNvBlockNeeds(child_element, need)
+                elif isinstance(need, DiagnosticCommunicationManagerNeeds):
+                    self.writeDiagnosticCommunicationManagerNeeds(child_element, need)
+                elif isinstance(need, DiagnosticRoutineNeeds):
+                    self.writeDiagnosticRoutineNeeds(child_element, need)
+                elif isinstance(need, DiagnosticValueNeeds):
+                    self.writeDiagnosticValueNeeds(child_element, need)
+                elif isinstance(need, DiagnosticEventNeeds):
+                    self.writeDiagnosticEventNeeds(child_element, need)
+                elif isinstance(need, CryptoServiceNeeds):
+                    self.writeCryptoServiceNeeds(child_element, need)
                 else:
                     self._raiseError("Unsupported service needs <%s>" % type(need))                  
 
@@ -1283,7 +1473,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalLiteral(child_element, "HANDLE-TERMINATION-AND-RESTART", behavior.handle_termination_and_restart)
         self.setIncludedDataTypeSets(child_element, behavior.getIncludedDataTypeSets())
         self.writePerInstanceMemories(child_element, behavior)
-        self.writeParameterDataPrototypes(child_element, behavior)
+        self.writePerInstanceParameters(child_element, behavior)
         self.writePortAPIOptions(child_element, behavior)
         self.writeSwcInternalBehaviorRunnableEntities(child_element, behavior)
         self.writeSwcInternalBehaviorServiceDependencies(child_element, behavior)
@@ -1346,12 +1536,13 @@ class ARXMLWriter(AbstractARXMLWriter):
             for memory_section in memory_sections:
                 child_element = ET.SubElement(sections_tag, "MEMORY-SECTION")
                 self.setIdentifiable(child_element, memory_section)
-                self.setChildElementOptionalLiteral(child_element, "ALIGNMENT", memory_section.alignment)
+                self.setChildElementOptionalLiteral(child_element, "ALIGNMENT", memory_section.getAlignment())
+                self.setChildElementOptionalLiteral(child_element, "MEM-CLASS-SYMBOL", memory_section.getMemClassSymbol())
                 self.setMemorySectionOptions(child_element, memory_section.getOptions())
-                self.setChildElementOptionalNumericalValue(child_element, "SIZE", memory_section.size)
-                self.setChildElementOptionalRefType(child_element, "SW-ADDRMETHOD-REF", memory_section.swAddrMethodRef)
-                self.setChildElementOptionalLiteral(child_element, "SYMBOL", memory_section.symbol)
-                self.logger.debug("writeMemorySections %s" % memory_section.short_name)
+                self.setChildElementOptionalNumericalValue(child_element, "SIZE", memory_section.getSize())
+                self.setChildElementOptionalRefType(child_element, "SW-ADDRMETHOD-REF", memory_section.getSwAddrMethodRef())
+                self.setChildElementOptionalLiteral(child_element, "SYMBOL", memory_section.getSymbol())
+                self.logger.debug("write MemorySection %s" % memory_section.getShortName())
 
     def setResourceConsumption(self, element: ET.Element, consumption: ResourceConsumption):
         if consumption is not None:
@@ -1441,15 +1632,15 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setIdentifiable(child_element, protection_set)
         self.writeEndToEndProtections(child_element, protection_set)
 
-    def writeAutosarDataPrototype(self, element: ET.Element, prototype: AutosarDataPrototype):
+    def setAutosarDataPrototype(self, element: ET.Element, prototype: AutosarDataPrototype):
+        self.setDataPrototype(element, prototype)
         self.setChildElementOptionalRefType(element, "TYPE-TREF", prototype.typeTRef)
 
     def writeVariableDataPrototype(self, element: ET.Element, prototype: VariableDataPrototype):
         self.logger.debug("writeVariableDataPrototype %s" % prototype.short_name)
         child_element = ET.SubElement(element, "VARIABLE-DATA-PROTOTYPE")
         self.setIdentifiable(child_element, prototype)
-        self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", prototype.swDataDefProps)
-        self.writeAutosarDataPrototype(child_element, prototype)
+        self.setAutosarDataPrototype(child_element, prototype)
         self.setInitValue(child_element, prototype.initValue)
 
     def writeSenderReceiverInterfaceDataElements(self, element: ET.Element, sr_interface: SenderReceiverInterface):
@@ -1477,6 +1668,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setIdentifiable(child_element, sr_interface)
         self.setChildElementOptionalBooleanValue(child_element, "IS-SERVICE", sr_interface.getIsService())
         self.writeSenderReceiverInterfaceDataElements(child_element, sr_interface)
+        self.writeSenderReceiverInterfaceInvalidationPolicies(child_element, sr_interface)
 
     def writerBswModuleDescriptionImplementedEntry(self, element: ET.Element, desc: BswModuleDescription):
         entries = desc.getImplementedEntries()
@@ -1557,7 +1749,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("setBswTimingEvent %s" % event.short_name)
         child_element = ET.SubElement(element, "BSW-TIMING-EVENT")
         self.setBswScheduleEvent(child_element, event)
-        self.setChildElementOptionalFloatValue(child_element, "PERIOD", event.period)
+        self.setChildElementOptionalTimeValue(child_element, "PERIOD", event.getPeriod())
 
     def writeBswInternalBehaviorBswEvents(self, element: ET.Element, parent: BswInternalBehavior):
         events = parent.getBswEvents()
@@ -1708,13 +1900,16 @@ class ARXMLWriter(AbstractARXMLWriter):
                 child_element = ET.SubElement(sub_elements_tag, "IMPLEMENTATION-DATA-TYPE-ELEMENT")
                 self.setIdentifiable(child_element, type_element)
                 self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE", type_element.getArraySize())
+                self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE-HANDLING", type_element.getArraySizeHandling())
                 self.setChildElementOptionalLiteral(child_element, "ARRAY-SIZE-SEMANTICS", type_element.getArraySizeSemantics())
+                self.writeImplementationDataTypeElements(child_element, type_element)
                 self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", type_element.getSwDataDefProps())
 
     def writeImplementationDataType(self, element: ET.Element, data_type: ImplementationDataType):
         self.logger.debug("writeImplementationDataType %s" % data_type.short_name)
         child_element = ET.SubElement(element, "IMPLEMENTATION-DATA-TYPE")
-        self.writeAutosarDataType(child_element, data_type)
+        self.setAutosarDataType(child_element, data_type)
+        self.setChildElementOptionalLiteral(child_element, "DYNAMIC-ARRAY-SIZE-PROFILE", data_type.getDynamicArraySizeProfile())
         self.writeImplementationDataTypeElements(child_element, data_type)
         self.setChildElementOptionalLiteral(child_element, "TYPE-EMITTER", data_type.getTypeEmitter())
 
@@ -1775,6 +1970,19 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalBooleanValue(element, "IS-SERVICE", port_interface.isService)
         self.setChildElementOptionalLiteral(element, "SERVICE-KIND", port_interface.serviceKind)
 
+    def writeParameterInterfaceParameters(self, element: ET.Element, param_interface: ParameterInterface):
+        parameters = param_interface.getParameters()
+        if len(parameters) > 0:
+            child_element = ET.SubElement(element, "PARAMETERS")
+            for prototype in parameters:
+                self.writeParameterDataPrototype(child_element, prototype)
+
+    def writeParameterInterface(self, element: ET.Element, param_interface: ParameterInterface):
+        self.logger.debug("Write ParameterInterface %s" % param_interface.short_name)
+        child_element = ET.SubElement(element, "PARAMETER-INTERFACE")
+        self.setPortInterface(child_element, param_interface)
+        self.writeParameterInterfaceParameters(child_element, param_interface)
+
     def writeClientServerInterface(self, element: ET.Element, cs_interface: ClientServerInterface):
         self.logger.debug("writeClientServerInterface %s" % cs_interface.short_name)
         child_element = ET.SubElement(element, "CLIENT-SERVER-INTERFACE")
@@ -1802,44 +2010,54 @@ class ARXMLWriter(AbstractARXMLWriter):
     def writeApplicationArrayDataType(self, element: ET.Element, data_type: ApplicationArrayDataType):
         self.logger.debug("writeApplicationArrayDataType %s" % data_type.short_name)
         child_element = ET.SubElement(element, "APPLICATION-ARRAY-DATA-TYPE")
-        self.writeApplicationCompositeDataType(child_element, data_type)
+        self.setApplicationCompositeDataType(child_element, data_type)
         self.setApplicationArrayElement(child_element, data_type.element)
 
     def setSwRecordLayoutV(self, element: ET.Element, key: str, layout_v: SwRecordLayoutV):
         if layout_v is not None:
             child_element = ET.SubElement(element, key)
-            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", layout_v.shortLabel)
-            self.setChildElementOptionalRefType(child_element, "BASE-TYPE-REF", layout_v.baseTypeRef)
-            self.setChildElementOptionalNumericalValue(child_element, "SW-RECORD-LAYOUT-V-AXIS", layout_v.swRecordLayoutVAxis)
-            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-V-PROP", layout_v.swRecordLayoutVProp)
-            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-V-INDEX", layout_v.swRecordLayoutVIndex)
+            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", layout_v.getShortLabel())
+            self.setChildElementOptionalRefType(child_element, "BASE-TYPE-REF", layout_v.getBaseTypeRef())
+            self.setChildElementOptionalNumericalValue(child_element, "SW-RECORD-LAYOUT-V-AXIS", layout_v.getSwRecordLayoutVAxis())
+            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-V-PROP", layout_v.getSwRecordLayoutVProp())
+            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-V-INDEX", layout_v.getSwRecordLayoutVIndex())
 
     def setSwRecordLayoutGroup(self, element: ET.Element, key: str, group: SwRecordLayoutGroup):
         if group is not None:
             child_element = ET.SubElement(element, key)
-            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", group.shortLabel)
-            self.setChildElementOptionalLiteral(child_element, "CATEGORY", group.category)
-            self.setChildElementOptionalNumericalValue(child_element, "SW-RECORD-LAYOUT-GROUP-AXIS", group.swRecordLayoutGroupAxis)
-            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-GROUP-INDEX", group.swRecordLayoutGroupIndex)
-            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-GROUP-FROM", group.swRecordLayoutGroupFrom)
-            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-GROUP-TO", group.swRecordLayoutGroupTo)
-            self.setSwRecordLayoutV(child_element, "SW-RECORD-LAYOUT-V", group.swRecordLayoutGroupContentType.swRecordLayoutV)
-            self.setSwRecordLayoutGroup(child_element, "SW-RECORD-LAYOUT-GROUP", group.swRecordLayoutGroupContentType.swRecordLayoutGroup)
+            self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", group.getShortLabel())
+            self.setChildElementOptionalLiteral(child_element, "CATEGORY", group.getCategory())
+            self.setChildElementOptionalNumericalValue(child_element, "SW-RECORD-LAYOUT-GROUP-AXIS", group.getSwRecordLayoutGroupAxis())
+            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-GROUP-INDEX", group.getSwRecordLayoutGroupIndex())
+            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-GROUP-FROM", group.getSwRecordLayoutGroupFrom())
+            self.setChildElementOptionalLiteral(child_element, "SW-RECORD-LAYOUT-GROUP-TO", group.getSwRecordLayoutGroupTo())
+            self.setChildElementOptionalIntegerValue(child_element, "SW-RECORD-LAYOUT-GROUP-STEP", group.getSwRecordLayoutGroupStep())
+            #self.setSwRecordLayoutV(child_element, "SW-RECORD-LAYOUT-V", group.swRecordLayoutGroupContentType.swRecordLayoutV)
+            #self.setSwRecordLayoutGroup(child_element, "SW-RECORD-LAYOUT-GROUP", group.swRecordLayoutGroupContentType.swRecordLayoutGroup)
         return group
 
     def writeSwRecordLayout(self, element: ET.Element, layout: SwRecordLayout):
         self.logger.debug("writeSwRecordLayout %s" % layout.short_name)
         child_element = ET.SubElement(element, "SW-RECORD-LAYOUT")
         self.setIdentifiable(child_element, layout)
-        self.setSwRecordLayoutGroup(child_element, "SW-RECORD-LAYOUT-GROUP", layout.swRecordLayoutGroup)
+        self.setSwRecordLayoutGroup(child_element, "SW-RECORD-LAYOUT-GROUP", layout.getSwRecordLayoutGroup())
 
     def writeSwAddrMethod(self, element: ET.Element, method: SwAddrMethod):
         self.logger.debug("writeSwAddrMethod %s" % method.short_name)
-        child_element = ET.SubElement(element, "SW-RECORD-LAYOUT")
+        child_element = ET.SubElement(element, "SW-ADDR-METHOD")
+        self.setIdentifiable(child_element, method)
+        self.setChildElementOptionalLiteral(child_element, "MEMORY-ALLOCATION-KEYWORD-POLICY", method.getMemoryAllocationKeywordPolicy())
+        options = method.getOptions()
+        if len(options) > 0:
+            options_tag = ET.SubElement(child_element, "OPTIONS")
+            for option in options:
+                self.setChildElementOptionalLiteral(options_tag, "OPTION", option)
+        self.setChildElementOptionalLiteral(child_element, "SECTION-INITIALIZATION-POLICY", method.getSectionInitializationPolicy())
+        self.setChildElementOptionalLiteral(child_element, "SECTION-TYPE", method.getSectionType())
 
     def writeTriggerInterface(self, element: ET.Element, trigger_if: TriggerInterface):
         self.logger.debug("writeTriggerInterface %s" % trigger_if.short_name)
-        child_element = ET.SubElement(element, "SW-RECORD-LAYOUT")
+        child_element = ET.SubElement(element, "TRIGGER-INTERFACE")
 
     def writeServiceSwComponentType(self, element: ET.Element, sw_component: ServiceSwComponentType):
         self.logger.debug("writeServiceSwComponentType %s" % sw_component.short_name)
@@ -1853,8 +2071,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             for map in maps:
                 child_element = ET.SubElement(maps_tag, "DATA-TYPE-MAP")
                 self.setARObjectAttributes(child_element, map)
-                self.setChildElementOptionalRefType(child_element, "APPLICATION-DATA-TYPE-REF", map.application_data_type_ref)
-                self.setChildElementOptionalRefType(child_element, "IMPLEMENTATION-DATA-TYPE-REF", map.implementation_data_type_ref)
+                self.setChildElementOptionalRefType(child_element, "APPLICATION-DATA-TYPE-REF", map.getApplicationDataTypeRef())
+                self.setChildElementOptionalRefType(child_element, "IMPLEMENTATION-DATA-TYPE-REF", map.getImplementationDataTypeRef())
 
     def writeModeRequestTypeMaps(self, element: ET.Element, parent: DataTypeMappingSet):
         maps = parent.getModeRequestTypeMaps()
@@ -1863,8 +2081,8 @@ class ARXMLWriter(AbstractARXMLWriter):
             for map in maps:
                 child_element = ET.SubElement(maps_tag, "MODE-REQUEST-TYPE-MAP")
                 self.setARObjectAttributes(child_element, map)
-                self.setChildElementOptionalRefType(child_element, "IMPLEMENTATION-DATA-TYPE-REF", map.implementation_data_type_ref)
-                self.setChildElementOptionalRefType(child_element, "MODE-GROUP-REF", map.mode_group_ref)
+                self.setChildElementOptionalRefType(child_element, "IMPLEMENTATION-DATA-TYPE-REF", map.getImplementationDataTypeRef())
+                self.setChildElementOptionalRefType(child_element, "MODE-GROUP-REF", map.getModeGroupRef())
 
     def writeDataTypeMappingSet(self, element: ET.Element, mapping_set: DataTypeMappingSet):
         self.logger.debug("writeDataTypeMappingSet %s" % mapping_set.short_name)
@@ -1889,7 +2107,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeModeDeclarationGroup %s" % group.short_name)
         child_element = ET.SubElement(element, "MODE-DECLARATION-GROUP")
         self.setIdentifiable(child_element, group)
-        self.setChildElementOptionalRefType(child_element, "INITIAL-MODE-REF", group._initial_mode_ref)
+        self.setChildElementOptionalRefType(child_element, "INITIAL-MODE-REF", group.initialModeRef)
         self.writeModeDeclarationGroupModeDeclaration(child_element, group)
         self.setChildElementOptionalNumericalValue(child_element, "ON-TRANSITION-VALUE", group.getOnTransitionValue())
 
@@ -2193,7 +2411,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 elif isinstance(triggering, LinFrameTriggering):
                     self.writeLinFrameTriggering(triggerings_tag, triggering)
                 else:
-                    raise NotImplementedError("Unsupported Frame Triggering <%s>" % type(triggering))
+                    self.notImplemented("Unsupported Frame Triggering <%s>" % type(triggering))
                 
         triggerings = channel.getISignalTriggerings()
         if len(triggerings) > 0:
@@ -2202,7 +2420,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(triggering, ISignalTriggering):
                     self.writeISignalTriggering(triggerings_tag, triggering)
                 else:
-                    raise NotImplementedError("Unsupported ISignalTriggering <%s>" % type(triggering))
+                    self.notImplemented("Unsupported ISignalTriggering <%s>" % type(triggering))
                 
         triggerings = channel.getPduTriggerings()
         if len(triggerings) > 0:
@@ -2211,7 +2429,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(triggering, PduTriggering):
                     self.writePduTriggering(triggerings_tag, triggering)
                 else:
-                    raise NotImplementedError("Unsupported PduTriggering <%s>" % type(triggering))
+                    self.notImplemented("Unsupported PduTriggering <%s>" % type(triggering))
 
     def writeCanPhysicalChannel(self, element: ET.Element, channel: CanPhysicalChannel):
         self.logger.debug("CanPhysicalChannel %s" % channel.short_name)
@@ -2235,7 +2453,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 elif isinstance(channel, LinPhysicalChannel):
                     self.writeLinPhysicalChannel(child_element, channel)
                 else:
-                    raise NotImplementedError("Unsupported Physical Channel <%s>" % type(channel))
+                    self.notImplemented("Unsupported Physical Channel <%s>" % type(channel))
 
     def writeCommunicationCluster(self, element: ET.Element, cluster: CommunicationCluster):
         self.setChildElementOptionalNumericalValue(element, "BAUDRATE", cluster.getBaudrate())
@@ -2380,7 +2598,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 elif isinstance(data_mapping, SenderReceiverToSignalGroupMapping):
                     self.setSenderReceiverToSignalGroupMapping(child_element, data_mapping)
                 else:
-                    raise NotImplementedError("Unsupported Data Mapping %s" % type(data_mapping))
+                    self.notImplemented("Unsupported Data Mapping %s" % type(data_mapping))
                 
     def setSwcToEcuMapping(self, element: ET.Element, mapping: SwcToEcuMapping):
         child_element = ET.SubElement(element, "SWC-TO-ECU-MAPPING")
@@ -2400,7 +2618,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(sw_mapping, SwcToEcuMapping):
                     self.setSwcToEcuMapping(child_element, sw_mapping)
                 else:
-                    raise NotImplementedError("Unsupported Sw Mapping %s" % type(sw_mapping))
+                    self.notImplemented("Unsupported Sw Mapping %s" % type(sw_mapping))
 
     def writeSystemMapping(self, element: ET.Element, mapping: SystemMapping):
         self.logger.debug("Write SystemMapping %s" % mapping.short_name)
@@ -2417,7 +2635,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(mapping, SystemMapping):
                     self.writeSystemMapping(mappings_tag, mapping)
                 else:
-                    raise NotImplementedError("Unsupported Mapping %s" % type(mapping))
+                    self.notImplemented("Unsupported Mapping %s" % type(mapping))
                 
     def writeRootSwCompositionPrototype(self, element: ET.Element, system: System):
         prototype = system.getRootSoftwareComposition()
@@ -2451,6 +2669,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setARElement(child_element, dimension)
         self.setChildElementOptionalNumericalValue(child_element, "CURRENT-EXP", dimension.getCurrentExp())
         self.setChildElementOptionalNumericalValue(child_element, "LENGTH-EXP", dimension.getLengthExp())
+        self.setChildElementOptionalNumericalValue(child_element, "TIME-EXP", dimension.getTimeExp())
 
     def setISignalMappings(self, element: ET.Element, mappings: List[ISignalMapping]):
         if len(mappings) > 0:
@@ -2500,7 +2719,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(sub_container, EcucContainerValue):
                     self.writeEcucContainValue(sub_containers_tag, sub_container)
                 else:
-                    raise NotImplementedError("Unsupported Sub Container %s" % type(container)) 
+                    self.notImplemented("Unsupported Sub Container %s" % type(container)) 
                 
     def writeEcucParameterValue(self, element: ET.Element, param_value: EcucParameterValue):
         self.setChildElementOptionalRefType(element, "DEFINITION-REF", param_value.getDefinitionRef())
@@ -2526,7 +2745,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 elif isinstance(param_value, EcucNumericalParamValue):
                     self.setEcucNumericalParamValue(child_element, param_value)
                 else:
-                    raise NotImplementedError("Unsupported EcucParameterValue <%s>" % type(param_value))
+                    self.notImplemented("Unsupported EcucParameterValue <%s>" % type(param_value))
                 
     def writeEcucAbstractReferenceValue(self, element: ET.Element, value: EcucAbstractReferenceValue):
         self.setChildElementOptionalRefType(element, "DEFINITION-REF", value.getDefinitionRef())
@@ -2562,7 +2781,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 elif isinstance(reference_value, EcucInstanceReferenceValue):
                     self.setEcucInstanceReferenceValue(child_element, reference_value)
                 else:
-                    raise NotImplementedError("Unsupported EcucParameterValue <%s>" % type(reference_value))
+                    self.notImplemented("Unsupported EcucParameterValue <%s>" % type(reference_value))
 
     def writeEcucContainValue(self, element: ET.Element, container_value: EcucContainerValue):
         self.logger.debug("EcucContainerValue %s" % container_value.short_name)
@@ -2581,7 +2800,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 if isinstance(container, EcucContainerValue):
                     self.writeEcucContainValue(containers_tag, container)
                 else:
-                    raise NotImplementedError("Unsupported Container %s" % type(container)) 
+                    self.notImplemented("Unsupported Container %s" % type(container)) 
 
     def writeEcucModuleConfigurationValues(self, element: ET.Element, values: EcucModuleConfigurationValues):
         self.logger.debug("EcucModuleConfigurationValues %s" % values.short_name)
@@ -2627,16 +2846,18 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setIdentifiable(child_element, signal)
         self.setChildElementOptionalBooleanValue(child_element, "DYNAMIC-LENGTH", signal.getDynamicLength())
 
-    def writeParameterInterface(self, element: ET.Element, signal: SystemSignal):
-        self.logger.debug("Write ParameterInterface %s" % signal.short_name)
-        child_element = ET.SubElement(element, "PARAMETER-INTERFACE")
-        self.setIdentifiable(child_element, signal)
+    
 
-    def writeGenericEthernetFrame(self, element: ET.Element, signal: SystemSignal):
+    def writeGenericEthernetFrame(self, element: ET.Element, signal: GenericEthernetFrame):
         self.logger.debug("Write GenericEthernetFrame %s" % signal.short_name)
         child_element = ET.SubElement(element, "ETHERNET-FRAME")
         self.writeFrame(child_element, signal)
 
+    def writeLifeCycleInfoSet(self, element: ET.Element, set: LifeCycleInfoSet):
+        self.logger.debug("Write LifeCycleInfoSet %s" % set.short_name)
+        child_element = ET.SubElement(element, "LIFE-CYCLE-INFO-SET")
+        self.setIdentifiable(child_element, set)
+
     def writeISignalToPduMappings(self, element: ET.Element, parent: ISignalIPdu):
         mappings = parent.getISignalToPduMappings()
         if len(mappings) > 0:
@@ -2797,8 +3018,24 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeParameterInterface(element, ar_element)
         elif isinstance(ar_element, GenericEthernetFrame):
             self.writeGenericEthernetFrame(element, ar_element)
+        elif isinstance(ar_element, LifeCycleInfoSet):
+            self.writeLifeCycleInfoSet(element, ar_element)
+        elif isinstance(ar_element, PhysicalDimension):
+            self.writePhysicalDimension(element, ar_element)
         else:
-            raise NotImplementedError("Unsupported Elements of ARPackage <%s>" % type(ar_element))
+            self.notImplemented("Unsupported Elements of ARPackage <%s>" % type(ar_element))
+        
+    def writeReferenceBases(self, element: ET.Element, bases: List[ReferenceBase]):
+        self.logger.debug("Write ReferenceBases")
+        if len(bases) > 0:
+            bases_tag = ET.SubElement(element, "REFERENCE-BASES")
+            for base in bases:
+                child_element = ET.SubElement(bases_tag, "REFERENCE-BASE")
+                self.setChildElementOptionalLiteral(child_element, "SHORT-LABEL", base.getShortLabel())
+                self.setChildElementOptionalBooleanValue(child_element, "IS-DEFAULT", base.getIsDefault())
+                self.setChildElementOptionalBooleanValue(child_element, "IS-GLOBAL", base.getIsDefault())
+                self.setChildElementOptionalBooleanValue(child_element,  "BASE-IS-THIS-PACKAGE", base.getBaseIsThisPackage())
+                self.setChildElementOptionalRefType(child_element, "PACKAGE-REF", base.getPackageRef())
         
     def writeARPackages(self, element: ET.Element, pkgs: List[ARPackage]):
         if len(pkgs) > 0:
@@ -2810,6 +3047,8 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setIdentifiable(pkg_tag, pkg)
                 self.logger.debug("writeARPackage %s" % pkg.full_name)
 
+                self.writeReferenceBases(pkg_tag, pkg.getReferenceBases())
+
                 if pkg.getTotalElement() > 0:
                     elements_tag = ET.SubElement(pkg_tag, "ELEMENTS")
 
@@ -2818,6 +3057,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                             self.writeARPackageElement(elements_tag, ar_element)
 
                 self.writeARPackages(pkg_tag, pkg.getARPackages())
+                
 
     def save(self, filename, document: AUTOSAR):
         self.logger.info("Save %s ..." % filename)
@@ -2826,6 +3066,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         root.attrib["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance"
         root.attrib["xsi:schemaLocation"] = document.schema_location
         
+        self.setAdminData(root, document.getAdminData())
         self.writeARPackages(root, document.getARPackages())
 
         self.saveToFile(filename, root)