--- a/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss	Tue Jul 06 14:06:02 2010 +0300
+++ b/omads/omadsextensions/adapters/contacts/src/NSmlContactsDataStoreFormat_1_1_2.rss	Wed Aug 18 09:39:14 2010 +0300
@@ -85,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="";
@@ -187,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="";
@@ -229,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="";
@@ -255,6 +251,36 @@
 				SML_DATA_PROPERTY
 					{
 					version=1;
+					display_name="GEO Address";
+					name="GEO";
+					data_type="";
+					enum_values={};
+					flags= 0;
+					max_size=256;
+					max_occur=0;
+					params=
+						{
+						SML_DATA_PROPERTY_PARAM
+							{
+							version=1;
+							display_name="Home GEO";
+							name="HOME";
+							data_type="";
+							enum_values={};
+							},
+						SML_DATA_PROPERTY_PARAM
+							{
+							version=1;
+							display_name="Work GEO";
+							name="WORK";
+							data_type="";
+							enum_values={};
+							}
+						};
+					},
+				SML_DATA_PROPERTY
+					{
+					version=1;
 					display_name="URL address";
 					name="URL";
 					data_type="";
@@ -357,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="";
@@ -434,7 +447,7 @@
 					{
 					version=1;
 					display_name="Nickname";
-					name="X-EPOCSECONDNAME";
+					name="X-NICKNAME";
 					data_type="";
 					enum_values={};
 					flags= 0;
@@ -445,18 +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="SIP protocol";
 					name="X-SIP";
 					data_type="";
@@ -469,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="";