diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 212234cb2a0a2c5e33981503d9949abbbb214391..820696e85693d9d1272f6b23f81fe5db98d1ed58 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     ETSI
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
- *              $Id: OneM2M_Types.ttcn 112 2016-09-07 14:29:02Z reinaortega $
+ *              $Id: OneM2M_Types.ttcn 113 2016-09-09 07:11:54Z reinaortega $
  *  @desc       Test System module for oneM2M
  *
  */
@@ -180,8 +180,8 @@ type record AEAnnc
 	Labels labels optional,
 	AcpType accessControlPolicyIDs,
 	Timestamp expirationTime,
-	XSD.AnyURI link,
 	ListOfURIs dynamicAuthorizationConsultationIDs optional,
+	XSD.AnyURI link,
 	XSD.String appName optional,
 	XSD.String app_ID optional,
 	XSD.ID aE_ID optional,
@@ -6380,8 +6380,8 @@ group optionalResourceTypes {
 		Labels labels optional,
 		AcpType accessControlPolicyIDs optional,
 		Timestamp expirationTime optional,
-		XSD.AnyURI link optional,
 		ListOfURIs dynamicAuthorizationConsultationIDs optional,
+		XSD.AnyURI link optional,
 		XSD.String appName optional,
 		XSD.String app_ID optional,
 		XSD.ID aE_ID optional,
@@ -6479,6 +6479,67 @@ group optionalResourceTypes {
 	  variant (choice.choice_list) "untagged";
 	  variant (choice.choice_list[-]) "untagged";
 	  variant (choice.choice_list[-].group_) "name as 'group'";
+	  
+	  //  long->short conversion XML
+	  variant                                             "name as 'ae'";
+	  variant (resourceName)                              "name as 'rn'";
+	  variant (resourceType)                              "name as 'ty'";
+	  variant (resourceID)                                "name as 'ri'";
+	  variant (parentID)                                  "name as 'pi'";
+	  variant (creationTime)                              "name as 'ct'";
+	  variant (lastModifiedTime)                          "name as 'lt'";
+	  variant (labels)                                    "name as 'lbl'";
+	  variant (accessControlPolicyIDs)                    "name as 'acpi'";
+	  variant (expirationTime)                            "name as 'et'";
+	  variant (dynamicAuthorizationConsultationIDs)       "name as 'daci'";
+	  variant (announceTo)                                "name as 'at'";
+	  variant (announcedAttribute)                        "name as 'aa'";
+	  variant (appName)                                   "name as 'apn'";
+	  variant (app_ID)                                    "name as 'api'";
+	  variant (aE_ID)                                     "name as 'aei'";
+	  variant (pointOfAccess)                             "name as 'poa'";
+	  variant (ontologyRef)                               "name as 'or'";
+	  variant (nodeLink)                                  "name as 'nl'";
+	  variant (requestReachability)                       "name as 'rr'";
+	  variant (contentSerialization)                      "name as 'csz'";
+	  variant (e2eSecInfo)								  "name as 'esi'";
+	  variant (choice.childResource_list[-])              "name as 'cr'";
+	  variant (choice.choice_list[-].container)           "name as 'cnt'";
+	  variant (choice.choice_list[-].group_)              "name as 'grp'";
+	  variant (choice.choice_list[-].accessControlPolicy) "name as 'acp'";
+	  variant (choice.choice_list[-].subscription)        "name as 'sub'";
+	  variant (choice.choice_list[-].pollingChannel)      "name as 'pch'";
+	  variant (choice.choice_list[-].schedule)            "name as 'sch'";
+
+	  //  long->short conversion JSON
+	  variant (resourceName)                              "JSON:name as rn";
+	  variant (resourceType)                              "JSON:name as ty";
+	  variant (resourceID)                                "JSON:name as ri";
+	  variant (parentID)                                  "JSON:name as pi";
+	  variant (creationTime)                              "JSON:name as ct";
+	  variant (lastModifiedTime)                          "JSON:name as lt";
+	  variant (labels)                                    "JSON:name as lbl";
+	  variant (accessControlPolicyIDs)                    "JSON:name as acpi";
+	  variant (expirationTime)                            "JSON:name as et";
+	  variant (dynamicAuthorizationConsultationIDs)       "JSON:name as daci";
+	  variant (announceTo)                                "JSON:name as at";
+	  variant (announcedAttribute)                        "JSON:name as aa";
+	  variant (appName)                                   "JSON:name as apn";
+	  variant (app_ID)                                    "JSON:name as api";
+	  variant (aE_ID)                                     "JSON:name as aei";
+	  variant (pointOfAccess)                             "JSON:name as poa";
+	  variant (ontologyRef)                               "JSON:name as or";
+	  variant (nodeLink)                                  "JSON:name as nl";
+	  variant (requestReachability)                       "JSON:name as rr";
+	  variant (contentSerialization)                      "JSON:name as csz";
+	  variant (e2eSecInfo)								  "JSON:name as esi";
+	  variant (choice.childResource_list)                 "JSON:name as cr";
+	  variant (choice.choice_list[-].container)           "JSON:name as cnt";
+	  variant (choice.choice_list[-].group_)              "JSON:name as grp";
+	  variant (choice.choice_list[-].accessControlPolicy) "JSON:name as acp";
+	  variant (choice.choice_list[-].subscription)        "JSON:name as sub";
+	  variant (choice.choice_list[-].pollingChannel)      "JSON:name as pch";
+	  variant (choice.choice_list[-].schedule)            "JSON:name as sch";
 	};
 
 	type record AccessControlPolicy_optional
@@ -6689,9 +6750,11 @@ group optionalResourceTypes {
 	  //variant (memberTypeValidated) "text 'false' as '0'";
 	  variant (choice) "untagged";
 	  variant (choice.childResource_list) "untagged";
+	  variant (choice.choice_list) "untagged";
 	  variant (choice.childResource_list[-]) "name as 'childResource'";
-	  variant (choice.subscription_list) "untagged";
-	  variant (choice.subscription_list[-]) "name as 'subscription'";
+	  variant (choice.choice_list[-]) "name as 'choice'";
+	  variant (choice.choice_list[-].subscription) "name as 'subscription'";
+	  variant (choice.choice_list[-].semanticDescriptor) "name as 'semanticDescriptor'";
 	};
 	
 	type record PollingChannel_optional