diff --git a/.gitignore b/.gitignore
index a9a5aecf429fd8a0d81fbd5fd37006bfa498d5c1..0802a14519f685883f53f3d7beecdbf6706c77a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 tmp
+TASTE-linux64/config/TASTE_DV_Properties.aadl
+TASTE-linux64/config/TASTE_IV_Properties.aadl
diff --git a/TASTE-linux/config/TASTE_IV_Properties.aadl b/TASTE-linux/config/TASTE_IV_Properties.aadl
index a51abe06232fcb2c05bac6a597d6e788160db6be..e1ee6df6c7313eb8632a548fe8eb68911ed7ccea 100755
--- a/TASTE-linux/config/TASTE_IV_Properties.aadl
+++ b/TASTE-linux/config/TASTE_IV_Properties.aadl
@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is
     MSCFiles : aadlstring applies to (Subprogram);
     is_Component_Type : aadlboolean applies to (System);
     is_instance_of    : aadlstring applies to (System);
+    FPGA_Modes : aadlstring applies to (System);
 --    MSCFiles : list of aadlstring applies to (Subprogram);
 end TASTE_IV_Properties;
diff --git a/TASTE-linux/config/TasteConfig.ini b/TASTE-linux/config/TasteConfig.ini
index 1e4dfdba98ecd364f63b57e7f31d2b6d272905a9..9f743a8f158267533c1258e3bea0f0084696f678 100755
--- a/TASTE-linux/config/TasteConfig.ini
+++ b/TASTE-linux/config/TasteConfig.ini
@@ -80,6 +80,7 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "2" \
 		"svgComponentDepth" "2" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 
 	variable DVObjectsConfig { \
@@ -123,5 +124,6 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "4" \
 		"svgComponentDepth" "3" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 }
diff --git a/TASTE-linux/config/defaults/TASTE_DV_Properties.aadl b/TASTE-linux/config/defaults/TASTE_DV_Properties.aadl
new file mode 100755
index 0000000000000000000000000000000000000000..cb772325b4eb399bb44508752187adaac83593f8
--- /dev/null
+++ b/TASTE-linux/config/defaults/TASTE_DV_Properties.aadl
@@ -0,0 +1,15 @@
+-- mapping TASTE : AADL
+-- Node : System
+-- Processor : Processor
+-- Process : Function
+-- Bus : Bus
+-- Device : Device
+-- Driver : Driver
+property set TASTE_DV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Processor, Process);
+    CoverageEnabled: aadlboolean applies to (Process);
+    Comment: aadlstring applies to (Device, Bus);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (Bus);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (Device);
+end TASTE_DV_Properties;
diff --git a/TASTE-linux/config/defaults/TASTE_IV_Properties.aadl b/TASTE-linux/config/defaults/TASTE_IV_Properties.aadl
new file mode 100755
index 0000000000000000000000000000000000000000..a51abe06232fcb2c05bac6a597d6e788160db6be
--- /dev/null
+++ b/TASTE-linux/config/defaults/TASTE_IV_Properties.aadl
@@ -0,0 +1,16 @@
+-- mapping TASTE : AADL
+-- Container : Package
+-- Function : System
+-- Interface : Subprogram
+property set TASTE_IV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Package);
+--  MyString: aadlstring applies to (System, Subprogram);
+    Version: aadlstring applies to (System);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (System);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (System);
+    MSCFiles : aadlstring applies to (Subprogram);
+    is_Component_Type : aadlboolean applies to (System);
+    is_instance_of    : aadlstring applies to (System);
+--    MSCFiles : list of aadlstring applies to (Subprogram);
+end TASTE_IV_Properties;
diff --git a/TASTE-linux/config/externalTools/concurrencyview.tcl b/TASTE-linux/config/externalTools/concurrencyview.tcl
index 64b504c766b97a9296db9320a0edd59078b8151f..f0bba1c4acb50335a44acd1b0bd916aa0aa7d301 100755
--- a/TASTE-linux/config/externalTools/concurrencyview.tcl
+++ b/TASTE-linux/config/externalTools/concurrencyview.tcl
@@ -35,11 +35,11 @@ namespace eval concurrencyview {
 				lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ]
 				return $res
 			} else {
-			Context::setAttribute "concurrencyview" state "normal"
-			if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
-				return [concurrencyviewWindows_internal ]
-			} else {
-				return [concurrencyview_internal ]
+				Context::setAttribute "concurrencyview" state "normal"
+				if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
+					return [concurrencyviewWindows_internal ]
+				} else {
+					return [concurrencyview_internal ]
 				}
 			}
 		}
diff --git a/TASTE-linux64/config/TASTE_IV_Properties.aadl b/TASTE-linux64/config/TASTE_IV_Properties.aadl
index a51abe06232fcb2c05bac6a597d6e788160db6be..e1ee6df6c7313eb8632a548fe8eb68911ed7ccea 100644
--- a/TASTE-linux64/config/TASTE_IV_Properties.aadl
+++ b/TASTE-linux64/config/TASTE_IV_Properties.aadl
@@ -12,5 +12,6 @@ property set TASTE_IV_Properties is
     MSCFiles : aadlstring applies to (Subprogram);
     is_Component_Type : aadlboolean applies to (System);
     is_instance_of    : aadlstring applies to (System);
+    FPGA_Modes : aadlstring applies to (System);
 --    MSCFiles : list of aadlstring applies to (Subprogram);
 end TASTE_IV_Properties;
diff --git a/TASTE-linux64/config/TasteConfig.ini b/TASTE-linux64/config/TasteConfig.ini
index 3a9d26e7e23ec896fd6e88ea5af41abb548a8cf7..7656606e136b6172af37d96d4c3976cd1866f22e 100644
--- a/TASTE-linux64/config/TasteConfig.ini
+++ b/TASTE-linux64/config/TasteConfig.ini
@@ -80,6 +80,7 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "2" \
 		"svgComponentDepth" "2" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 
 	variable DVObjectsConfig { \
@@ -123,5 +124,6 @@ namespace eval TasteConfig {
 		"displayConnectionLabel" "false" \
 		"zoomDepth" "4" \
 		"svgComponentDepth" "3" \
+        "svgBBox" {0 0 2970 2100} ] \
 	}
 }
diff --git a/TASTE-linux64/config/defaults/TASTE_DV_Properties.aadl b/TASTE-linux64/config/defaults/TASTE_DV_Properties.aadl
new file mode 100644
index 0000000000000000000000000000000000000000..cb772325b4eb399bb44508752187adaac83593f8
--- /dev/null
+++ b/TASTE-linux64/config/defaults/TASTE_DV_Properties.aadl
@@ -0,0 +1,15 @@
+-- mapping TASTE : AADL
+-- Node : System
+-- Processor : Processor
+-- Process : Function
+-- Bus : Bus
+-- Device : Device
+-- Driver : Driver
+property set TASTE_DV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Processor, Process);
+    CoverageEnabled: aadlboolean applies to (Process);
+    Comment: aadlstring applies to (Device, Bus);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (Bus);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (Device);
+end TASTE_DV_Properties;
diff --git a/TASTE-linux64/config/defaults/TASTE_IV_Properties.aadl b/TASTE-linux64/config/defaults/TASTE_IV_Properties.aadl
new file mode 100644
index 0000000000000000000000000000000000000000..a51abe06232fcb2c05bac6a597d6e788160db6be
--- /dev/null
+++ b/TASTE-linux64/config/defaults/TASTE_IV_Properties.aadl
@@ -0,0 +1,16 @@
+-- mapping TASTE : AADL
+-- Container : Package
+-- Function : System
+-- Interface : Subprogram
+property set TASTE_IV_Properties is
+--  MyBoolean: aadlboolean applies to (System, Package);
+--  MyString: aadlstring applies to (System, Subprogram);
+    Version: aadlstring applies to (System);
+--  MyInt: aadlinteger applies to (System);
+--  MyReal: aadlreal applies to (System);
+--  MyEnum: enumeration  (val1, val2, val3, val4) applies to (System);
+    MSCFiles : aadlstring applies to (Subprogram);
+    is_Component_Type : aadlboolean applies to (System);
+    is_instance_of    : aadlstring applies to (System);
+--    MSCFiles : list of aadlstring applies to (Subprogram);
+end TASTE_IV_Properties;
diff --git a/TASTE-linux64/config/externalTools/concurrencyview.tcl b/TASTE-linux64/config/externalTools/concurrencyview.tcl
index 64b504c766b97a9296db9320a0edd59078b8151f..f0bba1c4acb50335a44acd1b0bd916aa0aa7d301 100644
--- a/TASTE-linux64/config/externalTools/concurrencyview.tcl
+++ b/TASTE-linux64/config/externalTools/concurrencyview.tcl
@@ -35,11 +35,11 @@ namespace eval concurrencyview {
 				lset res 1 [ concat [ list "Deployment view is inconsistent" ] [lindex $res 1 ] ]
 				return $res
 			} else {
-			Context::setAttribute "concurrencyview" state "normal"
-			if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
-				return [concurrencyviewWindows_internal ]
-			} else {
-				return [concurrencyview_internal ]
+				Context::setAttribute "concurrencyview" state "normal"
+				if { [ string match win32*64 [::platform::identify]] || [ string match win32* [::platform::identify]] } {
+					return [concurrencyviewWindows_internal ]
+				} else {
+					return [concurrencyview_internal ]
 				}
 			}
 		}