diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index f506954dc26d073f9db166f1c0490429f5d9c759..c8e2f11963b8258371580d204e3c3f797c1343b7 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2899,7 +2899,7 @@ module OneM2M_Functions {
 					v_myResource.cSEBase.supportedResourceType := PX_TS_CSE1.supportedResourceType;
 					v_myResource.cSEBase.pointOfAccess := {f_getCompletePoA(PX_TS_CSE1.mccPortIn, "")};
 					v_myResource.cSEBase.cseType := vc_cseType;
-					v_myResource.cSEBase.supportedReleaseVersions := {"2a"};
+					v_myResource.cSEBase.supportedReleaseVersions := {"1", "2", "2a"};
 				    
 				}else if(p_resourceType == int16 and ispresent(p_resource)) {			//RemoteCSE
 					if(ischosen(p_resource.remoteCSE)){
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 6f817dba24aeff1bb08bcb3402439ce221537ccb..697b27513c189880ead761f0f7faa1e82275e14c 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -127,6 +127,12 @@ module OneM2M_Pixits {
 			 */			
 			modulepar float PX_TCONFIG_IUT					:= 10.0;
 			
+			/**
+			 * @desc Release version of IUT to be used. Any available release backwards from actual ATS release till 2a
+			 */			
+			modulepar ReleaseVersion PX_RELEASE_VERSION		:= "2a";
+			
+			
 			group flexContainerContainerDefinitions {
 				/**
 				 * @desc These contain the identifier reference (URI) to the <flexContainer> schema definition which is used by the CSE to validate the syntax of the <flexContainer> resource 
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 4c2f611bf0825439eed768aaa59c69a4a0c68274..0c60b92e1add031f43148602eef3cbf1e3186e95 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -122,7 +122,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			};
         	
@@ -219,7 +219,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
         	};
         	
@@ -253,7 +253,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			};
 			
@@ -473,7 +473,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			};
         	
@@ -722,7 +722,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 
 			};
@@ -1418,7 +1418,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			};
 
@@ -1489,7 +1489,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			};
 			
@@ -1536,7 +1536,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit,
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			};
     		
@@ -1758,7 +1758,7 @@ module OneM2M_Templates {
     		requestReachability := false,//M
     		contentSerialization := omit,//O
 			e2eSecInfo := omit, //O
-			supportedReleaseVersions := {"2a"}, //M
+			supportedReleaseVersions := {"1", "2", "2a"}, //M
     		choice := omit//NP
     	};	
 
@@ -1912,7 +1912,7 @@ module OneM2M_Templates {
 			nodeLink := omit,
 			dynamicAuthorizationConsultationIDs := omit,
 			e2eSecInfo := omit, 
-			supportedReleaseVersions := {"2a"},
+			supportedReleaseVersions := {"1", "2", "2a"},
 			choice := omit
 		};
 		
@@ -2705,7 +2705,7 @@ module OneM2M_Templates {
 			nodeLink := omit,//O
 			triggerReferenceNumber := omit,//O
 			e2eSecInfo := omit,//O
-			supportedReleaseVersions := {"2a"}, //M
+			supportedReleaseVersions := {"1", "2", "2a"}, //M
 			choice := omit//O
 		};
     	
@@ -2736,7 +2736,7 @@ module OneM2M_Templates {
 			nodeLink := omit,//O
 			triggerReferenceNumber := omit,//O
 			e2eSecInfo := omit,//O
-			supportedReleaseVersions := {"2a"}, //M
+			supportedReleaseVersions := {"1", "2", "2a"}, //M
 			choice := omit//O
 		};
 		
@@ -2766,7 +2766,7 @@ module OneM2M_Templates {
 			nodeLink := *,//O
 			triggerReferenceNumber := *,//O
 			e2eSecInfo := *,//O
-			supportedReleaseVersions := {"2a"}, //M
+			supportedReleaseVersions := ?, //M
 			choice := *//O
 		};
 		
@@ -5109,7 +5109,7 @@ module OneM2M_Templates {
 			requestReachability := omit,//M
 			contentSerialization := omit,//O
 			e2eSecInfo:= omit, //O
-			supportedReleaseVersions := {"2a"},//M
+			supportedReleaseVersions := {"1", "2", "2a"},//M
 			choice := omit//O
 		};	
         
@@ -5135,7 +5135,7 @@ module OneM2M_Templates {
 			requestReachability := omit,//M
 			contentSerialization := *,//O
 			e2eSecInfo:= *, //O
-			supportedReleaseVersions := {"2a"},//M
+			supportedReleaseVersions := ?,//M
 			choice := *//O
 		};	
 
@@ -5381,7 +5381,7 @@ module OneM2M_Templates {
 			contentOffset := omit,
 			assignedTokenIdentifiers := omit,
 			tokenRequestInformation := omit,
-			releaseVersionIndicator := "2a",
+			releaseVersionIndicator := PX_RELEASE_VERSION,
 			vendorInformation := omit
 		};
 		
@@ -5515,7 +5515,7 @@ module OneM2M_Templates {
 			contentOffset := omit,
 			assignedTokenIdentifiers := omit,
 			tokenRequestInformation := omit,
-			releaseVersionIndicator := "2a",
+			releaseVersionIndicator := PX_RELEASE_VERSION,
 			vendorInformation := omit
 		};
 		
@@ -5572,7 +5572,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",//FIXME
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			}, 
 			forcedFields := omit
@@ -5651,7 +5651,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",//FIXME
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			}, 
 			forcedFields := omit
@@ -5690,7 +5690,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",//FIXME
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			}, 
 			forcedFields := omit
@@ -5737,7 +5737,7 @@ module OneM2M_Templates {
 				tokenIDs := omit,
 				localTokenIDs := omit, 
 				tokenRequestIndicator := omit,
-				releaseVersionIndicator := "2a",//FIXME
+				releaseVersionIndicator := PX_RELEASE_VERSION,
 				vendorInformation := omit
 			}, 
 			forcedFields := omit
diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn
index 76f6421de0698d7d2fbf26792a2cdf489245aa2a..ab0658524fcdc04eaf3ba324fd122e41ddfa6a84 100644
--- a/LibOneM2M/OneM2M_Types.ttcn
+++ b/LibOneM2M/OneM2M_Types.ttcn
@@ -1601,13 +1601,13 @@ with {
 };
 
 
-type XSD.String ReleaseVersion (pattern "2a")
+type XSD.String ReleaseVersion (pattern "2a") //FIXME  All available releases backwards till 2a. XSD will define it as this
 with {
   variant "name as uncapitalized";
 };
 
 
-type XSD.String ApplicableReleaseVersion (pattern "2a")
+type XSD.String ApplicableReleaseVersion (pattern "(1|2|2a)") //FIXME All available release backwards. XSD will define it as this
 with {
   variant "name as uncapitalized";
 };