armodel 1.7.1__py3-none-any.whl → 1.7.3__py3-none-any.whl

armodel/writer/arxml_writer.py

@@ -2,14 +2,12 @@ import xml.etree.cElementTree as ET
 
 from typing import List
 
-from armodel.models.M2.AUTOSARTemplates.GenericStructure.LifeCycles import LifeCycleInfoSet
-
-
 
 
+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
+from ..models.M2.MSR.AsamHdo.ComputationMethod import Compu, CompuConst, CompuConstContent, CompuConstFormulaContent, CompuConstNumericContent, CompuConstTextContent, CompuMethod, CompuNominatorDenominator, CompuScale, CompuScaleConstantContents, CompuScaleRationalFormula, CompuScales
 from ..models.M2.MSR.AsamHdo.Constraints.GlobalConstraints import DataConstr, InternalConstrs, PhysConstrs
 from ..models.M2.MSR.AsamHdo.SpecialData import Sdg
 from ..models.M2.MSR.AsamHdo.Units import PhysicalDimension, Unit
@@ -17,8 +15,9 @@ from ..models.M2.MSR.CalibrationData.CalibrationValue import SwValueCont, SwValu
 from ..models.M2.MSR.DataDictionary.Axis import SwAxisGrouped, SwAxisIndividual
 from ..models.M2.MSR.DataDictionary.AuxillaryObjects import SwAddrMethod
 from ..models.M2.MSR.DataDictionary.CalibrationParameter import SwCalprmAxis, SwCalprmAxisSet
-from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, ValueList
+from ..models.M2.MSR.DataDictionary.DataDefProperties import SwDataDefProps, SwPointerTargetProps, ValueList
 from ..models.M2.MSR.DataDictionary.RecordLayout import SwRecordLayout, SwRecordLayoutGroup, SwRecordLayoutV
+from ..models.M2.MSR.DataDictionary.ServiceProcessTask import SwServiceArg
 from ..models.M2.MSR.Documentation.Annotation import Annotation
 from ..models.M2.MSR.Documentation.TextModel.BlockElements import DocumentationBlock
 from ..models.M2.MSR.Documentation.TextModel.BlockElements.ListElements import ListElement
@@ -29,20 +28,21 @@ from ..models.M2.AUTOSARTemplates.AutosarTopLevelStructure import AUTOSAR
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswOverview import BswModuleDescription
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswImplementation import BswImplementation
 from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswInterfaces import BswModuleEntry
-from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
+from ..models.M2.AUTOSARTemplates.BswModuleTemplate.BswBehavior import BswCalledEntity, BswEvent, BswInternalBehavior, BswInterruptEntity, BswModeSenderPolicy, BswModuleEntity, BswSchedulableEntity, BswScheduleEvent, BswTimingEvent
 from ..models.M2.AUTOSARTemplates.CommonStructure import ApplicationValueSpecification, ArrayValueSpecification, ConstantReference, ConstantSpecification, NumericalValueSpecification, RecordValueSpecification, TextValueSpecification, ValueSpecification
+from ..models.M2.AUTOSARTemplates.CommonStructure.FlatMap import FlatInstanceDescriptor, FlatMap
 from ..models.M2.AUTOSARTemplates.CommonStructure.Filter import DataFilter
 from ..models.M2.AUTOSARTemplates.CommonStructure.SwcBswMapping import SwcBswMapping, SwcBswRunnableMapping
 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, EcuStateMgrUserNeeds, 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
 from ..models.M2.AUTOSARTemplates.CommonStructure.ModeDeclaration import ModeDeclaration, ModeDeclarationGroup, ModeDeclarationGroupPrototype
 from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption import ResourceConsumption
-
+from ..models.M2.AUTOSARTemplates.CommonStructure.ResourceConsumption.StackUsage import RoughEstimateStackUsage, StackUsage
 from ..models.M2.AUTOSARTemplates.ECUCDescriptionTemplate import EcucAbstractReferenceValue, EcucContainerValue, EcucInstanceReferenceValue, EcucModuleConfigurationValues, EcucNumericalParamValue, EcucParameterValue, EcucReferenceValue, EcucTextualParamValue, EcucValueCollection
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.EngineeringObject import AutosarEngineeringObject, EngineeringObject
 from ..models.M2.AUTOSARTemplates.GenericStructure.GeneralTemplateClasses.Identifiable import ARElement, Identifiable, MultilanguageReferrable, Referrable
@@ -50,16 +50,16 @@ from ..models.M2.AUTOSARTemplates.GenericStructure.AbstractStructure import AnyI
 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.PortAPIOptions import PortAPIOption, PortDefinedArgumentValue
+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
@@ -73,7 +73,7 @@ from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.DataPrototypes im
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Components import ServiceSwComponentType
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.Datatype.Datatypes import DataTypeMappingSet
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.EndToEndProtection import EndToEndProtectionSet
-from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ClientServerInterface, ClientServerOperation, ModeSwitchInterface, ParameterInterface, PortInterface, SenderReceiverInterface, TriggerInterface
+from ..models.M2.AUTOSARTemplates.SWComponentTemplate.PortInterface import ApplicationError, ClientServerInterface, ClientServerOperation, DataPrototypeMapping, ModeSwitchInterface, ParameterInterface, PortInterface, PortInterfaceMappingSet, SenderReceiverInterface, TriggerInterface, VariableAndParameterInterfaceMapping
 from ..models.M2.AUTOSARTemplates.SWComponentTemplate.SwcImplementation import SwcImplementation
 
 from ..models.M2.AUTOSARTemplates.SystemTemplate import SwcToEcuMapping, System, SystemMapping
@@ -111,13 +111,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)
@@ -129,7 +131,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             for sdg in sdgs:
                 self.setSdg(sdgs_tag, sdg)
     
-    def writeChildLimitElement(self, element: ET.Element, key: str, limit: Limit):
+    def setChildLimitElement(self, element: ET.Element, key: str, limit: Limit):
         if limit is not None:
             limit_tag = ET.SubElement(element, key)
             self.setARObjectAttributes(limit_tag, limit)
@@ -139,7 +141,7 @@ 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)
@@ -224,7 +226,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         child_element = ET.SubElement(element, "NONQUEUED-SENDER-COM-SPEC")
         self.setARObjectAttributes(child_element, com_spec)
         self.setSenderComSpec(child_element, com_spec)
-        self.setInitValue(child_element, com_spec.initValue)
+        self.setValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
             
     def setServerComSpec(self, element: ET.Element, com_spec: ServerComSpec):
         child_element = ET.SubElement(element, "SERVER-COM-SPEC")
@@ -253,7 +255,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:
@@ -266,8 +268,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()
@@ -275,10 +277,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:
@@ -295,37 +298,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.unitRef)
+            self.setValueList(child_element, "SW-ARRAYSIZE", cont.swArraysize)
+            self.setSwValues(child_element, "SW-VALUES-PHYS", cont.swValuesPhys)
 
     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:
@@ -333,45 +340,48 @@ 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")
         self.writeValueSpecification(value_spec_tag, value_spec)
         self.setChildElementOptionalRefType(value_spec_tag, "CONSTANT-REF", value_spec.getConstantRef())
 
-    def setValueSpecification(self, element: ET.Element, value_spec: ValueSpecification):
+    def setValueSpecification(self, element: ET.Element, key: str, value_spec: ValueSpecification):
         if value_spec is not None:
+            child_element = ET.SubElement(element, key)
             if isinstance(value_spec, ApplicationValueSpecification):
-                self.setApplicationValueSpecification(element, value_spec)
+                self.setApplicationValueSpecification(child_element, value_spec)
             elif isinstance(value_spec, TextValueSpecification):
-                self.setTextValueSpecification(element, value_spec)
+                self.setTextValueSpecification(child_element, value_spec)
             elif isinstance(value_spec, ConstantReference):
-                self.setConstantReference(element, value_spec)
+                self.setConstantReference(child_element, value_spec)
             elif isinstance(value_spec, NumericalValueSpecification):
-                self.setNumericalValueSpecification(element, value_spec)
+                self.setNumericalValueSpecification(child_element, value_spec)
             elif isinstance(value_spec, ArrayValueSpecification):
-                self.setArrayValueSpecification(element, value_spec)
+                self.setArrayValueSpecification(child_element, value_spec)
             elif isinstance(value_spec, RecordValueSpecification):
-                self.setRecordValueSpecification(element, value_spec)
+                self.setRecordValueSpecification(child_element, value_spec)
             else:
-                raise NotImplementedError("Unsupported ValueSpecification %s" % type(value_spec))
-
-    def setInitValue(self, element: ET.Element, init_value: ValueSpecification):
-        if init_value is not None:
-            child_element = ET.SubElement(element, "INIT-VALUE")
-            self.setValueSpecification(child_element, init_value)
+                self.notImplemented("Unsupported ValueSpecification %s" % type(value_spec))
 
     def writeNonqueuedReceiverComSpec(self, element: ET.Element, com_spec: NonqueuedReceiverComSpec):
         child_element = ET.SubElement(element, "NONQUEUED-RECEIVER-COM-SPEC")
         self.setARObjectAttributes(child_element, com_spec)
         self.writeReceiverComSpec(child_element, com_spec)
-        self.setChildElementOptionalFloatValue(child_element, "ALIVE-TIMEOUT", com_spec.aliveTimeout)
-        self.setChildElementOptionalBooleanValue(child_element, "ENABLE-UPDATE", com_spec.enableUpdated)
-        self.setChildElementOptionalBooleanValue(child_element, "HANDLE-NEVER-RECEIVED", com_spec.handleNeverReceived)
-        self.setChildElementOptionalLiteral(child_element, "HANDLE-TIMEOUT-TYPE", com_spec.handleTimeoutType)
-        self.setInitValue(child_element, com_spec.initValue)
+        self.setChildElementOptionalFloatValue(child_element, "ALIVE-TIMEOUT", com_spec.getAliveTimeout())
+        self.setChildElementOptionalBooleanValue(child_element, "ENABLE-UPDATE", com_spec.getEnableUpdated())
+        self.setDataFilter(child_element, "FILTER", com_spec.getFilter())
+        self.setChildElementOptionalBooleanValue(child_element, "HANDLE-NEVER-RECEIVED", com_spec.getHandleNeverReceived())
+        self.setChildElementOptionalLiteral(child_element, "HANDLE-TIMEOUT-TYPE", com_spec.getHandleTimeoutType())
+        self.setValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
 
     def writeQueuedReceiverComSpec(self, element: ET.Element, com_spec: QueuedReceiverComSpec):
         child_element = ET.SubElement(element, "QUEUED-RECEIVER-COM-SPEC")
@@ -389,8 +399,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.logger.debug("writeParameterRequireComSpec")
         child_element = ET.SubElement(element, "PARAMETER-REQUIRE-COM-SPEC")
         self.setARObjectAttributes(child_element, com_spec)
-        self.setChildElementOptionalRefType(child_element, "PARAMETER-REF", com_spec.parameter_ref)
-        self.setInitValue(child_element, com_spec.init_value)
+        self.setChildElementOptionalRefType(child_element, "PARAMETER-REF", com_spec.getParameterRef())
+        self.setValueSpecification(child_element, "INIT-VALUE", com_spec.getInitValue())
 
     def writeModeSwitchReceiverComSpec(self, element: ET.Element, com_spec: ModeSwitchReceiverComSpec):
         self.logger.debug("writeModeSwitchReceiverComSpec")
@@ -411,31 +421,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.getShortName())
+        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.getShortName())
         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.getShortName())
+        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:
@@ -443,6 +465,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")
 
@@ -467,7 +491,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(child_element, "PORT-PROTOTYPE-REF", ref)
 
     def writePortGroup(self, element: ET.Element, port_group: PortGroup):
-        self.logger.debug("writePortGroup %s" % port_group.short_name)
+        self.logger.debug("writePortGroup %s" % port_group.getShortName())
         child_element = ET.SubElement(element, "PORT-GROUP")
         self.setIdentifiable(child_element, port_group)
         self.writePortGroupInnerGroupIRefs(child_element, port_group)
@@ -501,18 +525,19 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeSwComponentPrototype(components_tag, prototype)
 
     def writeAssemblySwConnector(self, element: ET.Element, sw_connector: AssemblySwConnector):
-        connector_tag = ET.SubElement(element, "ASSEMBLY-SW-CONNECTOR")
-        self.setIdentifiable(connector_tag, sw_connector)
+        child_element = ET.SubElement(element, "ASSEMBLY-SW-CONNECTOR")
+        self.setIdentifiable(child_element, sw_connector)
+        self.setChildElementOptionalRefType(child_element, "MAPPING-REF", sw_connector.getMappingRef())
 
         if sw_connector.getProviderIRef() is not None:
-            provider_iref_tag = ET.SubElement(connector_tag, "PROVIDER-IREF")
+            provider_iref_tag = ET.SubElement(child_element, "PROVIDER-IREF")
             provider_iref = sw_connector.getProviderIRef()
             self.setARObjectAttributes(provider_iref_tag, provider_iref)
             self.setChildElementOptionalRefType(provider_iref_tag, "CONTEXT-COMPONENT-REF", provider_iref.getContextComponentRef())
             self.setChildElementOptionalRefType(provider_iref_tag, "TARGET-P-PORT-REF", provider_iref.getTargetPPortRef())
 
         if sw_connector.getRequesterIRef() is not None:
-            requester_iref_tag = ET.SubElement(connector_tag, "REQUESTER-IREF")
+            requester_iref_tag = ET.SubElement(child_element, "REQUESTER-IREF")
             requester_iref = sw_connector.getRequesterIRef()
             self.setARObjectAttributes(requester_iref_tag, requester_iref)
             self.setChildElementOptionalRefType(requester_iref_tag, "CONTEXT-COMPONENT-REF", requester_iref.getContextComponentRef())
@@ -546,7 +571,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()
@@ -658,49 +683,53 @@ class ARXMLWriter(AbstractARXMLWriter):
             for axis in axises:
                 self.setSwCalprmAxis(child_element, axis)
 
-    def writeSwDataDefProsInvalidValue(self, element: ET.Element, props: SwDataDefProps):
-        if props.getInvalidValue() is not None:
-            child_element = ET.SubElement(element, "INVALID-VALUE")
-            self.setValueSpecification(child_element, props.getInvalidValue()) 
+    def setSwPointerTargetProps(self, element: ET.Element, key: str, props: SwPointerTargetProps):
+        if props is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalLiteral(child_element, "TARGET-CATEGORY", props.getTargetCategory())
+            self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", props.getSwDataDefProps())
 
-    def setSwDataDefProps(self, element: ET.Element, key: str, sw_data_def_props: SwDataDefProps):
-        if sw_data_def_props is not None:
+    def setSwDataDefProps(self, element: ET.Element, key: str, props: SwDataDefProps):
+        if props is not None:
             child_element = ET.SubElement(element, key)
-            self.setARObjectAttributes(child_element, sw_data_def_props)
+            self.setARObjectAttributes(child_element, props)
             sw_data_def_props_variants_tag = ET.SubElement(child_element, "SW-DATA-DEF-PROPS-VARIANTS")
-            sw_data_def_props_conditional_tag = ET.SubElement(sw_data_def_props_variants_tag, "SW-DATA-DEF-PROPS-CONDITIONAL")
-            self.setARObjectAttributes(sw_data_def_props_conditional_tag, sw_data_def_props.conditional)
-            self.setAnnotations(sw_data_def_props_conditional_tag, sw_data_def_props.getAnnotations())
-            self.setChildElementOptionalRefType(sw_data_def_props_conditional_tag, "BASE-TYPE-REF", sw_data_def_props.getBaseTypeRef())
-            self.writeSwDataDefProsInvalidValue(sw_data_def_props_conditional_tag, sw_data_def_props)
-            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.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, "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 writeApplicationCompositeDataType(self, element: ET.Element, data_type: ApplicationCompositeDataType):
-        self.writeApplicationDataType(element, data_type)
-
-    def writeAutosarDataType(self, element: ET.Element, data_type: AutosarDataType):
+            conditional_tag = ET.SubElement(sw_data_def_props_variants_tag, "SW-DATA-DEF-PROPS-CONDITIONAL")
+            self.setARObjectAttributes(conditional_tag, props.conditional)
+            self.setAnnotations(conditional_tag, props.getAnnotations())
+            self.setChildElementOptionalRefType(conditional_tag, "BASE-TYPE-REF", props.getBaseTypeRef())
+            self.setChildElementOptionalRefType(conditional_tag, "COMPU-METHOD-REF", props.getCompuMethodRef())
+            self.setChildElementOptionalRefType(conditional_tag, "DATA-CONSTR-REF", props.getDataConstrRef())
+            self.setValueSpecification(conditional_tag, "INVALID-VALUE", props.getInvalidValue())
+            self.setChildElementOptionalRefType(conditional_tag, "IMPLEMENTATION-DATA-TYPE-REF", props.getImplementationDataTypeRef())
+            self.setChildElementOptionalFloatValue(conditional_tag, "STEP-SIZE", props.getStepSize())
+            self.setChildElementOptionalRefType(conditional_tag, "SW-ADDR-METHOD-REF", props.getSwAddrMethodRef())
+            self.setChildElementOptionalLiteral(conditional_tag, "SW-CALIBRATION-ACCESS", props.getSwCalibrationAccess())
+            self.setSwCalprmAxisSet(conditional_tag, "SW-CALPRM-AXIS-SET", props.getSwCalprmAxisSet())
+            self.setChildElementOptionalLiteral(conditional_tag, "SW-IMPL-POLICY", props.getSwImplPolicy())
+            self.setChildElementOptionalNumericalValue(conditional_tag, "SW-INTENDED-RESOLUTION", props.getSwIntendedResolution())
+            self.setSwPointerTargetProps(conditional_tag, "SW-POINTER-TARGET-PROPS", props.getSwPointerTargetProps())
+            self.setChildElementOptionalRefType(conditional_tag, "SW-RECORD-LAYOUT-REF", props.getSwRecordLayoutRef())
+            self.setChildElementOptionalRefType(conditional_tag, "VALUE-AXIS-DATA-TYPE-REF", props.getValueAxisDataTypeRef())
+            self.setChildElementOptionalRefType(conditional_tag, "UNIT-REF", props.getUnitRef())
+
+    def setApplicationDataType(self, element: ET.Element, data_type: ApplicationDataType):
+        self.setAutosarDataType(element, data_type)
+
+    def setApplicationCompositeDataType(self, element: ET.Element, data_type: ApplicationCompositeDataType):
+        self.setApplicationDataType(element, data_type)
+
+    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)
+    def setApplicationPrimitiveDataType(self, element: ET.Element, data_type: ApplicationPrimitiveDataType):
+        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)
@@ -717,19 +746,19 @@ class ARXMLWriter(AbstractARXMLWriter):
                 child_element = ET.SubElement(elements_tag, "APPLICATION-RECORD-ELEMENT")
                 self.setApplicationRecordElement(child_element, record)
 
-    def writeApplicationRecordDataType(self, element: ET.Element, data_type: ApplicationRecordDataType):
+    def setApplicationRecordDataType(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):
         for data_type in ar_package.getApplicationDataType():
             if isinstance(data_type, ApplicationPrimitiveDataType):
-                self.writeApplicationPrimitiveDataType(parent, data_type)
+                self.setApplicationPrimitiveDataType(parent, data_type)
             elif isinstance(data_type, ApplicationRecordDataType):
-                self.writeApplicationRecordDataType(parent, data_type)
+                self.setApplicationRecordDataType(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)
@@ -737,15 +766,15 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalNumericalValue(element, "MEM-ALIGNMENT", base_type_definition.memAlignment)
         self.setChildElementOptionalLiteral(element, "NATIVE-DECLARATION", base_type_definition.nativeDeclaration)
 
-    def writeSwBaseType(self, element: ET.Element, base_type: SwBaseType):
+    def setSwBaseType(self, element: ET.Element, base_type: SwBaseType):
         data_type_tag = ET.SubElement(element, "SW-BASE-TYPE")
         self.setIdentifiable(data_type_tag, base_type)
         self.writeBaseTypeDirectDefinition(data_type_tag, base_type.baseTypeDefinition)
 
     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)
@@ -754,12 +783,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):
@@ -767,44 +796,63 @@ 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))
-
-    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.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)
-
-    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)
+            self.notImplemented("Unsupported CompuScaleContents %s" % type(compu_scale.compuScaleContents))
+
+    def setCompuConstContent(self, element: ET.Element, content: CompuConstContent):
+        if content is not None:
+            if isinstance(content, CompuConstFormulaContent):
+                self.setChildElementOptionalLiteral(element, "VF", content.getVf())
+            elif isinstance(content, CompuConstNumericContent):
+                self.setChildElementOptionalNumericalValue(element, "V", content.getV())
+            elif isinstance(content, CompuConstTextContent):
+                self.setChildElementOptionalLiteral(element, "VT", content.getVt())
+            else:
+                self.notImplemented("Unsupported CompuConstContent <%s>" % type(content))
+
+    def setCompuScales(self, element: ET.Element, compu_scales: CompuScales):
+        if compu_scales is not None:
+            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.getShortLabel())
+                self.setChildElementOptionalLiteral(child_element, "SYMBOL", compu_scale.getSymbol())
+                self.setChildLimitElement(child_element, "LOWER-LIMIT", compu_scale.getLowerLimit())
+                self.setChildLimitElement(child_element, "UPPER-LIMIT", compu_scale.getUpperLimit())
+                self.writeCompuScaleContents(child_element, compu_scale)
+
+    def setCompuConst(self, element: ET.Element, key: str, compu_const: CompuConst):
+        if compu_const is not None:
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, compu_const)
+            self.setCompuConstContent(child_element, compu_const.getCompuConstContentType())
+
+    def setCompu(self, element: ET.Element, key: str, compu: Compu):
+        if  compu is not None:
+            child_element = ET.SubElement(element, key)
+            self.setARObjectAttributes(child_element, compu)
+            self.setCompuScales(child_element, compu.getCompuContent())
+            self.setCompuConst(child_element, "COMPU-DEFAULT-VALUE", compu.getCompuDefaultValue())
+
+    def setCompuMethod(self, element: ET.Element, compu_method: CompuMethod):
+        child_element = ET.SubElement(element, "COMPU-METHOD")
+        self.logger.debug("write CompuMethods %s" % compu_method.getShortName())
+        self.setIdentifiable(child_element, compu_method)
+        self.setChildElementOptionalRefType(child_element, "UNIT-REF", compu_method.getUnitRef())
+        self.setCompu(child_element, "COMPU-INTERNAL-TO-PHYS", compu_method.getCompuInternalToPhys())
+        self.setCompu(child_element, "COMPU-PHYS-TO-INTERNAL", compu_method.getCompuPhysToInternal())
 
     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:
@@ -816,34 +864,35 @@ 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")
         self.setIdentifiable(spec_tag, spec)
 
         if spec.getValueSpec() is not None:
-            value_spec_tag = ET.SubElement(spec_tag, "VALUE-SPEC")
-            self.setValueSpecification(value_spec_tag, spec.getValueSpec())
+            self.setValueSpecification(spec_tag, "VALUE-SPEC", spec.getValueSpec())
                 
     def setInternalConstrs(self, element: ET.Element, constrs: InternalConstrs):
         if constrs is not None:
             constrs_tag = ET.SubElement(element, "INTERNAL-CONSTRS")
             self.setARObjectAttributes(constrs_tag, constrs)
             if constrs.lower_limit is not None:
-                self.writeChildLimitElement(constrs_tag, "LOWER-LIMIT", constrs.lower_limit)
+                self.setChildLimitElement(constrs_tag, "LOWER-LIMIT", constrs.lower_limit)
             if constrs.upper_limit is not None:
-                self.writeChildLimitElement(constrs_tag, "UPPER-LIMIT", constrs.upper_limit)
+                self.setChildLimitElement(constrs_tag, "UPPER-LIMIT", constrs.upper_limit)
 
     def setPhysConstrs(self, element: ET.Element, constrs: PhysConstrs):
         if constrs is not None:
             child_element = ET.SubElement(element, "PHYS-CONSTRS")
             self.setARObjectAttributes(child_element, constrs)
             if constrs.lower_limit is not None:
-                self.writeChildLimitElement(child_element, "LOWER-LIMIT", constrs.lower_limit)
+                self.setChildLimitElement(child_element, "LOWER-LIMIT", constrs.lower_limit)
             if constrs.upper_limit is not None:
-                self.writeChildLimitElement(child_element, "UPPER-LIMIT", constrs.upper_limit)
+                self.setChildLimitElement(child_element, "UPPER-LIMIT", constrs.upper_limit)
             self.setChildElementOptionalRefType(child_element, "UNIT-REF", constrs.unit_ref)
                 
     def writeDataConstrRules(self, element: ET.Element, parent: DataConstr):
@@ -863,7 +912,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeDataConstrRules(child_element, constr) 
 
     def writeUnit(self, element: ET.Element, unit: Unit):
-        self.logger.debug("writeUnit %s" % unit.short_name)
+        self.logger.debug("writeUnit %s" % unit.getShortName())
         child_element = ET.SubElement(element, "UNIT")
         self.setIdentifiable(child_element, unit)
         self.setChildElementOptionalLiteral(child_element, "DISPLAY-NAME", unit.getDisplayName())
@@ -873,15 +922,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)
@@ -896,7 +948,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:
@@ -935,6 +988,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:
@@ -953,8 +1012,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()
@@ -990,6 +1051,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())
@@ -1007,9 +1069,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setIdentifiable(child_element, access)
         self.setAutosarVariableRef(child_element, access.getAccessedVariableRef())
 
-    def writeDataReadAccesses(self, element: ET.Element, entity: RunnableEntity):
-        #accesses = entity.getDataReadAccesses():
-        pass
+    
 
     def setAutosarParameterRef(self, element: ET.Element, key: str, parameter_ref: AutosarParameterRef):
         if parameter_ref is not None:
@@ -1042,12 +1102,19 @@ class ARXMLWriter(AbstractARXMLWriter):
             for point in points:
                 self.setVariableAccess(child_element, point)
 
+    def writeDataReadAccesses(self, element: ET.Element, entity: RunnableEntity):
+        accesses = entity.getDataReadAccesses()
+        if len(accesses) > 0:
+            child_element = ET.SubElement(element, "DATA-READ-ACCESSS")
+            for access in accesses:
+                self.setVariableAccess(child_element, access)
+
     def writeDataWriteAccesses(self, element: ET.Element, entity: RunnableEntity):
-        points = entity.getDataWriteAccesses()
-        if len(points) > 0:
+        accesses = entity.getDataWriteAccesses()
+        if len(accesses) > 0:
             child_element = ET.SubElement(element, "DATA-WRITE-ACCESSS")
-            for point in points:
-                self.setVariableAccess(child_element, point)
+            for access in accesses:
+                self.setVariableAccess(child_element, access)
 
     def writeReadLocalVariables(self, element: ET.Element, entity: RunnableEntity):
         variables = entity.getReadLocalVariables()
@@ -1059,8 +1126,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())
@@ -1071,6 +1139,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:
@@ -1078,6 +1151,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))
 
@@ -1130,15 +1205,26 @@ 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.writeDataReadAccesses(child_element, entity)
             self.writeDataReceivePointByArguments(child_element, entity)
             self.writeDataSendPoints(child_element, entity)
             self.writeDataWriteAccesses(child_element, entity)
@@ -1157,7 +1243,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()
@@ -1176,34 +1262,32 @@ 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.setValueSpecification(child_element, "INIT-VALUE", 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")
             for prototype in prototypes:
                 self.writeParameterDataPrototype(child_element, prototype)
 
-    def writePortDefinedArgumentValues(self, element: ET.Element, option: PortAPIOption) :
-        argument_values = option.getPortArgValues()
+    def writePortDefinedArgumentValues(self, element: ET.Element, argument_values: List[PortDefinedArgumentValue]) :
         if len(argument_values) > 0:
             child_element = ET.SubElement(element, "PORT-ARG-VALUES")
             for argument_value in argument_values:
                 child_element = ET.SubElement(child_element, "PORT-DEFINED-ARGUMENT-VALUE")
-                if argument_value.value is not None:
-                    value_tag = ET.SubElement(child_element, "VALUE")
-                    self.setValueSpecification(value_tag, argument_value.value)
-                self.setChildElementOptionalRefType(child_element, "VALUE-TYPE-TREF", argument_value.valueTypeTRef)
+                if argument_value.getValue() is not None:
+                    self.setValueSpecification(child_element, "VALUE", argument_value.getValue())
+                self.setChildElementOptionalRefType(child_element, "VALUE-TYPE-TREF", argument_value.getValueTypeTRef())
 
     def writePortAPIOptions(self, element: ET.Element, behavior: SwcInternalBehavior):
         options = behavior.getPortAPIOptions()
@@ -1211,19 +1295,36 @@ class ARXMLWriter(AbstractARXMLWriter):
             port_api_options_tag = ET.SubElement(element, "PORT-API-OPTIONS")
             for option in options:
                 child_element = ET.SubElement(port_api_options_tag, "PORT-API-OPTION")
-                self.setChildElementOptionalBooleanValue(child_element, "ENABLE-TAKE-ADDRESS", option.enableTakeAddress)
-                self.setChildElementOptionalBooleanValue(child_element, "INDIRECT-API", option.indirectAPI)
-                self.writePortDefinedArgumentValues(child_element, option)
-                self.setChildElementOptionalRefType(child_element, "PORT-REF", option.portRef)
+                self.setChildElementOptionalBooleanValue(child_element, "ENABLE-TAKE-ADDRESS", option.getEnableTakeAddress())
+                self.setChildElementOptionalLiteral(child_element, "ERROR-HANDLING", option.getErrorHandling())
+                self.setChildElementOptionalBooleanValue(child_element, "INDIRECT-API", option.getIndirectAPI())
+                self.writePortDefinedArgumentValues(child_element, option.getPortArgValues())
+                self.setChildElementOptionalRefType(child_element, "PORT-REF", option.getPortRef())
+
+    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")
@@ -1252,20 +1353,81 @@ 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.getShortName())
+        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.getShortName())
+        self.setIdentifiable(child_element, needs)
+        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.getShortName())
+        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.getShortName())
+        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.getShortName())
+        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.getShortName())
+        self.setIdentifiable(child_element, needs)
+        self.setChildElementOptionalPositiveInteger(child_element, "MAXIMUM-KEY-LENGTH", needs.getMaximumKeyLength())
+
+    def writeEcuStateMgrUserNeeds(self, element: ET.Element, needs: EcuStateMgrUserNeeds):
+        child_element = ET.SubElement(element, "ECU-STATE-MGR-USER-NEEDS")
+        self.logger.debug("write EcuStateMgrUserNeeds %s" % needs.getShortName())
         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)      
 
     def writeSwcServiceDependencyServiceNeeds(self, element: ET.Element, parent: SwcServiceDependency):
         needs = parent.getServiceNeeds()
@@ -1273,7 +1435,19 @@ 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)
+                elif isinstance(need, EcuStateMgrUserNeeds):
+                    self.writeEcuStateMgrUserNeeds(child_element, need)
                 else:
                     self._raiseError("Unsupported service needs <%s>" % type(need))                  
 
@@ -1307,20 +1481,20 @@ class ARXMLWriter(AbstractARXMLWriter):
                         self.setChildElementOptionalRefType(data_type_refs_tag, "DATA-TYPE-REF", type_ref)
 
     def writeSwcInternalBehavior(self, element: ET.Element, behavior: SwcInternalBehavior):
-        self.logger.debug("writeSwInternalBehavior %s" % behavior.short_name)
+        self.logger.debug("writeSwInternalBehavior %s" % behavior.getShortName())
 
         child_element = ET.SubElement(element, "SWC-INTERNAL-BEHAVIOR")
         self.writeInternalBehavior(child_element, behavior)
         self.writeRTEEvents(child_element, behavior)
         self.writeExplicitInterRunnableVariables(child_element, behavior)
-        self.setChildElementOptionalLiteral(child_element, "HANDLE-TERMINATION-AND-RESTART", behavior.handle_termination_and_restart)
+        self.setChildElementOptionalLiteral(child_element, "HANDLE-TERMINATION-AND-RESTART", behavior.handleTerminationAndRestart)
         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)
-        self.setChildElementOptionalBooleanValue(child_element, "SUPPORTS-MULTIPLE-INSTANTIATION", behavior.supports_multiple_instantiation)
+        self.setChildElementOptionalBooleanValue(child_element, "SUPPORTS-MULTIPLE-INSTANTIATION", behavior.supportsMultipleInstantiation)
 
     def writeAtomicSwComponentTypeInternalBehaviors(self, element: ET.Element, behavior: InternalBehavior):
         if behavior is not None:
@@ -1335,7 +1509,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeAtomicSwComponentTypeInternalBehaviors(element, sw_component.internal_behavior)
 
     def writeComplexDeviceDriverSwComponentType(self, element: ET.Element, sw_component: ComplexDeviceDriverSwComponentType):
-        self.logger.debug("writeComplexDeviceDriverSwComponentType %s" % sw_component.short_name)
+        self.logger.debug("writeComplexDeviceDriverSwComponentType %s" % sw_component.getShortName())
         child_element = ET.SubElement(element, "COMPLEX-DEVICE-DRIVER-SW-COMPONENT-TYPE")
         self.writeAtomicSwComponentType(child_element, sw_component)
 
@@ -1351,7 +1525,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalLiteral(artifact_desc_tag, "CATEGORY", artifact_desc.category)
 
     def setCode(self, element: ET.SubElement, code_desc: Code):
-        self.logger.debug("setCode %s" % code_desc.short_name)
+        self.logger.debug("setCode %s" % code_desc.getShortName())
         child_element = ET.SubElement(element, "CODE")
         self.setIdentifiable(child_element, code_desc)
         self.writeArtifactDescriptor(child_element, code_desc)
@@ -1379,18 +1553,39 @@ 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 setStackUsage(self, element: ET.Element, usage: StackUsage):
+        self.logger.debug("Write StackUsage %s" % usage.getShortName())
+        self.setIdentifiable(element, usage)
+
+    def setRoughEstimateStackUsage(self, element: ET.Element, usage: RoughEstimateStackUsage):
+        if usage is not None:
+            child_element = ET.SubElement(element, "ROUGH-ESTIMATE-STACK-USAGE")
+            self.setStackUsage(child_element, usage)
+            self.setChildElementOptionalPositiveInteger(child_element, "MEMORY-CONSUMPTION", usage.getMemoryConsumption())
+
+    def writeStackUsages(self, element: ET.Element, usages: List[StackUsage]):
+        if len(usages) > 0:
+            child_element = ET.SubElement(element, "STACK-USAGES")
+            for usage in usages:
+                if isinstance(usage, RoughEstimateStackUsage):
+                    self.setRoughEstimateStackUsage(child_element, usage)
+                else:
+                    self.notImplemented("Unsupported Stack Usages: <%s>" % type(usage))
 
     def setResourceConsumption(self, element: ET.Element, consumption: ResourceConsumption):
         if consumption is not None:
             child_element = ET.SubElement(element, "RESOURCE-CONSUMPTION")
             self.setIdentifiable(child_element, consumption)
             self.writeMemorySections(child_element, consumption)
+            self.writeStackUsages(child_element, consumption.getStackUsages())
 
     def writeImplementation(self, element: ET.Element, impl: Implementation):
         self.setIdentifiable(element, impl)
@@ -1403,7 +1598,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalNumericalValue(element, "VENDOR-ID", impl.getVendorId())
 
     def writeSwcImplementation(self, element: ET.Element, impl: SwcImplementation):
-        self.logger.debug("writeSwcImplementation %s" % impl.short_name)
+        self.logger.debug("writeSwcImplementation %s" % impl.getShortName())
         child_element = ET.SubElement(element, "SWC-IMPLEMENTATION")
         self.writeImplementation(child_element, impl)
         self.setChildElementOptionalRefType(child_element, "BEHAVIOR-REF", impl.getBehaviorRef())
@@ -1469,21 +1664,21 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setEndToEndProtection(child_element, protection)
 
     def writeEndToEndProtectionSet(self, element: ET.Element, protection_set: EndToEndProtectionSet):
-        self.logger.debug("writeEndToEndProtectionSet %s" % protection_set.short_name)
+        self.logger.debug("writeEndToEndProtectionSet %s" % protection_set.getShortName())
         child_element = ET.SubElement(element, "END-TO-END-PROTECTION-SET")
         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)
+        self.logger.debug("writeVariableDataPrototype %s" % prototype.getShortName())
         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.setInitValue(child_element, prototype.initValue)
+        self.setAutosarDataPrototype(child_element, prototype)
+        self.setValueSpecification(child_element, "INIT-VALUE", prototype.getInitValue())
 
     def writeSenderReceiverInterfaceDataElements(self, element: ET.Element, sr_interface: SenderReceiverInterface):
         data_elements = sr_interface.getDataElements()
@@ -1505,11 +1700,12 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalLiteral(child_element, "HANDLE-INVALID", policy.getHandleInvalid())
 
     def writeSenderReceiverInterface(self, element: ET.Element, sr_interface: SenderReceiverInterface):
-        self.logger.debug("writeSenderReceiverInterface %s" % sr_interface.short_name)
+        self.logger.debug("writeSenderReceiverInterface %s" % sr_interface.getShortName())
         child_element = ET.SubElement(element, "SENDER-RECEIVER-INTERFACE")
         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()
@@ -1558,15 +1754,22 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeBswModuleEntityManagedModeGroup(element, entity)
 
     def setBswCalledEntity(self, element: ET.Element, entity: BswCalledEntity):
-        self.logger.debug("setBswCalledEntity %s" % entity.short_name)
+        self.logger.debug("setBswCalledEntity %s" % entity.getShortName())
         child_element = ET.SubElement(element, "BSW-CALLED-ENTITY")
         self.setBswModuleEntity(child_element, entity)
 
     def setBswSchedulableEntity(self, element: ET.Element, entity: BswSchedulableEntity):
-        self.logger.debug("setBswCalledEntity %s" % entity.short_name)
+        self.logger.debug("set BswSchedulableEntity %s" % entity.getShortName())
         child_element = ET.SubElement(element, "BSW-SCHEDULABLE-ENTITY")
         self.setBswModuleEntity(child_element, entity)
 
+    def setBswInterruptEntity(self, element: ET.Element, entity: BswInterruptEntity):
+        self.logger.debug("read BswInterruptEntity %s" % entity.getShortName())
+        child_element = ET.SubElement(element, "BSW-INTERRUPT-ENTITY")
+        self.setBswModuleEntity(child_element, entity)
+        self.setChildElementOptionalLiteral(child_element, "INTERRUPT-CATEGORY", entity.getInterruptCategory())
+        self.setChildElementOptionalLiteral(child_element, "INTERRUPT-SOURCE", entity.getInterruptSource())
+
     def writeBswInternalBehaviorBswModuleEntities(self, element: ET.Element, parent: BswInternalBehavior):
         entities = parent.getBswModuleEntities()    
         if len(entities) > 0:
@@ -1576,8 +1779,10 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setBswCalledEntity(child_element, entity)
                 elif isinstance(entity, BswSchedulableEntity):
                     self.setBswSchedulableEntity(child_element, entity)
+                elif isinstance(entity, BswInterruptEntity):
+                    self.setBswInterruptEntity(child_element, entity)
                 else:
-                    self._raiseError("Unsupported BswModuleEntity <%s>" % type(entity))
+                    self.notImplemented("Unsupported BswModuleEntity <%s>" % type(entity))
 
     def setBswEvent(self, element: ET.Element, event: BswEvent):
         self.setIdentifiable(element, event)
@@ -1587,10 +1792,10 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setBswEvent(element, event)
 
     def setBswTimingEvent(self, element: ET.Element, event: BswTimingEvent):
-        self.logger.debug("setBswTimingEvent %s" % event.short_name)
+        self.logger.debug("setBswTimingEvent %s" % event.getShortName())
         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()
@@ -1645,10 +1850,10 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self._raiseError("Unsupported BswInternalBehavior <%s>" % type(behavior))
 
     def writeBswModuleDescription(self, element: ET.Element, desc: BswModuleDescription):
-        self.logger.debug("writeBswModuleDescription %s" % desc.short_name)
+        self.logger.debug("writeBswModuleDescription %s" % desc.getShortName())
         child_element = ET.SubElement(element, "BSW-MODULE-DESCRIPTION")
         self.setIdentifiable(child_element, desc)
-        self.setChildElementOptionalNumericalValue(child_element, "MODULE-ID", desc.module_id)
+        self.setChildElementOptionalNumericalValue(child_element, "MODULE-ID", desc.getModuleId())
         self.writerBswModuleDescriptionImplementedEntry(child_element, desc)
         self.writeProvidedModeGroup(child_element, desc)
         #self.readRequiredModeGroup(element, bsw_module_description)
@@ -1662,22 +1867,37 @@ class ARXMLWriter(AbstractARXMLWriter):
                 child_element = ET.SubElement(mode_groups_tag, "MODE-DECLARATION-GROUP-PROTOTYPE-REF-CONDITIONAL")
                 self.setChildElementOptionalRefType(child_element, "MODE-DECLARATION-GROUP-PROTOTYPE-REF", mode_group_ref)
 
+    def setSwServiceArg(self, element: ET.Element, arg: SwServiceArg):
+        self.logger.debug("Set SwServiceArg <%s>" % arg.getShortName())
+        if arg is not None:
+            child_element = ET.SubElement(element, "SW-SERVICE-ARG")
+            self.setIdentifiable(child_element, arg)
+            self.setChildElementOptionalLiteral(child_element, "DIRECTION", arg.getDirection())
+            self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", arg.getSwDataDefProps())
+
+    def writeBswModuleEntryArguments(self, element: ET.Element, entry: BswModuleEntry):
+        arguments = entry.getArguments()
+        if len(arguments) > 0:
+            child_element = ET.SubElement(element, "ARGUMENTS")
+            for argument in arguments:
+                self.setSwServiceArg(child_element, argument)
+
     def writeBswModuleEntry(self, element: ET.Element, entry: BswModuleEntry):
-        self.logger.debug("writeBswModuleDescription %s" % entry.short_name)
+        self.logger.debug("writeBswModuleDescription %s" % entry.getShortName())
         child_element = ET.SubElement(element, "BSW-MODULE-ENTRY")
         self.setIdentifiable(child_element, entry)
-        self.setChildElementOptionalNumericalValue(child_element, "SERVICE-ID", entry.service_id)
-        self.setChildElementOptionalBooleanValue(child_element, "IS-REENTRANT", entry.is_reentrant)
-        self.setChildElementOptionalBooleanValue(child_element, "IS-SYNCHRONOUS", entry.is_synchronous)
-        self.setChildElementOptionalLiteral(child_element, "CALL-TYPE", entry.call_type)
-        self.setChildElementOptionalLiteral(child_element, "EXECUTION-CONTEXT", entry.execution_context)
-        self.setChildElementOptionalLiteral(child_element, "SW-SERVICE-IMPL-POLICY", entry.sw_service_impl_policy)
-        
+        self.setChildElementOptionalNumericalValue(child_element, "SERVICE-ID", entry.getServiceId())
+        self.setChildElementOptionalBooleanValue(child_element, "IS-REENTRANT", entry.getIsReentrant())
+        self.setChildElementOptionalBooleanValue(child_element, "IS-SYNCHRONOUS", entry.getIsSynchronous())
+        self.setChildElementOptionalLiteral(child_element, "CALL-TYPE", entry.getCallType())
+        self.setChildElementOptionalLiteral(child_element, "EXECUTION-CONTEXT", entry.getExecutionContext())
+        self.setChildElementOptionalLiteral(child_element, "SW-SERVICE-IMPL-POLICY", entry.getSwServiceImplPolicy())
+        self.writeBswModuleEntryArguments(child_element, entry)
 
     def setSwcBswRunnableMapping(self, element: ET.SubElement, mapping: SwcBswRunnableMapping):
         child_element = ET.SubElement(element, "SWC-BSW-RUNNABLE-MAPPING")
-        self.setChildElementOptionalRefType(child_element, "BSW-ENTITY-REF", mapping.bswEntityRef)
-        self.setChildElementOptionalRefType(child_element, "SWC-RUNNABLE-REF", mapping.swcRunnableRef)
+        self.setChildElementOptionalRefType(child_element, "BSW-ENTITY-REF", mapping.getBswEntityRef())
+        self.setChildElementOptionalRefType(child_element, "SWC-RUNNABLE-REF", mapping.getSwcRunnableRef())
 
     def writeSwcBswRunnableMappings(self, element: ET.Element, parent: SwcBswMapping):
         runnable_mappings = parent.getRunnableMappings()
@@ -1690,12 +1910,12 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self._raiseError("Unsupported Runnable Mapping <%s>" % type(mapping))
 
     def setSwcBswMapping(self, element: ET.Element, mapping: SwcBswMapping):
-        self.logger.debug("writeBswModuleDescription %s" % mapping.short_name)
+        self.logger.debug("writeBswModuleDescription %s" % mapping.getShortName())
         child_element = ET.SubElement(element, "SWC-BSW-MAPPING")
         self.setIdentifiable(child_element, mapping)
-        self.setChildElementOptionalRefType(child_element, "BSW-BEHAVIOR-REF", mapping.bswBehaviorRef)
+        self.setChildElementOptionalRefType(child_element, "BSW-BEHAVIOR-REF", mapping.getBswBehaviorRef())
         self.writeSwcBswRunnableMappings(child_element, mapping)
-        self.setChildElementOptionalRefType(child_element, "SWC-BEHAVIOR-REF", mapping.swcBehaviorRef)
+        self.setChildElementOptionalRefType(child_element, "SWC-BEHAVIOR-REF", mapping.getSwcBehaviorRef())
 
     def writeEngineeringObject(self, element: ET.Element, engineering_obj: EngineeringObject):
         self.setARObjectAttributes(element, engineering_obj)
@@ -1726,7 +1946,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self.setChildElementOptionalRefType(child_element, "VENDOR-SPECIFIC-MODULE-DEF-REF", ref)
 
     def writeBswImplementation(self, element: ET.Element, impl: BswImplementation):
-        self.logger.debug("writeBswModuleDescription %s" % impl.short_name)
+        self.logger.debug("writeBswModuleDescription %s" % impl.getShortName())
         child_element = ET.SubElement(element, "BSW-IMPLEMENTATION")
         self.writeImplementation(child_element, impl)
         self.setChildElementOptionalLiteral(child_element, "AR-RELEASE-VERSION", impl.getArReleaseVersion())
@@ -1741,13 +1961,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)
+        self.logger.debug("writeImplementationDataType %s" % data_type.getShortName())
         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())
 
@@ -1761,7 +1984,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setSwDataDefProps(child_element, "SW-DATA-DEF-PROPS", prototype.swDataDefProps)
                 self.setChildElementOptionalRefType(child_element, "TYPE-TREF", prototype.typeTRef)
                 self.setChildElementOptionalLiteral(child_element, "DIRECTION", prototype.direction)
-                self.setChildElementOptionalLiteral(child_element, "SERVER-ARGUMENT-IMPL-POLICY", prototype.server_argument_impl_policy)
+                self.setChildElementOptionalLiteral(child_element, "SERVER-ARGUMENT-IMPL-POLICY", prototype.serverArgumentImplPolicy)
 
     def writePossibleErrorRefs(self, element: ET.Element, parent: ClientServerOperation):
         error_refs = parent.getPossbileErrorRefs()
@@ -1771,7 +1994,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(error_refs_tag, "POSSIBLE-ERROR-REF", error_ref)
 
     def writeClientServerOperation(self, element: ET.Element, operation: ClientServerOperation):
-        self.logger.debug("writeClientServerOperation %s" % operation.short_name)
+        self.logger.debug("writeClientServerOperation %s" % operation.getShortName())
         child_element = ET.SubElement(element, "CLIENT-SERVER-OPERATION")
         self.setIdentifiable(child_element, operation)
         self.writeArgumentDataPrototypes(child_element, operation)
@@ -1788,7 +2011,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self._raiseError("Unsupported Operation <%s>" % type(operation))
 
     def writeApplicationError(self, element: ET.Element, error: ApplicationError):
-        self.logger.debug("writeApplicationError %s" % error.short_name)
+        self.logger.debug("writeApplicationError %s" % error.getShortName())
         child_element = ET.SubElement(element, "APPLICATION-ERROR")
         self.setIdentifiable(child_element, error)
         self.setChildElementOptionalNumericalValue(child_element, "ERROR-CODE", error.error_code)
@@ -1808,20 +2031,33 @@ 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.getShortName())
+        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)
+        self.logger.debug("writeClientServerInterface %s" % cs_interface.getShortName())
         child_element = ET.SubElement(element, "CLIENT-SERVER-INTERFACE")
         self.setPortInterface(child_element, cs_interface)
         self.writeOperations(child_element, cs_interface)
         self.writePossibleErrors(child_element, cs_interface)
 
     def writeApplicationSwComponentType(self, element: ET.Element, sw_component: ApplicationSwComponentType):
-        self.logger.debug("writeApplicationSwComponentType %s" % sw_component.short_name)
+        self.logger.debug("writeApplicationSwComponentType %s" % sw_component.getShortName())
         child_element = ET.SubElement(element, "APPLICATION-SW-COMPONENT-TYPE")
         self.writeAtomicSwComponentType(child_element, sw_component)
 
     def writeEcuAbstractionSwComponentType(self, element: ET.Element, sw_component: EcuAbstractionSwComponentType):
-        self.logger.debug("writeEcuAbstractionSwComponentType %s" % sw_component.short_name)
+        self.logger.debug("writeEcuAbstractionSwComponentType %s" % sw_component.getShortName())
         child_element = ET.SubElement(element, "ECU-ABSTRACTION-SW-COMPONENT-TYPE")
         self.writeAtomicSwComponentType(child_element, sw_component)
 
@@ -1833,49 +2069,59 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalNumericalValue(child_element, "MAX-NUMBER-OF-ELEMENTS", prototype.maxNumberOfElements)
 
     def writeApplicationArrayDataType(self, element: ET.Element, data_type: ApplicationArrayDataType):
-        self.logger.debug("writeApplicationArrayDataType %s" % data_type.short_name)
+        self.logger.debug("writeApplicationArrayDataType %s" % data_type.getShortName())
         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)
+        self.logger.debug("writeSwRecordLayout %s" % layout.getShortName())
         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")
+        self.logger.debug("writeSwAddrMethod %s" % method.getShortName())
+        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")
+        self.logger.debug("writeTriggerInterface %s" % trigger_if.getShortName())
+        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)
+        self.logger.debug("writeServiceSwComponentType %s" % sw_component.getShortName())
         child_element = ET.SubElement(element, "SERVICE-SW-COMPONENT-TYPE")
         self.writeAtomicSwComponentType(child_element, sw_component)
 
@@ -1886,8 +2132,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()
@@ -1896,11 +2142,11 @@ 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)
+        self.logger.debug("writeDataTypeMappingSet %s" % mapping_set.getShortName())
         child_element = ET.SubElement(element, "DATA-TYPE-MAPPING-SET")
         self.setIdentifiable(child_element, mapping_set)
         self.writeDataTypeMaps(child_element, mapping_set)
@@ -1919,10 +2165,10 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setModeDeclaration(child_element, mode_declaration)
 
     def writeModeDeclarationGroup(self, element: ET.Element, group: ModeDeclarationGroup):
-        self.logger.debug("writeModeDeclarationGroup %s" % group.short_name)
+        self.logger.debug("writeModeDeclarationGroup %s" % group.getShortName())
         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())
 
@@ -1935,7 +2181,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setChildElementOptionalRefType(child_element, "TYPE-TREF", mode_group.type_tref)
 
     def writeModeSwitchInterface(self, element: ET.Element, mode_interface: ModeSwitchInterface):
-        self.logger.debug("writeModeSwitchInterface %s" % mode_interface.short_name)
+        self.logger.debug("writeModeSwitchInterface %s" % mode_interface.getShortName())
         child_element = ET.SubElement(element, "MODE-SWITCH-INTERFACE")
         self.setPortInterface(child_element, mode_interface)
         self.writeModeSwitchInterfaceModeGroup(child_element, mode_interface)
@@ -1962,7 +2208,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self._raiseError("Unsupported order element <%s>" % type(order_element))
 
     def writeExecutionOrderConstraint(self, element: ET.Element, constraint: ExecutionOrderConstraint):
-        self.logger.debug("writeExecutionOrderConstraint %s" % constraint.short_name)
+        self.logger.debug("writeExecutionOrderConstraint %s" % constraint.getShortName())
         child_element = ET.SubElement(element, "EXECUTION-ORDER-CONSTRAINT")
         self.setIdentifiable(child_element, constraint)
         self.writeExecutionOrderConstraintOrderedElement(child_element, constraint)
@@ -1981,7 +2227,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeTimingRequirements(element, extension)
 
     def writeSwcTiming(self, element: ET.Element, timing: SwcTiming):
-        self.logger.debug("writeSWcTiming %s" % timing.short_name)
+        self.logger.debug("writeSWcTiming %s" % timing.getShortName())
         child_element = ET.SubElement(element, "SWC-TIMING")
         self.setIdentifiable(child_element, timing)
         self.writeTimingExtension(child_element, timing)
@@ -2003,7 +2249,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writePduToFrameMappings(element, frame)
 
     def writeLinUnconditionalFrame(self, element: ET.Element, frame: LinUnconditionalFrame):
-        self.logger.debug("LinUnconditionalFrame %s" % frame.short_name)
+        self.logger.debug("LinUnconditionalFrame %s" % frame.getShortName())
         child_element = ET.SubElement(element, "LIN-UNCONDITIONAL-FRAME")
         self.writeFrame(child_element, frame)
 
@@ -2025,7 +2271,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(refs_tag, "TX-NM-PDU-REF", ref)
 
     def writeCanNmNode(self, element: ET.Element, nm_node: CanNmNode):
-        self.logger.debug("writeCanNmNode %s" % nm_node.short_name)
+        self.logger.debug("writeCanNmNode %s" % nm_node.getShortName())
         child_element = ET.SubElement(element, "CAN-NM-NODE")
         self.setIdentifiable(child_element, nm_node)
         self.writeNmNode(child_element, nm_node)
@@ -2074,7 +2320,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalBooleanValue(element, "NM-SYNCHRONIZING-NETWORK", cluster.getNmSynchronizingNetwork())
 
     def writeCanNmCluster(self, element: ET.Element, cluster: CanNmCluster):
-        self.logger.debug("WriteCanNmCluster %s" % cluster.short_name)
+        self.logger.debug("WriteCanNmCluster %s" % cluster.getShortName())
         child_element = ET.SubElement(element, "CAN-NM-CLUSTER")
         self.setIdentifiable(child_element, cluster)
         self.writeNmCluster(child_element, cluster)
@@ -2105,20 +2351,20 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self._raiseError("Unsupported Nm Cluster <%s>" % type(cluster))
 
     def writeNmConfig(self, element: ET.Element, config: NmConfig):
-        self.logger.debug("WriteNmConfig %s" % config.short_name)
+        self.logger.debug("WriteNmConfig %s" % config.getShortName())
         child_element = ET.SubElement(element, "NM-CONFIG")
         self.setIdentifiable(child_element, config)
         self.writeNmConfigNmClusters(child_element, config)
         self.writeNmConfigNmClusterCouplings(child_element, config)
 
     def writeNmPdu(self, element: ET.Element, pdu: NmPdu):
-        self.logger.debug("NmPdu %s" % pdu.short_name)
+        self.logger.debug("NmPdu %s" % pdu.getShortName())
         child_element = ET.SubElement(element, "NM-PDU")
         self.setIdentifiable(child_element, pdu)
         self.writeIPdu(child_element, pdu)
 
     def writeNPdu(self, element: ET.Element, pdu: NPdu):
-        self.logger.debug("NPdu %s" % pdu.short_name)
+        self.logger.debug("NPdu %s" % pdu.getShortName())
         child_element = ET.SubElement(element, "N-PDU")
         self.setIdentifiable(child_element, pdu)
         self.writeIPdu(child_element, pdu)
@@ -2127,20 +2373,20 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalLiteral(element, "LENGTH", pdu.getLength())
 
     def writeDcmIPdu(self, element: ET.Element, pdu: DcmIPdu):
-        self.logger.debug("DcmIPdu %s" % pdu.short_name)
+        self.logger.debug("DcmIPdu %s" % pdu.getShortName())
         child_element = ET.SubElement(element, "DCM-I-PDU")
         self.setIdentifiable(child_element, pdu)
         self.writeIPdu(child_element, pdu)
         self.setChildElementOptionalLiteral(child_element, "DIAG-PDU-TYPE", pdu.getDiagPduType())
 
     def writeSecuredIPdu(self, element: ET.Element, pdu: DcmIPdu):
-        self.logger.debug("SecuredIPdu %s" % pdu.short_name)
+        self.logger.debug("SecuredIPdu %s" % pdu.getShortName())
         child_element = ET.SubElement(element, "SECURED-I-PDU")
         self.setIdentifiable(child_element, pdu)
         self.writeIPdu(child_element, pdu)
 
     def writeCanTpConfig(self, element: ET.Element, config: CanTpConfig):
-        self.logger.debug("CanTpConfig %s" % config.short_name)
+        self.logger.debug("CanTpConfig %s" % config.getShortName())
         child_element = ET.SubElement(element, "CAN-TP-CONFIG")
         self.setIdentifiable(child_element, config)
 
@@ -2226,7 +2472,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:
@@ -2235,7 +2481,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:
@@ -2244,16 +2490,16 @@ 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)
+        self.logger.debug("CanPhysicalChannel %s" % channel.getShortName())
         child_element = ET.SubElement(element, "CAN-PHYSICAL-CHANNEL")
         self.setIdentifiable(child_element, channel)
         self.writePhysicalChannel(child_element, channel)
 
     def writeLinPhysicalChannel(self, element: ET.Element, channel: LinPhysicalChannel):
-        self.logger.debug("LinPhysicalChannel %s" % channel.short_name)
+        self.logger.debug("LinPhysicalChannel %s" % channel.getShortName())
         child_element = ET.SubElement(element, "LIN-PHYSICAL-CHANNEL")
         self.setIdentifiable(child_element, channel)
         self.writePhysicalChannel(child_element, channel)
@@ -2268,7 +2514,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())
@@ -2281,7 +2527,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalNumericalValue(element, "SPEED", cluster.getSpeed())
 
     def writeLinCluster(self, element: ET.Element, cluster: LinCluster):
-        self.logger.debug("LinCluster %s" % cluster.short_name)
+        self.logger.debug("LinCluster %s" % cluster.getShortName())
         child_element = ET.SubElement(element, "LIN-CLUSTER")
         self.setIdentifiable(child_element, cluster)
         child_element = ET.SubElement(child_element, "LIN-CLUSTER-VARIANTS")
@@ -2289,7 +2535,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeCommunicationCluster(child_element, cluster)
 
     def writeCanCluster(self, element: ET.Element, cluster: CanCluster):
-        self.logger.debug("CanCluster %s" % cluster.short_name)
+        self.logger.debug("CanCluster %s" % cluster.getShortName())
         child_element = ET.SubElement(element, "CAN-CLUSTER")
         self.setIdentifiable(child_element, cluster)
 
@@ -2299,7 +2545,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.readAbstractCanCluster(child_element, cluster)
 
     def writeCanFrame(self, element: ET.Element, frame: CanFrame):
-        self.logger.debug("Write CanFrame %s" % frame.short_name)
+        self.logger.debug("Write CanFrame %s" % frame.getShortName())
         child_element = ET.SubElement(element, "CAN-FRAME")
         self.writeFrame(child_element, frame)
 
@@ -2371,7 +2617,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                     self._raiseError("Unsupported Communication connector <%s>" % type(connector))
 
     def writeEcuInstance(self, element: ET.Element, instance: EcuInstance):
-        self.logger.debug("EcuInstance %s" % instance.short_name)
+        self.logger.debug("EcuInstance %s" % instance.getShortName())
         child_element = ET.SubElement(element, "ECU-INSTANCE")
         self.setIdentifiable(child_element, instance)
         self.setChildElementOptionalTimeValue(child_element, "COM-CONFIGURATION-GW-TIME-BASE", instance.getComConfigurationGwTimeBase())
@@ -2384,7 +2630,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalBooleanValue(child_element, "WAKE-UP-OVER-BUS-SUPPORTED", instance.getWakeUpOverBusSupported())
 
     def writeSystemSignalGroup(self, element: ET.Element, group: SystemSignalGroup):
-        self.logger.debug("Write SystemSignalGroup %s" % group.short_name)
+        self.logger.debug("Write SystemSignalGroup %s" % group.getShortName())
         child_element = ET.SubElement(element, "SYSTEM-SIGNAL-GROUP")
         self.setIdentifiable(child_element, group)
         signal_refs = group.getSystemSignalRefs()
@@ -2395,6 +2641,7 @@ class ARXMLWriter(AbstractARXMLWriter):
 
     def setSenderReceiverToSignalMapping(self, element: ET.Element, mapping: SenderReceiverToSignalMapping):
         child_element = ET.SubElement(element, "SENDER-RECEIVER-TO-SIGNAL-MAPPING")
+        self.setChildElementOptionalLiteral(child_element, "COMMUNICATION-DIRECTION", mapping.getCommunicationDirection())
         self.setVariableDataPrototypeInSystemInstanceRef(child_element, "DATA-ELEMENT-IREF", mapping.getDataElementIRef())
         self.setChildElementOptionalRefType(child_element, "SYSTEM-SIGNAL-REF", mapping.getSystemSignalRef())
 
@@ -2413,7 +2660,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")
@@ -2433,10 +2680,10 @@ 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)
+        self.logger.debug("Write SystemMapping %s" % mapping.getShortName())
         child_element = ET.SubElement(element, "SYSTEM-MAPPING")
         self.setIdentifiable(child_element, mapping)
         self.writeSystemMappingDataMappings(child_element, mapping)
@@ -2450,7 +2697,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()
@@ -2459,10 +2706,11 @@ class ARXMLWriter(AbstractARXMLWriter):
             child_element = ET.SubElement(element, "ROOT-SOFTWARE-COMPOSITIONS")
             child_element = ET.SubElement(child_element, "ROOT-SW-COMPOSITION-PROTOTYPE")
             self.setIdentifiable(child_element, prototype)
+            self.setChildElementOptionalRefType(child_element, "FLAT-MAP-REF", prototype.getFlatMapRef())
             self.setChildElementOptionalRefType(child_element, "SOFTWARE-COMPOSITION-TREF", prototype.getSoftwareCompositionTRef())
                 
     def writeSystem(self, element: ET.Element, system: System):
-        self.logger.debug("Write System %s" % system.short_name)
+        self.logger.debug("Write System %s" % system.getShortName())
         child_element = ET.SubElement(element, "SYSTEM")
         self.setARElement(child_element, system)
 
@@ -2478,12 +2726,69 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeRootSwCompositionPrototype(child_element, system)
         self.setChildElementOptionalRevisionLabelString(child_element, "SYSTEM-VERSION", system.getSystemVersion())
 
-    def writePhysicalDimension(self, element: ET.Element, dimension: PhysicalDimension):
-        self.logger.debug("Write PhysicalDimension %s" % dimension.short_name)
+    def setPhysicalDimension(self, element: ET.Element, dimension: PhysicalDimension):
+        self.logger.debug("Set PhysicalDimension %s" % dimension.getShortName())
         child_element = ET.SubElement(element, "PHYSICAL-DIMENSION")
         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 setFlatInstanceDescriptor(self, element: ET.Element, desc: FlatInstanceDescriptor):
+        self.logger.debug("Set FlatInstanceDescriptor %s" % desc.getShortName())
+        child_element = ET.SubElement(element, "FLAT-INSTANCE-DESCRIPTOR")
+        self.setIdentifiable(child_element, desc)
+        self.setAnyInstanceRef(child_element, "UPSTREAM-REFERENCE-IREF", desc.getUpstreamReferenceIRef())
+        self.setAnyInstanceRef(child_element, "ECU-EXTRACT-REFERENCE-IREF", desc.getEcuExtractReferenceIRef())
+
+    def writeFlatMapInstances(self, element: ET.Element, map: FlatMap):
+        instances = map.getInstances()
+        if len(instances) > 0:
+            child_element = ET.SubElement(element, "INSTANCES")
+            for instance in instances:
+                if isinstance(instance, FlatInstanceDescriptor):
+                    self.setFlatInstanceDescriptor(child_element, instance)
+                else:
+                    self.notImplemented("Unsupported Flat Map Instances <%s>" % type(instance))
+
+    def setFlatMap(self, element: ET.Element, map: FlatMap):
+        self.logger.debug("Set FlatMap %s" % map.getShortName())
+        child_element = ET.SubElement(element, "FLAT-MAP")
+        self.setARElement(child_element, map)
+        self.writeFlatMapInstances(child_element, map)
+
+    def setDataPrototypeMapping(self, element: ET.Element, mapping: DataPrototypeMapping):
+        child_element = ET.SubElement(element, "DATA-PROTOTYPE-MAPPING")
+        self.setChildElementOptionalRefType(child_element, "FIRST-DATA-PROTOTYPE-REF", mapping.getFirstDataPrototypeRef())
+        self.setChildElementOptionalRefType(child_element, "SECOND-DATA-PROTOTYPE-REF", mapping.getSecondDataPrototypeRef())
+
+    def setDataPrototypeMappings(self, element: ET.Element, key: str, mappings: List[DataPrototypeMapping]):
+        if len(mappings) > 0:
+            child_element = ET.SubElement(element, key)
+            for mapping in mappings:
+                self.setDataPrototypeMapping(child_element, mapping)
+
+    def setVariableAndParameterInterfaceMapping(self, element: ET.Element, mapping: VariableAndParameterInterfaceMapping):
+        self.logger.debug("set VariableAndParameterInterfaceMapping %s" % mapping.getShortName())
+        child_element = ET.SubElement(element, "VARIABLE-AND-PARAMETER-INTERFACE-MAPPING")
+        self.setIdentifiable(child_element, mapping)
+        self.setDataPrototypeMappings(child_element, "DATA-MAPPINGS", mapping.getDataMappings())
+
+    def writePortInterfaceMappings(self, element: ET.Element, mapping_set: PortInterfaceMappingSet):
+        mappings = mapping_set.getPortInterfaceMappings()
+        if len(mappings) > 0:
+            child_element = ET.SubElement(element, "PORT-INTERFACE-MAPPINGS")
+            for mapping in mappings:
+                if isinstance(mapping, VariableAndParameterInterfaceMapping):
+                    self.setVariableAndParameterInterfaceMapping(child_element, mapping)
+                else:
+                    self.notImplemented("Unsupported PortInterfaceMapping <%s>" % type(mapping))
+
+    def setPortInterfaceMappingSet(self, element: ET.Element, mapping_set: PortInterfaceMappingSet):
+        self.logger.debug("Set PortInterfaceMappingSet %s" % mapping_set.getShortName())
+        child_element = ET.SubElement(element, "PORT-INTERFACE-MAPPING-SET")
+        self.setARElement(child_element, mapping_set)
+        self.writePortInterfaceMappings(child_element, mapping_set)
 
     def setISignalMappings(self, element: ET.Element, mappings: List[ISignalMapping]):
         if len(mappings) > 0:
@@ -2494,21 +2799,21 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(child_element, "TARGET-SIGNAL-REF", mapping.targetSignalRef)
 
     def writeGateway(self, element: ET.Element, gateway: Gateway):
-        self.logger.debug("Gateway %s" % gateway.short_name)
+        self.logger.debug("Gateway %s" % gateway.getShortName())
         child_element = ET.SubElement(element, "GATEWAY")
         self.setIdentifiable(child_element, gateway)
         self.setChildElementOptionalRefType(child_element, "ECU-REF", gateway.ecuRef)
         self.setISignalMappings(child_element, gateway.getSignalMappings())
 
     def writeISignal(self, element: ET.Element, signal: ISignal):
-        self.logger.debug("ISignal %s" % signal.short_name)
+        self.logger.debug("ISignal %s" % signal.getShortName())
         child_element = ET.SubElement(element, "I-SIGNAL")
         self.setIdentifiable(child_element, signal)
-        self.setChildElementOptionalLiteral(child_element, "DATA-TYPE-POLICY", signal.dataTypePolicy)
-        self.setInitValue(child_element, signal.initValue)
-        self.setChildElementOptionalNumericalValue(child_element, "LENGTH", signal.length)
-        self.setSwDataDefProps(child_element, "NETWORK-REPRESENTATION-PROPS", signal.networkRepresentationProps)
-        self.setChildElementOptionalRefType(child_element, "SYSTEM-SIGNAL-REF", signal.systemSignalRef)
+        self.setChildElementOptionalLiteral(child_element, "DATA-TYPE-POLICY", signal.getDataTypePolicy())
+        self.setValueSpecification(element, "INIT-VALUE", signal.getInitValue())
+        self.setChildElementOptionalNumericalValue(child_element, "LENGTH", signal.getLength())
+        self.setSwDataDefProps(child_element, "NETWORK-REPRESENTATION-PROPS", signal.getNetworkRepresentationProps())
+        self.setChildElementOptionalRefType(child_element, "SYSTEM-SIGNAL-REF", signal.getSystemSignalRef())
 
     def writeEcucValueCollectionEcucValues(self, element: ET.Element, collection: EcucValueCollection):
         value_refs = collection.getEcucValueRefs()
@@ -2519,7 +2824,7 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(child_element, "ECUC-MODULE-CONFIGURATION-VALUES-REF", value_ref) 
 
     def writeEcucValueCollection(self, element: ET.Element, collection: EcucValueCollection):
-        self.logger.debug("EcucValueCollection %s" % collection.short_name)
+        self.logger.debug("EcucValueCollection %s" % collection.getShortName())
         child_element = ET.SubElement(element, "ECUC-VALUE-COLLECTION")
         self.setIdentifiable(child_element, collection)
         self.setChildElementOptionalRefType(child_element, "ECU-EXTRACT-REF", collection.getEcuExtractRef())
@@ -2533,7 +2838,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())
@@ -2559,7 +2864,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())
@@ -2575,7 +2880,8 @@ class ARXMLWriter(AbstractARXMLWriter):
         if instance_ref is not None:
             child_element = ET.SubElement(element, key)
             self.setChildElementOptionalRefType(child_element, "BASE-REF", instance_ref.getBaseRef()) 
-            self.setChildElementOptionalRefType(child_element, "CONTEXT-ELEMENT-REF", instance_ref.getContextElementRef())
+            for ref in instance_ref.getContextElementRefs():
+                self.setChildElementOptionalRefType(child_element, "CONTEXT-ELEMENT-REF", ref)
             self.setChildElementOptionalRefType(child_element, "TARGET-REF", instance_ref.getTargetRef())
         return instance_ref
     
@@ -2595,10 +2901,10 @@ 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)
+        self.logger.debug("EcucContainerValue %s" % container_value.getShortName())
         child_element = ET.SubElement(element, "ECUC-CONTAINER-VALUE")
         self.setIdentifiable(child_element, container_value)
         self.setChildElementOptionalRefType(child_element, "DEFINITION-REF", container_value.getDefinitionRef())
@@ -2614,10 +2920,10 @@ 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)
+        self.logger.debug("EcucModuleConfigurationValues %s" % values.getShortName())
         child_element = ET.SubElement(element, "ECUC-MODULE-CONFIGURATION-VALUES")
         self.setIdentifiable(child_element, values)
         self.setChildElementOptionalRefType(child_element, "DEFINITION-REF", values.getDefinitionRef())
@@ -2626,7 +2932,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.writeEcucModuleConfigurationValuesContainers(child_element, values)
 
     def writeISignalGroup(self, element: ET.Element, group: ISignalGroup):
-        self.logger.debug("ISignalGroup %s" % group.short_name)
+        self.logger.debug("ISignalGroup %s" % group.getShortName())
         child_element = ET.SubElement(element, "I-SIGNAL-GROUP")
         self.setIdentifiable(child_element, group)
         signal_refs = group.getISignalRefs()
@@ -2637,7 +2943,7 @@ class ARXMLWriter(AbstractARXMLWriter):
         self.setChildElementOptionalRefType(child_element, "SYSTEM-SIGNAL-GROUP-REF", group.getSystemSignalGroupRef())
 
     def writeISignalIPduGroup(self, element: ET.Element, group: ISignalIPduGroup):
-        self.logger.debug("ISignalIPduGroup %s" % group.short_name)
+        self.logger.debug("ISignalIPduGroup %s" % group.getShortName())
         child_element = ET.SubElement(element, "I-SIGNAL-I-PDU-GROUP")
         self.setIdentifiable(child_element, group)
         self.setChildElementOptionalLiteral(child_element, "COMMUNICATION-DIRECTION", group.getCommunicationDirection())
@@ -2655,23 +2961,20 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalRefType(ref_conditional_tag, "I-SIGNAL-I-PDU-REF", pdu_ref)
 
     def writeSystemSignal(self, element: ET.Element, signal: SystemSignal):
-        self.logger.debug("SystemSignal %s" % signal.short_name)
+        self.logger.debug("SystemSignal %s" % signal.getShortName())
         child_element = ET.SubElement(element, "SYSTEM-SIGNAL")
         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: GenericEthernetFrame):
-        self.logger.debug("Write GenericEthernetFrame %s" % signal.short_name)
+        self.logger.debug("Write GenericEthernetFrame %s" % signal.getShortName())
         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)
+        self.logger.debug("Write LifeCycleInfoSet %s" % set.getShortName())
         child_element = ET.SubElement(element, "LIFE-CYCLE-INFO-SET")
         self.setIdentifiable(child_element, set)
 
@@ -2690,8 +2993,9 @@ class ARXMLWriter(AbstractARXMLWriter):
                 self.setChildElementOptionalNumericalValue(child_element, "UPDATE-INDICATION-BIT-POSITION", mapping.getUpdateIndicationBitPosition())
     
     def setDataFilter(self, element: ET.Element, key: str, filter: DataFilter):
-        child_element = ET.SubElement(element, key)
-        self.setChildElementOptionalLiteral(child_element, "DATA-FILTER-TYPE", filter.getDataFilterType())
+        if filter is not None:
+            child_element = ET.SubElement(element, key)
+            self.setChildElementOptionalLiteral(child_element, "DATA-FILTER-TYPE", filter.getDataFilterType())
 
     def setTransmissionModeConditions(self, element: ET.Element, conditions: List[TransmissionModeCondition]):
         if len(conditions) > 0:
@@ -2732,7 +3036,7 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.setTransmissionModeDeclaration(child_element, "TRANSMISSION-MODE-DECLARATION", timing.getTransmissionModeDeclaration())
 
     def writeISignalIPdu(self, element: ET.Element, i_pdu: ISignalIPdu):
-        self.logger.debug("ISignalIPdu %s" % i_pdu.short_name)
+        self.logger.debug("ISignalIPdu %s" % i_pdu.getShortName())
         child_element = ET.SubElement(element, "I-SIGNAL-I-PDU")
         self.setIdentifiable(child_element, i_pdu)
         self.setChildElementOptionalNumericalValue(child_element, "LENGTH", i_pdu.getLength())
@@ -2748,13 +3052,13 @@ class ARXMLWriter(AbstractARXMLWriter):
         elif isinstance(ar_element, CompositionSwComponentType):
             self.writeCompositionSwComponentType(element, ar_element)
         elif isinstance(ar_element, ApplicationPrimitiveDataType):
-            self.writeApplicationPrimitiveDataType(element, ar_element)
+            self.setApplicationPrimitiveDataType(element, ar_element)
         elif isinstance(ar_element, ApplicationRecordDataType):
-            self.writeApplicationRecordDataType(element, ar_element)
+            self.setApplicationRecordDataType(element, ar_element)
         elif isinstance(ar_element, SwBaseType):
-            self.writeSwBaseType(element, ar_element)
+            self.setSwBaseType(element, ar_element)
         elif isinstance(ar_element, CompuMethod):
-            self.writeCompuMethod(element, ar_element)
+            self.setCompuMethod(element, ar_element)
         elif isinstance(ar_element, ConstantSpecification):
             self.writeConstantSpecification(element, ar_element)
         elif isinstance(ar_element, DataConstr):
@@ -2837,8 +3141,14 @@ class ARXMLWriter(AbstractARXMLWriter):
             self.writeGenericEthernetFrame(element, ar_element)
         elif isinstance(ar_element, LifeCycleInfoSet):
             self.writeLifeCycleInfoSet(element, ar_element)
+        elif isinstance(ar_element, PhysicalDimension):
+            self.setPhysicalDimension(element, ar_element)
+        elif isinstance(ar_element, FlatMap):
+            self.setFlatMap(element, ar_element)
+        elif isinstance(ar_element, PortInterfaceMappingSet):
+            self.setPortInterfaceMappingSet(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")