diff --git a/data/gencerts.cfg b/data/gencerts.cfg
index 6a94750e0a4a480253d84d7ca7ac62fa73dc9363..b46dbc91d3e24f46c854e44f7bac388a7094ef08 100644
--- a/data/gencerts.cfg
+++ b/data/gencerts.cfg
@@ -7,13 +7,12 @@ format=hex
 # Reference time point. The begining of the current year is used by default
 #reftime=2016-01-01
 
-# location of the IUT position
-reflocation= 43.552545:10.300891
+# location of the IUT position (ETSI)
+reflocation = 43.616949:7.053308
 
 # custom AID to be used to test GenericMessageProfile
 macro=CAM:36
 macro=DENM:37
-macro=GENERIC:38
 
 # local region: Italy
 macro=RGN_LOCAL:380
diff --git a/data/profiles/CERT_IUT_A_1_AT.xml b/data/profiles/CERT_IUT_A_1_AT.xml
index a5a6f9cd4aa67c25d3e9718c74b32c3916efbc9c..d6daa57aed86936143bfe681185cdadb6baae725 100644
--- a/data/profiles/CERT_IUT_A_1_AT.xml
+++ b/data/profiles/CERT_IUT_A_1_AT.xml
@@ -16,7 +16,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_A_AT.xml b/data/profiles/CERT_IUT_A_AT.xml
index dcc6714e4c21f90e7db85207189f6c0b41626c40..c27b17a0840599510508829c7d27e525799df44d 100644
--- a/data/profiles/CERT_IUT_A_AT.xml
+++ b/data/profiles/CERT_IUT_A_AT.xml
@@ -16,7 +16,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_B_AT.xml b/data/profiles/CERT_IUT_B_AT.xml
index f6b2f55de5ff1f11e6a21aadb079d5080c1a6a4d..4049cec395a26b2fd77859ead9ca95cd64e91506 100644
--- a/data/profiles/CERT_IUT_B_AT.xml
+++ b/data/profiles/CERT_IUT_B_AT.xml
@@ -16,7 +16,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_C_1_BV_AT.xml b/data/profiles/CERT_IUT_C_1_BV_AT.xml
index b86186c5e37ad42c5086d0821f1471f424a1535a..3b27369f096858361d122b84d687c010d85e9d95 100644
--- a/data/profiles/CERT_IUT_C_1_BV_AT.xml
+++ b/data/profiles/CERT_IUT_C_1_BV_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_C_2_BV_AT.xml b/data/profiles/CERT_IUT_C_2_BV_AT.xml
index 989627cd921227b144fd8991ea93abbdb4eddab1..83e0c11009090c874470d960f4fae9aeb49a2344 100644
--- a/data/profiles/CERT_IUT_C_2_BV_AT.xml
+++ b/data/profiles/CERT_IUT_C_2_BV_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_C_3_BO_AT.xml b/data/profiles/CERT_IUT_C_3_BO_AT.xml
index f3459bcbbed981b5d7ec86e1d554d30c6e7fd2c5..8ecc41fd7049ee66d4bf1697381d6a8d2387ed21 100644
--- a/data/profiles/CERT_IUT_C_3_BO_AT.xml
+++ b/data/profiles/CERT_IUT_C_3_BO_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_C_4_BO_AT.xml b/data/profiles/CERT_IUT_C_4_BO_AT.xml
index 807ddb586f38d2a525c7f9303d947dd9905c9dc5..e72313feaf543f31ae2d602a98f80a7aec65b496 100644
--- a/data/profiles/CERT_IUT_C_4_BO_AT.xml
+++ b/data/profiles/CERT_IUT_C_4_BO_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_C_5_BV_AT.xml b/data/profiles/CERT_IUT_C_5_BV_AT.xml
index 1dd1b8934c3e38ab7fb3cc72b74e35c9f84b3258..f48bd2a1312ac2e03aa4ee0fb0b6e6173d7e0c06 100644
--- a/data/profiles/CERT_IUT_C_5_BV_AT.xml
+++ b/data/profiles/CERT_IUT_C_5_BV_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_C_AT.xml b/data/profiles/CERT_IUT_C_AT.xml
index ea7693b1d4f406ca04d3438ea3ce119c7d6d0a3a..2b2acaf4606f49fb6d60b06c5ed624d9840a2f6d 100644
--- a/data/profiles/CERT_IUT_C_AT.xml
+++ b/data/profiles/CERT_IUT_C_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_D_1_BV_AT.xml b/data/profiles/CERT_IUT_D_1_BV_AT.xml
index cb0cf736d84c35a9a0b6e240a5f15ff13195ce42..ff64649e78d438e052b5ae6c021d35b9cf7e5d88 100644
--- a/data/profiles/CERT_IUT_D_1_BV_AT.xml
+++ b/data/profiles/CERT_IUT_D_1_BV_AT.xml
@@ -20,7 +20,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_D_2_BO_AT.xml b/data/profiles/CERT_IUT_D_2_BO_AT.xml
index ed52f1a0c35ee0fdba70ee7e475fba5b1d445228..d58ef1fad627f71fc970c7f19d838aa4eed13afc 100644
--- a/data/profiles/CERT_IUT_D_2_BO_AT.xml
+++ b/data/profiles/CERT_IUT_D_2_BO_AT.xml
@@ -20,7 +20,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_D_3_BO_AT.xml b/data/profiles/CERT_IUT_D_3_BO_AT.xml
index 8fcfaae8182d31e0db97e4b07adb96c945eb9e48..7c8d81528c3211c4d5780c07ad21d6b0f7b6f587 100644
--- a/data/profiles/CERT_IUT_D_3_BO_AT.xml
+++ b/data/profiles/CERT_IUT_D_3_BO_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_D_AT.xml b/data/profiles/CERT_IUT_D_AT.xml
index 645df8a39ca8d34b7808f3bc1315f9e6a8ac78a6..5b76c38c546380a1db33b334421f4accbc62f339 100644
--- a/data/profiles/CERT_IUT_D_AT.xml
+++ b/data/profiles/CERT_IUT_D_AT.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_IUT_E_AT.xml b/data/profiles/CERT_IUT_E_AT.xml
index e9755cc9fa1348af871263957f9cd9f3ab390b0f..8b292a7e78570592d8825d64e35f00d046320041 100644
--- a/data/profiles/CERT_IUT_E_AT.xml
+++ b/data/profiles/CERT_IUT_E_AT.xml
@@ -16,7 +16,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#01;&#xFF;&#xFF;</ssp>  <!-- CAM -->
 			<ssp aid="DENM">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TEST_ROOT.xml b/data/profiles/CERT_TEST_ROOT.xml
index dbfd7958623ed2abff7afa69f6326ebea09761ba..ea6d441d37da3c10338c53200c112c0fe7642ddd 100644
--- a/data/profiles/CERT_TEST_ROOT.xml
+++ b/data/profiles/CERT_TEST_ROOT.xml
@@ -21,7 +21,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_01_04_BO_AA.xml b/data/profiles/CERT_TS_01_04_BO_AA.xml
index cbbd1af16e8139b78ffa58f61b3ac00de72f25b2..ca8a6207f86337da7b1a79ae9a0a19df9c99d6b3 100644
--- a/data/profiles/CERT_TS_01_04_BO_AA.xml
+++ b/data/profiles/CERT_TS_01_04_BO_AA.xml
@@ -23,7 +23,6 @@
 			<aid value="MAP"/> <!-- RLT / MAP-->
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
-			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_02_02_BO_AA.xml b/data/profiles/CERT_TS_02_02_BO_AA.xml
index 4b43664c8143552db74504f49a47c1df7daa9c09..4311e58f31a632caed612668099da440a8b023ac 100644
--- a/data/profiles/CERT_TS_02_02_BO_AA.xml
+++ b/data/profiles/CERT_TS_02_02_BO_AA.xml
@@ -21,7 +21,6 @@
 			<aid value="MAP"/> <!-- RLT / MAP-->
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
-			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_AA.xml b/data/profiles/CERT_TS_A_AA.xml
index 4b3c1c6f1c45855b2b0841bec3bc712388f1939e..3012efe9c01cc4ee0c71988d11ee0ac2d1f5693e 100644
--- a/data/profiles/CERT_TS_A_AA.xml
+++ b/data/profiles/CERT_TS_A_AA.xml
@@ -22,7 +22,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_AT.xml b/data/profiles/CERT_TS_A_AT.xml
index 1c8966fb86bc617860db9a4c730c289406331237..6951b3a0b17f932b3f7b48de88b5dc793c4fa9aa 100644
--- a/data/profiles/CERT_TS_A_AT.xml
+++ b/data/profiles/CERT_TS_A_AT.xml
@@ -20,8 +20,7 @@
 			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
 			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
 			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
-			<ssp aid="GN-MGMT">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</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 58623dc025f7959e3657a1a7ea14b59060d8c278..19a69349ef38dd721179b9a0c36af61cf8f7478d 100644
--- a/data/profiles/CERT_TS_A_EA.xml
+++ b/data/profiles/CERT_TS_A_EA.xml
@@ -21,7 +21,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_A_EC.xml b/data/profiles/CERT_TS_A_EC.xml
index 8cfc982e48d7250a17543e490c3c8ebd7cae79b4..521a411b5b710895fb5931bf997c19010f7cd23f 100644
--- a/data/profiles/CERT_TS_A_EC.xml
+++ b/data/profiles/CERT_TS_A_EC.xml
@@ -16,7 +16,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_B1_AT.xml b/data/profiles/CERT_TS_B1_AT.xml
new file mode 100755
index 0000000000000000000000000000000000000000..68f5464e4c608457525390107d25f7d60b96d8f7
--- /dev/null
+++ b/data/profiles/CERT_TS_B1_AT.xml
@@ -0,0 +1,33 @@
+<certificate name="CERT_TS_B1_AT">
+	<version>2</version>
+	<signer type="digest" name="CERT_TS_B_AA"/>
+	<subject type="AT" name="">
+		<!-- verification_key -->
+		<attribute type="verification_key">
+			<public_key algorythm="ecdsa_nistp256_with_sha256">
+				<ecc_point type="uncompressed"/>
+			</public_key>
+		</attribute>
+		<!-- assurance_level -->
+		<attribute type="assurance_level">
+			<assurance level="3"/>
+		</attribute>
+		<!-- its_aid_ssp_list -->
+		<attribute type="its_aid_ssp_list">
+			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
+			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
+			<ssp aid="SPAT">&#x01;&#xF8;</ssp> <!-- TLM -->
+			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
+			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
+			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
+		</attribute>
+	</subject>
+	<validity>
+		<restriction type="time" start="+0d" end="+365d"/>
+		<restriction type="region">
+			<circle latitude="0.0" longitude="0.0" radius="5000"/>
+		</restriction>
+	</validity>
+	<signature algorithm="0"/>
+</certificate>
diff --git a/data/profiles/CERT_TS_B_AA.xml b/data/profiles/CERT_TS_B_AA.xml
index 3d3a862ffa50994de2cbe135cfce6f611e5df9c8..c95838db02cc49827e09ffe7a524f7b857e1aae2 100644
--- a/data/profiles/CERT_TS_B_AA.xml
+++ b/data/profiles/CERT_TS_B_AA.xml
@@ -25,7 +25,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_B_AT.xml b/data/profiles/CERT_TS_B_AT.xml
index 8f4aa618db011809da17dc54f97335afdfec3683..c58d56fcd7643baec8d0c4c4e27ca2e1ea48f421 100644
--- a/data/profiles/CERT_TS_B_AT.xml
+++ b/data/profiles/CERT_TS_B_AT.xml
@@ -20,8 +20,7 @@
 			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
 			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
 			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
-			<ssp aid="GN-MGMT">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_C_AA.xml b/data/profiles/CERT_TS_C_AA.xml
index 0780c5c2fb672f98396be6b67601529288fd827c..f216f17fe7481a8ded2f4cc9691bd9474091de5c 100644
--- a/data/profiles/CERT_TS_C_AA.xml
+++ b/data/profiles/CERT_TS_C_AA.xml
@@ -24,7 +24,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_C_AT.xml b/data/profiles/CERT_TS_C_AT.xml
index a10b0e9b9b1c20fec5f73d35b96e946e745bbe50..a3d6456b6579a87f92d16919f170290e4d392914 100644
--- a/data/profiles/CERT_TS_C_AT.xml
+++ b/data/profiles/CERT_TS_C_AT.xml
@@ -23,8 +23,7 @@
 			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
 			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
 			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
-			<ssp aid="GN-MGMT">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_D_AA.xml b/data/profiles/CERT_TS_D_AA.xml
index 678fe3dd9c0de571391d8dc8eb9df203dd844e17..8b0a0f9a5f957a0e727bb9c47434ff820a5b5614 100644
--- a/data/profiles/CERT_TS_D_AA.xml
+++ b/data/profiles/CERT_TS_D_AA.xml
@@ -24,7 +24,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_D_AT.xml b/data/profiles/CERT_TS_D_AT.xml
index f9cf0c82d5310947dfdb0cad3718788ee1f44fc3..04840be4ac6880243782b47041fa532fbc296b3d 100644
--- a/data/profiles/CERT_TS_D_AT.xml
+++ b/data/profiles/CERT_TS_D_AT.xml
@@ -23,8 +23,7 @@
 			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
 			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
 			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
-			<ssp aid="GN-MGMT">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E0_AA.xml b/data/profiles/CERT_TS_E0_AA.xml
index 4b3b7f7ce369d92e385ba672c63b468981b122f7..786d69a88d16c9a0a69fe0493e8cc11bc428e85a 100644
--- a/data/profiles/CERT_TS_E0_AA.xml
+++ b/data/profiles/CERT_TS_E0_AA.xml
@@ -21,7 +21,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E1_AA.xml b/data/profiles/CERT_TS_E1_AA.xml
index 61a3f6c2e9079b2a287036b9ba51affd6e3ab49e..3e2c9db3256e016762b48acb79ff4a3dde7ee216 100644
--- a/data/profiles/CERT_TS_E1_AA.xml
+++ b/data/profiles/CERT_TS_E1_AA.xml
@@ -21,7 +21,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E_AA.xml b/data/profiles/CERT_TS_E_AA.xml
index ac711eb8b290ef710e41c9042f2a25c43e2c58d0..0fc9870011fc05addb996280e9f7413038980533 100644
--- a/data/profiles/CERT_TS_E_AA.xml
+++ b/data/profiles/CERT_TS_E_AA.xml
@@ -21,7 +21,6 @@
 			<aid value="IVI"/> <!-- IVI -->
 			<aid value="TLC"/> <!-- TLC -->
 			<aid value="GN-MGMT"/> <!-- GN-MGMT -->
-			<aid value="GENERIC"/> <!-- GENERIC -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_E_AT.xml b/data/profiles/CERT_TS_E_AT.xml
index b488b73352bb2175cc3f823e77b3136b7fd61736..3cce7b2b43443305c78b18d2a07b4d77ab5376c4 100644
--- a/data/profiles/CERT_TS_E_AT.xml
+++ b/data/profiles/CERT_TS_E_AT.xml
@@ -20,8 +20,7 @@
 			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
 			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
 			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
-			<ssp aid="GN-MGMT">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_F_AT.xml b/data/profiles/CERT_TS_F_AT.xml
index 6806e643478252c771be31cf0401ebf372a53157..2193a11a1e46d5637dee55ddb3aa7756aa22af7b 100644
--- a/data/profiles/CERT_TS_F_AT.xml
+++ b/data/profiles/CERT_TS_F_AT.xml
@@ -20,8 +20,7 @@
 			<ssp aid="MAP">&#x01;&#xE0;</ssp> <!-- RLT -->
 			<ssp aid="IVI">&#x01;&#xFF;&#xF8;</ssp> <!-- IVI -->
 			<ssp aid="TLC">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- TLC -->
-			<ssp aid="GN-MGMT">&#x01;&#xFF;&#xFF;&#xE0;</ssp> <!-- GN-MGMT -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_06_01_BO_AT.xml b/data/profiles/CERT_TS_MSG_06_01_BO_AT.xml
index 3b032a21c49b6b232b5c006dd52fd1c7afaba0d6..39d0fc08979d9d127ceba3e03a7d773c13d08805 100644
--- a/data/profiles/CERT_TS_MSG_06_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_06_01_BO_AT.xml
@@ -17,7 +17,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_06_02_BO_AT.xml b/data/profiles/CERT_TS_MSG_06_02_BO_AT.xml
index 7ed3842318165b00fe8a7b88bef9264fff54dc41..91e15a60c17ebf076704c9f70fda43f83c5d3988 100644
--- a/data/profiles/CERT_TS_MSG_06_02_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_06_02_BO_AT.xml
@@ -17,7 +17,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_01_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_01_BO_AT.xml
index f40e1d5c5567796213226ee72d178df5ec15cf62..b71520617643cac11b2c9b171fc77e159a52e544 100644
--- a/data/profiles/CERT_TS_MSG_13_01_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_01_BO_AT.xml
@@ -17,7 +17,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_02_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_02_BO_AT.xml
index 8427badfd724d4106e38eaffb4f1c3a52c72fc00..2bdce4865f187b63538a897fa040c0c3d02541d1 100644
--- a/data/profiles/CERT_TS_MSG_13_02_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_02_BO_AT.xml
@@ -17,7 +17,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_03_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_03_BO_AT.xml
index d159678b409464592beee9c763c020c230ead462..c20890d23646264d1dfd2852dfaaeadbb3d78d73 100644
--- a/data/profiles/CERT_TS_MSG_13_03_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_03_BO_AT.xml
@@ -20,7 +20,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_04_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_04_BO_AT.xml
index bb9a28fd104788fccced32f5c99156731fa169f3..9b1d129b370c9ee6f1137fa862b8dd6379236d8b 100644
--- a/data/profiles/CERT_TS_MSG_13_04_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_04_BO_AT.xml
@@ -20,7 +20,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_05_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_05_BO_AT.xml
index f091bc9577db5c883ee9b50c8b8f27a0feb10342..83c86fa55f873b054f01f029e6d80b2663a67c0a 100644
--- a/data/profiles/CERT_TS_MSG_13_05_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_05_BO_AT.xml
@@ -20,7 +20,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_06_BO_AA.xml b/data/profiles/CERT_TS_MSG_13_06_BO_AA.xml
index c27c6f0df3409500a1b9e81c29de26d29fc85db8..e5cd18c6b25b2dc868a32b44f511517a111984af 100644
--- a/data/profiles/CERT_TS_MSG_13_06_BO_AA.xml
+++ b/data/profiles/CERT_TS_MSG_13_06_BO_AA.xml
@@ -19,7 +19,7 @@
 		<attribute type="its_aid_list">
 			<aid value="CAM"/> <!-- CAM -->
 			<aid value="DENM"/> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>
diff --git a/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml b/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml
index 4fc76fba547100c6dd46c988f9064eb649d900d7..990ea7cf2a342745efb2e7f28f4bbb47137f7ab7 100644
--- a/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml
+++ b/data/profiles/CERT_TS_MSG_13_06_BO_AT.xml
@@ -18,7 +18,7 @@
 		<attribute type="its_aid_ssp_list">
 			<ssp aid="CAM">&#x01;&#xFF;&#xFF;</ssp> <!-- CAM -->
 			<ssp aid="DENM">&#x01;&#xFF;&#xFF;&#xFF;</ssp> <!-- DENM -->
-			<ssp aid="GENERIC">&#01;&#xFF;&#xFF;&#xFF;</ssp>  <!-- GENERIC -->
+			<ssp aid="GN-MGMT">&#00;</ssp>  <!-- GN-MGMT -->
 		</attribute>
 	</subject>
 	<validity>