--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss	Thu Aug 19 09:41:17 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss	Tue Aug 31 15:05:37 2010 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "SmlDataFormat.rh"
 #include "SmlDataFormat.hrh"
 
@@ -86,6 +85,18 @@
 				SML_DATA_PROPERTY
 					{
 					version=1;
+					display_name="Uid";
+					name="UID";
+					data_type="";
+					enum_values={};
+					flags=0;
+					max_size=256;
+					max_occur=0;
+					params={};
+					},
+				SML_DATA_PROPERTY
+					{
+					version=1;
 					display_name="Name";
 					name="N";
 					data_type="";
@@ -188,14 +199,6 @@
 						SML_DATA_PROPERTY_PARAM
 							{
 							version=1;
-							display_name="Default number";
-							name="PREF";
-							data_type="";
-							enum_values={};
-							},	
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
 							display_name="Car telephone";
 							name="CAR";
 							data_type="";
@@ -230,14 +233,6 @@
 						SML_DATA_PROPERTY_PARAM
 							{
 							version=1;
-							display_name="";
-							name="INTERNET";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
 							display_name="Home email";
 							name="HOME";
 							data_type="";
@@ -321,7 +316,7 @@
 					data_type="";
 					enum_values={};
 					flags= 0;
-					max_size=1000;
+					max_size=256;
 					max_occur=0;
 					params={};
 					},
@@ -388,19 +383,6 @@
 				SML_DATA_PROPERTY
 					{
 					version=1;
-					display_name="Wireless Village Id";
-					name="X-WV-ID";
-					data_type="";
-					enum_values={};
-					flags= 0;
-					max_size=256;
-					max_occur=0;
-					params={};
-					},
-					
-				SML_DATA_PROPERTY
-					{
-					version=1;
 					display_name="Assistant name";
 					name="X-ASSISTANT";
 					data_type="";
@@ -476,104 +458,6 @@
 				SML_DATA_PROPERTY
 					{
 					version=1;
-					display_name="Class";
-					name="X-CLASS";
-					data_type="";
-					enum_values={"PUBLIC","PRIVATE","CONFIDENTIAL"};
-					flags= 0;
-					max_size=256;
-					max_occur=0;
-					params={};
-					},
-				SML_DATA_PROPERTY
-					{
-					version=1;
-					display_name="IMPP";
-					name="X-IMPP";
-					data_type="";
-					enum_values={};
-					flags= 0;
-					max_size=256;
-					max_occur=0;
-					params=
-						{
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
-							display_name=""; 
-							name="PERSONAL";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
-							display_name=""; 
-							name="HOME";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
-							display_name=""; 
-							name="WORK";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
-							display_name=""; 
-							name="BUSINESS";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
-							display_name=""; 
-							name="MOBILE";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
-							display_name=""; 
-							name="PREF";
-							data_type="";
-							enum_values={};
-							}
-						};
-					},
-					SML_DATA_PROPERTY
-					{
-					version=1;
-					display_name="Top contact";
-					name="X-FAVORITE";
-					data_type="";
-					enum_values={};
-					flags= 0;
-					max_size=256;
-					max_occur=0;
-					params={};
-					},
-				      SML_DATA_PROPERTY
-					{
-					version=1;
-					display_name="My Card";
-					name="X-SELF";
-					data_type="";
-					enum_values={};
-					flags= 0;
-					max_size=256;
-					max_occur=0;
-					params={};
-					},
-				SML_DATA_PROPERTY
-					{
-					version=1;
 					display_name="SIP protocol";
 					name="X-SIP";
 					data_type="";
@@ -586,14 +470,6 @@
 						SML_DATA_PROPERTY_PARAM
 							{
 							version=1;
-							display_name="POC";
-							name="POC";
-							data_type="";
-							enum_values={};
-							},
-						SML_DATA_PROPERTY_PARAM
-							{
-							version=1;
 							display_name="SWIS";
 							name="SWIS";
 							data_type="";
@@ -608,19 +484,7 @@
 							enum_values={};
 							}
 						};
-					},
-                    SML_DATA_PROPERTY
-                              {
-                              version=1;
-                              display_name="Categories";
-                              name="X-CATEGORIES";
-                              data_type="";
-                              enum_values={};
-                              flags= 0;
-                              max_size=256;
-                              max_occur=0;
-                              params={};
-                              }
+					}
 				};
 				field_level=0;
 				}