diff --git a/CASA/sharp/NSSCSWrapper/NativeCalls.cs b/CASA/sharp/NSSCSWrapper/NativeCalls.cs
index ab2023c4..1110fa14 100644
--- a/CASA/sharp/NSSCSWrapper/NativeCalls.cs
+++ b/CASA/sharp/NSSCSWrapper/NativeCalls.cs
@@ -931,10 +931,14 @@ namespace Novell.CASA
 			keyChainID.keychainID = sKeyChainID;
 			keyChainID.len = sKeyChainID.Length + 1;
 
-			SSCS_PASSWORD_T epPassword = new SSCS_PASSWORD_T();
-			epPassword.pword = sEPPassword;
-			epPassword.pwordLen = (uint)sEPPassword.Length + 1;
-			epPassword.pwordType = 0;  // todo set type
+			SSCS_PASSWORD_T epPassword = null;                
+            if (sEPPassword != null)
+            {
+                epPassword = new SSCS_PASSWORD_T();
+			    epPassword.pword = sEPPassword;
+			    epPassword.pwordLen = (uint)sEPPassword.Length + 1;
+			    epPassword.pwordType = 0;  // todo set type
+            }
 
 			SSCS_SH_SECRET_ID_T secretID = new SSCS_SH_SECRET_ID_T();
 			secretID.name = sSecretID;
@@ -951,7 +955,7 @@ namespace Novell.CASA
 				ssFlags,				
 				secretID,
 				epPassword,
-				ext);
+				null);
 			
 
 			return rcode;
@@ -984,7 +988,8 @@ namespace Novell.CASA
 
 			if (USE_OBJECT_SERIALIZATION)
 			{
-				sc = (StringCollection)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_SECRETIDS, null, null, null, sc);
+				//sc = (StringCollection)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_SECRETIDS, null, null, null, sc);
+                sc = (StringCollection)MiCasaRequestReply.Send(MiCasaRequestReply.VERB_GET_SECRETIDS, sKeyChainID, null, null, sc);
 				return sc;	
 			}
 			else
diff --git a/CASA/sharp/NSSCSWrapper/SecretStore.cs b/CASA/sharp/NSSCSWrapper/SecretStore.cs
index cb506034..b0e46cde 100644
--- a/CASA/sharp/NSSCSWrapper/SecretStore.cs
+++ b/CASA/sharp/NSSCSWrapper/SecretStore.cs
@@ -34,7 +34,9 @@ namespace Novell.CASA
 	{		
 		private string m_sMasterPassword = null;
 		private static string SESSION_KEY_CHAIN = "SSCS_SESSION_KEY_CHAIN_ID";
-		public static string LOCAL_REMOTE_KEY_CHAIN = "SSCS_LOCAL_REMOTE_KEY_CHAIN_ID";
+		public static string LOCAL_REMOTE_KEY_CHAIN = "SSCS_LOCAL_REMOTE_KEY_CHAIN_ID";        
+        
+        public static string SSCS_CONFLICT_KEYCHAIN = "SSCS_CONFLICT_KEYCHAIN_ID";
 
 		private NativeCalls m_NativeCalls = null;
 		private IntPtr m_hsc = IntPtr.Zero;
@@ -72,7 +74,7 @@ namespace Novell.CASA
 		*/
 
 
-		internal Secret getSecret(string sKeyChainID, uint ssFlags, string sSecretID, int iSecretType, string sEPPassword)
+		public Secret getSecret(string sKeyChainID, uint ssFlags, string sSecretID, int iSecretType, string sEPPassword)
 		{
 			if (m_NativeCalls != null)
 				return m_NativeCalls.getSecret(m_hsc, sKeyChainID, ssFlags, sSecretID, iSecretType, sEPPassword);