diff --git a/pycrate_asn1c/asnobj.py b/pycrate_asn1c/asnobj.py
index f99d7b5..f75b52c 100644
--- a/pycrate_asn1c/asnobj.py
+++ b/pycrate_asn1c/asnobj.py
@@ -4760,7 +4760,7 @@ class ASN1Obj(object):
         else:
             # raw BOOLEAN value
             self.select_set(_path_cur(),
-                                 self._VALUE_BOOL[m.group(1)])
+                            self._VALUE_BOOL[m.group(1)])
             return text[m.end():].strip()
     
     def _parse_value_int(self, text):
@@ -5727,7 +5727,18 @@ class ASN1Obj(object):
             if self._type == TYPE_OPEN:
                 rest = self.__parse_set_comp_open(rv, val, dom)
             else:
+                len_val = len(val[dom])
                 rest = self._parse_set_comp(rv, val, dom)
+                # in case the set component just parsed is a single value,
+                # we need to check for potential deduplication here,
+                # because parse_value() is used and cannot implement such control
+                if len(val[dom]) >= 2 and len(val[dom]) == len_val + 1 \
+                and val[dom][-1] in val[dom][:-1]:
+                    print('WNG: {0}.{1}, duplicated value in {2} set: {3}'\
+                          .format(GLOBAL.COMP['NS']['mod'], self.fullname(), dom,
+                                  repr(val[dom][-1]).replace('\n', '')))
+                    del val[dom][-1]
+            # 
             self.__parse_set_comp_path_unconfig()
             val = self.__parse_set_track_val(val)
             #
@@ -5752,7 +5763,18 @@ class ASN1Obj(object):
             if self._type == TYPE_OPEN:
                 rest = self.__parse_set_comp_open(ev, val, dom)
             else:
+                len_val = len(val[dom])
                 rest = self._parse_set_comp(ev, val, dom)
+                # in case the set component just parsed is a single value,
+                # we need to check for potential deduplication here,
+                # because parse_value() is used and cannot implement such control
+                if len(val[dom]) >= 2 and len(val[dom]) == len_val + 1 \
+                and val[dom][-1] in val[dom][:-1]:
+                    print('WNG: {0}.{1}, duplicated value in {2} set: {3}'\
+                          .format(GLOBAL.COMP['NS']['mod'], self.fullname(), dom,
+                                  repr(val[dom][-1]).replace('\n', '')))
+                    del val[dom][-1]
+            #
             self.__parse_set_comp_path_unconfig()
             val = self.__parse_set_track_val(val)
             #
@@ -5915,6 +5937,11 @@ class ASN1Obj(object):
                     else:
                         objval = ObjProxy_val
                     #
+                    
+                    if self._name == 'Supported-MAP-Operations':
+                        print(objval)
+                    
+                    
                     # 3.4.4) dispatch the root / ext values from objval into self within val
                     if objval['root']:
                         self.__parse_set_insert(val[dom], objval['root'], dom)
@@ -5966,11 +5993,13 @@ class ASN1Obj(object):
         # 2) insert all values  1 by 1 from objval into val (self)
         # and rewrite the root / ext domain and indexing into the val set
         for v in objval:
-            val.append(v)
-            if v in ref:
-                ind = ref.index(v)
-                GLOBAL.COMP['NS']['setpar'][ind][-2] = dom
-                GLOBAL.COMP['NS']['setpar'][ind][-1] = len(val)-1
+            # deduplicate values within v
+            if v not in val:
+                val.append(v)
+                if v in ref:
+                    ind = ref.index(v)
+                    GLOBAL.COMP['NS']['setpar'][ind][-2] = dom
+                    GLOBAL.COMP['NS']['setpar'][ind][-1] = len(val)-1
         GLOBAL.COMP['NS']['setpar'] = []
     
     def _parse_value_or_range(self, text):
diff --git a/pycrate_asn1c/dictobj.py b/pycrate_asn1c/dictobj.py
index dc19c7d..8751a5d 100644
--- a/pycrate_asn1c/dictobj.py
+++ b/pycrate_asn1c/dictobj.py
@@ -86,10 +86,16 @@ class ASN1Dict(object):
         return self._dict.__contains__(item)
     
     def __eq__(self, other):
-        return self._index == other._index and self._dict == other._dict
+        if isinstance(other, self.__class__):
+            return self._index == other._index and self._dict == other._dict
+        else:
+            return False
     
     def __ne__(self, other):
-        return self._index != other._index or self._dict != other._dict
+        if isinstance(other, self.__class__):
+            return self._index != other._index or self._dict != other._dict
+        else:
+            return False
     
     def index(self, key):
         return self._index.index(key)
diff --git a/pycrate_asn1dir/AsymKeyPkg.py b/pycrate_asn1dir/AsymKeyPkg.py
index 97ba38b..05b5189 100644
--- a/pycrate_asn1dir/AsymKeyPkg.py
+++ b/pycrate_asn1dir/AsymKeyPkg.py
@@ -10018,9 +10018,8 @@ class SecureMimeMessageV3dot1_2009:
     _SMimeCapsSet_val_Type_1 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
     _SMimeCapsSet_val_Type_13 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
     _SMimeCapsSet_val_Type_14 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
-    _SMimeCapsSet_val_Type_19 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
-    _SMimeCapsSet_val_Type_22 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
-    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'Type', _SMimeCapsSet_val_Type_19), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_22), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
+    _SMimeCapsSet_val_Type_21 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
+    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
     
     #-----< aa-encrypKeyPref >-----#
     aa_encrypKeyPref = CLASS(name=u'aa-encrypKeyPref', mode=MODE_VALUE, typeref=ASN1RefType(('PKIX-CommonTypes-2009', 'ATTRIBUTE')))
@@ -10096,8 +10095,7 @@ class SecureMimeMessageV3dot1_2009:
         _SMimeCapsSet_val_Type_1,
         _SMimeCapsSet_val_Type_13,
         _SMimeCapsSet_val_Type_14,
-        _SMimeCapsSet_val_Type_19,
-        _SMimeCapsSet_val_Type_22,
+        _SMimeCapsSet_val_Type_21,
         aa_encrypKeyPref,
         _aa_encrypKeyPref_val_Type,
         id_aa_encrypKeyPref,
diff --git a/pycrate_asn1dir/CMSAndPKIX08.py b/pycrate_asn1dir/CMSAndPKIX08.py
index be5325c..9765718 100644
--- a/pycrate_asn1dir/CMSAndPKIX08.py
+++ b/pycrate_asn1dir/CMSAndPKIX08.py
@@ -13438,9 +13438,8 @@ class SecureMimeMessageV3dot1_2009:
     _SMimeCapsSet_val_Type_1 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
     _SMimeCapsSet_val_Type_13 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
     _SMimeCapsSet_val_Type_14 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
-    _SMimeCapsSet_val_Type_19 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
-    _SMimeCapsSet_val_Type_22 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
-    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'Type', _SMimeCapsSet_val_Type_19), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_22), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
+    _SMimeCapsSet_val_Type_21 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
+    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
     
     #-----< aa-encrypKeyPref >-----#
     aa_encrypKeyPref = CLASS(name=u'aa-encrypKeyPref', mode=MODE_VALUE, typeref=ASN1RefType(('PKIX-CommonTypes-2009', 'ATTRIBUTE')))
@@ -13516,8 +13515,7 @@ class SecureMimeMessageV3dot1_2009:
         _SMimeCapsSet_val_Type_1,
         _SMimeCapsSet_val_Type_13,
         _SMimeCapsSet_val_Type_14,
-        _SMimeCapsSet_val_Type_19,
-        _SMimeCapsSet_val_Type_22,
+        _SMimeCapsSet_val_Type_21,
         aa_encrypKeyPref,
         _aa_encrypKeyPref_val_Type,
         id_aa_encrypKeyPref,
diff --git a/pycrate_asn1dir/ITS.py b/pycrate_asn1dir/ITS.py
index 8a1e374..20f864f 100644
--- a/pycrate_asn1dir/ITS.py
+++ b/pycrate_asn1dir/ITS.py
@@ -2461,13 +2461,13 @@ class CALMiitsscu:
     _IICPresponses_val_IICPresponse_5 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Command-confirm')))
     _IICPresponses_val_IICPresponse_6 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Request-confirm')))
     _IICPresponses_val_IICPresponse_7 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Get-confirm')))
-    _IICPresponses_val_IICPresponse_8 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Get-confirm')))
-    _IICPresponses_val_IICPresponse_9 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Set-confirm')))
-    _IICPresponses_val_IICPresponse_10 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMiitsscu', 'McmdRs')))
-    _IICPresponses_val_IICPresponse_11 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Command-confirm')))
-    _IICPresponses_val_IICPresponse_12 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Request-confirm')))
-    _IICPresponses_val_IICPresponse_13 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Command-confirm')))
-    _IICPresponses_val_IICPresponse_14 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Request-confirm')))
+    _IICPresponses_val_IICPresponse_8 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Set-confirm')))
+    _IICPresponses_val_IICPresponse_9 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMiitsscu', 'McmdRs')))
+    _IICPresponses_val_IICPresponse_10 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Command-confirm')))
+    _IICPresponses_val_IICPresponse_11 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Request-confirm')))
+    _IICPresponses_val_IICPresponse_12 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Command-confirm')))
+    _IICPresponses_val_IICPresponse_13 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Request-confirm')))
+    _IICPresponses_val_IICPresponse_14 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     _IICPresponses_val_IICPresponse_15 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     _IICPresponses_val_IICPresponse_16 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     _IICPresponses_val_IICPresponse_17 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
@@ -2483,8 +2483,7 @@ class CALMiitsscu:
     _IICPresponses_val_IICPresponse_27 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     _IICPresponses_val_IICPresponse_28 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     _IICPresponses_val_IICPresponse_29 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
-    _IICPresponses_val_IICPresponse_30 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
-    IICPresponses._val = ASN1Set(rv=[dict([(u'ref', 0), (u'IICPresponse', _IICPresponses_val_IICPresponse_0)]), dict([(u'ref', 1), (u'IICPresponse', _IICPresponses_val_IICPresponse_1)]), dict([(u'ref', 2), (u'IICPresponse', _IICPresponses_val_IICPresponse_2)]), dict([(u'ref', 3), (u'IICPresponse', _IICPresponses_val_IICPresponse_3)]), dict([(u'ref', 4), (u'IICPresponse', _IICPresponses_val_IICPresponse_4)]), dict([(u'ref', 5), (u'IICPresponse', _IICPresponses_val_IICPresponse_5)]), dict([(u'ref', 6), (u'IICPresponse', _IICPresponses_val_IICPresponse_6)]), dict([(u'ref', 7), (u'IICPresponse', _IICPresponses_val_IICPresponse_7)]), dict([(u'ref', 7), (u'IICPresponse', _IICPresponses_val_IICPresponse_8)]), dict([(u'ref', 8), (u'IICPresponse', _IICPresponses_val_IICPresponse_9)]), dict([(u'ref', 9), (u'IICPresponse', _IICPresponses_val_IICPresponse_10)]), dict([(u'ref', 10), (u'IICPresponse', _IICPresponses_val_IICPresponse_11)]), dict([(u'ref', 11), (u'IICPresponse', _IICPresponses_val_IICPresponse_12)]), dict([(u'ref', 12), (u'IICPresponse', _IICPresponses_val_IICPresponse_13)]), dict([(u'ref', 13), (u'IICPresponse', _IICPresponses_val_IICPresponse_14)]), dict([(u'ref', 242), (u'IICPresponse', _IICPresponses_val_IICPresponse_15)]), dict([(u'ref', 243), (u'IICPresponse', _IICPresponses_val_IICPresponse_16)]), dict([(u'ref', 244), (u'IICPresponse', _IICPresponses_val_IICPresponse_17)]), dict([(u'ref', 245), (u'IICPresponse', _IICPresponses_val_IICPresponse_18)]), dict([(u'ref', 246), (u'IICPresponse', _IICPresponses_val_IICPresponse_19)]), dict([(u'ref', 247), (u'IICPresponse', _IICPresponses_val_IICPresponse_20)]), dict([(u'ref', 248), (u'IICPresponse', _IICPresponses_val_IICPresponse_21)]), dict([(u'ref', 249), (u'IICPresponse', _IICPresponses_val_IICPresponse_22)]), dict([(u'ref', 250), (u'IICPresponse', _IICPresponses_val_IICPresponse_23)]), dict([(u'ref', 251), (u'IICPresponse', _IICPresponses_val_IICPresponse_24)]), dict([(u'ref', 252), (u'IICPresponse', _IICPresponses_val_IICPresponse_25)]), dict([(u'ref', 253), (u'IICPresponse', _IICPresponses_val_IICPresponse_26)]), dict([(u'ref', 254), (u'IICPresponse', _IICPresponses_val_IICPresponse_27)]), dict([(u'ref', 255), (u'IICPresponse', _IICPresponses_val_IICPresponse_28)]), dict([(u'ref', 240), (u'IICPresponse', _IICPresponses_val_IICPresponse_29)]), dict([(u'ref', 241), (u'IICPresponse', _IICPresponses_val_IICPresponse_30)])], rr=[], ev=[], er=[])
+    IICPresponses._val = ASN1Set(rv=[dict([(u'ref', 0), (u'IICPresponse', _IICPresponses_val_IICPresponse_0)]), dict([(u'ref', 1), (u'IICPresponse', _IICPresponses_val_IICPresponse_1)]), dict([(u'ref', 2), (u'IICPresponse', _IICPresponses_val_IICPresponse_2)]), dict([(u'ref', 3), (u'IICPresponse', _IICPresponses_val_IICPresponse_3)]), dict([(u'ref', 4), (u'IICPresponse', _IICPresponses_val_IICPresponse_4)]), dict([(u'ref', 5), (u'IICPresponse', _IICPresponses_val_IICPresponse_5)]), dict([(u'ref', 6), (u'IICPresponse', _IICPresponses_val_IICPresponse_6)]), dict([(u'ref', 7), (u'IICPresponse', _IICPresponses_val_IICPresponse_7)]), dict([(u'ref', 8), (u'IICPresponse', _IICPresponses_val_IICPresponse_8)]), dict([(u'ref', 9), (u'IICPresponse', _IICPresponses_val_IICPresponse_9)]), dict([(u'ref', 10), (u'IICPresponse', _IICPresponses_val_IICPresponse_10)]), dict([(u'ref', 11), (u'IICPresponse', _IICPresponses_val_IICPresponse_11)]), dict([(u'ref', 12), (u'IICPresponse', _IICPresponses_val_IICPresponse_12)]), dict([(u'ref', 13), (u'IICPresponse', _IICPresponses_val_IICPresponse_13)]), dict([(u'ref', 242), (u'IICPresponse', _IICPresponses_val_IICPresponse_14)]), dict([(u'ref', 243), (u'IICPresponse', _IICPresponses_val_IICPresponse_15)]), dict([(u'ref', 244), (u'IICPresponse', _IICPresponses_val_IICPresponse_16)]), dict([(u'ref', 245), (u'IICPresponse', _IICPresponses_val_IICPresponse_17)]), dict([(u'ref', 246), (u'IICPresponse', _IICPresponses_val_IICPresponse_18)]), dict([(u'ref', 247), (u'IICPresponse', _IICPresponses_val_IICPresponse_19)]), dict([(u'ref', 248), (u'IICPresponse', _IICPresponses_val_IICPresponse_20)]), dict([(u'ref', 249), (u'IICPresponse', _IICPresponses_val_IICPresponse_21)]), dict([(u'ref', 250), (u'IICPresponse', _IICPresponses_val_IICPresponse_22)]), dict([(u'ref', 251), (u'IICPresponse', _IICPresponses_val_IICPresponse_23)]), dict([(u'ref', 252), (u'IICPresponse', _IICPresponses_val_IICPresponse_24)]), dict([(u'ref', 253), (u'IICPresponse', _IICPresponses_val_IICPresponse_25)]), dict([(u'ref', 254), (u'IICPresponse', _IICPresponses_val_IICPresponse_26)]), dict([(u'ref', 255), (u'IICPresponse', _IICPresponses_val_IICPresponse_27)]), dict([(u'ref', 240), (u'IICPresponse', _IICPresponses_val_IICPresponse_28)]), dict([(u'ref', 241), (u'IICPresponse', _IICPresponses_val_IICPresponse_29)])], rr=[], ev=[], er=[])
     
     #-----< PduResponse >-----#
     PduResponse = SEQ(name=u'PduResponse', mode=MODE_TYPE)
@@ -2498,13 +2497,13 @@ class CALMiitsscu:
     ___PduResponse_resRef_tab_val_IICPresponse_5 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Command-confirm')))
     ___PduResponse_resRef_tab_val_IICPresponse_6 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Request-confirm')))
     ___PduResponse_resRef_tab_val_IICPresponse_7 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Get-confirm')))
-    ___PduResponse_resRef_tab_val_IICPresponse_8 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Get-confirm')))
-    ___PduResponse_resRef_tab_val_IICPresponse_9 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Set-confirm')))
-    ___PduResponse_resRef_tab_val_IICPresponse_10 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMiitsscu', 'McmdRs')))
-    ___PduResponse_resRef_tab_val_IICPresponse_11 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Command-confirm')))
-    ___PduResponse_resRef_tab_val_IICPresponse_12 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Request-confirm')))
-    ___PduResponse_resRef_tab_val_IICPresponse_13 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Command-confirm')))
-    ___PduResponse_resRef_tab_val_IICPresponse_14 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Request-confirm')))
+    ___PduResponse_resRef_tab_val_IICPresponse_8 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MI-Set-confirm')))
+    ___PduResponse_resRef_tab_val_IICPresponse_9 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMiitsscu', 'McmdRs')))
+    ___PduResponse_resRef_tab_val_IICPresponse_10 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Command-confirm')))
+    ___PduResponse_resRef_tab_val_IICPresponse_11 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MA-Request-confirm')))
+    ___PduResponse_resRef_tab_val_IICPresponse_12 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Command-confirm')))
+    ___PduResponse_resRef_tab_val_IICPresponse_13 = SEQ(name=u'IICPresponse', mode=MODE_TYPE, typeref=ASN1RefType(('CALMmsap', 'MS-Request-confirm')))
+    ___PduResponse_resRef_tab_val_IICPresponse_14 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     ___PduResponse_resRef_tab_val_IICPresponse_15 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     ___PduResponse_resRef_tab_val_IICPresponse_16 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     ___PduResponse_resRef_tab_val_IICPresponse_17 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
@@ -2520,8 +2519,7 @@ class CALMiitsscu:
     ___PduResponse_resRef_tab_val_IICPresponse_27 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     ___PduResponse_resRef_tab_val_IICPresponse_28 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
     ___PduResponse_resRef_tab_val_IICPresponse_29 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
-    ___PduResponse_resRef_tab_val_IICPresponse_30 = NULL(name=u'IICPresponse', mode=MODE_TYPE)
-    __PduResponse_resRef_tab._val = ASN1Set(rv=[dict([(u'ref', 0), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_0)]), dict([(u'ref', 1), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_1)]), dict([(u'ref', 2), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_2)]), dict([(u'ref', 3), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_3)]), dict([(u'ref', 4), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_4)]), dict([(u'ref', 5), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_5)]), dict([(u'ref', 6), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_6)]), dict([(u'ref', 7), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_7)]), dict([(u'ref', 7), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_8)]), dict([(u'ref', 8), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_9)]), dict([(u'ref', 9), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_10)]), dict([(u'ref', 10), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_11)]), dict([(u'ref', 11), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_12)]), dict([(u'ref', 12), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_13)]), dict([(u'ref', 13), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_14)]), dict([(u'ref', 242), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_15)]), dict([(u'ref', 243), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_16)]), dict([(u'ref', 244), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_17)]), dict([(u'ref', 245), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_18)]), dict([(u'ref', 246), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_19)]), dict([(u'ref', 247), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_20)]), dict([(u'ref', 248), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_21)]), dict([(u'ref', 249), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_22)]), dict([(u'ref', 250), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_23)]), dict([(u'ref', 251), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_24)]), dict([(u'ref', 252), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_25)]), dict([(u'ref', 253), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_26)]), dict([(u'ref', 254), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_27)]), dict([(u'ref', 255), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_28)]), dict([(u'ref', 240), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_29)]), dict([(u'ref', 241), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_30)])], rr=[], ev=None, er=[])
+    __PduResponse_resRef_tab._val = ASN1Set(rv=[dict([(u'ref', 0), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_0)]), dict([(u'ref', 1), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_1)]), dict([(u'ref', 2), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_2)]), dict([(u'ref', 3), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_3)]), dict([(u'ref', 4), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_4)]), dict([(u'ref', 5), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_5)]), dict([(u'ref', 6), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_6)]), dict([(u'ref', 7), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_7)]), dict([(u'ref', 8), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_8)]), dict([(u'ref', 9), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_9)]), dict([(u'ref', 10), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_10)]), dict([(u'ref', 11), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_11)]), dict([(u'ref', 12), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_12)]), dict([(u'ref', 13), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_13)]), dict([(u'ref', 242), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_14)]), dict([(u'ref', 243), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_15)]), dict([(u'ref', 244), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_16)]), dict([(u'ref', 245), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_17)]), dict([(u'ref', 246), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_18)]), dict([(u'ref', 247), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_19)]), dict([(u'ref', 248), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_20)]), dict([(u'ref', 249), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_21)]), dict([(u'ref', 250), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_22)]), dict([(u'ref', 251), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_23)]), dict([(u'ref', 252), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_24)]), dict([(u'ref', 253), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_25)]), dict([(u'ref', 254), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_26)]), dict([(u'ref', 255), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_27)]), dict([(u'ref', 240), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_28)]), dict([(u'ref', 241), (u'IICPresponse', ___PduResponse_resRef_tab_val_IICPresponse_29)])], rr=[], ev=None, er=[])
     _PduResponse_resRef._const_tab = __PduResponse_resRef_tab
     _PduResponse_resRef._const_tab_at = None
     _PduResponse_resRef._const_tab_id = u'ref'
@@ -3144,7 +3142,6 @@ class CALMiitsscu:
         _IICPresponses_val_IICPresponse_27,
         _IICPresponses_val_IICPresponse_28,
         _IICPresponses_val_IICPresponse_29,
-        _IICPresponses_val_IICPresponse_30,
         __PduResponse_resRef_tab,
         ___PduResponse_resRef_tab_val_IICPresponse_0,
         ___PduResponse_resRef_tab_val_IICPresponse_1,
@@ -3176,7 +3173,6 @@ class CALMiitsscu:
         ___PduResponse_resRef_tab_val_IICPresponse_27,
         ___PduResponse_resRef_tab_val_IICPresponse_28,
         ___PduResponse_resRef_tab_val_IICPresponse_29,
-        ___PduResponse_resRef_tab_val_IICPresponse_30,
         _PduResponse_resRef,
         _PduResponse_iicpRes,
         PduResponse,
diff --git a/pycrate_asn1dir/RFC5911.py b/pycrate_asn1dir/RFC5911.py
index 2937b2a..ec28c23 100644
--- a/pycrate_asn1dir/RFC5911.py
+++ b/pycrate_asn1dir/RFC5911.py
@@ -15024,9 +15024,8 @@ class SecureMimeMessageV3dot1_2009:
     _SMimeCapsSet_val_Type_1 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
     _SMimeCapsSet_val_Type_13 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
     _SMimeCapsSet_val_Type_14 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
-    _SMimeCapsSet_val_Type_19 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
-    _SMimeCapsSet_val_Type_22 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
-    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'Type', _SMimeCapsSet_val_Type_19), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_22), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
+    _SMimeCapsSet_val_Type_21 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
+    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
     
     #-----< aa-encrypKeyPref >-----#
     aa_encrypKeyPref = CLASS(name=u'aa-encrypKeyPref', mode=MODE_VALUE, typeref=ASN1RefType(('PKIX-CommonTypes-2009', 'ATTRIBUTE')))
@@ -15102,8 +15101,7 @@ class SecureMimeMessageV3dot1_2009:
         _SMimeCapsSet_val_Type_1,
         _SMimeCapsSet_val_Type_13,
         _SMimeCapsSet_val_Type_14,
-        _SMimeCapsSet_val_Type_19,
-        _SMimeCapsSet_val_Type_22,
+        _SMimeCapsSet_val_Type_21,
         aa_encrypKeyPref,
         _aa_encrypKeyPref_val_Type,
         id_aa_encrypKeyPref,
diff --git a/pycrate_asn1dir/RFC5912.py b/pycrate_asn1dir/RFC5912.py
index bbdc58e..071b0f8 100644
--- a/pycrate_asn1dir/RFC5912.py
+++ b/pycrate_asn1dir/RFC5912.py
@@ -2348,9 +2348,8 @@ class SecureMimeMessageV3dot1_2009:
     _SMimeCapsSet_val_Type_1 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
     _SMimeCapsSet_val_Type_13 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
     _SMimeCapsSet_val_Type_14 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('CryptographicMessageSyntaxAlgorithms-2009', 'KeyWrapAlgorithm')))
-    _SMimeCapsSet_val_Type_19 = INT(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('SecureMimeMessageV3dot1-2009', 'SMIMECapabilitiesParametersForRC2CBC')))
-    _SMimeCapsSet_val_Type_22 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
-    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'Type', _SMimeCapsSet_val_Type_19), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_22), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
+    _SMimeCapsSet_val_Type_21 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('PKIX1-PSS-OAEP-Algorithms-2009', 'RSAES-OAEP-params')))
+    SMimeCapsSet._val = ASN1Set(rv=[dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 11, 1))]), dict([(u'Type', _SMimeCapsSet_val_Type_1), (u'id', (1, 2, 840, 113549, 3, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 4))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'id', (1, 2, 840, 10040, 4, 3))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SMimeCapsSet_val_Type_13), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 5))]), dict([(u'Type', _SMimeCapsSet_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 10))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 6))]), dict([(u'id', (1, 2, 840, 113549, 1, 9, 16, 3, 7))]), dict([(u'id', (1, 2, 840, 113549, 3, 7))]), dict([(u'id', (1, 3, 6, 1, 5, 5, 8, 1, 2))]), dict([(u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'Type', _SMimeCapsSet_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 7))])], rr=[], ev=[], er=[])
     
     #-----< aa-encrypKeyPref >-----#
     aa_encrypKeyPref = CLASS(name=u'aa-encrypKeyPref', mode=MODE_VALUE, typeref=ASN1RefType(('PKIX-CommonTypes-2009', 'ATTRIBUTE')))
@@ -2426,8 +2425,7 @@ class SecureMimeMessageV3dot1_2009:
         _SMimeCapsSet_val_Type_1,
         _SMimeCapsSet_val_Type_13,
         _SMimeCapsSet_val_Type_14,
-        _SMimeCapsSet_val_Type_19,
-        _SMimeCapsSet_val_Type_22,
+        _SMimeCapsSet_val_Type_21,
         aa_encrypKeyPref,
         _aa_encrypKeyPref_val_Type,
         id_aa_encrypKeyPref,
diff --git a/pycrate_asn1dir/TCAP_CAP.py b/pycrate_asn1dir/TCAP_CAP.py
index a321561..ea7d1ce 100644
--- a/pycrate_asn1dir/TCAP_CAP.py
+++ b/pycrate_asn1dir/TCAP_CAP.py
@@ -51719,8 +51719,7 @@ class TCAP_CAP_Messages:
         (u'extensions', __AllCAPInvokable_val_ArgumentType_42_extensions),
         ])
     _AllCAPInvokable_val_ArgumentType_42._ext = []
-    _AllCAPInvokable_val_ArgumentType_43 = CHOICE(name=u'ArgumentType', mode=MODE_TYPE, typeref=ASN1RefType(('CAP-gsmSCF-gsmSRF-ops-args', 'SpecializedResourceReportArg')))
-    AllCAPInvokable._val = ASN1Set(rv=[dict([(u'returnResult', True), (u'operationCode', (u'local', 70))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_1), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_6), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 71))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_2), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_6), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 72))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_3), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 73))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_4), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'errorCode', (u'local', 50))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 74))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_5), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 76))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_6), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 80))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_7), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 77))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_8), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 6))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 78))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_9), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 79))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_10), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 81))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_11), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 82))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_12), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 83))]), dict([(u'returnResult', True), (u'operationCode', (u'local', 55))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_14), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 6))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 16))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_15), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_0), (u'errorCode', (u'local', 1))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 53))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_16), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 0))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 13))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'Linked', ASN1Set(rv=[dict([(u'ArgumentType', __OPERATION_Linked_val_ArgumentType_0), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 47))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_17), (u'ResultType', _AllCAPInvokable_val_ResultType_17), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 0))]), dict([(u'errorCode', (u'local', 4))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 13))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'Linked', ASN1Set(rv=[dict([(u'ArgumentType', __OPERATION_Linked_val_ArgumentType_0), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 48))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_18), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_19), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_6), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 35))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_20), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 51))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_7), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_8), (u'errorCode', (u'local', 12))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 36))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_21), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 44))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_22), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_1), (u'errorCode', (u'local', 10))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 45))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_23), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 20))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_24), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 19))]), dict([(u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 27))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_26), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 88))]), dict([(u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_0_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 18))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_28), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 86))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_29), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 90))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_30), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 96))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_31), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 3))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 17))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_32), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 24))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_33), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 34))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_34), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 6))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 0))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_35), (u'ResultType', _AllCAPInvokable_val_ResultType_35), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 32))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_36), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 93))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_37), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 22))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_38), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 23))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_39), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 33))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_40), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 46))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_41), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 95))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_42), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 97))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_43), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))])], rr=[], ev=None, er=[])
+    AllCAPInvokable._val = ASN1Set(rv=[dict([(u'returnResult', True), (u'operationCode', (u'local', 70))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_1), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_6), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 71))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_2), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_6), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 72))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_3), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 73))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_4), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'errorCode', (u'local', 50))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 74))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_5), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 76))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_6), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 80))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_7), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 77))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_8), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 6))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 78))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_9), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 79))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_10), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 81))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_11), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 82))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_12), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 50))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 83))]), dict([(u'returnResult', True), (u'operationCode', (u'local', 55))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_14), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 6))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 16))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_15), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_0), (u'errorCode', (u'local', 1))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 53))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_16), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 0))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 13))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'Linked', ASN1Set(rv=[dict([(u'ArgumentType', __OPERATION_Linked_val_ArgumentType_0), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 47))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_17), (u'ResultType', _AllCAPInvokable_val_ResultType_17), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 0))]), dict([(u'errorCode', (u'local', 4))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 13))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'Linked', ASN1Set(rv=[dict([(u'ArgumentType', __OPERATION_Linked_val_ArgumentType_0), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 48))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_18), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 49))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_19), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_6), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 35))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_20), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 51))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_7), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_8), (u'errorCode', (u'local', 12))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 36))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_21), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 44))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_22), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_1), (u'errorCode', (u'local', 10))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 45))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_23), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 20))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_24), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 19))]), dict([(u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 27))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_26), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 88))]), dict([(u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_0_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 18))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_28), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 86))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_29), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 90))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_30), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 96))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_31), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 3))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 17))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_32), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 24))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_33), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 34))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_34), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 6))]), dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 0))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_35), (u'ResultType', _AllCAPInvokable_val_ResultType_35), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 32))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_36), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_1_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 93))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_37), (u'returnResult', False), (u'alwaysReturns', False), (u'operationCode', (u'local', 22))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_38), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_3_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 23))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_39), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 33))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_40), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 46))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_41), (u'returnResult', True), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_4_0), (u'errorCode', (u'local', 11))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_5_0), (u'errorCode', (u'local', 12))]), dict([(u'errorCode', (u'local', 17))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 95))]), dict([(u'ArgumentType', _AllCAPInvokable_val_ArgumentType_42), (u'returnResult', False), (u'Errors', ASN1Set(rv=[dict([(u'errorCode', (u'local', 7))]), dict([(u'errorCode', (u'local', 8))]), dict([(u'ParameterType', __OPERATION_Errors_val_ParameterType_2), (u'errorCode', (u'local', 11))]), dict([(u'errorCode', (u'local', 14))]), dict([(u'errorCode', (u'local', 15))]), dict([(u'errorCode', (u'local', 16))]), dict([(u'errorCode', (u'local', 17))]), dict([(u'errorCode', (u'local', 51))])], rr=[], ev=None, er=[])), (u'operationCode', (u'local', 97))])], rr=[], ev=None, er=[])
     
     #-----< AllCAPReturnable >-----#
     AllCAPReturnable = CLASS(name=u'AllCAPReturnable', mode=MODE_SET, typeref=ASN1RefType(('Remote-Operations-Information-Objects', 'OPERATION')))
@@ -54718,7 +54717,6 @@ class TCAP_CAP_Messages:
         ___AllCAPInvokable_val_ArgumentType_42_extensions__item_,
         __AllCAPInvokable_val_ArgumentType_42_extensions,
         _AllCAPInvokable_val_ArgumentType_42,
-        _AllCAPInvokable_val_ArgumentType_43,
         AllCAPReturnable,
         _AllCAPReturnable_val_ArgumentType_1,
         _AllCAPReturnable_val_ArgumentType_2,
diff --git a/pycrate_asn1dir/X509_2016.py b/pycrate_asn1dir/X509_2016.py
index 48624fb..caec53f 100644
--- a/pycrate_asn1dir/X509_2016.py
+++ b/pycrate_asn1dir/X509_2016.py
@@ -997,53 +997,52 @@ class AlgorithmObjectIdentifiers:
     AllAlgorithmsOID = CLASS(name=u'AllAlgorithmsOID', mode=MODE_SET, typeref=ASN1RefType(('AuthenticationFramework', 'ALGORITHM')))
     _AllAlgorithmsOID_val_Type_0 = NULL(name=u'Type', mode=MODE_TYPE)
     _AllAlgorithmsOID_val_Type_1 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_6 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_11 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
-    _AllAlgorithmsOID_val_Type_12 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
-    _AllAlgorithmsOID_val_Type_13 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
-    _AllAlgorithmsOID_val_Type_14 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_15 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'KEA-Parms-Id')))
-    _AllAlgorithmsOID_val_Type_16 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DSS-Parms')))
-    _AllAlgorithmsOID_val_Type_17 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
-    _AllAlgorithmsOID_val_Type_18 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
-    _AllAlgorithmsOID_val_Type_19 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
-    _AllAlgorithmsOID_val_Type_20 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DomainParameters')))
-    _AllAlgorithmsOID_val_Type_21 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_22 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_23 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_24 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_25 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_26 = SEQ(name=u'Type', mode=MODE_TYPE)
-    __AllAlgorithmsOID_val_Type_26_hashAlgorithm = SEQ(name=u'hashAlgorithm', mode=MODE_TYPE, tag=(0, TAG_CONTEXT_SPEC, TAG_EXPLICIT), typeref=ASN1RefType(('AuthenticationFramework', 'AlgorithmIdentifier')))
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm = OID(name=u'algorithm', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'id']))
-    ____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab = CLASS(name='_tab_ALGORITHM', mode=MODE_SET, typeref=ASN1RefType(('AuthenticationFramework', 'ALGORITHM')))
-    _____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab_val_Type_0 = NULL(name=u'Type', mode=MODE_TYPE)
-    ____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab._val = ASN1Set(rv=[dict([(u'Type', _____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab_val_Type_0), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))])], rr=[], ev=None, er=[])
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm._const_tab = ____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm._const_tab_at = None
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm._const_tab_id = u'id'
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_parameters = OPEN(name=u'parameters', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'Type']), opt=True)
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_parameters._const_tab = ____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_parameters._const_tab_at = ('..', u'algorithm')
-    ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_parameters._const_tab_id = u'Type'
-    __AllAlgorithmsOID_val_Type_26_hashAlgorithm._cont = ASN1Dict([
-        (u'algorithm', ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm),
-        (u'parameters', ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_parameters),
+    _AllAlgorithmsOID_val_Type_6 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
+    _AllAlgorithmsOID_val_Type_7 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
+    _AllAlgorithmsOID_val_Type_8 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
+    _AllAlgorithmsOID_val_Type_9 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_10 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'KEA-Parms-Id')))
+    _AllAlgorithmsOID_val_Type_11 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DSS-Parms')))
+    _AllAlgorithmsOID_val_Type_12 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
+    _AllAlgorithmsOID_val_Type_13 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
+    _AllAlgorithmsOID_val_Type_14 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
+    _AllAlgorithmsOID_val_Type_15 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DomainParameters')))
+    _AllAlgorithmsOID_val_Type_16 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_17 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_18 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_19 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_20 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_21 = SEQ(name=u'Type', mode=MODE_TYPE)
+    __AllAlgorithmsOID_val_Type_21_hashAlgorithm = SEQ(name=u'hashAlgorithm', mode=MODE_TYPE, tag=(0, TAG_CONTEXT_SPEC, TAG_EXPLICIT), typeref=ASN1RefType(('AuthenticationFramework', 'AlgorithmIdentifier')))
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm = OID(name=u'algorithm', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'id']))
+    ____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab = CLASS(name='_tab_ALGORITHM', mode=MODE_SET, typeref=ASN1RefType(('AuthenticationFramework', 'ALGORITHM')))
+    _____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab_val_Type_0 = NULL(name=u'Type', mode=MODE_TYPE)
+    ____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab._val = ASN1Set(rv=[dict([(u'Type', _____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab_val_Type_0), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))])], rr=[], ev=None, er=[])
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm._const_tab = ____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm._const_tab_at = None
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm._const_tab_id = u'id'
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_parameters = OPEN(name=u'parameters', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'Type']), opt=True)
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_parameters._const_tab = ____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_parameters._const_tab_at = ('..', u'algorithm')
+    ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_parameters._const_tab_id = u'Type'
+    __AllAlgorithmsOID_val_Type_21_hashAlgorithm._cont = ASN1Dict([
+        (u'algorithm', ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm),
+        (u'parameters', ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_parameters),
         ])
-    __AllAlgorithmsOID_val_Type_26_hashAlgorithm._ext = []
-    __AllAlgorithmsOID_val_Type_26_saltLength = INT(name=u'saltLength', mode=MODE_TYPE, tag=(2, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=20)
-    __AllAlgorithmsOID_val_Type_26_trailerField = INT(name=u'trailerField', mode=MODE_TYPE, tag=(3, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=1)
-    _AllAlgorithmsOID_val_Type_26._cont = ASN1Dict([
-        (u'hashAlgorithm', __AllAlgorithmsOID_val_Type_26_hashAlgorithm),
-        (u'saltLength', __AllAlgorithmsOID_val_Type_26_saltLength),
-        (u'trailerField', __AllAlgorithmsOID_val_Type_26_trailerField),
+    __AllAlgorithmsOID_val_Type_21_hashAlgorithm._ext = []
+    __AllAlgorithmsOID_val_Type_21_saltLength = INT(name=u'saltLength', mode=MODE_TYPE, tag=(2, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=20)
+    __AllAlgorithmsOID_val_Type_21_trailerField = INT(name=u'trailerField', mode=MODE_TYPE, tag=(3, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=1)
+    _AllAlgorithmsOID_val_Type_21._cont = ASN1Dict([
+        (u'hashAlgorithm', __AllAlgorithmsOID_val_Type_21_hashAlgorithm),
+        (u'saltLength', __AllAlgorithmsOID_val_Type_21_saltLength),
+        (u'trailerField', __AllAlgorithmsOID_val_Type_21_trailerField),
         ])
-    _AllAlgorithmsOID_val_Type_26._ext = None
-    _AllAlgorithmsOID_val_Type_33 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_34 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_35 = NULL(name=u'Type', mode=MODE_TYPE)
-    _AllAlgorithmsOID_val_Type_36 = NULL(name=u'Type', mode=MODE_TYPE)
-    AllAlgorithmsOID._val = ASN1Set(rv=[dict([(u'Type', _AllAlgorithmsOID_val_Type_0), (u'id', (1, 2, 840, 113549, 2, 5))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_1), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_6), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_11), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 2))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_12), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 22))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_13), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 42))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_15), (u'id', (2, 16, 840, 1, 101, 2, 1, 1, 22))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_16), (u'id', (1, 2, 840, 10040, 4, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_17), (u'id', (1, 2, 840, 10045, 2, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_18), (u'id', (1, 3, 132, 1, 12))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_19), (u'id', (1, 3, 132, 1, 13))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_20), (u'id', (1, 2, 840, 10046, 2, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_22), (u'id', (1, 2, 840, 113549, 1, 1, 14))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_23), (u'id', (1, 2, 840, 113549, 1, 1, 11))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_24), (u'id', (1, 2, 840, 113549, 1, 1, 12))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_25), (u'id', (1, 2, 840, 113549, 1, 1, 13))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_26), (u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_33), (u'id', (1, 2, 840, 113549, 2, 8))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_34), (u'id', (1, 2, 840, 113549, 2, 9))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_35), (u'id', (1, 2, 840, 113549, 2, 10))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_36), (u'id', (1, 2, 840, 113549, 2, 11))])], rr=[], ev=None, er=[])
+    _AllAlgorithmsOID_val_Type_21._ext = None
+    _AllAlgorithmsOID_val_Type_28 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_29 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_30 = NULL(name=u'Type', mode=MODE_TYPE)
+    _AllAlgorithmsOID_val_Type_31 = NULL(name=u'Type', mode=MODE_TYPE)
+    AllAlgorithmsOID._val = ASN1Set(rv=[dict([(u'Type', _AllAlgorithmsOID_val_Type_0), (u'id', (1, 2, 840, 113549, 2, 5))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_1), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_6), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 2))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_7), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 22))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_8), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 42))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_9), (u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_10), (u'id', (2, 16, 840, 1, 101, 2, 1, 1, 22))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_11), (u'id', (1, 2, 840, 10040, 4, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_12), (u'id', (1, 2, 840, 10045, 2, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_13), (u'id', (1, 3, 132, 1, 12))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_14), (u'id', (1, 3, 132, 1, 13))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_15), (u'id', (1, 2, 840, 10046, 2, 1))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_16), (u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_17), (u'id', (1, 2, 840, 113549, 1, 1, 14))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_18), (u'id', (1, 2, 840, 113549, 1, 1, 11))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_19), (u'id', (1, 2, 840, 113549, 1, 1, 12))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_20), (u'id', (1, 2, 840, 113549, 1, 1, 13))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_28), (u'id', (1, 2, 840, 113549, 2, 8))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_29), (u'id', (1, 2, 840, 113549, 2, 9))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_30), (u'id', (1, 2, 840, 113549, 2, 10))]), dict([(u'Type', _AllAlgorithmsOID_val_Type_31), (u'id', (1, 2, 840, 113549, 2, 11))])], rr=[], ev=None, er=[])
     
     _all_ = [
         ID,
@@ -1232,6 +1231,10 @@ class AlgorithmObjectIdentifiers:
         _AllAlgorithmsOID_val_Type_0,
         _AllAlgorithmsOID_val_Type_1,
         _AllAlgorithmsOID_val_Type_6,
+        _AllAlgorithmsOID_val_Type_7,
+        _AllAlgorithmsOID_val_Type_8,
+        _AllAlgorithmsOID_val_Type_9,
+        _AllAlgorithmsOID_val_Type_10,
         _AllAlgorithmsOID_val_Type_11,
         _AllAlgorithmsOID_val_Type_12,
         _AllAlgorithmsOID_val_Type_13,
@@ -1242,23 +1245,18 @@ class AlgorithmObjectIdentifiers:
         _AllAlgorithmsOID_val_Type_18,
         _AllAlgorithmsOID_val_Type_19,
         _AllAlgorithmsOID_val_Type_20,
+        ____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab,
+        _____AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm_tab_val_Type_0,
+        ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_algorithm,
+        ___AllAlgorithmsOID_val_Type_21_hashAlgorithm_parameters,
+        __AllAlgorithmsOID_val_Type_21_hashAlgorithm,
+        __AllAlgorithmsOID_val_Type_21_saltLength,
+        __AllAlgorithmsOID_val_Type_21_trailerField,
         _AllAlgorithmsOID_val_Type_21,
-        _AllAlgorithmsOID_val_Type_22,
-        _AllAlgorithmsOID_val_Type_23,
-        _AllAlgorithmsOID_val_Type_24,
-        _AllAlgorithmsOID_val_Type_25,
-        ____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab,
-        _____AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm_tab_val_Type_0,
-        ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_algorithm,
-        ___AllAlgorithmsOID_val_Type_26_hashAlgorithm_parameters,
-        __AllAlgorithmsOID_val_Type_26_hashAlgorithm,
-        __AllAlgorithmsOID_val_Type_26_saltLength,
-        __AllAlgorithmsOID_val_Type_26_trailerField,
-        _AllAlgorithmsOID_val_Type_26,
-        _AllAlgorithmsOID_val_Type_33,
-        _AllAlgorithmsOID_val_Type_34,
-        _AllAlgorithmsOID_val_Type_35,
-        _AllAlgorithmsOID_val_Type_36,
+        _AllAlgorithmsOID_val_Type_28,
+        _AllAlgorithmsOID_val_Type_29,
+        _AllAlgorithmsOID_val_Type_30,
+        _AllAlgorithmsOID_val_Type_31,
     ]
 
 class AttributeCertificateDefinitions:
@@ -3587,53 +3585,52 @@ class AuthenticationFramework:
     SupportedAlgorithms = CLASS(name=u'SupportedAlgorithms', mode=MODE_SET, typeref=ASN1RefType(('AuthenticationFramework', 'ALGORITHM')))
     _SupportedAlgorithms_val_Type_0 = NULL(name=u'Type', mode=MODE_TYPE)
     _SupportedAlgorithms_val_Type_1 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_6 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_11 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
-    _SupportedAlgorithms_val_Type_12 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
-    _SupportedAlgorithms_val_Type_13 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
-    _SupportedAlgorithms_val_Type_14 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_15 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'KEA-Parms-Id')))
-    _SupportedAlgorithms_val_Type_16 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DSS-Parms')))
-    _SupportedAlgorithms_val_Type_17 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
-    _SupportedAlgorithms_val_Type_18 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
-    _SupportedAlgorithms_val_Type_19 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
-    _SupportedAlgorithms_val_Type_20 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DomainParameters')))
-    _SupportedAlgorithms_val_Type_21 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_22 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_23 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_24 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_25 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_26 = SEQ(name=u'Type', mode=MODE_TYPE)
-    __SupportedAlgorithms_val_Type_26_hashAlgorithm = SEQ(name=u'hashAlgorithm', mode=MODE_TYPE, tag=(0, TAG_CONTEXT_SPEC, TAG_EXPLICIT), typeref=ASN1RefType(('AuthenticationFramework', 'AlgorithmIdentifier')))
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm = OID(name=u'algorithm', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'id']))
-    ____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab = CLASS(name='_tab_ALGORITHM', mode=MODE_SET, typeref=ASN1RefType(('AuthenticationFramework', 'ALGORITHM')))
-    _____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab_val_Type_0 = NULL(name=u'Type', mode=MODE_TYPE)
-    ____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab._val = ASN1Set(rv=[dict([(u'Type', _____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab_val_Type_0), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))])], rr=[], ev=None, er=[])
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm._const_tab = ____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm._const_tab_at = None
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm._const_tab_id = u'id'
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_parameters = OPEN(name=u'parameters', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'Type']), opt=True)
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_parameters._const_tab = ____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_parameters._const_tab_at = ('..', u'algorithm')
-    ___SupportedAlgorithms_val_Type_26_hashAlgorithm_parameters._const_tab_id = u'Type'
-    __SupportedAlgorithms_val_Type_26_hashAlgorithm._cont = ASN1Dict([
-        (u'algorithm', ___SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm),
-        (u'parameters', ___SupportedAlgorithms_val_Type_26_hashAlgorithm_parameters),
+    _SupportedAlgorithms_val_Type_6 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
+    _SupportedAlgorithms_val_Type_7 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
+    _SupportedAlgorithms_val_Type_8 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'AES-InitializationVector')))
+    _SupportedAlgorithms_val_Type_9 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_10 = OCT_STR(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'KEA-Parms-Id')))
+    _SupportedAlgorithms_val_Type_11 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DSS-Parms')))
+    _SupportedAlgorithms_val_Type_12 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
+    _SupportedAlgorithms_val_Type_13 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
+    _SupportedAlgorithms_val_Type_14 = OID(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'X509Curves')))
+    _SupportedAlgorithms_val_Type_15 = SEQ(name=u'Type', mode=MODE_TYPE, typeref=ASN1RefType(('AlgorithmObjectIdentifiers', 'DomainParameters')))
+    _SupportedAlgorithms_val_Type_16 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_17 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_18 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_19 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_20 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_21 = SEQ(name=u'Type', mode=MODE_TYPE)
+    __SupportedAlgorithms_val_Type_21_hashAlgorithm = SEQ(name=u'hashAlgorithm', mode=MODE_TYPE, tag=(0, TAG_CONTEXT_SPEC, TAG_EXPLICIT), typeref=ASN1RefType(('AuthenticationFramework', 'AlgorithmIdentifier')))
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm = OID(name=u'algorithm', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'id']))
+    ____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab = CLASS(name='_tab_ALGORITHM', mode=MODE_SET, typeref=ASN1RefType(('AuthenticationFramework', 'ALGORITHM')))
+    _____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab_val_Type_0 = NULL(name=u'Type', mode=MODE_TYPE)
+    ____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab._val = ASN1Set(rv=[dict([(u'Type', _____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab_val_Type_0), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))])], rr=[], ev=None, er=[])
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm._const_tab = ____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm._const_tab_at = None
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm._const_tab_id = u'id'
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_parameters = OPEN(name=u'parameters', mode=MODE_TYPE, typeref=ASN1RefClassField(('AuthenticationFramework', 'ALGORITHM'), [u'Type']), opt=True)
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_parameters._const_tab = ____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_parameters._const_tab_at = ('..', u'algorithm')
+    ___SupportedAlgorithms_val_Type_21_hashAlgorithm_parameters._const_tab_id = u'Type'
+    __SupportedAlgorithms_val_Type_21_hashAlgorithm._cont = ASN1Dict([
+        (u'algorithm', ___SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm),
+        (u'parameters', ___SupportedAlgorithms_val_Type_21_hashAlgorithm_parameters),
         ])
-    __SupportedAlgorithms_val_Type_26_hashAlgorithm._ext = []
-    __SupportedAlgorithms_val_Type_26_saltLength = INT(name=u'saltLength', mode=MODE_TYPE, tag=(2, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=20)
-    __SupportedAlgorithms_val_Type_26_trailerField = INT(name=u'trailerField', mode=MODE_TYPE, tag=(3, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=1)
-    _SupportedAlgorithms_val_Type_26._cont = ASN1Dict([
-        (u'hashAlgorithm', __SupportedAlgorithms_val_Type_26_hashAlgorithm),
-        (u'saltLength', __SupportedAlgorithms_val_Type_26_saltLength),
-        (u'trailerField', __SupportedAlgorithms_val_Type_26_trailerField),
+    __SupportedAlgorithms_val_Type_21_hashAlgorithm._ext = []
+    __SupportedAlgorithms_val_Type_21_saltLength = INT(name=u'saltLength', mode=MODE_TYPE, tag=(2, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=20)
+    __SupportedAlgorithms_val_Type_21_trailerField = INT(name=u'trailerField', mode=MODE_TYPE, tag=(3, TAG_CONTEXT_SPEC, TAG_EXPLICIT), default=1)
+    _SupportedAlgorithms_val_Type_21._cont = ASN1Dict([
+        (u'hashAlgorithm', __SupportedAlgorithms_val_Type_21_hashAlgorithm),
+        (u'saltLength', __SupportedAlgorithms_val_Type_21_saltLength),
+        (u'trailerField', __SupportedAlgorithms_val_Type_21_trailerField),
         ])
-    _SupportedAlgorithms_val_Type_26._ext = None
-    _SupportedAlgorithms_val_Type_33 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_34 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_35 = NULL(name=u'Type', mode=MODE_TYPE)
-    _SupportedAlgorithms_val_Type_36 = NULL(name=u'Type', mode=MODE_TYPE)
-    SupportedAlgorithms._val = ASN1Set(rv=[dict([(u'Type', _SupportedAlgorithms_val_Type_0), (u'id', (1, 2, 840, 113549, 2, 5))]), dict([(u'Type', _SupportedAlgorithms_val_Type_1), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))]), dict([(u'Type', _SupportedAlgorithms_val_Type_6), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))]), dict([(u'Type', _SupportedAlgorithms_val_Type_11), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 2))]), dict([(u'Type', _SupportedAlgorithms_val_Type_12), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 22))]), dict([(u'Type', _SupportedAlgorithms_val_Type_13), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 42))]), dict([(u'Type', _SupportedAlgorithms_val_Type_14), (u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_15), (u'id', (2, 16, 840, 1, 101, 2, 1, 1, 22))]), dict([(u'Type', _SupportedAlgorithms_val_Type_16), (u'id', (1, 2, 840, 10040, 4, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_17), (u'id', (1, 2, 840, 10045, 2, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_18), (u'id', (1, 3, 132, 1, 12))]), dict([(u'Type', _SupportedAlgorithms_val_Type_19), (u'id', (1, 3, 132, 1, 13))]), dict([(u'Type', _SupportedAlgorithms_val_Type_20), (u'id', (1, 2, 840, 10046, 2, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'Type', _SupportedAlgorithms_val_Type_22), (u'id', (1, 2, 840, 113549, 1, 1, 14))]), dict([(u'Type', _SupportedAlgorithms_val_Type_23), (u'id', (1, 2, 840, 113549, 1, 1, 11))]), dict([(u'Type', _SupportedAlgorithms_val_Type_24), (u'id', (1, 2, 840, 113549, 1, 1, 12))]), dict([(u'Type', _SupportedAlgorithms_val_Type_25), (u'id', (1, 2, 840, 113549, 1, 1, 13))]), dict([(u'Type', _SupportedAlgorithms_val_Type_26), (u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SupportedAlgorithms_val_Type_33), (u'id', (1, 2, 840, 113549, 2, 8))]), dict([(u'Type', _SupportedAlgorithms_val_Type_34), (u'id', (1, 2, 840, 113549, 2, 9))]), dict([(u'Type', _SupportedAlgorithms_val_Type_35), (u'id', (1, 2, 840, 113549, 2, 10))]), dict([(u'Type', _SupportedAlgorithms_val_Type_36), (u'id', (1, 2, 840, 113549, 2, 11))])], rr=[], ev=[], er=[])
+    _SupportedAlgorithms_val_Type_21._ext = None
+    _SupportedAlgorithms_val_Type_28 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_29 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_30 = NULL(name=u'Type', mode=MODE_TYPE)
+    _SupportedAlgorithms_val_Type_31 = NULL(name=u'Type', mode=MODE_TYPE)
+    SupportedAlgorithms._val = ASN1Set(rv=[dict([(u'Type', _SupportedAlgorithms_val_Type_0), (u'id', (1, 2, 840, 113549, 2, 5))]), dict([(u'Type', _SupportedAlgorithms_val_Type_1), (u'id', (1, 3, 14, 3, 2, 26))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 4))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 2))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 2, 3))]), dict([(u'Type', _SupportedAlgorithms_val_Type_6), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 2))]), dict([(u'Type', _SupportedAlgorithms_val_Type_7), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 22))]), dict([(u'Type', _SupportedAlgorithms_val_Type_8), (u'id', (2, 16, 840, 1, 101, 3, 4, 1, 42))]), dict([(u'Type', _SupportedAlgorithms_val_Type_9), (u'id', (1, 2, 840, 113549, 1, 1, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_10), (u'id', (2, 16, 840, 1, 101, 2, 1, 1, 22))]), dict([(u'Type', _SupportedAlgorithms_val_Type_11), (u'id', (1, 2, 840, 10040, 4, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_12), (u'id', (1, 2, 840, 10045, 2, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_13), (u'id', (1, 3, 132, 1, 12))]), dict([(u'Type', _SupportedAlgorithms_val_Type_14), (u'id', (1, 3, 132, 1, 13))]), dict([(u'Type', _SupportedAlgorithms_val_Type_15), (u'id', (1, 2, 840, 10046, 2, 1))]), dict([(u'Type', _SupportedAlgorithms_val_Type_16), (u'id', (1, 2, 840, 113549, 1, 1, 5))]), dict([(u'Type', _SupportedAlgorithms_val_Type_17), (u'id', (1, 2, 840, 113549, 1, 1, 14))]), dict([(u'Type', _SupportedAlgorithms_val_Type_18), (u'id', (1, 2, 840, 113549, 1, 1, 11))]), dict([(u'Type', _SupportedAlgorithms_val_Type_19), (u'id', (1, 2, 840, 113549, 1, 1, 12))]), dict([(u'Type', _SupportedAlgorithms_val_Type_20), (u'id', (1, 2, 840, 113549, 1, 1, 13))]), dict([(u'Type', _SupportedAlgorithms_val_Type_21), (u'id', (1, 2, 840, 113549, 1, 1, 10))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 1))]), dict([(u'id', (2, 16, 840, 1, 101, 3, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 1))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 2))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 3))]), dict([(u'id', (1, 2, 840, 10045, 4, 3, 4))]), dict([(u'Type', _SupportedAlgorithms_val_Type_28), (u'id', (1, 2, 840, 113549, 2, 8))]), dict([(u'Type', _SupportedAlgorithms_val_Type_29), (u'id', (1, 2, 840, 113549, 2, 9))]), dict([(u'Type', _SupportedAlgorithms_val_Type_30), (u'id', (1, 2, 840, 113549, 2, 10))]), dict([(u'Type', _SupportedAlgorithms_val_Type_31), (u'id', (1, 2, 840, 113549, 2, 11))])], rr=[], ev=[], er=[])
     
     #-----< SupportedCurves >-----#
     SupportedCurves = OID(name=u'SupportedCurves', mode=MODE_SET)
@@ -5004,6 +5001,10 @@ class AuthenticationFramework:
         _SupportedAlgorithms_val_Type_0,
         _SupportedAlgorithms_val_Type_1,
         _SupportedAlgorithms_val_Type_6,
+        _SupportedAlgorithms_val_Type_7,
+        _SupportedAlgorithms_val_Type_8,
+        _SupportedAlgorithms_val_Type_9,
+        _SupportedAlgorithms_val_Type_10,
         _SupportedAlgorithms_val_Type_11,
         _SupportedAlgorithms_val_Type_12,
         _SupportedAlgorithms_val_Type_13,
@@ -5014,23 +5015,18 @@ class AuthenticationFramework:
         _SupportedAlgorithms_val_Type_18,
         _SupportedAlgorithms_val_Type_19,
         _SupportedAlgorithms_val_Type_20,
+        ____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab,
+        _____SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm_tab_val_Type_0,
+        ___SupportedAlgorithms_val_Type_21_hashAlgorithm_algorithm,
+        ___SupportedAlgorithms_val_Type_21_hashAlgorithm_parameters,
+        __SupportedAlgorithms_val_Type_21_hashAlgorithm,
+        __SupportedAlgorithms_val_Type_21_saltLength,
+        __SupportedAlgorithms_val_Type_21_trailerField,
         _SupportedAlgorithms_val_Type_21,
-        _SupportedAlgorithms_val_Type_22,
-        _SupportedAlgorithms_val_Type_23,
-        _SupportedAlgorithms_val_Type_24,
-        _SupportedAlgorithms_val_Type_25,
-        ____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab,
-        _____SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm_tab_val_Type_0,
-        ___SupportedAlgorithms_val_Type_26_hashAlgorithm_algorithm,
-        ___SupportedAlgorithms_val_Type_26_hashAlgorithm_parameters,
-        __SupportedAlgorithms_val_Type_26_hashAlgorithm,
-        __SupportedAlgorithms_val_Type_26_saltLength,
-        __SupportedAlgorithms_val_Type_26_trailerField,
-        _SupportedAlgorithms_val_Type_26,
-        _SupportedAlgorithms_val_Type_33,
-        _SupportedAlgorithms_val_Type_34,
-        _SupportedAlgorithms_val_Type_35,
-        _SupportedAlgorithms_val_Type_36,
+        _SupportedAlgorithms_val_Type_28,
+        _SupportedAlgorithms_val_Type_29,
+        _SupportedAlgorithms_val_Type_30,
+        _SupportedAlgorithms_val_Type_31,
         SupportedCurves,
         dummyCurv,
         _Certificate_toBeSigned,