diff --git a/c_adlib/AD_Facade.cs b/c_adlib/AD_Facade.cs
index 5c6911c5..c7cc6a07 100644
--- a/c_adlib/AD_Facade.cs
+++ b/c_adlib/AD_Facade.cs
@@ -40,9 +40,9 @@ namespace Novell.CASA.DataEngines
        private miCASAEngine micasaengine;
 #if LINUX
        private GKEngine gkEngine = null;
-       private KWalletEngine  kwEngine = null; 
-       private FFEngine ffEngine = null;
+       private KWalletEngine  kwEngine = null;        
 #endif
+		private FFEngine ffEngine = null;
        private AggregationPol aggPol;
    
 
@@ -103,8 +103,13 @@ namespace Novell.CASA.DataEngines
                 {
                         string storeID = (((Store)(enumerator.Current)).StoreName);
 
+					    if(storeID.Equals(ConstStrings.FF) && (ffEngine==null) )
+                        {		//Use the existing instance of firefox
+                                 //Logger.DbgLog("A-D Lib:FireFox Set up for Aggregation");
+                                 ffEngine = new FFEngine();
+                        }
 #if LINUX
-                        if(storeID.Equals(ConstStrings.KW))
+                        else if(storeID.Equals(ConstStrings.KW))
                         {
                                 Logger.DbgLog("A-D Lib: KWallet Set up for Aggregation");
                                 kwEngine = new KWalletEngine();
@@ -114,11 +119,7 @@ namespace Novell.CASA.DataEngines
                                 Logger.DbgLog("A-D Lib:Gnome Keyring Set up for Aggregation");
                                  gkEngine = new GKEngine();
                         }
-                        else if(storeID.Equals(ConstStrings.FF) && (ffEngine==null) )
-                        {//Use the existing instance of firefox
-                                Logger.DbgLog("A-D Lib:FireFox Set up for Aggregation");
-                                 ffEngine = new FFEngine();
-                        }
+
 #endif
                 // Console.WriteLine("StoreName = " + ((Store)(enumerator.Current)).StoreName + "StoreId = " + ((Store)(enumerator.Current)).StoreId);
                 }
@@ -419,6 +420,38 @@ namespace Novell.CASA.DataEngines
                else
                    return  ConstStrings.CASA_STORE_NOT_AVAILABLE;
            } 
+		   else if(StoreID == ConstStrings.CASA_STORE_FFOX)
+		   {
+			   //Use the existing instance of firefox 
+			   if(ffEngine == null)
+				   ffEngine = new FFEngine();
+
+			   if(ffEngine != null)
+			   {
+				   secEnum = ffEngine.Aggregate();
+				   if (secEnum != null )
+				   {
+					   XmlNode root = outDoc.DocumentElement;
+					   XmlNodeList ffNode = root.SelectNodes("descendant::FireFox");
+					   if (ffNode.Count !=  0) // If there is something remove it
+					   {
+						   root.RemoveChild(ffNode[0]);
+					   } 
+					   XmlNode ffImportNode = outDoc.ImportNode(secEnum,true);
+					   root.AppendChild(ffImportNode);
+					   return  ConstStrings.CASA_SUCCESS;
+				   }
+				   else
+				   {
+					   //Console.WriteLine("FireFox some issue");
+					   return  ConstStrings.CASA_STORE_NOT_AVAILABLE;
+				   }
+			   }
+			   else
+			   {
+				   // Logger.DbgLog("A-D Lib:Aggregatestore:Could not aggregate Gnome FireFox since FireFoxEngine not instantiated");
+			   }
+		   } 
 #if LINUX
            else if( StoreID == ConstStrings.CASA_STORE_GK )
            {
@@ -463,39 +496,6 @@ namespace Novell.CASA.DataEngines
                        }
 
            } 
-           else if(StoreID == ConstStrings.CASA_STORE_FFOX)
-           {
-		//Use the existing instance of firefox 
-		if(ffEngine == null)
-	                ffEngine = new FFEngine();
-
-		if(ffEngine != null)
-		{
-	       	       secEnum = ffEngine.Aggregate();
-	               if (secEnum != null )
-        	       {
-                   		XmlNode root = outDoc.DocumentElement;
-	                	XmlNodeList ffNode = root.SelectNodes("descendant::FireFox");
-                                if (ffNode.Count !=  0) // If there is something remove it
-  	                        {
-        		        	root.RemoveChild(ffNode[0]);
-                                } 
- 		                XmlNode ffImportNode = outDoc.ImportNode(secEnum,true);
- 		                root.AppendChild(ffImportNode);
- 		                return  ConstStrings.CASA_SUCCESS;
-               	       }
-                       else
-                       {
-                          //Console.WriteLine("FireFox some issue");
- 	                  return  ConstStrings.CASA_STORE_NOT_AVAILABLE;
-                       }
-		 }
-		else
-		      Logger.DbgLog("A-D Lib:Aggregatestore:Could not aggregate Gnome FireFox since FireFoxEngine not instantiated");
-
-
-           } 
-
            Logger.DbgLog("A-D Lib: Unknown Operation Requested");
 #endif           
            return ConstStrings.CASA_OPERATION_FAILED;
diff --git a/c_adlib/Novell.CASA.A-D.csproj b/c_adlib/Novell.CASA.A-D.csproj
index 9fe0b772..54048c26 100644
--- a/c_adlib/Novell.CASA.A-D.csproj
+++ b/c_adlib/Novell.CASA.A-D.csproj
@@ -28,7 +28,7 @@
                     BaseAddress = "285212672"
                     CheckForOverflowUnderflow = "false"
                     ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
+                    DefineConstants = "DEBUG;TRACE; WIN32"
                     DocumentationFile = ""
                     DebugSymbols = "true"
                     FileAlignment = "4096"
@@ -48,7 +48,7 @@
                     BaseAddress = "285212672"
                     CheckForOverflowUnderflow = "false"
                     ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
+                    DefineConstants = "TRACE; WIN32"
                     DocumentationFile = ""
                     DebugSymbols = "false"
                     FileAlignment = "4096"
@@ -149,6 +149,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "FFEngine.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "GKEngine.cs"
                     SubType = "Code"
@@ -169,6 +174,11 @@
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
+                <File
+                    RelPath = "ad_ff\FireFox.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
                 <File
                     RelPath = "ad_gk\GnomeKeyring.cs"
                     SubType = "Code"
diff --git a/c_adlib/ad_ff/FireFox.cs b/c_adlib/ad_ff/FireFox.cs
index 4f34b1e1..b358c8c0 100644
--- a/c_adlib/ad_ff/FireFox.cs
+++ b/c_adlib/ad_ff/FireFox.cs
@@ -29,197 +29,204 @@ using System.Collections;
 namespace Novell.CASA.DataEngines.FF
 {
     
-[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-public class Host
-{
-	public IntPtr hostName;
-	public IntPtr hostElement;
-	public IntPtr next;
-        /*public Host()
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public class Host
+	{
+		public IntPtr hostName;
+		public IntPtr hostElement;
+		public IntPtr next;
+		/*public Host()
 	//NOT NEEDED SINCE WE GET THIS FILLED FROM NATIVE WHEN
 	//WE MARSHAL PTR TO STRUCTURE        
 	{
-            hostName = Marshal.AllocHGlobal(128);
-        }
-        ~Host()
-        {		
+			hostName = Marshal.AllocHGlobal(128);
+		}
+		~Host()
+		{		
 		try
 		{ 
-            		Marshal.FreeHGlobal(hostName);
+					Marshal.FreeHGlobal(hostName);
 		}
 		catch (Exception e)
 		{
 			Console.WriteLine("FireFox:Marshal FreeHGlobal Exception for Host:");		
 		}
-        }*/
-};
+		}*/
+	};
 
 
-[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-public class HostElement
-{
-	public IntPtr name;
-	public IntPtr value;
-	public int  isPassword;
-	public IntPtr next;
-        /*public HostElement()
-        {
-            name = Marshal.AllocHGlobal(128);
-            value = Marshal.AllocHGlobal(128);
-        }
-        ~HostElement()
-        {
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public class HostElement
+	{
+		public IntPtr name;
+		public IntPtr value;
+		public int  isPassword;
+		public IntPtr next;
+		/*public HostElement()
+		{
+			name = Marshal.AllocHGlobal(128);
+			value = Marshal.AllocHGlobal(128);
+		}
+		~HostElement()
+		{
 		try
 		{ 
-            		Marshal.FreeHGlobal(name);
-            		Marshal.FreeHGlobal(value);
+					Marshal.FreeHGlobal(name);
+					Marshal.FreeHGlobal(value);
 		}		
 		catch (Exception e)
 		{
-            		Console.WriteLine("FireFox:Marshal FreeHGlobal Exception for HostElement:");
+					Console.WriteLine("FireFox:Marshal FreeHGlobal Exception for HostElement:");
 		}
-        }*/
-};
+		}*/
+	};
 
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public class KeyringInfo
-    {
-        public int lockOnIdle;
-        public uint lockTimeout;
-        public uint mTime;
-        public uint cTime;
-        public int isLocked;
-    }
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public class NativeItemInfo
-    {
-        public int itemType;
-        public IntPtr displayName;
-        public IntPtr secret;
-        public int mTime;
-        public int cTime;
-        public NativeItemInfo()
-        {
-            displayName = Marshal.AllocHGlobal(128);
-            secret = Marshal.AllocHGlobal(128);
-        }
-        ~NativeItemInfo()
-        {
-            Marshal.FreeHGlobal(displayName);
-            Marshal.FreeHGlobal(secret);
-        }
-    }
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public class KeyringInfo
+	{
+		public int lockOnIdle;
+		public uint lockTimeout;
+		public uint mTime;
+		public uint cTime;
+		public int isLocked;
+	}
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public class NativeItemInfo
+	{
+		public int itemType;
+		public IntPtr displayName;
+		public IntPtr secret;
+		public int mTime;
+		public int cTime;
+		public NativeItemInfo()
+		{
+			displayName = Marshal.AllocHGlobal(128);
+			secret = Marshal.AllocHGlobal(128);
+		}
+		~NativeItemInfo()
+		{
+			Marshal.FreeHGlobal(displayName);
+			Marshal.FreeHGlobal(secret);
+		}
+	}
 
-    public class ItemInfo
-    {
-        public string itemType;
-        public string displayName;
-        public string secret;
-        public int mTime;
-        public int cTime;
-    }
+	public class ItemInfo
+	{
+		public string itemType;
+		public string displayName;
+		public string secret;
+		public int mTime;
+		public int cTime;
+	}
 
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public class NativeAttribute
-    {
-        public uint type;
-        public IntPtr key;
-        public IntPtr value;
-    }
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public class NativeAttribute
+	{
+		public uint type;
+		public IntPtr key;
+		public IntPtr value;
+	}
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
-    public class Attribute
-    {
-        public uint type;
-        public string key;
-        public string value;
+	[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+	public class Attribute
+	{
+		public uint type;
+		public string key;
+		public string value;
     
-    }
+	}
 
-    public class FireFox
-    {
-	private static int MAX_PROFILES = 5;			//FIXME:Maximum Profiles for Firefox - To be removed when done dynamically via a native api
-	private static int LOAD_PROFILE_ALWAYSFROM_FILE = 1;		
+	public class FireFox
+	{
+		private static int MAX_PROFILES = 5;			//FIXME:Maximum Profiles for Firefox - To be removed when done dynamically via a native api
+		private static int LOAD_PROFILE_ALWAYSFROM_FILE = 1;		
+
+#if WIN32
+		private const string FF_LIB = "ad_ff.dll";
+#else
+		private const string FF_LIB = "libad_ff.so.1.1.1";
+#endif
 
 
-	//Initialization functions
-    	[DllImport("libad_ff.so.1.1.1")]
-    	public static extern int FPM_GetProfileList(out IntPtr[] profileList, out IntPtr[] profileFlag);
 
-    	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_FirefoxProfileInit(string profileName);
+		//Initialization functions
+		[DllImport(FF_LIB)]
+		public static extern int FPM_GetProfileList(out IntPtr[] profileList, out IntPtr[] profileFlag);
 
-	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_IsStoreAvailable();
+		[DllImport(FF_LIB)]
+		public static extern int FPM_FirefoxProfileInit(string profileName);
 
-    	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_FirefoxProfileExit(string profileName);
+		[DllImport(FF_LIB)]
+		public static extern int FPM_IsStoreAvailable();
 
-	//Master Password functions
-     	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_IsMasterPasswordSet(string profileName);
+		[DllImport(FF_LIB)]
+		public static extern int FPM_FirefoxProfileExit(string profileName);
 
-     	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_CheckMasterPassword(string profileName, string masterPassword);
+		//Master Password functions
+		[DllImport(FF_LIB)]
+		public static extern int FPM_IsMasterPasswordSet(string profileName);
 
-	//Signon functions
-    	[DllImport("libad_ff.so.1.1.1")]
-        public static extern int FPM_GetSignonData(string profileName,out IntPtr host,int doRefresh);
+		[DllImport(FF_LIB)]
+		public static extern int FPM_CheckMasterPassword(string profileName, string masterPassword);
 
-	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_ModifyHost(string profileName, Host host, int doUpdate);
+		//Signon functions
+		[DllImport(FF_LIB)]
+		public static extern int FPM_GetSignonData(string profileName,out IntPtr host,int doRefresh);
 
-	[DllImport("libad_ff.so.1.1.1")]
- 	public static extern int FPM_RemoveHost(string profileName, string hostName, int doUpdate);
+		[DllImport(FF_LIB)]
+		public static extern int FPM_ModifyHost(string profileName, Host host, int doUpdate);
 
-	//TBD
-	//int FPM_WriteSignonData(char *profileName)
-   	//int FPM_AddHost(char *profileName, struct Host *host, int doUpdate)
+		[DllImport(FF_LIB)]
+		public static extern int FPM_RemoveHost(string profileName, string hostName, int doUpdate);
+
+		//TBD
+		//int FPM_WriteSignonData(char *profileName)
+		//int FPM_AddHost(char *profileName, struct Host *host, int doUpdate)
 	
-	public static int IsStoreAvailable()
-	{
-		return FPM_IsStoreAvailable();
-	}
+		public static int IsStoreAvailable()
+		{
+			return FPM_IsStoreAvailable();
+		}
 
-	public static int Remove_Host(string ProfileName, string hostName)
-	{
-		return (FPM_RemoveHost(ProfileName, hostName, 1)); 
-	}
+		public static int Remove_Host(string ProfileName, string hostName)
+		{
+			return (FPM_RemoveHost(ProfileName, hostName, 1)); 
+		}
 
-	public static int Modify_Host(string profileName, Host mhost, int doUpdate)
-	{
-		//Console.WriteLine("FireFox.cs : ProfileName : " + profileName);
-		//Console.WriteLine("FireFox.cs : HostName : " + (String)Marshal.PtrToStringAnsi(mhost.hostName));
+		public static int Modify_Host(string profileName, Host mhost, int doUpdate)
+		{
+			//Console.WriteLine("FireFox.cs : ProfileName : " + profileName);
+			//Console.WriteLine("FireFox.cs : HostName : " + (String)Marshal.PtrToStringAnsi(mhost.hostName));
 		
-		return FPM_ModifyHost(profileName, mhost,1);
-	}
+			return FPM_ModifyHost(profileName, mhost,1);
+		}
 
-	//--------------------------------------------------------------
-	//GetDefaultProfileName
-	//@param   None
-	//@return  Default ProfileName on success
-	//         else null if not retrivable 
-	//--------------------------------------------------------------
-        public static String GetDefaultProfileName()
-        {
+		//--------------------------------------------------------------
+		//GetDefaultProfileName
+		//@param   None
+		//@return  Default ProfileName on success
+		//         else null if not retrivable 
+		//--------------------------------------------------------------
+		public static String GetDefaultProfileName()
+		{
 
-		IntPtr[] profileListIntPtr=new IntPtr[MAX_PROFILES];;
-		IntPtr[] profileFlagsIntPtr=new IntPtr[MAX_PROFILES];;
-		String[] profileList=null;   
-		int[] profileFlags=null;  
-		String profileName=null;   
-		int profileFlag=0;  
-		int profCount=0;
-		String defaultProfileName=null;   
+			IntPtr[] profileListIntPtr=new IntPtr[MAX_PROFILES];;
+			IntPtr[] profileFlagsIntPtr=new IntPtr[MAX_PROFILES];;
+			String[] profileList=null;   
+			int[] profileFlags=null;  
+			String profileName=null;   
+			int profileFlag=0;  
+			int profCount=0;
+			String defaultProfileName=null;   
 
-		//Console.WriteLine("FireFox:Invoking FPM_GetProfileList:");
-		profCount=FPM_GetProfileList(out profileListIntPtr,out profileFlagsIntPtr);
-		//Console.WriteLine("FireFox:No of Profiles found= "+profCount);
+			//Console.WriteLine("FireFox:Invoking FPM_GetProfileList:");
+			profCount=FPM_GetProfileList(out profileListIntPtr,out profileFlagsIntPtr);
+			//Console.WriteLine("FireFox:No of Profiles found= "+profCount);
 		
-		//try
-		///{
+			//try
+			///{
 			for(int i=0; i< profCount; i++)
 			{
 				//Console.WriteLine("Firefox.cs : Inside The for Loop");
@@ -232,167 +239,163 @@ public class HostElement
 			}
 
 		
-		return defaultProfileName;
-	}
+			return defaultProfileName;
+		}
 
 
-	//--------------------------------------------------------------
-	//GetAllProfileNames
-	//@param   None
-	//@return  ProfileNames (String[]) - List of all Profile Names
-	//	   else null 
-	//--------------------------------------------------------------
-        public static String[] GetAllProfileNames()
-        {
-		//TBD:To be implemented if\when required
-		return null;
-	}
+		//--------------------------------------------------------------
+		//GetAllProfileNames
+		//@param   None
+		//@return  ProfileNames (String[]) - List of all Profile Names
+		//	   else null 
+		//--------------------------------------------------------------
+		public static String[] GetAllProfileNames()
+		{
+			//TBD:To be implemented if\when required
+			return null;
+		}
 
 
 
 
-	//--------------------------------------------------------------
-	//GetProfileData
-	//GetProfileData   for the specified profile
-	//@param   
-	//		profileName (string)
-	//
-	//@return  hostList (Host)   on success
-	//         else null 
-	//--------------------------------------------------------------
-        public static Host GetProfileData(string profileName)
-	{
-             	Host hostList;		// = new Host(); - NOT NEEDED SINCE WE GET THIS FILLED FROM NATIVE WHEN
-					//			WE MARSHAL PTR TO STRUCTURE
-		int methodStatusCode=-1;  
-		String defaultProfileName = null;
-		int initProfileStatus = -1;
+		//--------------------------------------------------------------
+		//GetProfileData
+		//GetProfileData   for the specified profile
+		//@param   
+		//		profileName (string)
+		//
+		//@return  hostList (Host)   on success
+		//         else null 
+		//--------------------------------------------------------------
+		public static Host GetProfileData(string profileName)
+		{
+			Host hostList;		// = new Host(); - NOT NEEDED SINCE WE GET THIS FILLED FROM NATIVE WHEN
+			//			WE MARSHAL PTR TO STRUCTURE
+			int methodStatusCode=-1;  
+			String defaultProfileName = null;
+			int initProfileStatus = -1;
 
 			//if(methodStatusCode==1)
-			{//If Init of the profile was sucessfull, get the sigon data to complete the aggregation
-                 		IntPtr hostListIntPtr = new IntPtr();
-          			try
-            			{
- 					//Console.WriteLine("FireFox:Getting Data for profile "+profileName);
-					methodStatusCode=-1;
-                			methodStatusCode = FPM_GetSignonData(profileName,out hostListIntPtr,LOAD_PROFILE_ALWAYSFROM_FILE);
-                			if( 1 != methodStatusCode )
-					{
- 						//Console.WriteLine("FireFox:Getting Data for profile Failed with error "+methodStatusCode);
-						hostList=null;
-						return hostList;
-					}  	
+		{//If Init of the profile was sucessfull, get the sigon data to complete the aggregation
+			IntPtr hostListIntPtr = new IntPtr();
+			try
+			{
+				//Console.WriteLine("FireFox:Getting Data for profile "+profileName);
+				methodStatusCode=-1;
+				methodStatusCode = FPM_GetSignonData(profileName,out hostListIntPtr,LOAD_PROFILE_ALWAYSFROM_FILE);
+				if( 1 != methodStatusCode )
+				{
+					//Console.WriteLine("FireFox:Getting Data for profile Failed with error "+methodStatusCode);
+					hostList=null;
+					return hostList;
+				}  	
+				hostList = null;
+				hostList = (Host)Marshal.PtrToStructure(hostListIntPtr, typeof(Host));
+				//This can be Null only when nothing is aggregated.
+				if (((String)Marshal.PtrToStringAnsi(hostList.hostName)) == null ) 
+				{
+					//TBD: Log that there are no secrets to aggregate
+					//Console.WriteLine("FireFox:no secrets to aggregate");
 					hostList = null;
-          				hostList = (Host)Marshal.PtrToStructure(hostListIntPtr, typeof(Host));
-	            			//This can be Null only when nothing is aggregated.
-        	     			if (((String)Marshal.PtrToStringAnsi(hostList.hostName)) == null ) 
-        	     			{
-        	         			//TBD: Log that there are no secrets to aggregate
-        	        			//Console.WriteLine("FireFox:no secrets to aggregate");
-        	         			hostList = null;
-        	    			}
 				}
-            			catch(Exception e)
-            			{
-                			//Console.WriteLine("FireFox:Exception during invokation of FPM_GetSignonData");
-                			//Console.WriteLine(e.ToString());
-                			hostList = null;
-            			}
-
-				//Uninitialize the profile
-				//Console.WriteLine("FireFox:UnInitializing the Profile "+profileName);
-				//UninitProfile(profileName);
 			}
-		return hostList;
-	}
+			catch(Exception e)
+			{
+				//Console.WriteLine("FireFox:Exception during invokation of FPM_GetSignonData");
+				//Console.WriteLine(e.ToString());
+				hostList = null;
+			}
 
-	//--------------------------------------------------------------
-	//InitFFProfile
-	//@param   profileName   name of the profile
-	//@return  1     on success
-	//         <=0   on error 
-	//--------------------------------------------------------------
-        public static int InitProfile(string profileName)
-        {
-		return FPM_FirefoxProfileInit(profileName);
-	}
+			//Uninitialize the profile
+			//Console.WriteLine("FireFox:UnInitializing the Profile "+profileName);
+			//UninitProfile(profileName);
+		}
+			return hostList;
+		}
 
-
-	//=================================================================
-
-	//--------------------------------------------------------------
-	//UninitProfile
-	//UninitProfile   for the specified profile
-	//@param   
-	//		profileName (string)
-	//
-	//@return  	1     on success
-        //		<=0   on error 
-	//--------------------------------------------------------------
-        public static int UninitProfile(string profileName)
-	{
-	 int methodStatusCode=-1; 
- 
- 		//Console.WriteLine("FireFox:UninitProfile for "+profileName);
-		methodStatusCode=-1;
-                methodStatusCode = FPM_FirefoxProfileExit(profileName);
-                /*if( 1 != methodStatusCode )
+		//--------------------------------------------------------------
+		//InitFFProfile
+		//@param   profileName   name of the profile
+		//@return  1     on success
+		//         <=0   on error 
+		//--------------------------------------------------------------
+		public static int InitProfile(string profileName)
 		{
- 			Console.WriteLine("FireFox:UninitProfile Failed with error "+methodStatusCode);
+			return FPM_FirefoxProfileInit(profileName);
+		}
+
+
+		//=================================================================
+
+		//--------------------------------------------------------------
+		//UninitProfile
+		//UninitProfile   for the specified profile
+		//@param   
+		//		profileName (string)
+		//
+		//@return  	1     on success
+		//		<=0   on error 
+		//--------------------------------------------------------------
+		public static int UninitProfile(string profileName)
+		{
+			int methodStatusCode=-1; 
+ 
+			//Console.WriteLine("FireFox:UninitProfile for "+profileName);
+			methodStatusCode=-1;
+			methodStatusCode = FPM_FirefoxProfileExit(profileName);
+			/*if( 1 != methodStatusCode )
+		{
+			Console.WriteLine("FireFox:UninitProfile Failed with error "+methodStatusCode);
 		} */ 
 
-	 return methodStatusCode;					
-	}
+			return methodStatusCode;					
+		}
 
 
-	//--------------------------------------------------------------
-	//isMasterPasswordSetFor
-	//Is MasterPassword Set For specified profile
-	//@param   
-	//		profileName (string)
-	//
-	//@param   profileName   name of the profile
-	//	@return 1    if master password is set
-	//        	0    if master password not set
-	//--------------------------------------------------------------
-        public static int isMasterPasswordSetFor(string profileName)
-	{
-	 int methodStatusCode=0; 
+		//--------------------------------------------------------------
+		//isMasterPasswordSetFor
+		//Is MasterPassword Set For specified profile
+		//@param   
+		//		profileName (string)
+		//
+		//@param   profileName   name of the profile
+		//	@return 1    if master password is set
+		//        	0    if master password not set
+		//--------------------------------------------------------------
+		public static int isMasterPasswordSetFor(string profileName)
+		{
+			int methodStatusCode=0; 
  
- 		//Console.WriteLine("FireFox:isMasterPasswordSetFor "+profileName);
-                methodStatusCode = FPM_IsMasterPasswordSet(profileName);
+			//Console.WriteLine("FireFox:isMasterPasswordSetFor "+profileName);
+			methodStatusCode = FPM_IsMasterPasswordSet(profileName);
 
-	 return methodStatusCode;					
-	}
+			return methodStatusCode;					
+		}
 
-	//--------------------------------------------------------------
-	//checkMasterPassword
-	//Check if the specified master password is correct or not. 
-	//If it is correct then password is stored to the internal store for later use. 
-	//If it is wrong then nothing is stored and 0 will be returned.
-	//
-	//@param   
-	//	profileName (string)
-	//	masterPassword (string)
-	//
-	//	@return  1   if the specified master password is correct
-        //		 0   if the master password is wrong.
-	//--------------------------------------------------------------
-        public static int checkMasterPassword(string profileName,string masterPassword)
-	{
-	 int methodStatusCode=0; 
+		//--------------------------------------------------------------
+		//checkMasterPassword
+		//Check if the specified master password is correct or not. 
+		//If it is correct then password is stored to the internal store for later use. 
+		//If it is wrong then nothing is stored and 0 will be returned.
+		//
+		//@param   
+		//	profileName (string)
+		//	masterPassword (string)
+		//
+		//	@return  1   if the specified master password is correct
+		//		 0   if the master password is wrong.
+		//--------------------------------------------------------------
+		public static int checkMasterPassword(string profileName,string masterPassword)
+		{
+			int methodStatusCode=0; 
  
- 		//Console.WriteLine("FireFox:checking MasterPassword for "+profileName);
-                methodStatusCode = FPM_CheckMasterPassword(profileName,masterPassword);
+			//Console.WriteLine("FireFox:checking MasterPassword for "+profileName);
+			methodStatusCode = FPM_CheckMasterPassword(profileName,masterPassword);
+
+			return methodStatusCode;					
+		}
+
+		//=================Local Methods====================================
 
-	 return methodStatusCode;					
 	}
-
-	//=================Local Methods====================================
-
-
-
-
-
-    }
 }
diff --git a/c_adlib/ad_ff/firefox.vcproj b/c_adlib/ad_ff/firefox.vcproj
new file mode 100644
index 00000000..2c8ee21a
--- /dev/null
+++ b/c_adlib/ad_ff/firefox.vcproj
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="ad_firefox_native"
+	ProjectGUID="{BB304ECF-FCBA-4693-9D47-86749815DDC8}"
+	RootNamespace="ad_firefox_native"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FIREFOX_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="D:/casaClean2/c_gui/Debug/ad_ff.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/firefox.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/firefox.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FIREFOX_EXPORTS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/ad_ff.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/firefox.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\native\Common.cpp">
+			</File>
+			<File
+				RelativePath=".\native\CryptManager.cpp">
+			</File>
+			<File
+				RelativePath=".\native\DataManager.cpp">
+			</File>
+			<File
+				RelativePath=".\native\FirefoxPasswordManager.cpp">
+			</File>
+			<File
+				RelativePath=".\native\ProfileManager.cpp">
+			</File>
+			<File
+				RelativePath=".\native\SignonManager.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\native\Common.h">
+			</File>
+			<File
+				RelativePath=".\native\CryptManager.h">
+			</File>
+			<File
+				RelativePath=".\native\DataManager.h">
+			</File>
+			<File
+				RelativePath=".\native\FirefoxPasswordManager.h">
+			</File>
+			<File
+				RelativePath=".\native\ProfileManager.h">
+			</File>
+			<File
+				RelativePath=".\native\SignonManager.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/c_gui/CASAManager.csproj b/c_gui/CASAManager.csproj
index a12300dc..2a7b1dbd 100644
--- a/c_gui/CASAManager.csproj
+++ b/c_gui/CASAManager.csproj
@@ -228,6 +228,14 @@
                     RelPath = "images\CASA.bmp"
                     BuildAction = "Content"
                 />
+                <File
+                    RelPath = "images\casa.glade"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "images\casa.gladep"
+                    BuildAction = "None"
+                />
                 <File
                     RelPath = "images\CASA_16.png"
                     BuildAction = "Content"
@@ -240,14 +248,6 @@
                     RelPath = "images\CASA_48.png"
                     BuildAction = "Content"
                 />
-                <File
-                    RelPath = "images\casa-1.5.glade"
-                    BuildAction = "None"
-                />
-                <File
-                    RelPath = "images\casa-1.5.gladep"
-                    BuildAction = "None"
-                />
                 <File
                     RelPath = "images\CASAiconsLocked.ico"
                     BuildAction = "Content"
diff --git a/c_test/c_sample/CSample.ncb b/c_test/c_sample/CSample.ncb
index 95f8d732..60c1d1f6 100644
Binary files a/c_test/c_sample/CSample.ncb and b/c_test/c_sample/CSample.ncb differ
diff --git a/c_test/c_sample/CSample.sln b/c_test/c_sample/CSample.sln
index 3db809e9..5db46a1c 100644
--- a/c_test/c_sample/CSample.sln
+++ b/c_test/c_sample/CSample.sln
@@ -1,5 +1,13 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cSample", "..\..\..\casa2\c_test\c_sample\CSample.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cSample", "CSample.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c_micasacache", "..\..\c_micasacache\c_micasacache.vcproj", "{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "c_micasadk", "..\..\c_micasadk\c_micasadk.vcproj", "{99988A22-4C58-4BF7-A2DB-57761E76FB26}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -13,6 +21,14 @@ Global
 		{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}.Debug.Build.0 = Debug|Win32
 		{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}.Release.ActiveCfg = Release|Win32
 		{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}.Release.Build.0 = Release|Win32
+		{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}.Debug.ActiveCfg = Debug|Win32
+		{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}.Debug.Build.0 = Debug|Win32
+		{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}.Release.ActiveCfg = Release|Win32
+		{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}.Release.Build.0 = Release|Win32
+		{99988A22-4C58-4BF7-A2DB-57761E76FB26}.Debug.ActiveCfg = Debug|Win32
+		{99988A22-4C58-4BF7-A2DB-57761E76FB26}.Debug.Build.0 = Debug|Win32
+		{99988A22-4C58-4BF7-A2DB-57761E76FB26}.Release.ActiveCfg = Release|Win32
+		{99988A22-4C58-4BF7-A2DB-57761E76FB26}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/c_test/c_sample/CSample.suo b/c_test/c_sample/CSample.suo
index 82f2b0ed..03c3dcc3 100644
Binary files a/c_test/c_sample/CSample.suo and b/c_test/c_sample/CSample.suo differ
diff --git a/c_test/c_sample/CSample.vcproj b/c_test/c_sample/CSample.vcproj
index e0397f97..8b83c508 100644
--- a/c_test/c_sample/CSample.vcproj
+++ b/c_test/c_sample/CSample.vcproj
@@ -22,7 +22,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="D:\ccm\SSClient\SecretStoreClient_src\include"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
@@ -38,10 +38,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="micasa_mdd.lib odbc32.lib odbccp32.lib"
+				AdditionalDependencies=" odbc32.lib odbccp32.lib"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\bin\w32\mdd"
+				AdditionalLibraryDirectories=""
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				TargetMachine="1"/>
diff --git a/c_test/c_sample/cSample.c b/c_test/c_sample/cSample.c
index f29080a5..256e4cc1 100644
--- a/c_test/c_sample/cSample.c
+++ b/c_test/c_sample/cSample.c
@@ -37,7 +37,9 @@
 #include <time.h>
 #include <string.h>
 #include <sscs_utf8.h>
-#include <micasa_mgmd.h>
+#include <micasa.h>
+#include <sscs_cache.h>
+
 
 ///////////////////////////////////////////////////////////////////////
 
@@ -51,6 +53,147 @@ void Pause()
 
 
 
+void ReadKey()
+{		
+	int rcode = 0;
+	char inputID[20];
+	char inputKey[20];
+	char inputValue[128] = {0};
+	uint32_t valueLen = 128;
+	uint32_t bytesRequired = 0;
+	
+	SSCS_SECRETSTORE_T 		store = {0};
+	SSCS_SECRET_ID_T		appSecretId = {0};
+	SSCS_SECRET_ID_T		sharedSecretId = {0};
+	void					*context;
+	SSCS_KEYCHAIN_ID_T 		kc = {0};
+	
+	SSCS_EXT_T ext = {0};
+	
+	printf("Enter secretID: ");		
+	gets(inputID);
+
+	printf("Enter Key: ");		
+	gets(inputKey);		
+
+	if ((sscs_Utf8Strlen(inputID) > 0) &&
+		(sscs_Utf8Strlen(inputKey) > 0))
+		
+	{
+		appSecretId.len = sscs_Utf8Strlen(inputID) + 1;
+		sscs_Utf8Strcpy(appSecretId.id, inputID);
+
+		printf("SAMPLE: Calling miCASAReadKey\r\n");
+
+		// open secretStore
+		sscs_Utf8Strcpy(store.ssName, SSCS_DEFAULT_SECRETSTORE_ID);
+		store.version = 1;
+		context = miCASAOpenSecretStoreCache(&store, 0, NULL);
+
+		if (context == NULL)
+		{
+			return; // NSSCS_E_SYSTEM_FAILURE;
+		}
+
+		sscs_Utf8Strcpy(kc.keychainID, SSCS_SESSION_KEY_CHAIN_ID);
+		kc.len = SSCS_S_KC_ID_CHARS;
+
+		rcode = miCASAReadKey(context, 
+			0, 
+			&kc, 
+			&appSecretId, 
+			inputKey, 
+			strlen(inputKey)+1, 
+			inputValue, 
+			&valueLen, 
+			NULL, 
+			&bytesRequired,
+			&ext);
+
+		miCASACloseSecretStoreCache(context, 0, NULL);
+
+		if (rcode)
+		{
+			printf("miCASAReadKey returned %d\r\n", rcode);
+			Pause();
+		}
+		else
+		{
+			//set null			
+			//memcpy(inputValue[valueLen + 1],
+			printf("KeyValue is %s\r\n", inputValue);
+		}
+	}
+}
+
+
+void WriteKey()
+{		
+	int rcode = 0;
+	char inputID[20];
+	char inputKey[20];
+	char inputValue[20];
+	
+	SSCS_SECRETSTORE_T 		store = {0};
+	SSCS_SECRET_ID_T		appSecretId = {0};
+	SSCS_SECRET_ID_T		sharedSecretId = {0};
+	void					*context;
+	SSCS_KEYCHAIN_ID_T 		kc = {0};
+	
+	SSCS_EXT_T ext = {0};
+	
+	printf("Enter secretID: ");		
+	gets(inputID);
+
+	printf("Enter Key: ");		
+	gets(inputKey);
+	
+	printf("Enter Value: ");		
+	gets(inputValue);	
+
+	if ((sscs_Utf8Strlen(inputID) > 0) &&
+		(sscs_Utf8Strlen(inputKey) > 0) &&
+		(sscs_Utf8Strlen(inputValue) > 0))
+	{
+		appSecretId.len = sscs_Utf8Strlen(inputID) + 1;
+		sscs_Utf8Strcpy(appSecretId.id, inputID);
+
+		printf("SAMPLE: Calling miCASAWriteKey\r\n");
+
+		// open secretStore
+		sscs_Utf8Strcpy(store.ssName, SSCS_DEFAULT_SECRETSTORE_ID);
+		store.version = 1;
+		context = miCASAOpenSecretStoreCache(&store, 0, NULL);
+
+		if (context == NULL)
+		{
+			return; // NSSCS_E_SYSTEM_FAILURE;
+		}
+
+		sscs_Utf8Strcpy(kc.keychainID, SSCS_SESSION_KEY_CHAIN_ID);
+		kc.len = SSCS_S_KC_ID_CHARS;
+
+		rcode = miCASAWriteKey(context, 
+			0, 
+			&kc, 
+			&appSecretId, 
+			inputKey, 
+			strlen(inputKey)+1, 
+			inputValue, 
+			strlen(inputValue)+1, 
+			NULL, 
+			&ext);
+
+		miCASACloseSecretStoreCache(context, 0, NULL);
+
+		if (rcode)
+		{
+			printf("miCASAWriteKey returned %d\r\n", rcode);
+			Pause();
+		}
+	}
+}
+
 void AddSecret()
 {		
 	int rcode = 0;
@@ -396,8 +539,10 @@ void displayMenu()
 		printf("*  1. Add secret         *\r\n");
 		printf("*  2. Display secret     *\r\n");
 		printf("*  3. Remove secret      *\r\n");				
-		printf("*  4. Run automated test *\r\n");
-		printf("*  5. Quit               *\r\n");
+		printf("*  4. Run automated test *\r\n");		
+		printf("*  5. WriteKey           *\r\n");
+		printf("*  6. ReadKey            *\r\n");
+		printf("*  7. Quit               *\r\n");
 		printf("**************************\r\n");
 
 
@@ -407,7 +552,7 @@ void displayMenu()
 		// get return
 		getchar();
 
-		if (c == '5')
+		if (c == '7')
 			return;
 		else if (c == '1')
 			AddSecret();			
@@ -417,7 +562,12 @@ void displayMenu()
 			RemoveSecret();
 		else if (c == '4')
 			RunTests();
-		
+		else if (c == '5')
+			WriteKey();
+		else if (c == '6')
+			ReadKey();
+
+
 	}
 	
 }
diff --git a/vs_solutions/CASAInstall/CASA.ncb b/vs_solutions/CASAInstall/CASA.ncb
index 63c384bb..619c606e 100644
Binary files a/vs_solutions/CASAInstall/CASA.ncb and b/vs_solutions/CASAInstall/CASA.ncb differ
diff --git a/vs_solutions/CASAInstall/CASA.sln b/vs_solutions/CASAInstall/CASA.sln
index bd64ce8d..7178a4fe 100644
--- a/vs_solutions/CASAInstall/CASA.sln
+++ b/vs_solutions/CASAInstall/CASA.sln
@@ -33,6 +33,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcredmgr", "..\..\LoginCapt
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\c_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}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sshtst", "..\..\c_test\sdk_sshtst\sshtst.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
@@ -41,6 +43,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sshtst", "..\..\c_test\sdk_
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\c_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}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\c_gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
@@ -64,6 +68,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad_firefox_native", "..\..\c_adlib\ad_ff\firefox.vcproj", "{BB304ECF-FCBA-4693-9D47-86749815DDC8}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -141,6 +150,10 @@ Global
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}.Debug.Build.0 = Debug|.NET
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}.Release.ActiveCfg = Release|.NET
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}.Release.Build.0 = Release|.NET
+		{BB304ECF-FCBA-4693-9D47-86749815DDC8}.Debug.ActiveCfg = Debug|Win32
+		{BB304ECF-FCBA-4693-9D47-86749815DDC8}.Debug.Build.0 = Debug|Win32
+		{BB304ECF-FCBA-4693-9D47-86749815DDC8}.Release.ActiveCfg = Release|Win32
+		{BB304ECF-FCBA-4693-9D47-86749815DDC8}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/vs_solutions/CASAInstall/CASA.suo b/vs_solutions/CASAInstall/CASA.suo
index cb5b7394..af5b94c8 100644
Binary files a/vs_solutions/CASAInstall/CASA.suo and b/vs_solutions/CASAInstall/CASA.suo differ
diff --git a/vs_solutions/CASAInstall/CASA.vdproj b/vs_solutions/CASAInstall/CASA.vdproj
index fadd6890..1b533784 100644
--- a/vs_solutions/CASAInstall/CASA.vdproj
+++ b/vs_solutions/CASAInstall/CASA.vdproj
@@ -21,13 +21,13 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_4B4B9A4F5B7E4929B38FAB47682314BF"
+        "MsmKey" = "8:_2A9B4092119F4B118095C34EAEF3DB68"
         "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_4B4B9A4F5B7E4929B38FAB47682314BF"
+        "MsmKey" = "8:_2A9B4092119F4B118095C34EAEF3DB68"
         "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -302,13 +302,13 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{FF8742B3-40B2-42E1-8E41-209FC7B52010}"
-        "PackageCode" = "8:{9B0768DB-1FF0-4D55-BC4A-9AB13225F003}"
+        "ProductCode" = "8:{D7BDD8C3-E243-4584-8585-AEE911D0F41B}"
+        "PackageCode" = "8:{5452479A-747C-405B-B589-FFBC8E111988}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
-        "ProductVersion" = "8:1.6.323"
+        "ProductVersion" = "8:1.6.454"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -830,7 +830,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_4B4B9A4F5B7E4929B38FAB47682314BF"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_2A9B4092119F4B118095C34EAEF3DB68"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
diff --git a/vs_solutions/CASAManager/CASAManager.suo b/vs_solutions/CASAManager/CASAManager.suo
index 670da1ac..a922072a 100644
Binary files a/vs_solutions/CASAManager/CASAManager.suo and b/vs_solutions/CASAManager/CASAManager.suo differ
diff --git a/vs_solutions/miCASA-msm/miCASA-msm.vdproj b/vs_solutions/miCASA-msm/miCASA-msm.vdproj
index 6c845ef5..099461a8 100644
--- a/vs_solutions/miCASA-msm/miCASA-msm.vdproj
+++ b/vs_solutions/miCASA-msm/miCASA-msm.vdproj
@@ -28,6 +28,12 @@
         "Entry"
         {
         "MsmKey" = "8:_08A1CA5327E2116600DD116399755D03"
+        "OwnerKey" = "8:_75D4793883AC69EB5C80C692A0646641"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_08A1CA5327E2116600DD116399755D03"
         "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -40,12 +46,6 @@
         "Entry"
         {
         "MsmKey" = "8:_08A1CA5327E2116600DD116399755D03"
-        "OwnerKey" = "8:_75D4793883AC69EB5C80C692A0646641"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_08A1CA5327E2116600DD116399755D03"
         "OwnerKey" = "8:_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -148,6 +148,12 @@
         "Entry"
         {
         "MsmKey" = "8:_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
+        "OwnerKey" = "8:_75D4793883AC69EB5C80C692A0646641"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
         "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -159,12 +165,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
-        "OwnerKey" = "8:_75D4793883AC69EB5C80C692A0646641"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_7028EA92BB22106B3818B39218ECB430"
         "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
         "MsmSig" = "8:_UNDEFINED"
@@ -225,86 +225,8 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_C00CA53A4FE5D5D8C2E1F180F3FFAEEA"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_75D4793883AC69EB5C80C692A0646641"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_8A9603CD88B4BD85398F06368C331FA7"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_787E55BDAEFAEFD80F117741AF3272B5"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_08A1CA5327E2116600DD116399755D03"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_EF5E50464FE5EAA537474E42D0F30260"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_114339C5FA5A8FE485037146095A6105"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_EFA3DD68739043A8624F29B9A51F4ABD"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_7028EA92BB22106B3818B39218ECB430"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_97D7B3B898483D0809B47AC7A4464315"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_804E32F2151641389602942B40EB0838"
-        "OwnerKey" = "8:_D5075AF1F7BEA563EB5A4CEAAD9706FB"
+        "MsmKey" = "8:_85D845B31C1847ECAEEE4E7566B2B036"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -321,6 +243,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_8B160C580DCD4755A9EE368E7811A487"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_8C1C73400DCB4428A4CB558D11D27F7C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -441,6 +369,90 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_C00CA53A4FE5D5D8C2E1F180F3FFAEEA"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_08A1CA5327E2116600DD116399755D03"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_75D4793883AC69EB5C80C692A0646641"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_8A9603CD88B4BD85398F06368C331FA7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_EF5E50464FE5EAA537474E42D0F30260"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_787E55BDAEFAEFD80F117741AF3272B5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_114339C5FA5A8FE485037146095A6105"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_EFA3DD68739043A8624F29B9A51F4ABD"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_7028EA92BB22106B3818B39218ECB430"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_97D7B3B898483D0809B47AC7A4464315"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CC8D261D49604692AB9AAE4A5972286B"
+        "OwnerKey" = "8:_D5075AF1F7BEA563EB5A4CEAAD9706FB"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_CC926AC5EE2C4920B2395B7DE6C4DAA2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -465,12 +477,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_D7337DEE1AB9400EA50365074821F437"
-        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_D8BE4B1E9CB842079C5A337A97573B8F"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -496,13 +502,13 @@
         "Entry"
         {
         "MsmKey" = "8:_EF5E50464FE5EAA537474E42D0F30260"
-        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
+        "OwnerKey" = "8:_787E55BDAEFAEFD80F117741AF3272B5"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_EF5E50464FE5EAA537474E42D0F30260"
-        "OwnerKey" = "8:_787E55BDAEFAEFD80F117741AF3272B5"
+        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -519,12 +525,24 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_FBA55A285FF94555AC432BDCCE57A0DF"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FBE629333B844380AF883D43920855F4"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_FD1050C73307449F9F2D7130D268FA0D"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FFCD28DFFAE247149672C7FAE8B75D1A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -664,7 +682,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.28109, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.14942, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_08A1CA5327E2116600DD116399755D03"
@@ -986,7 +1004,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.28110, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.14942, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_69B81C77C4CA19E0A4DE0B4EE02FDC5D"
@@ -1068,7 +1086,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2243.28110, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2294.14942, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_75D4793883AC69EB5C80C692A0646641"
@@ -1119,7 +1137,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.DataEngines, Version=1.6.2243.28113, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.DataEngines, Version=1.6.2294.14943, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_787E55BDAEFAEFD80F117741AF3272B5"
@@ -1170,7 +1188,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.6.2243.28111, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.6.2294.14943, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_8A9603CD88B4BD85398F06368C331FA7"
@@ -1197,6 +1215,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_8B160C580DCD4755A9EE368E7811A487"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\images\\casa-logo-left.png"
+            "TargetName" = "8:casa-logo-left.png"
+            "Tag" = "8:"
+            "Folder" = "8:_162CCA8002474F63A499FB7BA61C66B4"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_8C1C73400DCB4428A4CB558D11D27F7C"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\micasa-logo.png"
@@ -1530,26 +1568,6 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_D7337DEE1AB9400EA50365074821F437"
-            {
-            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\Persistent Storage.htm"
-            "TargetName" = "8:Persistent Storage.htm"
-            "Tag" = "8:"
-            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
-            "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:"
-            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_D8BE4B1E9CB842079C5A337A97573B8F"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\CASA_32.png"
@@ -1634,7 +1652,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.CASAPol, Version=1.6.2243.28112, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.CASAPol, Version=1.6.2294.14943, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_EF5E50464FE5EAA537474E42D0F30260"
@@ -1692,6 +1710,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FBA55A285FF94555AC432BDCCE57A0DF"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\help\\en\\Persistent_Storage.htm"
+            "TargetName" = "8:Persistent_Storage.htm"
+            "Tag" = "8:"
+            "Folder" = "8:_87E65670B4D54F8B8F50ADC1C4DA4AC0"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_FBE629333B844380AF883D43920855F4"
             {
             "SourcePath" = "8:..\\..\\c_gui\\help\\en\\LinkA.gif"
@@ -1712,6 +1750,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FD1050C73307449F9F2D7130D268FA0D"
+            {
+            "SourcePath" = "8:..\\..\\c_gui\\images\\casa-logo-right.png"
+            "TargetName" = "8:casa-logo-right.png"
+            "Tag" = "8:"
+            "Folder" = "8:_162CCA8002474F63A499FB7BA61C66B4"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_FFCD28DFFAE247149672C7FAE8B75D1A"
             {
             "SourcePath" = "8:..\\..\\doc\\CASA_Reference_Guide.pdf"
@@ -1910,7 +1968,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_804E32F2151641389602942B40EB0838"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_CC8D261D49604692AB9AAE4A5972286B"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -1966,7 +2024,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_52BF328273034BF199E0FBBB91655492"
             {
-            "SourcePath" = "8:..\\..\\logincapture\\windows\\bin\\release\\lcredmgr.dll"
+            "SourcePath" = "8:..\\..\\LoginCapture\\windows\\bin\\Release\\lcredmgr.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_1A41C925C695498E975E522C6E5A77F9"
@@ -2020,6 +2078,34 @@
                 {
                 }
             }
+            "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_85D845B31C1847ECAEEE4E7566B2B036"
+            {
+            "SourcePath" = "8:..\\..\\c_adlib\\ad_ff\\Release\\ad_ff.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_1A41C925C695498E975E522C6E5A77F9"
+            "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:{BB304ECF-FCBA-4693-9D47-86749815DDC8}"
+            "ShowKeyOutput" = "11:TRUE"
+                "ExcludeFilters"
+                {
+                }
+            }
         }
         "Registry"
         {
diff --git a/vs_solutions/micasad/micasad.suo b/vs_solutions/micasad/micasad.suo
index e6818c3b..d32f8b84 100644
Binary files a/vs_solutions/micasad/micasad.suo and b/vs_solutions/micasad/micasad.suo differ