diff --git a/data/profiles/CERT_TEST_ROOT.xml b/data/profiles/CERT_TEST_ROOT.xml
index 3827eb911808b8926a3b6efe4d59691510ed28f5..65ba05fa48ed5423de706184a3afa7b366df3e1e 100644
--- a/data/profiles/CERT_TEST_ROOT.xml
+++ b/data/profiles/CERT_TEST_ROOT.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_03_BO_AA.xml b/data/profiles/CERT_TS_01_03_BO_AA.xml
index e288cecb306e86dc6c3d5e73db1fbac3f4230203..227654b6f64fdecc6f81202ba4c05d6482362dab 100644
--- a/data/profiles/CERT_TS_01_03_BO_AA.xml
+++ b/data/profiles/CERT_TS_01_03_BO_AA.xml
@@ -15,8 +15,8 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_03_BO_AT.xml b/data/profiles/CERT_TS_01_03_BO_AT.xml
index 61c12b270db665ada4b5c94df358deaa788445ee..3a26df018dbf7c52895131c187db5bdd9f3b099c 100644
--- a/data/profiles/CERT_TS_01_03_BO_AT.xml
+++ b/data/profiles/CERT_TS_01_03_BO_AT.xml
@@ -1,3 +1,4 @@
+<!-- valid AT certificate signed with AA cert with version 3 -->
 <certificate name="CERT_TS_01_03_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_01_03_BO_AA"/>
diff --git a/data/profiles/CERT_TS_01_04_BO_AA.xml b/data/profiles/CERT_TS_01_04_BO_AA.xml
index 2d30bee7190e285d9f26102073192b4a477b9567..7c3c65b01743e3f909392bee71c7ecb7dd3ab3fc 100644
--- a/data/profiles/CERT_TS_01_04_BO_AA.xml
+++ b/data/profiles/CERT_TS_01_04_BO_AA.xml
@@ -15,8 +15,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_04_BO_AT.xml b/data/profiles/CERT_TS_01_04_BO_AT.xml
index 9325972b7324538cdacf73b32bf15ee7a3950c97..db8bc484ddddc99044df66c67fe6686c4f910684 100644
--- a/data/profiles/CERT_TS_01_04_BO_AT.xml
+++ b/data/profiles/CERT_TS_01_04_BO_AT.xml
@@ -1,3 +1,4 @@
+<!-- valid AT certificate signed with AA cert with version 1 -->
 <certificate name="CERT_TS_01_04_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_01_04_BO_AA"/>
diff --git a/data/profiles/CERT_TS_02_01_BO_AT.xml b/data/profiles/CERT_TS_02_01_BO_AT.xml
index f7dc8264a020b60dda1993d73c6685b9ee67ca28..2a1d52377d370d47855853117309b25d48e50f86 100644
--- a/data/profiles/CERT_TS_02_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_02_01_BO_AT.xml
@@ -1,4 +1,4 @@
-<!-- AT certificate signed by EA cert -->
+<!-- AT certificate signed by EC cert -->
 <certificate name="CERT_TS_02_01_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_EC"/>
diff --git a/data/profiles/CERT_TS_02_02_BO_AA.xml b/data/profiles/CERT_TS_02_02_BO_AA.xml
index 9b1a8535b8468ef43f027848d392bc778c9307b4..26dbe8c9916ca119bb0d0364d5970fe979885422 100644
--- a/data/profiles/CERT_TS_02_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AA.xml
@@ -1,4 +1,4 @@
-<!-- AA certificate signed by EA cert -->
+<!-- AA certificate signed by EC cert -->
 <certificate name="CERT_TS_02_02_BO_AA">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_EC"/>
@@ -15,8 +15,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_02_02_BO_AT.xml b/data/profiles/CERT_TS_02_02_BO_AT.xml
index b263a9c71cde3ef56640ed83090b3710cf07de4b..8d4a40fc66e93305325cbd1e6b57372110ecf4de 100644
--- a/data/profiles/CERT_TS_02_02_BO_AT.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AT.xml
@@ -1,4 +1,4 @@
-<!-- AT certificate signed by AA which is signed by EA -->
+<!-- AT certificate signed by AA which is signed by EC -->
 <certificate name="CERT_TS_02_02_BO_AT">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_02_02_BO_AA"/>
diff --git a/data/profiles/CERT_TS_03_BO_CA.xml b/data/profiles/CERT_TS_03_BO_CA.xml
index d81bc093a48d6d4e8cd26ed7e0fb73c925d02f5a..6bd1562edc45429c202f59dfdef02ea7fd53dea5 100644
--- a/data/profiles/CERT_TS_03_BO_CA.xml
+++ b/data/profiles/CERT_TS_03_BO_CA.xml
@@ -1,4 +1,4 @@
-<!-- AT certificate used to sign AA cert -->
+<!-- valid AT certificate used to sign AA cert -->
 <certificate name="CERT_TS_03_BO_CA">
 	<version>2</version>
 	<signer type="digest" name="CERT_TS_A_AA"/>
diff --git a/data/profiles/CERT_TS_A_AA.xml b/data/profiles/CERT_TS_A_AA.xml
index 2f6f722d2f32e9c43f81798a6ca141c07c63e1e4..8cabb4c87f53bd0ce56ab7b14b5b7cf8d05eebba 100644
--- a/data/profiles/CERT_TS_A_AA.xml
+++ b/data/profiles/CERT_TS_A_AA.xml
@@ -15,8 +15,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!--CAM--> <!-- CAM -->
-			<aid value="37"/> <!--DENM--> <!-- DENM -->
+			<aid value="36"/>  <!--CAM-->
+			<aid value="37"/>  <!--DENM-->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_AT.xml b/data/profiles/CERT_TS_A_AT.xml
index 617ad57ef255bf7dc169dea6448cc90f7bf86419..3d95b95401acfc195f5b57ffb13e1a642272b59d 100644
--- a/data/profiles/CERT_TS_A_AT.xml
+++ b/data/profiles/CERT_TS_A_AT.xml
@@ -16,6 +16,11 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="36">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="37">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
+			<ssp aid="137">&#x01;&#xF8;</ssp> <!-- TLM -->
+			<ssp aid="138">&#x01;&#xE0;</ssp> <!-- RLT -->
+			<ssp aid="139">&#x01;XXX&#xFF;&#xF8;</ssp> <!-- IVI -->
+			<ssp aid="140">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
+			<ssp aid="141">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_EA.xml b/data/profiles/CERT_TS_A_EA.xml
index 196b298e4de3d55909a868bdce3b4de220b98603..8cc6425eb5aef3c0adec24064e676e0786acfddc 100644
--- a/data/profiles/CERT_TS_A_EA.xml
+++ b/data/profiles/CERT_TS_A_EA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_B_AA.xml b/data/profiles/CERT_TS_B_AA.xml
index 807d5527355fce73c22d075cd231ef73ff9fb9a3..3c639a779d91ebdb4a7cbb3380b161b01e0eec7f 100644
--- a/data/profiles/CERT_TS_B_AA.xml
+++ b/data/profiles/CERT_TS_B_AA.xml
@@ -18,8 +18,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!--CAM-->
+			<aid value="37"/>  <!--DENM-->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_C_AA.xml b/data/profiles/CERT_TS_C_AA.xml
index 4a2e1987a0ff44390da0b9cc0518efaa94832739..00a5b9afc8cfe6ad78cf3f25b30e4a35ec98aa67 100644
--- a/data/profiles/CERT_TS_C_AA.xml
+++ b/data/profiles/CERT_TS_C_AA.xml
@@ -17,8 +17,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!--CAM-->
+			<aid value="37"/>  <!--DENM-->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_D_AA.xml b/data/profiles/CERT_TS_D_AA.xml
index baf62ceb9383fb72dcdb4576b2d44c55c699237c..bd4f0fc00fd6a2c735f9337d9d6bd6ad0355479d 100644
--- a/data/profiles/CERT_TS_D_AA.xml
+++ b/data/profiles/CERT_TS_D_AA.xml
@@ -17,8 +17,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E0_AA.xml b/data/profiles/CERT_TS_E0_AA.xml
index 2849a9cbb99f3247dadf5c85ed93eed96110e453..37625c06c0cefdf15e0d0610357b7065fd1bece7 100644
--- a/data/profiles/CERT_TS_E0_AA.xml
+++ b/data/profiles/CERT_TS_E0_AA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E1_AA.xml b/data/profiles/CERT_TS_E1_AA.xml
index fc0f368de60786607bf8028f6a734bb0ef4dadbf..63a51c947110c05ac9ac55518b6f0d32f6dca74b 100644
--- a/data/profiles/CERT_TS_E1_AA.xml
+++ b/data/profiles/CERT_TS_E1_AA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E_AA.xml b/data/profiles/CERT_TS_E_AA.xml
index a339b1927284a4a8aa8c7dfa815876f3a9ae08b6..b926a3edc4a673b5bb4c895255eb2843557f9f95 100644
--- a/data/profiles/CERT_TS_E_AA.xml
+++ b/data/profiles/CERT_TS_E_AA.xml
@@ -14,8 +14,13 @@
 		</attribute>
 		<!-- its_aid_list -->
 		<attribute type="its_aid_list">
-			<aid value="36"/> <!-- CAM -->
-			<aid value="37"/> <!-- DENM -->
+			<aid value="36"/>  <!-- CAM -->
+			<aid value="37"/>  <!-- DENM -->
+			<aid value="137"/> <!-- TLM / SPAT -->
+			<aid value="138"/> <!-- RLT / MAP-->
+			<aid value="139"/> <!-- IVI -->
+			<aid value="140"/> <!-- TLC -->
+			<aid value="141"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>