diff --git a/CASA/jwrapper/jnsscs/jnsscs.vcproj b/CASA/jwrapper/jnsscs/jnsscs.vcproj
index 074951ff..1f2a332d 100644
--- a/CASA/jwrapper/jnsscs/jnsscs.vcproj
+++ b/CASA/jwrapper/jnsscs/jnsscs.vcproj
@@ -1,147 +1,213 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
-	Name="jnsscs"
+	Version="8.00"
+	Name="jmicasa"
+	ProjectGUID="{D2BD9955-65B4-4E34-B178-52D71444AE63}"
 	RootNamespace="jnsscs"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine="cd ..&#x0D;&#x0A;%JAVA_HOME%\bin\javac.exe -classpath . com/novell/casa/MiCasa.java&#x0D;&#x0A;%JAVA_HOME%\bin\javah.exe -d ../../include -classpath  . com.novell.casa.MiCasa&#x0D;&#x0A;%JAVA_HOME%\bin\jar cvf miCASA.jar com/novell/casa/MiCasa.class com/novell/casa/NetCredential.class com/novell/casa/MiCasaException.class&#x0D;&#x0A;dir&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/jnsscs.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="C:\j2sdk1.4.2_05\include\win32;D:\ccm\SSClient\SecretStoreClient_src\include;C:\j2sdk1.4.2_05\include;D:\ccm\SSClient\SecretStoreClient_src\c_jwrapper\classes"
+				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(JAVA_HOME)\include&quot;;..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;JNSSCS_EXPORTS"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/jnsscs.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="1"/>
+				SuppressStartupBanner="true"
+				CompileAs="1"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="micasa.lib"
 				OutputFile=".\Release/jmicasa.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="D:\ccm\SSClient\SecretStoreClient_src\lib\w32"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib\Release"
 				ProgramDatabaseFile=".\Release/jnsscs.pdb"
 				ImportLibrary=".\Release/jnsscs.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/jnsscs.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				Description="Building Java Files"
+				CommandLine="cd ..&#x0D;&#x0A;%JAVA_HOME%\bin\javac.exe -classpath . com/novell/casa/MiCasa.java&#x0D;&#x0A;%JAVA_HOME%\bin\javah.exe -d ../../include -classpath  . com.novell.casa.MiCasa&#x0D;&#x0A;%JAVA_HOME%\bin\jar cvf miCASA.jar com/novell/casa/MiCasa.class com/novell/casa/NetCredential.class com/novell/casa/MiCasaException.class&#x0D;&#x0A;dir&#x0D;&#x0A;"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/jnsscs.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\Java\jdk1.5.0_06\include\win32&quot;;&quot;%JAVA_HOME%\include&quot;;../../include"
+				AdditionalIncludeDirectories="&quot;$(JAVA_HOME)\include\win32&quot;;&quot;$(JAVA_HOME)\include&quot;;..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JNSSCS_EXPORTS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="0"
-				UsePrecompiledHeader="2"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/jnsscs.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="1"/>
+				CompileAs="1"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="odbc32.lib odbccp32.lib micasa.lib"
 				OutputFile=".\Debug/jmicasa.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib\Release"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/jnsscs.pdb"
 				ImportLibrary=".\Debug/jnsscs.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/jnsscs.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -149,21 +215,26 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\jmicasa.c">
+				RelativePath=".\jmicasa.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="..\classes\com_novell_casa_MiCasa.h">
+				RelativePath="..\classes\com_novell_casa_MiCasa.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj b/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj
index 31ccec13..9e8fb32a 100644
--- a/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj
+++ b/CASA/package/windows/vs_solutions/CASA-dev-msm/miCASA-Dev-msm.vdproj
@@ -33,6 +33,48 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_52179197002254A68EACB031EA8E0D62"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_52179197002254A68EACB031EA8E0D62"
+        "OwnerKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC"
+        "OwnerKey" = "8:_8C67B5EDEB55DE3F71D20D5669166174"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6F5143A35711D14A06EDE31F04D74B53"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6F5143A35711D14A06EDE31F04D74B53"
+        "OwnerKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_6F5143A35711D14A06EDE31F04D74B53"
+        "OwnerKey" = "8:_52179197002254A68EACB031EA8E0D62"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -45,6 +87,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_8C67B5EDEB55DE3F71D20D5669166174"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_9630BD80B06842BB9DE27916F038665C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -57,6 +105,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_A3C72108A9014990A7B96560357D3A70"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_A7A23CA536234B8BAE08CA9528EC8F93"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -69,6 +123,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_BFB5523F92C62717D5FFB02E609341F7"
+        "OwnerKey" = "8:_384A908A3DE54B359C611011C2A2AA97"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_EE232DF9B4BC45A4930DB0E636A09A53"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -79,6 +139,30 @@
         "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_8C67B5EDEB55DE3F71D20D5669166174"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_65E7F678A98BB9AED57C6D474140DDEC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_52179197002254A68EACB031EA8E0D62"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_6F5143A35711D14A06EDE31F04D74B53"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -190,6 +274,99 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_52179197002254A68EACB031EA8E0D62"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.16397, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_52179197002254A68EACB031EA8E0D62"
+                    {
+                    "Name" = "8:AppModule.NamedPipes.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.NamedPipes.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_65E7F678A98BB9AED57C6D474140DDEC"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2501.16398, Culture=neutral, processorArchitecture=x86"
+                "ScatterAssemblies"
+                {
+                    "_65E7F678A98BB9AED57C6D474140DDEC"
+                    {
+                    "Name" = "8:Novell.CASA.Common.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.Common.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6F5143A35711D14A06EDE31F04D74B53"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.16397, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_6F5143A35711D14A06EDE31F04D74B53"
+                    {
+                    "Name" = "8:AppModule.InterProcessComm.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.InterProcessComm.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7B574E73CEF5460FB51F5A341F81EA9A"
             {
             "SourcePath" = "8:..\\..\\..\\..\\lib\\release\\micasa.lib"
@@ -210,6 +387,37 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_8C67B5EDEB55DE3F71D20D5669166174"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.6.2501.16402, Culture=neutral, processorArchitecture=x86"
+                "ScatterAssemblies"
+                {
+                    "_8C67B5EDEB55DE3F71D20D5669166174"
+                    {
+                    "Name" = "8:Novell.CASA.miCASAWrapper.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.miCASAWrapper.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9630BD80B06842BB9DE27916F038665C"
             {
             "SourcePath" = "8:..\\..\\..\\..\\include\\sscs_utf8.h"
@@ -250,6 +458,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3C72108A9014990A7B96560357D3A70"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\jwrapper\\miCASA.jar"
+            "TargetName" = "8:miCASA.jar"
+            "Tag" = "8:"
+            "Folder" = "8:_B38C5202FD154B2EB81B5ED7738CCE94"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A7A23CA536234B8BAE08CA9528EC8F93"
             {
             "SourcePath" = "8:..\\..\\..\\..\\include\\micasa_types.h"
@@ -290,6 +518,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BFB5523F92C62717D5FFB02E609341F7"
+            {
+            "SourcePath" = "8:micasa.dll"
+            "TargetName" = "8:micasa.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_F3F9192858114846913E6271C812F8FA"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EE232DF9B4BC45A4930DB0E636A09A53"
             {
             "SourcePath" = "8:..\\..\\..\\..\\include\\sscs_string.h"
@@ -495,7 +743,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_384A908A3DE54B359C611011C2A2AA97"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Release\\cSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Debug\\cSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F3F9192858114846913E6271C812F8FA"
@@ -523,7 +771,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_718042C617DB414B91C69D1ACCD99A42"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Release\\CSharpSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Debug\\CSharpSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
diff --git a/CASA/package/windows/vs_solutions/CASA-msm/CASA-msm.vdproj b/CASA/package/windows/vs_solutions/CASA-msm/CASA-msm.vdproj
index 221360c7..eb7fdcf2 100644
--- a/CASA/package/windows/vs_solutions/CASA-msm/CASA-msm.vdproj
+++ b/CASA/package/windows/vs_solutions/CASA-msm/CASA-msm.vdproj
@@ -21,12 +21,66 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_01EA198D017B971B145A17145CE2C5F6"
+        "OwnerKey" = "8:_C37A35F33FD14730BC7E7C47DF9C2DD1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_01EA198D017B971B145A17145CE2C5F6"
+        "OwnerKey" = "8:_35D7FFD9A5F02B162343D1F3922ADB06"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_093DBD038821017381C58C1600BB65FF"
+        "OwnerKey" = "8:_69B8715C6C864CE4BA0C8234D344175F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_132F57540C1E9FCF17E2DF8360F4B09C"
+        "OwnerKey" = "8:_C37A35F33FD14730BC7E7C47DF9C2DD1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_132F57540C1E9FCF17E2DF8360F4B09C"
+        "OwnerKey" = "8:_35D7FFD9A5F02B162343D1F3922ADB06"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_132F57540C1E9FCF17E2DF8360F4B09C"
+        "OwnerKey" = "8:_01EA198D017B971B145A17145CE2C5F6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_35D7FFD9A5F02B162343D1F3922ADB06"
+        "OwnerKey" = "8:_C37A35F33FD14730BC7E7C47DF9C2DD1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_538816C3FDB46EF4059CBA054855C473"
+        "OwnerKey" = "8:_C37A35F33FD14730BC7E7C47DF9C2DD1"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_53A2168DF64E4E9EB3FD5516424E732E"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_69B8715C6C864CE4BA0C8234D344175F"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_90C16B41FE7F435A8640BFDDD7C02619"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -39,10 +93,40 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_FCA9C6770F0FB28185373954659263CB"
+        "OwnerKey" = "8:_01C1EAD583CE4AD39778A1F9EC86204D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_C37A35F33FD14730BC7E7C47DF9C2DD1"
         "MsmSig" = "8:_UNDEFINED"
         }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_538816C3FDB46EF4059CBA054855C473"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_35D7FFD9A5F02B162343D1F3922ADB06"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_01EA198D017B971B145A17145CE2C5F6"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_132F57540C1E9FCF17E2DF8360F4B09C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
     }
     "Configurations"
     {
@@ -142,6 +226,170 @@
         }
         "File"
         {
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_01EA198D017B971B145A17145CE2C5F6"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.19770, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_01EA198D017B971B145A17145CE2C5F6"
+                    {
+                    "Name" = "8:AppModule.NamedPipes.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.NamedPipes.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_24B477312C8840DB8DF8C1E373E7FC6D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_093DBD038821017381C58C1600BB65FF"
+            {
+            "SourcePath" = "8:micasa.dll"
+            "TargetName" = "8:micasa.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_4913CF477F8E455DA2D13A4A6892F4F7"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_132F57540C1E9FCF17E2DF8360F4B09C"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.19770, Culture=neutral, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_132F57540C1E9FCF17E2DF8360F4B09C"
+                    {
+                    "Name" = "8:AppModule.InterProcessComm.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.InterProcessComm.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_24B477312C8840DB8DF8C1E373E7FC6D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_35D7FFD9A5F02B162343D1F3922ADB06"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2495.19770, Culture=neutral, processorArchitecture=x86"
+                "ScatterAssemblies"
+                {
+                    "_35D7FFD9A5F02B162343D1F3922ADB06"
+                    {
+                    "Name" = "8:Novell.CASA.Common.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.Common.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_24B477312C8840DB8DF8C1E373E7FC6D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_538816C3FDB46EF4059CBA054855C473"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.CASAPol, Version=1.6.2495.19770, Culture=neutral, processorArchitecture=x86"
+                "ScatterAssemblies"
+                {
+                    "_538816C3FDB46EF4059CBA054855C473"
+                    {
+                    "Name" = "8:Novell.CASA.CASAPol.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.CASAPol.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_24B477312C8840DB8DF8C1E373E7FC6D"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FCA9C6770F0FB28185373954659263CB"
+            {
+            "SourcePath" = "8:micasacache.dll"
+            "TargetName" = "8:micasacache.dll"
+            "Tag" = "8:"
+            "Folder" = "8:_4913CF477F8E455DA2D13A4A6892F4F7"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
         }
         "FileType"
         {
@@ -230,7 +478,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_01C1EAD583CE4AD39778A1F9EC86204D"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\micasadk\\release\\micasa.dll"
+            "SourcePath" = "8:..\\..\\..\\..\\micasadk\\Debug\\micasa.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_4913CF477F8E455DA2D13A4A6892F4F7"
@@ -258,7 +506,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_53A2168DF64E4E9EB3FD5516424E732E"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\micasacache\\release\\micasacache.dll"
+            "SourcePath" = "8:..\\..\\..\\..\\micasacache\\Debug\\micasacache.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_4913CF477F8E455DA2D13A4A6892F4F7"
@@ -284,9 +532,37 @@
                 {
                 }
             }
+            "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_69B8715C6C864CE4BA0C8234D344175F"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\jwrapper\\jnsscs\\Debug\\jmicasa.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_4913CF477F8E455DA2D13A4A6892F4F7"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            "ProjectOutputGroupRegister" = "3:1"
+            "OutputConfiguration" = "8:"
+            "OutputGroupCanonicalName" = "8:Built"
+            "OutputProjectGuid" = "8:{D2BD9955-65B4-4E34-B178-52D71444AE63}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_90C16B41FE7F435A8640BFDDD7C02619"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\logincapture\\windows\\bin\\release\\lcredmgr.dll"
+            "SourcePath" = "8:..\\..\\..\\..\\logincapture\\windows\\bin\\debug\\lcredmgr.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_24B477312C8840DB8DF8C1E373E7FC6D"
@@ -314,7 +590,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C37A35F33FD14730BC7E7C47DF9C2DD1"
             {
-            "SourcePath" = "8:..\\..\\..\\..\\micasad\\obj\\Release\\micasad.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\micasad\\obj\\Debug\\micasad.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_24B477312C8840DB8DF8C1E373E7FC6D"
diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb
index 7b7e0b41..82e20590 100644
Binary files a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb and b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.ncb differ
diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.sln b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.sln
index 8b00864a..65ac8bac 100644
--- a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.sln
+++ b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.sln
@@ -15,14 +15,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcredmgr", "..\..\..\..\Log
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\..\..\sharp\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66} = {077B53BB-404A-4B2F-BA17-AAE98C5E9C66}
+		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\..\..\micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66} = {077B53BB-404A-4B2F-BA17-AAE98C5E9C66}
+		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\..\..\gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
@@ -53,6 +53,11 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CASA-msm", "..\CASA-msm\CAS
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CASA-gui-msm", "..\CASA-gui-msm\CASA-gui.vdproj", "{0B3208BF-0948-4FA9-89C8-61A0AD00D241}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jmicasa", "..\..\..\..\jwrapper\jnsscs\jnsscs.vcproj", "{D2BD9955-65B4-4E34-B178-52D71444AE63}"
+	ProjectSection(ProjectDependencies) = postProject
+		{99988A22-4C58-4BF7-A2DB-57761E76FB26} = {99988A22-4C58-4BF7-A2DB-57761E76FB26}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -251,6 +256,16 @@ Global
 		{0B3208BF-0948-4FA9-89C8-61A0AD00D241}.Release|Mixed Platforms.Build.0 = Release
 		{0B3208BF-0948-4FA9-89C8-61A0AD00D241}.Release|Win32.ActiveCfg = Release
 		{0B3208BF-0948-4FA9-89C8-61A0AD00D241}.Release|Win32.Build.0 = Release
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Debug|Win32.Build.0 = Debug|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Release|Any CPU.ActiveCfg = Release|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Release|Win32.ActiveCfg = Release|Win32
+		{D2BD9955-65B4-4E34-B178-52D71444AE63}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo
index 0ecebc03..05331695 100644
Binary files a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo and b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.suo differ
diff --git a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.vdproj b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.vdproj
index 95a1e2b8..0e5ca76a 100644
--- a/CASA/package/windows/vs_solutions/CASA32-msi/CASA.vdproj
+++ b/CASA/package/windows/vs_solutions/CASA32-msi/CASA.vdproj
@@ -70,13 +70,13 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_98DCC664712A41B993FCD33026D06FFC"
+        "OwnerKey" = "8:_BF2CE61978054B2DB482792974E390F0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_BF2CE61978054B2DB482792974E390F0"
+        "OwnerKey" = "8:_98DCC664712A41B993FCD33026D06FFC"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -333,14 +333,14 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{6A5BB76D-93CA-4D3F-B465-40508DB10B60}"
-        "PackageCode" = "8:{44FE8FE8-345A-4AA8-9A8D-A851FFDCFF3F}"
+        "ProductCode" = "8:{49AB55EE-5DBD-4992-BC39-65AFFB00C125}"
+        "PackageCode" = "8:{B65108A7-B1EC-488A-8A4F-0E2FFF469C13}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.7.916"
+        "ProductVersion" = "8:1.7.936"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -956,45 +956,31 @@
                 "SourcePath" = "8:..\\CASA-dev-msm\\Release\\miCASA-Dev-msm.msm"
                     "Properties"
                     {
-                        "_096DFFA8534DE54FEA338BE8844B4A14.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_3ECE494579D255C0D85D58A79F6399A0.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_096DFFA8534DE54FEA338BE8844B4A14.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_3ECE494579D255C0D85D58A79F6399A0.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_CCB98E2F6080411055CAE9A6976AA8DA.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_6F5143A35711D14A06EDE31F04D74B53.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_CCB98E2F6080411055CAE9A6976AA8DA.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_CCB98E2F6080411055CAE9A6976AA8DA.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_6F5143A35711D14A06EDE31F04D74B53.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_6F5143A35711D14A06EDE31F04D74B53.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_0C1CC6FAC5B42B26FF5D05AAC24B5A6D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_589CD62C5BC3BA5B93CC46816AA3EF82.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_0C1CC6FAC5B42B26FF5D05AAC24B5A6D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_589CD62C5BC3BA5B93CC46816AA3EF82.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_07673B8768F9F030C4AB200CBFAF8E3D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_65E7F678A98BB9AED57C6D474140DDEC.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_07673B8768F9F030C4AB200CBFAF8E3D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_07673B8768F9F030C4AB200CBFAF8E3D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "UsePlugInResources" = "11:FALSE"
-                        }
-                        "_2DAC4F1E469FFE453929BFEE1F564B3F.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        {
-                        "Name" = "8:_2DAC4F1E469FFE453929BFEE1F564B3F.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DisplayName" = "8:"
-                        "Description" = "8:"
-                        "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_DF1AB282790BE3D3B630C01BB13D636C.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "Attributes" = "3:0"
-                        "Setting" = "3:2"
-                        "Value" = "8:_DF1AB282790BE3D3B630C01BB13D636C.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_DF1AB282790BE3D3B630C01BB13D636C.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_65E7F678A98BB9AED57C6D474140DDEC.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_65E7F678A98BB9AED57C6D474140DDEC.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
@@ -1009,31 +995,45 @@
                         "Setting" = "3:1"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_D4E8F6DD8A3F01EC8D5898B769D81908.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_79B391DA0CD738393E315705E2D6813D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_D4E8F6DD8A3F01EC8D5898B769D81908.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_79B391DA0CD738393E315705E2D6813D.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_DAD7F4EC07E2E7D2B4635FC23457A5AE.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_52179197002254A68EACB031EA8E0D62.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_DAD7F4EC07E2E7D2B4635FC23457A5AE.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_DAD7F4EC07E2E7D2B4635FC23457A5AE.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_52179197002254A68EACB031EA8E0D62.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_52179197002254A68EACB031EA8E0D62.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_E2A92A1FCAD5AA65085479E15688E39E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_BDA7A7A3A0848C544EF87EFA0FBC3D66.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_E2A92A1FCAD5AA65085479E15688E39E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_BDA7A7A3A0848C544EF87EFA0FBC3D66.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_D9204E5D6F43B35364EE92AE48B41AA8.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_8C67B5EDEB55DE3F71D20D5669166174.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_D9204E5D6F43B35364EE92AE48B41AA8.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_D9204E5D6F43B35364EE92AE48B41AA8.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_8C67B5EDEB55DE3F71D20D5669166174.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_8C67B5EDEB55DE3F71D20D5669166174.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "UsePlugInResources" = "11:FALSE"
+                        }
+                        "_C846A5C81BEAA896651F9D385D77259E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        {
+                        "Name" = "8:_C846A5C81BEAA896651F9D385D77259E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DisplayName" = "8:"
+                        "Description" = "8:"
+                        "Type" = "3:2"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_9DB85133B7F211735B9CA21DE62BB148.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Attributes" = "3:0"
+                        "Setting" = "3:2"
+                        "Value" = "8:_9DB85133B7F211735B9CA21DE62BB148.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_9DB85133B7F211735B9CA21DE62BB148.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }