diff --git a/c_micasacache/sscs_unx_ipc_client.c b/c_micasacache/sscs_unx_ipc_client.c
index 66752dc2..69b29e68 100644
--- a/c_micasacache/sscs_unx_ipc_client.c
+++ b/c_micasacache/sscs_unx_ipc_client.c
@@ -2092,6 +2092,7 @@ int32_t ipc_ReadBinaryKey
                 retCode = NSSCS_E_SYSTEM_FAILURE;
                 break;
             }
+			*valLen = dataLen;
             
         }
         else
diff --git a/c_micasad/micasad.csproj b/c_micasad/micasad.csproj
index 9c3bd5fe..211e710a 100644
--- a/c_micasad/micasad.csproj
+++ b/c_micasad/micasad.csproj
@@ -305,7 +305,7 @@
                 />
                 <File
                     RelPath = "init\ProjectInstaller.cs"
-                    SubType = "Code"
+                    SubType = "Component"
                     BuildAction = "Compile"
                 />
                 <File
@@ -315,7 +315,7 @@
                 />
                 <File
                     RelPath = "init\WinSecretStoreClientService.cs"
-                    SubType = "Code"
+                    SubType = "Component"
                     BuildAction = "Compile"
                 />
                 <File
@@ -384,6 +384,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "verbs\ReadBinaryKey.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "verbs\ReadKey.cs"
                     SubType = "Code"
@@ -419,6 +424,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "verbs\WriteBinaryKey.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "verbs\WriteKey.cs"
                     SubType = "Code"
diff --git a/c_micasadk/sscs_ndk.c b/c_micasadk/sscs_ndk.c
index ecc143de..1177e2ba 100644
--- a/c_micasadk/sscs_ndk.c
+++ b/c_micasadk/sscs_ndk.c
@@ -1603,7 +1603,7 @@ miCASAWriteBinaryKey
     SS_UTF8_T           *	key,
     uint32_t                keyLen,
     uint8_t             *	val,
-    uint32_t                valLen,	
+    uint32_t            *   valLen,	
 	SSCS_PASSWORD_T		*	epPassword, 
 	SSCS_EXT_T			*	ext
 )
@@ -1673,7 +1673,7 @@ miCASAWriteBinaryKey
 							escapedSHSKey,
 							sscs_Utf8Strlen(escapedSHSKey), 
 							val,
-							valLen,
+							*valLen,
 							epPassword, 
 							ext);
 
@@ -2907,11 +2907,11 @@ miCASASetCredential
 									context,	
 									ssFlags, 
 									&kc, 	
-									sharedSecretID,
+									appSecretID,
 									binaryCred->id,
 									binaryCred->idLen,
 									binaryCred->data,
-					                *binaryCred->dataLen,	
+					                binaryCred->dataLen,
 									NULL, 
 									ext);
 	}
diff --git a/include/micasa.h b/include/micasa.h
index 757d2fed..1ac3c0bb 100644
--- a/include/micasa.h
+++ b/include/micasa.h
@@ -453,10 +453,25 @@ miCASAWriteKey
 	uint32_t				ssFlags, 
 	SSCS_KEYCHAIN_ID_T	*	keyChainID, 	
 	SSCS_SECRET_ID_T	*	sharedSecretID,
-    SS_UTF8_T               *key,
-    uint32_t                 keyLen,
-    uint8_t                 *val,
-    uint32_t                 valLen,	
+    SS_UTF8_T           *	key,
+    uint32_t                keyLen,
+    uint8_t             *	val,
+    uint32_t                valLen,	
+	SSCS_PASSWORD_T		*	epPassword, 
+	SSCS_EXT_T			*	ext
+);
+
+SSCS_EXTERN_LIBCALL(int32_t)
+miCASAWriteBinaryKey
+(
+	void				*	context,	
+	uint32_t				ssFlags, 
+	SSCS_KEYCHAIN_ID_T	*	keyChainID, 	
+	SSCS_SECRET_ID_T	*	sharedSecretID,
+    SS_UTF8_T           *	key,
+    uint32_t                keyLen,
+    uint8_t             *	val,
+    uint32_t            *   valLen,	
 	SSCS_PASSWORD_T		*	epPassword, 
 	SSCS_EXT_T			*	ext
 );
diff --git a/vs_solutions/micasad/micasad.suo b/vs_solutions/micasad/micasad.suo
index ea52cbb4..455cfb30 100644
Binary files a/vs_solutions/micasad/micasad.suo and b/vs_solutions/micasad/micasad.suo differ