diff --git a/.gitignore b/.gitignore
index 2f3eebdc0d391da28a84c576f2e9b53a6d0f31d3..104cc2e8179cfaf6df157acc008dc08c1c52cfc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,11 @@ Demo_Crazyflie_IMU/control_laws.zip
 Demo_Crazyflie_IMU/copter_imu.zip
 Demo_Crazyflie_IMU_Height/control_laws.zip
 Demo_Crazyflie_IMU_Height/copter_imu.zip
+*/__dv_1_3.aadl
+*/__iv_1_3.aadl
+*/deployment.pro
+*/interfaceview.pro
+Demo_ContextParams/cyclic_function.zip
+Demo_ContextParams/passive_function.zip
+Demo_SpaceWire_N2X/function1.zip
+Demo_SpaceWire_N2X/function2.zip
diff --git a/Demo_Eth_GR740_to_PC/deployment.pro b/Demo_Eth_GR740_to_PC/deployment.pro
deleted file mode 100644
index fbf5bd5ae47fb03a5e10dbeb31e204f1f71df12d..0000000000000000000000000000000000000000
--- a/Demo_Eth_GR740_to_PC/deployment.pro
+++ /dev/null
@@ -1,102 +0,0 @@
-isImportDeclaration('deploymentview::DV','PUBLIC','interfaceview::IV','').
-isSubcomponent('deploymentview::DV','Node1','others','IV_LivesInX86','SYSTEM','interfaceview::IV::LivesInX86.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node1','others','IV_LivesInX86','Taste::FunctionName','"LivesInX86"','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','Node1','others','IV_LivesInX86','Taste::APLC_Binding','(reference (x86_partition))','').
-isComponentType('deploymentview::DV::Node1','PUBLIC','x86_partition','PROCESS','NIL','').
-isComponentImplementation('deploymentview::DV::Node1','PUBLIC','x86_partition','others','PROCESS','NIL','others','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','Node1','others','x86_partition','Actual_Processor_Binding','(reference (x86_linux))','').
-isSubcomponent('deploymentview::DV','Node1','others','x86_partition','PROCESS','deploymentview::DV::Node1::x86_partition.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node1','others','x86_partition','Taste::coordinates','"91018 62191 117323 88272"','').
-isProperty('NIL','=>','deploymentview::DV','Node1','others','x86_partition','Deployment::Port_Number','0','').
-isImportDeclaration('deploymentview::DV','PUBLIC','ocarina_processors_x86','').
-isProperty('NIL','=>','deploymentview::DV','x86','NIL','NIL','Scheduling_Protocol','Posix_1003_Highest_Priority_First_Protocol','').
-isSubcomponent('deploymentview::DV','Node1','others','x86_linux','PROCESSOR','ocarina_processors_x86::x86.linux','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node1','others','x86_linux','Taste::coordinates','"87730 54739 120611 91998"','').
-isConnection('BUS ACCESS','deploymentview::DV','deploymentview','others','Connection2','ip_i','->','Node1.generic_sockets_ip_pohic_ip_i','NIL','').
-isProperty('NIL','=>','deploymentview::DV','deploymentview','others','Connection2','Taste::coordinates','"106642 116917 106642 133496 120784 133496 120784 150075"','').
-isConnection('BUS ACCESS','deploymentview::DV','Node1','others','generic_sockets_ip_pohic_ip_i_link','generic_sockets_ip_pohic_ip_i','->','generic_sockets_ip_pohic.link','NIL','').
-isFeature('ACCESS','deploymentview::DV','Node1','generic_sockets_ip_pohic_ip_i','REQUIRES','BUS','ocarina_buses::ip.i','NIL','NIL','').
-isProperty('NIL','APPLIES TO','deploymentview::DV::Node1','generic_sockets_ip_pohic','NIL','link','Taste::Interface_Coordinates','"120784 150075"','').
-isImportDeclaration('deploymentview::DV::Node1','PUBLIC','ocarina_buses','').
-isFeature('ACCESS','deploymentview::DV::Node1','generic_sockets_ip_pohic','link','REQUIRES','BUS','ocarina_buses::ip.i','NIL','REFINED TO','').
-isProperty('NIL','=>','deploymentview::DV::Node1','generic_sockets_ip_pohic','NIL','link','Taste::coordinates','"106642 116917"','').
-isImportDeclaration('deploymentview::DV::Node1','PUBLIC','ocarina_drivers','').
-isComponentType('deploymentview::DV::Node1','PUBLIC','generic_sockets_ip_pohic','DEVICE','ocarina_drivers::generic_sockets_ip','').
-isComponentImplementation('deploymentview::DV::Node1','PUBLIC','generic_sockets_ip_pohic','others','DEVICE','ocarina_drivers::generic_sockets_ip','pohic','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','Node1','others','generic_sockets_ip_pohic','Actual_Processor_Binding','(reference (x86_linux))','').
-isSubcomponent('deploymentview::DV','Node1','others','generic_sockets_ip_pohic','DEVICE','deploymentview::DV::Node1::generic_sockets_ip_pohic.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node1','others','generic_sockets_ip_pohic','Taste::coordinates','"89257 97794 118522 116917"','').
-isProperty('NIL','=>','deploymentview::DV::Node1','generic_sockets_ip_pohic','NIL','NIL','Deployment::Help','"Write your ASN.1 configuration here"','').
-isProperty('NIL','=>','deploymentview::DV::Node1','generic_sockets_ip_pohic','NIL','NIL','Deployment::Configuration','"{devname ""enx0050b6519447"", address ""192.168.0.151"", port 5116 }"','').
-isProperty('NIL','=>','deploymentview::DV::Node1','generic_sockets_ip_pohic','NIL','NIL','Deployment::Config','"/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn"','').
-isProperty('NIL','=>','deploymentview::DV::Node1','generic_sockets_ip_pohic','NIL','NIL','Deployment::Version','"0.1beta"','').
-isComponentType('deploymentview::DV','PUBLIC','Node1','SYSTEM','NIL','').
-isComponentImplementation('deploymentview::DV','PUBLIC','Node1','others','SYSTEM','NIL','others','').
-isSubcomponent('deploymentview::DV','deploymentview','others','Node1','SYSTEM','Node1.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','deploymentview','others','Node1','Taste::coordinates','"84565 50865 125666 138453"','').
-isPackage('deploymentview::DV::Node1','PUBLIC','').
-isImportDeclaration('deploymentview::DV::Node1','PUBLIC','Taste','').
-isImportDeclaration('deploymentview::DV::Node1','PUBLIC','Deployment','').
-isImportDeclaration('deploymentview::DV::Node1','PUBLIC','TASTE_DV_Properties','').
-isImportDeclaration('deploymentview::DV','PUBLIC','deploymentview::DV::Node1','').
-isSubcomponent('deploymentview::DV','Node2','others','IV_LivesInGR740','SYSTEM','interfaceview::IV::LivesInGR740.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node2','others','IV_LivesInGR740','Taste::FunctionName','"LivesInGR740"','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','Node2','others','IV_LivesInGR740','Taste::APLC_Binding','(reference (gr740_partition))','').
-isComponentType('deploymentview::DV::Node2','PUBLIC','gr740_partition','PROCESS','NIL','').
-isComponentImplementation('deploymentview::DV::Node2','PUBLIC','gr740_partition','others','PROCESS','NIL','others','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','Node2','others','gr740_partition','Actual_Processor_Binding','(reference (gr740_rtems412_posix))','').
-isSubcomponent('deploymentview::DV','Node2','others','gr740_partition','PROCESS','deploymentview::DV::Node2::gr740_partition.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node2','others','gr740_partition','Taste::coordinates','"154393 62725 186543 89579"','').
-isProperty('NIL','=>','deploymentview::DV','Node2','others','gr740_partition','Deployment::Port_Number','0','').
-isImportDeclaration('deploymentview::DV','PUBLIC','ocarina_processors_leon','').
-isProperty('NIL','=>','deploymentview::DV','gr740','NIL','NIL','Scheduling_Protocol','Posix_1003_Highest_Priority_First_Protocol','').
-isSubcomponent('deploymentview::DV','Node2','others','gr740_rtems412_posix','PROCESSOR','ocarina_processors_leon::gr740.rtems412_posix','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node2','others','gr740_rtems412_posix','Taste::coordinates','"150374 55053 190562 93415"','').
-isConnection('BUS ACCESS','deploymentview::DV','deploymentview','others','Connection1','ip_i','->','Node2.leon_ethernet_raw_ip_i','NIL','').
-isProperty('NIL','=>','deploymentview::DV','deploymentview','others','Connection1','Taste::coordinates','"172100 116810 172100 133442 163932 133442 163932 150075"','').
-isConnection('BUS ACCESS','deploymentview::DV','Node2','others','leon_ethernet_raw_ip_i_link','leon_ethernet_raw_ip_i','->','leon_ethernet_raw.link','NIL','').
-isFeature('ACCESS','deploymentview::DV','Node2','leon_ethernet_raw_ip_i','REQUIRES','BUS','ocarina_buses::ip.i','NIL','NIL','').
-isProperty('NIL','APPLIES TO','deploymentview::DV::Node2','leon_ethernet_raw','NIL','link','Taste::Interface_Coordinates','"163932 150075"','').
-isImportDeclaration('deploymentview::DV::Node2','PUBLIC','ocarina_buses','').
-isFeature('ACCESS','deploymentview::DV::Node2','leon_ethernet_raw','link','REQUIRES','BUS','ocarina_buses::ip.i','NIL','REFINED TO','').
-isProperty('NIL','=>','deploymentview::DV::Node2','leon_ethernet_raw','NIL','link','Taste::coordinates','"172100 116810"','').
-isImportDeclaration('deploymentview::DV::Node2','PUBLIC','ocarina_drivers','').
-isComponentType('deploymentview::DV::Node2','PUBLIC','leon_ethernet_raw','DEVICE','ocarina_drivers::leon_ethernet','').
-isComponentImplementation('deploymentview::DV::Node2','PUBLIC','leon_ethernet_raw','others','DEVICE','ocarina_drivers::leon_ethernet','raw','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','Node2','others','leon_ethernet_raw','Actual_Processor_Binding','(reference (gr740_rtems412_posix))','').
-isSubcomponent('deploymentview::DV','Node2','others','leon_ethernet_raw','DEVICE','deploymentview::DV::Node2::leon_ethernet_raw.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','Node2','others','leon_ethernet_raw','Taste::coordinates','"157178 99425 187601 116810"','').
-isProperty('NIL','=>','deploymentview::DV::Node2','leon_ethernet_raw','NIL','NIL','Deployment::Help','"Write your ASN.1 configuration here"','').
-isProperty('NIL','=>','deploymentview::DV::Node2','leon_ethernet_raw','NIL','NIL','Deployment::Configuration','"{devname ""greth1"", address ""192.168.0.81"", gateway ""192.168.0.1"", netmask ""255.255.255.0"", version ipv4, port 5118 }"','').
-isProperty('NIL','=>','deploymentview::DV::Node2','leon_ethernet_raw','NIL','NIL','Deployment::Config','"/home/taste/tool-inst/include/ocarina/runtime/polyorb-hi-c/src/drivers/configuration/ip.asn"','').
-isProperty('NIL','=>','deploymentview::DV::Node2','leon_ethernet_raw','NIL','NIL','Deployment::Version','"0.1beta"','').
-isComponentType('deploymentview::DV','PUBLIC','Node2','SYSTEM','NIL','').
-isComponentImplementation('deploymentview::DV','PUBLIC','Node2','others','SYSTEM','NIL','others','').
-isSubcomponent('deploymentview::DV','deploymentview','others','Node2','SYSTEM','Node2.others','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','deploymentview','others','Node2','Taste::coordinates','"144563 51022 194798 138018"','').
-isPackage('deploymentview::DV::Node2','PUBLIC','').
-isImportDeclaration('deploymentview::DV::Node2','PUBLIC','Taste','').
-isImportDeclaration('deploymentview::DV::Node2','PUBLIC','Deployment','').
-isImportDeclaration('deploymentview::DV::Node2','PUBLIC','TASTE_DV_Properties','').
-isImportDeclaration('deploymentview::DV','PUBLIC','deploymentview::DV::Node2','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','deploymentview','others','interfaceview.LivesInX86_PI_report_LivesInGR740_RI_report','Actual_Connection_Binding','(reference (ip_i))','').
-isProperty('NIL','APPLIES TO','deploymentview::DV','deploymentview','others','interfaceview.LivesInGR740_PI_something_LivesInX86_RI_something','Actual_Connection_Binding','(reference (ip_i))','').
-isImportDeclaration('deploymentview::DV','PUBLIC','ocarina_buses','').
-isSubcomponent('deploymentview::DV','deploymentview','others','ip_i','BUS','ocarina_buses::ip.i','NIL','NIL','').
-isProperty('NIL','=>','deploymentview::DV','deploymentview','others','ip_i','Taste::coordinates','"120784 150075 176373 182672"','').
-isProperty('_','_','_','_','_','_','LMP::Unparser_ID_Case','AsIs','').
-isProperty('_','_','_','_','_','_','LMP::Unparser_Insert_Header','Yes','').
-isVersion('AADL2.1','TASTE type deploymentview','','generated code: do not edit').
-isPackage('deploymentview::DV','PUBLIC','').
-isImportDeclaration('deploymentview::DV','PUBLIC','Taste','').
-isImportDeclaration('deploymentview::DV','PUBLIC','Deployment','').
-isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::coordinates','"0 0 297000 210000"','').
-isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::version','"1.3"','').
-isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::interfaceView','"InterfaceView.aadl"','').
-isProperty('NIL','=>','deploymentview::DV','NIL','NIL','NIL','Taste::HWLibraries','("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl")','').
-isComponentType('deploymentview::DV','PUBLIC','deploymentview','SYSTEM','NIL','').
-isComponentImplementation('deploymentview::DV','PUBLIC','deploymentview','others','SYSTEM','NIL','others','').
-isImportDeclaration('deploymentview::DV','PUBLIC','interfaceview::IV','').
-isSubcomponent('deploymentview::DV','deploymentview','others','interfaceview','SYSTEM','interfaceview::IV::interfaceview.others','NIL','NIL','').
-isImportDeclaration('deploymentview::DV','PUBLIC','TASTE_DV_Properties','').
-
diff --git a/Demo_Eth_GR740_to_PC/interfaceview.pro b/Demo_Eth_GR740_to_PC/interfaceview.pro
deleted file mode 100644
index 54717f5bdddb377f31f8162c3ba65e5a60e83f97..0000000000000000000000000000000000000000
--- a/Demo_Eth_GR740_to_PC/interfaceview.pro
+++ /dev/null
@@ -1,98 +0,0 @@
-isComponentType('interfaceview::FV::LivesInX86','PUBLIC','PI_pulse','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::LivesInX86','PUBLIC','PI_pulse','others','SUBPROGRAM','NIL','others','').
-isFeature('ACCESS','interfaceview::IV','LivesInX86','PI_pulse','PROVIDES','SUBPROGRAM','interfaceview::FV::LivesInX86::PI_pulse.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInX86','PI_pulse','NIL','NIL','Taste::Associated_Queue_Size','1','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_pulse','Taste::coordinates','"118268 50077"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_pulse','Taste::RCMoperationKind','cyclic','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_pulse','Taste::RCMperiod','1000 ms','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_pulse','Taste::Deadline','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_pulse','Taste::InterfaceName','"pulse"','').
-isProperty('NIL','=>','interfaceview::FV::LivesInX86','PI_pulse','others','NIL','Compute_Execution_Time','0 ms .. 0 ms','').
-isSubcomponent('interfaceview::IV','LivesInX86','others','pulse_impl','SUBPROGRAM','interfaceview::FV::LivesInX86::PI_pulse.others','NIL','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','LivesInX86','others','OpToPICnx_pulse_impl','pulse_impl','->','PI_pulse','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','interfaceview','others','LivesInX86_PI_report_LivesInGR740_RI_report','LivesInX86.PI_report','->','LivesInGR740.RI_report','NIL','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','LivesInX86_PI_report_LivesInGR740_RI_report','Taste::coordinates','"159523 73230 147082 73230 147082 78427 134642 78427"','').
-isComponentType('interfaceview::FV::LivesInX86','PUBLIC','PI_report','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::LivesInX86','PUBLIC','PI_report','others','SUBPROGRAM','NIL','others','').
-isFeature('ACCESS','interfaceview::IV','LivesInX86','PI_report','PROVIDES','SUBPROGRAM','interfaceview::FV::LivesInX86::PI_report.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInX86','PI_report','NIL','NIL','Taste::Associated_Queue_Size','1','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_report','Taste::coordinates','"134642 78427"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_report','Taste::RCMoperationKind','sporadic','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_report','Taste::RCMperiod','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_report','Taste::Deadline','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','PI_report','Taste::InterfaceName','"report"','').
-isFeature('PARAMETER','interfaceview::FV::LivesInX86','PI_report','inputData','IN','NIL','DataView::T_SEQ','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInX86','PI_report','NIL','inputData','Taste::encoding','UPER','').
-isProperty('NIL','=>','interfaceview::FV::LivesInX86','PI_report','others','NIL','Compute_Execution_Time','0 ms .. 0 ms','').
-isSubcomponent('interfaceview::IV','LivesInX86','others','report_impl','SUBPROGRAM','interfaceview::FV::LivesInX86::PI_report.others','NIL','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','LivesInX86','others','OpToPICnx_report_impl','report_impl','->','PI_report','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','interfaceview','others','LivesInGR740_PI_something_LivesInX86_RI_something','LivesInGR740.PI_something','->','LivesInX86.RI_something','NIL','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','LivesInGR740_PI_something_LivesInX86_RI_something','Taste::coordinates','"134642 56377 147082 56377 147082 62205 159523 62205"','').
-isComponentType('interfaceview::FV::LivesInX86','PUBLIC','RI_something','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::LivesInX86','PUBLIC','RI_something','others','SUBPROGRAM','NIL','others','').
-isImportDeclaration('interfaceview::IV','PUBLIC','interfaceview::FV::LivesInGR740','').
-isFeature('ACCESS','interfaceview::IV','LivesInX86','RI_something','REQUIRES','SUBPROGRAM','interfaceview::FV::LivesInGR740::PI_something.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','RI_something','Taste::coordinates','"134642 56377"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','RI_something','Taste::RCMoperationKind','any','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','RI_something','Taste::InterfaceName','"something"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','RI_something','Taste::labelInheritance','"true"','').
-isFeature('PARAMETER','interfaceview::FV::LivesInX86','RI_something','inputData','IN','NIL','DataView::T_SEQ','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInX86','RI_something','NIL','inputData','Taste::encoding','UPER','').
-isPackage('interfaceview::FV::LivesInX86','PUBLIC','').
-isComponentType('interfaceview::IV','PUBLIC','LivesInX86','SYSTEM','NIL','').
-isComponentImplementation('interfaceview::IV','PUBLIC','LivesInX86','others','SYSTEM','NIL','others','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','NIL','Source_Language','(C)','').
-isProperty('NIL','=>','interfaceview::IV','LivesInX86','NIL','NIL','Taste::Active_Interfaces','any','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','LivesInX86','Taste::coordinates','"93068 50077 134642 99525"','').
-isSubcomponent('interfaceview::IV','interfaceview','others','LivesInX86','SYSTEM','interfaceview::IV::LivesInX86.others','NIL','NIL','').
-isImportDeclaration('interfaceview::IV','PUBLIC','interfaceview::FV::LivesInX86','').
-isImportDeclaration('interfaceview::IV','PUBLIC','Taste','').
-isImportDeclaration('interfaceview::FV::LivesInX86','PUBLIC','Taste','').
-isImportDeclaration('interfaceview::IV','PUBLIC','DataView','').
-isImportDeclaration('interfaceview::FV::LivesInX86','PUBLIC','DataView','').
-isImportDeclaration('interfaceview::FV::LivesInX86','PUBLIC','TASTE_IV_Properties','').
-isImportDeclaration('interfaceview::IV','PUBLIC','TASTE_IV_Properties','').
-isComponentType('interfaceview::FV::LivesInGR740','PUBLIC','PI_something','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::LivesInGR740','PUBLIC','PI_something','others','SUBPROGRAM','NIL','others','').
-isFeature('ACCESS','interfaceview::IV','LivesInGR740','PI_something','PROVIDES','SUBPROGRAM','interfaceview::FV::LivesInGR740::PI_something.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInGR740','PI_something','NIL','NIL','Taste::Associated_Queue_Size','1','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','PI_something','Taste::coordinates','"159523 62205"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','PI_something','Taste::RCMoperationKind','sporadic','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','PI_something','Taste::RCMperiod','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','PI_something','Taste::Deadline','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','PI_something','Taste::InterfaceName','"something"','').
-isFeature('PARAMETER','interfaceview::FV::LivesInGR740','PI_something','inputData','IN','NIL','DataView::T_SEQ','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInGR740','PI_something','NIL','inputData','Taste::encoding','UPER','').
-isProperty('NIL','=>','interfaceview::FV::LivesInGR740','PI_something','others','NIL','Compute_Execution_Time','0 ms .. 0 ms','').
-isSubcomponent('interfaceview::IV','LivesInGR740','others','something_impl','SUBPROGRAM','interfaceview::FV::LivesInGR740::PI_something.others','NIL','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','LivesInGR740','others','OpToPICnx_something_impl','something_impl','->','PI_something','NIL','').
-isComponentType('interfaceview::FV::LivesInGR740','PUBLIC','RI_report','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::LivesInGR740','PUBLIC','RI_report','others','SUBPROGRAM','NIL','others','').
-isFeature('ACCESS','interfaceview::IV','LivesInGR740','RI_report','REQUIRES','SUBPROGRAM','interfaceview::FV::LivesInX86::PI_report.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','RI_report','Taste::coordinates','"159523 73230"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','RI_report','Taste::RCMoperationKind','any','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','RI_report','Taste::InterfaceName','"report"','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','RI_report','Taste::labelInheritance','"true"','').
-isFeature('PARAMETER','interfaceview::FV::LivesInGR740','RI_report','inputData','IN','NIL','DataView::T_SEQ','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::LivesInGR740','RI_report','NIL','inputData','Taste::encoding','UPER','').
-isPackage('interfaceview::FV::LivesInGR740','PUBLIC','').
-isComponentType('interfaceview::IV','PUBLIC','LivesInGR740','SYSTEM','NIL','').
-isComponentImplementation('interfaceview::IV','PUBLIC','LivesInGR740','others','SYSTEM','NIL','others','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','NIL','Source_Language','(C)','').
-isProperty('NIL','=>','interfaceview::IV','LivesInGR740','NIL','NIL','Taste::Active_Interfaces','any','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','LivesInGR740','Taste::coordinates','"159523 49605 202829 99210"','').
-isSubcomponent('interfaceview::IV','interfaceview','others','LivesInGR740','SYSTEM','interfaceview::IV::LivesInGR740.others','NIL','NIL','').
-isImportDeclaration('interfaceview::FV::LivesInGR740','PUBLIC','Taste','').
-isImportDeclaration('interfaceview::FV::LivesInGR740','PUBLIC','DataView','').
-isImportDeclaration('interfaceview::FV::LivesInGR740','PUBLIC','TASTE_IV_Properties','').
-isProperty('_','_','_','_','_','_','LMP::Unparser_ID_Case','AsIs','').
-isProperty('_','_','_','_','_','_','LMP::Unparser_Insert_Header','Yes','').
-isPackage('interfaceview::IV','PUBLIC','').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::dataView','("DataView")','').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::dataViewPath','("DataView.aadl")','').
-isVersion('AADL2.1','TASTE type interfaceview','','generated code: do not edit').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::coordinates','"0 0 297000 210000"','').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::version','"1.3"','').
-isComponentType('interfaceview::IV','PUBLIC','interfaceview','SYSTEM','NIL','').
-isComponentImplementation('interfaceview::IV','PUBLIC','interfaceview','others','SYSTEM','NIL','others','').
-
diff --git a/Demo_Serial_N2X/__iv_1_3.aadl b/Demo_Serial_N2X/__iv_1_3.aadl
deleted file mode 100644
index 055252f0e4675498775811bce544829f931b00e0..0000000000000000000000000000000000000000
--- a/Demo_Serial_N2X/__iv_1_3.aadl
+++ /dev/null
@@ -1,137 +0,0 @@
----------------------------------------------------
--- AADL2.1
--- TASTE type interfaceview
--- 
--- generated code: do not edit
----------------------------------------------------
-
-PACKAGE interfaceview::FV::Function1
-PUBLIC
-
-WITH Taste;
-WITH DataView;
-WITH TASTE_IV_Properties;
-SUBPROGRAM PI_pulse
-PROPERTIES
-  Taste::Associated_Queue_Size => 1;
-END PI_pulse;
-
-SUBPROGRAM IMPLEMENTATION PI_pulse.others
-PROPERTIES
-  Compute_Execution_Time => 0 ms .. 0 ms;
-END PI_pulse.others;
-
-SUBPROGRAM RI_doSomething
-FEATURES
-  sss : IN PARAMETER DataView::T_Int32 {
-    Taste::encoding => UPER;
-  };
-END RI_doSomething;
-
-SUBPROGRAM IMPLEMENTATION RI_doSomething.others
-END RI_doSomething.others;
-
-END interfaceview::FV::Function1;
-
-PACKAGE interfaceview::FV::Function2
-PUBLIC
-
-WITH Taste;
-WITH DataView;
-WITH TASTE_IV_Properties;
-SUBPROGRAM PI_doSomething
-FEATURES
-  sss : IN PARAMETER DataView::T_Int32 {
-    Taste::encoding => UPER;
-  };
-PROPERTIES
-  Taste::Associated_Queue_Size => 1;
-END PI_doSomething;
-
-SUBPROGRAM IMPLEMENTATION PI_doSomething.others
-PROPERTIES
-  Compute_Execution_Time => 0 ms .. 1000 ms;
-END PI_doSomething.others;
-
-END interfaceview::FV::Function2;
-
-PACKAGE interfaceview::IV
-PUBLIC
-
-WITH interfaceview::FV::Function2;
-WITH interfaceview::FV::Function1;
-WITH Taste;
-WITH DataView;
-WITH TASTE_IV_Properties;
-SYSTEM Function1
-FEATURES
-  PI_pulse : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Function1::PI_pulse.others {
-    Taste::coordinates => "109607 52755";
-    Taste::RCMoperationKind => cyclic;
-    Taste::RCMperiod => 1000 ms;
-    Taste::Deadline => 0 ms;
-    Taste::InterfaceName => "pulse";
-  };
-  RI_doSomething : REQUIRES SUBPROGRAM ACCESS interfaceview::FV::Function2::PI_doSomething.others {
-    Taste::coordinates => "128501 65355";
-    Taste::RCMoperationKind => any;
-    Taste::InterfaceName => "doSomething";
-    Taste::labelInheritance => "true";
-  };
-PROPERTIES
-  Source_Language => (C);
-  Taste::Active_Interfaces => any;
-END Function1;
-
-SYSTEM IMPLEMENTATION Function1.others
-SUBCOMPONENTS
-  pulse_impl : SUBPROGRAM interfaceview::FV::Function1::PI_pulse.others;
-CONNECTIONS
-  OpToPICnx_pulse_impl : SUBPROGRAM ACCESS pulse_impl -> PI_pulse;
-END Function1.others;
-
-SYSTEM Function2
-FEATURES
-  PI_doSomething : PROVIDES SUBPROGRAM ACCESS interfaceview::FV::Function2::PI_doSomething.others {
-    Taste::coordinates => "147240 68188";
-    Taste::RCMoperationKind => sporadic;
-    Taste::RCMperiod => 0 ms;
-    Taste::Deadline => 0 ms;
-    Taste::InterfaceName => "doSomething";
-  };
-PROPERTIES
-  Source_Language => (C);
-  Taste::Active_Interfaces => any;
-END Function2;
-
-SYSTEM IMPLEMENTATION Function2.others
-SUBCOMPONENTS
-  doSomething_impl : SUBPROGRAM interfaceview::FV::Function2::PI_doSomething.others;
-CONNECTIONS
-  OpToPICnx_doSomething_impl : SUBPROGRAM ACCESS doSomething_impl -> PI_doSomething;
-END Function2.others;
-
-SYSTEM interfaceview
-END interfaceview;
-
-SYSTEM IMPLEMENTATION interfaceview.others
-SUBCOMPONENTS
-  Function1 : SYSTEM interfaceview::IV::Function1.others {
-    Taste::coordinates => "87557 52755 128501 102517";
-  };
-  Function2 : SYSTEM interfaceview::IV::Function2.others {
-    Taste::coordinates => "147240 52755 187869 103777";
-  };
-CONNECTIONS
-  Function2_PI_doSomething_Function1_RI_doSomething : SUBPROGRAM ACCESS Function2.PI_doSomething -> Function1.RI_doSomething {
-    Taste::coordinates => "128501 65355 137870 65355 137870 68188 147240 68188";
-  };
-END interfaceview.others;
-
-PROPERTIES
-  Taste::dataView => ("DataView");
-  Taste::dataViewPath => ("DataView.aadl");
-  Taste::coordinates => "0 0 297000 210000";
-  Taste::version => "1.3";
-END interfaceview::IV;
-
diff --git a/Demo_Serial_N2X/interfaceview.pro b/Demo_Serial_N2X/interfaceview.pro
deleted file mode 100644
index a8631cd2e1c0a4e198715ab57d1cdc1731b2ba38..0000000000000000000000000000000000000000
--- a/Demo_Serial_N2X/interfaceview.pro
+++ /dev/null
@@ -1,73 +0,0 @@
-isComponentType('interfaceview::FV::Function1','PUBLIC','PI_pulse','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::Function1','PUBLIC','PI_pulse','others','SUBPROGRAM','NIL','others','').
-isFeature('ACCESS','interfaceview::IV','Function1','PI_pulse','PROVIDES','SUBPROGRAM','interfaceview::FV::Function1::PI_pulse.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::Function1','PI_pulse','NIL','NIL','Taste::Associated_Queue_Size','1','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','PI_pulse','Taste::coordinates','"109607 52755"','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','PI_pulse','Taste::RCMoperationKind','cyclic','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','PI_pulse','Taste::RCMperiod','1000 ms','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','PI_pulse','Taste::Deadline','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','PI_pulse','Taste::InterfaceName','"pulse"','').
-isProperty('NIL','=>','interfaceview::FV::Function1','PI_pulse','others','NIL','Compute_Execution_Time','0 ms .. 0 ms','').
-isSubcomponent('interfaceview::IV','Function1','others','pulse_impl','SUBPROGRAM','interfaceview::FV::Function1::PI_pulse.others','NIL','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','Function1','others','OpToPICnx_pulse_impl','pulse_impl','->','PI_pulse','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','interfaceview','others','Function2_PI_doSomething_Function1_RI_doSomething','Function2.PI_doSomething','->','Function1.RI_doSomething','NIL','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','Function2_PI_doSomething_Function1_RI_doSomething','Taste::coordinates','"128501 65355 137870 65355 137870 68188 147240 68188"','').
-isComponentType('interfaceview::FV::Function1','PUBLIC','RI_doSomething','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::Function1','PUBLIC','RI_doSomething','others','SUBPROGRAM','NIL','others','').
-isImportDeclaration('interfaceview::IV','PUBLIC','interfaceview::FV::Function2','').
-isFeature('ACCESS','interfaceview::IV','Function1','RI_doSomething','REQUIRES','SUBPROGRAM','interfaceview::FV::Function2::PI_doSomething.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','RI_doSomething','Taste::coordinates','"128501 65355"','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','RI_doSomething','Taste::RCMoperationKind','any','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','RI_doSomething','Taste::InterfaceName','"doSomething"','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','RI_doSomething','Taste::labelInheritance','"true"','').
-isFeature('PARAMETER','interfaceview::FV::Function1','RI_doSomething','sss','IN','NIL','DataView::T_Int32','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::Function1','RI_doSomething','NIL','sss','Taste::encoding','UPER','').
-isPackage('interfaceview::FV::Function1','PUBLIC','').
-isComponentType('interfaceview::IV','PUBLIC','Function1','SYSTEM','NIL','').
-isComponentImplementation('interfaceview::IV','PUBLIC','Function1','others','SYSTEM','NIL','others','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','NIL','Source_Language','(C)','').
-isProperty('NIL','=>','interfaceview::IV','Function1','NIL','NIL','Taste::Active_Interfaces','any','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','Function1','Taste::coordinates','"87557 52755 128501 102517"','').
-isSubcomponent('interfaceview::IV','interfaceview','others','Function1','SYSTEM','interfaceview::IV::Function1.others','NIL','NIL','').
-isImportDeclaration('interfaceview::IV','PUBLIC','interfaceview::FV::Function1','').
-isImportDeclaration('interfaceview::IV','PUBLIC','Taste','').
-isImportDeclaration('interfaceview::FV::Function1','PUBLIC','Taste','').
-isImportDeclaration('interfaceview::IV','PUBLIC','DataView','').
-isImportDeclaration('interfaceview::FV::Function1','PUBLIC','DataView','').
-isImportDeclaration('interfaceview::FV::Function1','PUBLIC','TASTE_IV_Properties','').
-isImportDeclaration('interfaceview::IV','PUBLIC','TASTE_IV_Properties','').
-isComponentType('interfaceview::FV::Function2','PUBLIC','PI_doSomething','SUBPROGRAM','NIL','').
-isComponentImplementation('interfaceview::FV::Function2','PUBLIC','PI_doSomething','others','SUBPROGRAM','NIL','others','').
-isFeature('ACCESS','interfaceview::IV','Function2','PI_doSomething','PROVIDES','SUBPROGRAM','interfaceview::FV::Function2::PI_doSomething.others','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::Function2','PI_doSomething','NIL','NIL','Taste::Associated_Queue_Size','1','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','PI_doSomething','Taste::coordinates','"147240 68188"','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','PI_doSomething','Taste::RCMoperationKind','sporadic','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','PI_doSomething','Taste::RCMperiod','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','PI_doSomething','Taste::Deadline','0 ms','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','PI_doSomething','Taste::InterfaceName','"doSomething"','').
-isFeature('PARAMETER','interfaceview::FV::Function2','PI_doSomething','sss','IN','NIL','DataView::T_Int32','NIL','NIL','').
-isProperty('NIL','=>','interfaceview::FV::Function2','PI_doSomething','NIL','sss','Taste::encoding','UPER','').
-isProperty('NIL','=>','interfaceview::FV::Function2','PI_doSomething','others','NIL','Compute_Execution_Time','0 ms .. 1000 ms','').
-isSubcomponent('interfaceview::IV','Function2','others','doSomething_impl','SUBPROGRAM','interfaceview::FV::Function2::PI_doSomething.others','NIL','NIL','').
-isConnection('SUBPROGRAM ACCESS','interfaceview::IV','Function2','others','OpToPICnx_doSomething_impl','doSomething_impl','->','PI_doSomething','NIL','').
-isPackage('interfaceview::FV::Function2','PUBLIC','').
-isComponentType('interfaceview::IV','PUBLIC','Function2','SYSTEM','NIL','').
-isComponentImplementation('interfaceview::IV','PUBLIC','Function2','others','SYSTEM','NIL','others','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','NIL','Source_Language','(C)','').
-isProperty('NIL','=>','interfaceview::IV','Function2','NIL','NIL','Taste::Active_Interfaces','any','').
-isProperty('NIL','=>','interfaceview::IV','interfaceview','others','Function2','Taste::coordinates','"147240 52755 187869 103777"','').
-isSubcomponent('interfaceview::IV','interfaceview','others','Function2','SYSTEM','interfaceview::IV::Function2.others','NIL','NIL','').
-isImportDeclaration('interfaceview::FV::Function2','PUBLIC','Taste','').
-isImportDeclaration('interfaceview::FV::Function2','PUBLIC','DataView','').
-isImportDeclaration('interfaceview::FV::Function2','PUBLIC','TASTE_IV_Properties','').
-isProperty('_','_','_','_','_','_','LMP::Unparser_ID_Case','AsIs','').
-isProperty('_','_','_','_','_','_','LMP::Unparser_Insert_Header','Yes','').
-isPackage('interfaceview::IV','PUBLIC','').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::dataView','("DataView")','').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::dataViewPath','("DataView.aadl")','').
-isVersion('AADL2.1','TASTE type interfaceview','','generated code: do not edit').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::coordinates','"0 0 297000 210000"','').
-isProperty('NIL','=>','interfaceview::IV','NIL','NIL','NIL','Taste::version','"1.3"','').
-isComponentType('interfaceview::IV','PUBLIC','interfaceview','SYSTEM','NIL','').
-isComponentImplementation('interfaceview::IV','PUBLIC','interfaceview','others','SYSTEM','NIL','others','').
-