diff -r 2bb96f4ecad8 -r 8e7494275d3a omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss
--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_2.rss	Thu Aug 19 09:41:17 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_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="";
@@ -135,7 +146,7 @@
 							display_name="Type";
 							name="TYPE";
 							data_type="";
-							enum_values={"HOME", "WORK", "VOICE", "CELL", "PAGER", "FAX", "VIDEO", "PREF", "CAR"};
+							enum_values={"HOME", "WORK", "CELL", "PAGER", "FAX", "VIDEO", "CAR"};
 							}
 						};
 					},
@@ -169,7 +180,7 @@
 							display_name="Type";
 							name="TYPE";
 							data_type="";
-							enum_values={"INTERNET", "HOME", "WORK", "PREF"};
+							enum_values={"HOME", "WORK"};
 							}
 						};
 					},
@@ -213,7 +224,7 @@
 							display_name="Type";
 							name="TYPE";
 							data_type="";
-							enum_values={"HOME", "WORK", "PREF"};
+							enum_values={"HOME", "WORK"};
 							}
 						};
 					},
@@ -225,7 +236,7 @@
 					data_type="";
 					enum_values={};
 					flags= 0;
-					max_size=1000;
+					max_size=256;
 					max_occur=0;
 					params={};
 					},
@@ -292,18 +303,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="";
@@ -376,65 +375,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="Type";
-							name="TYPE";
-							data_type="";
-							enum_values={"PERSONAL", "HOME", "WORK","BUSINESS", "MOBILE", "PREF"};
-							}
-						};
-					},	
-					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="";
@@ -450,22 +390,10 @@
 							display_name="Type";
 							name="TYPE";
 							data_type="";
-							enum_values={"POC", "SWIS", "VOIP", "WORK", "HOME"};
+							enum_values={"SWIS", "VOIP"};
 							}
 						};
-					},
-	                   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;
 				}