diff --git a/linkid-example/linkid-example.suo b/linkid-example/linkid-example.suo
index 7b07b99..c38dccc 100644
Binary files a/linkid-example/linkid-example.suo and b/linkid-example/linkid-example.suo differ
diff --git a/linkid-example/linkid-example/LinkIDLogin.aspx b/linkid-example/linkid-example/LinkIDLogin.aspx
index 234fc09..3bed3c1 100644
--- a/linkid-example/linkid-example/LinkIDLogin.aspx
+++ b/linkid-example/linkid-example/LinkIDLogin.aspx
@@ -25,8 +25,6 @@
     <form id="form1" runat="server" method="post" autocomplete="off" target="_self">
     
         <asp:HiddenField ID="SAMLRequest" runat="server" />
-        <asp:HiddenField ID="LoginMode" runat="server" />
-        <asp:HiddenField ID="StartPage" runat="server" />
         <asp:HiddenField ID="LanguageField" runat="server" />
     
         <noscript>
diff --git a/linkid-example/linkid-example/LinkIDLogin.aspx.cs b/linkid-example/linkid-example/LinkIDLogin.aspx.cs
index e876aab..2edb671 100644
--- a/linkid-example/linkid-example/LinkIDLogin.aspx.cs
+++ b/linkid-example/linkid-example/LinkIDLogin.aspx.cs
@@ -62,7 +62,7 @@ protected void Page_Load(object sender, EventArgs e)
 
             LoginConfig.handleLinkIDWithPOST(Request, Response, Session, SESSION_AUTH_CONTEXT, LINKID_HOST,
                 APP_NAME, language, LOGINPAGE_LOCATION, KEY_APP, CERT_APP, CERT_LINKID,
-                this.form1, this.SAMLRequest, this.LoginMode, this.StartPage, this.LanguageField);
+                this.form1, this.SAMLRequest, this.LanguageField);
             
         }
     }
diff --git a/linkid-example/linkid-example/LinkIDLogin.aspx.designer.cs b/linkid-example/linkid-example/LinkIDLogin.aspx.designer.cs
index e356b84..58a5959 100644
--- a/linkid-example/linkid-example/LinkIDLogin.aspx.designer.cs
+++ b/linkid-example/linkid-example/LinkIDLogin.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:2.0.50727.5477
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -31,24 +31,6 @@ public partial class LinkIDLogin {
         /// </remarks>
         protected global::System.Web.UI.WebControls.HiddenField SAMLRequest;
         
-        /// <summary>
-        /// LoginMode control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.HiddenField LoginMode;
-        
-        /// <summary>
-        /// StartPage control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.HiddenField StartPage;
-        
         /// <summary>
         /// LanguageField control.
         /// </summary>
diff --git a/linkid-example/linkid-example/LoginMobile.aspx.designer.cs b/linkid-example/linkid-example/LoginMobile.aspx.designer.cs
index 99725bd..7893884 100644
--- a/linkid-example/linkid-example/LoginMobile.aspx.designer.cs
+++ b/linkid-example/linkid-example/LoginMobile.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:2.0.50727.5477
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/linkid-example/linkid-example/LoginMobileHaws.aspx.designer.cs b/linkid-example/linkid-example/LoginMobileHaws.aspx.designer.cs
index 934d99a..cef8c34 100644
--- a/linkid-example/linkid-example/LoginMobileHaws.aspx.designer.cs
+++ b/linkid-example/linkid-example/LoginMobileHaws.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:2.0.50727.5477
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/linkid-example/linkid-example/PaymentMobileHaws.aspx.designer.cs b/linkid-example/linkid-example/PaymentMobileHaws.aspx.designer.cs
index b73a2ae..0ab9d78 100644
--- a/linkid-example/linkid-example/PaymentMobileHaws.aspx.designer.cs
+++ b/linkid-example/linkid-example/PaymentMobileHaws.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5472
+//     Runtime Version:2.0.50727.5477
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet-test/linkid-sdk-dotnet-test.csproj b/linkid-sdk-dotnet/linkid-sdk-dotnet-test/linkid-sdk-dotnet-test.csproj
index 4b6b7d5..d0a1046 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet-test/linkid-sdk-dotnet-test.csproj
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet-test/linkid-sdk-dotnet-test.csproj
@@ -57,7 +57,6 @@
     <Compile Include="src\test\cs\TestNotificationClient.cs" />
     <Compile Include="src\test\cs\TestPingClient.cs" />
     <Compile Include="src\test\cs\TestSaml.cs" />
-    <Compile Include="src\test\cs\TestSessionTrackingClient.cs" />
     <Compile Include="src\test\cs\WebServerTest.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/TestSaml.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/TestSaml.cs
index 21ebf4b..0a1f9a5 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/TestSaml.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/TestSaml.cs
@@ -27,100 +27,102 @@
 
 namespace safe_online_sdk_dotnet.test.cs
 {
-	[TestFixture]
-	public class TestSaml
-	{
-		[Test]
-		public void TestMethod()
-		{
-			string[] attributeValues = {"test-value"};
-			SamlAttribute samlAttribute = new SamlAttribute("urn:namespace", "attributeName", attributeValues);
-			Console.WriteLine("saml attribute: " + samlAttribute);
-			
-			SamlAuthenticationStatement samlStatement = new SamlAuthenticationStatement();
-			
-			SamlAssertion samlAssertion = new SamlAssertion();
-			samlAssertion.Statements.Add(samlStatement);
-		}
-		
-		[Test]
-		public void TestAuthnRequest() {
-			AuthnRequestType authnRequest = new AuthnRequestType();
-			authnRequest.ID = "test-id";
-			authnRequest.AssertionConsumerServiceURL = "http://test.assertion.consumer";
-			authnRequest.Destination = "http://destination";
-			authnRequest.ForceAuthn = true;
-			authnRequest.ProtocolBinding = "urn:test:protocol:binding";
-			authnRequest.Version = "2.0";
-			authnRequest.IssueInstant = DateTime.Now.ToUniversalTime();
-			
-			NameIDType issuer = new NameIDType();
-			issuer.Value = "test-issuer";
-			authnRequest.Issuer = issuer;
-			
-			NameIDPolicyType nameIdPolicy = new NameIDPolicyType();
-			nameIdPolicy.AllowCreate = true;
-			nameIdPolicy.AllowCreateSpecified = true;
-			authnRequest.NameIDPolicy = nameIdPolicy;
-			
-			XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
-      		ns.Add("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
-      		ns.Add("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
-      		//ns.Add("ds", "http://www.w3.org/2000/09/xmldsig#");
-			
-			XmlRootAttribute xRoot = new XmlRootAttribute();
-    		xRoot.ElementName = "AuthnRequest";
-    		xRoot.Namespace = "urn:oasis:names:tc:SAML:2.0:protocol";
-			XmlSerializer serializer = new XmlSerializer(typeof(AuthnRequestType), xRoot);
-			MemoryStream memoryStream = new MemoryStream();
-			XmlTextWriter xmlTextWriter = new XmlTextWriter(memoryStream, Encoding.UTF8);
-      		serializer.Serialize(xmlTextWriter, authnRequest, ns);
-     		memoryStream = (MemoryStream)xmlTextWriter.BaseStream;
-     		string result = new UTF8Encoding().GetString(memoryStream.ToArray());
-      		Console.WriteLine("result: " + result);
-      		
-      		XmlDocument document = new XmlDocument();
-      		memoryStream.Seek(0, SeekOrigin.Begin);
-      		document.Load(memoryStream);
-      		String xmlString = document.OuterXml;
-      		Console.WriteLine("DOM result: " + xmlString);
-      		
-      		RSACryptoServiceProvider Key = new RSACryptoServiceProvider();
-      		
-      		SignedXml signedXml = new SignedXml(document);
-      		signedXml.SigningKey = Key;
-      		Signature signature = signedXml.Signature;
-      		signature.SignedInfo.CanonicalizationMethod = SignedXml.XmlDsigExcC14NTransformUrl;
-      		Reference reference = new Reference("#" + authnRequest.ID);
-      		XmlDsigEnvelopedSignatureTransform env = new XmlDsigEnvelopedSignatureTransform();
-        	reference.AddTransform(env);
-        	XmlDsigExcC14NTransform excC14NTransform = new XmlDsigExcC14NTransform("ds saml samlp");
-        	reference.AddTransform(excC14NTransform);
-        	signature.SignedInfo.AddReference(reference);
-        	
-        	signedXml.ComputeSignature();
-
-        	XmlElement xmlDigitalSignature = signedXml.GetXml();
-        	document.DocumentElement.AppendChild(document.ImportNode(xmlDigitalSignature, true));
-
-        	result = document.OuterXml;
-        	Console.WriteLine("result: " + result);
-        	
-        	XmlTextWriter xmltw = new XmlTextWriter(TestConstants.workDir + "\\test.xml", new UTF8Encoding(false));
-        	document.WriteTo(xmltw);
-        	xmltw.Close();
-		}
-		
-		[Test]
-		public void TestSaml2AuthUtil() {
-			RSACryptoServiceProvider key = new RSACryptoServiceProvider();
-			
-			Saml2AuthUtil testedInstance = new Saml2AuthUtil(key);
-			
-			string spUrl = "http://service.provider.com";
-			string idpUrl = "http://identity.provider.com";
-			string applicationId = "urn:application:id";
-			string[] devices = new string[] {"test-device-1", "test-device-2"};
+    [TestFixture]
+    public class TestSaml
+    {
+        [Test]
+        public void TestMethod()
+        {
+            string[] attributeValues = { "test-value" };
+            SamlAttribute samlAttribute = new SamlAttribute("urn:namespace", "attributeName", attributeValues);
+            Console.WriteLine("saml attribute: " + samlAttribute);
+
+            SamlAuthenticationStatement samlStatement = new SamlAuthenticationStatement();
+
+            SamlAssertion samlAssertion = new SamlAssertion();
+            samlAssertion.Statements.Add(samlStatement);
+        }
+
+        [Test]
+        public void TestAuthnRequest()
+        {
+            AuthnRequestType authnRequest = new AuthnRequestType();
+            authnRequest.ID = "test-id";
+            authnRequest.AssertionConsumerServiceURL = "http://test.assertion.consumer";
+            authnRequest.Destination = "http://destination";
+            authnRequest.ForceAuthn = true;
+            authnRequest.ProtocolBinding = "urn:test:protocol:binding";
+            authnRequest.Version = "2.0";
+            authnRequest.IssueInstant = DateTime.Now.ToUniversalTime();
+
+            NameIDType issuer = new NameIDType();
+            issuer.Value = "test-issuer";
+            authnRequest.Issuer = issuer;
+
+            NameIDPolicyType nameIdPolicy = new NameIDPolicyType();
+            nameIdPolicy.AllowCreate = true;
+            nameIdPolicy.AllowCreateSpecified = true;
+            authnRequest.NameIDPolicy = nameIdPolicy;
+
+            XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
+            ns.Add("samlp", "urn:oasis:names:tc:SAML:2.0:protocol");
+            ns.Add("saml", "urn:oasis:names:tc:SAML:2.0:assertion");
+            //ns.Add("ds", "http://www.w3.org/2000/09/xmldsig#");
+
+            XmlRootAttribute xRoot = new XmlRootAttribute();
+            xRoot.ElementName = "AuthnRequest";
+            xRoot.Namespace = "urn:oasis:names:tc:SAML:2.0:protocol";
+            XmlSerializer serializer = new XmlSerializer(typeof(AuthnRequestType), xRoot);
+            MemoryStream memoryStream = new MemoryStream();
+            XmlTextWriter xmlTextWriter = new XmlTextWriter(memoryStream, Encoding.UTF8);
+            serializer.Serialize(xmlTextWriter, authnRequest, ns);
+            memoryStream = (MemoryStream)xmlTextWriter.BaseStream;
+            string result = new UTF8Encoding().GetString(memoryStream.ToArray());
+            Console.WriteLine("result: " + result);
+
+            XmlDocument document = new XmlDocument();
+            memoryStream.Seek(0, SeekOrigin.Begin);
+            document.Load(memoryStream);
+            String xmlString = document.OuterXml;
+            Console.WriteLine("DOM result: " + xmlString);
+
+            RSACryptoServiceProvider Key = new RSACryptoServiceProvider();
+
+            SignedXml signedXml = new SignedXml(document);
+            signedXml.SigningKey = Key;
+            Signature signature = signedXml.Signature;
+            signature.SignedInfo.CanonicalizationMethod = SignedXml.XmlDsigExcC14NTransformUrl;
+            Reference reference = new Reference("#" + authnRequest.ID);
+            XmlDsigEnvelopedSignatureTransform env = new XmlDsigEnvelopedSignatureTransform();
+            reference.AddTransform(env);
+            XmlDsigExcC14NTransform excC14NTransform = new XmlDsigExcC14NTransform("ds saml samlp");
+            reference.AddTransform(excC14NTransform);
+            signature.SignedInfo.AddReference(reference);
+
+            signedXml.ComputeSignature();
+
+            XmlElement xmlDigitalSignature = signedXml.GetXml();
+            document.DocumentElement.AppendChild(document.ImportNode(xmlDigitalSignature, true));
+
+            result = document.OuterXml;
+            Console.WriteLine("result: " + result);
+
+            XmlTextWriter xmltw = new XmlTextWriter(TestConstants.workDir + "\\test.xml", new UTF8Encoding(false));
+            document.WriteTo(xmltw);
+            xmltw.Close();
+        }
+
+        [Test]
+        public void TestSaml2AuthUtil()
+        {
+            RSACryptoServiceProvider key = new RSACryptoServiceProvider();
+
+            Saml2AuthUtil testedInstance = new Saml2AuthUtil(key);
+
+            string spUrl = "http://service.provider.com";
+            string idpUrl = "http://identity.provider.com";
+            string applicationId = "urn:application:id";
+            string[] devices = new string[] { "test-device-1", "test-device-2" };
 
             // device context
             Dictionary<string, string> deviceContextMap = new Dictionary<string, string>();
@@ -128,7 +130,7 @@ public void TestSaml2AuthUtil() {
 
             // attribute suggestions
             Dictionary<string, List<Object>> attributeSuggestions = new Dictionary<string, List<object>>();
-            attributeSuggestions.Add("test.attribute.string", new List<Object>{"test"});
+            attributeSuggestions.Add("test.attribute.string", new List<Object> { "test" });
             attributeSuggestions.Add("test.attribute.date", new List<Object> { new DateTime() });
             attributeSuggestions.Add("test.attribute.boolean", new List<Object> { true });
             attributeSuggestions.Add("test.attribute.integer", new List<Object> { 69 });
@@ -137,46 +139,47 @@ public void TestSaml2AuthUtil() {
             // payment context
             PaymentContext paymentContext = new PaymentContext(1, Currency.EUR);
 
-            string result = testedInstance.generateAuthnRequest(applicationId, null, null, spUrl, idpUrl, null, false, 
-                deviceContextMap, attributeSuggestions, paymentContext);			
-			Console.WriteLine("result document: " + result);
-			
-			XmlDocument xmlDocument = new XmlDocument();
-			xmlDocument.LoadXml(result);
-			
-			SignedXml signedXml = new SignedXml(xmlDocument);
-			XmlNodeList nodeList = xmlDocument.GetElementsByTagName("Signature");
-			signedXml.LoadXml((XmlElement)nodeList[0]);
-			
-			bool verificationResult = signedXml.CheckSignature(key);
-			Console.WriteLine("verification result: " + verificationResult);
-			Assert.IsTrue(verificationResult);
-		}
-
-		[Test]
-		public void TestSaml2LogoutUtil() {
-			RSACryptoServiceProvider key = new RSACryptoServiceProvider();
-			
-			Saml2LogoutUtil testedInstance = new Saml2LogoutUtil(key);
-			
-			string idpUrl = "http://identity.provider.com";
-			string applicationId = "urn:application:id";
-			string subjectName = "test-subject";
-			
-			string result = testedInstance.generateLogoutRequest(subjectName, applicationId, idpUrl);
-			Console.WriteLine("result document: " + result);
-			
-			XmlDocument xmlDocument = new XmlDocument();
-			xmlDocument.LoadXml(result);
-			
-			SignedXml signedXml = new SignedXml(xmlDocument);
-			XmlNodeList nodeList = xmlDocument.GetElementsByTagName("Signature");
-			signedXml.LoadXml((XmlElement)nodeList[0]);
-			
-			bool verificationResult = signedXml.CheckSignature(key);
-			Console.WriteLine("verification result: " + verificationResult);
-			Assert.IsTrue(verificationResult);
-		}
+            string result = testedInstance.generateAuthnRequest(applicationId, null, null, spUrl, idpUrl, false,
+                deviceContextMap, attributeSuggestions, paymentContext);
+            Console.WriteLine("result document: " + result);
+
+            XmlDocument xmlDocument = new XmlDocument();
+            xmlDocument.LoadXml(result);
+
+            SignedXml signedXml = new SignedXml(xmlDocument);
+            XmlNodeList nodeList = xmlDocument.GetElementsByTagName("Signature");
+            signedXml.LoadXml((XmlElement)nodeList[0]);
+
+            bool verificationResult = signedXml.CheckSignature(key);
+            Console.WriteLine("verification result: " + verificationResult);
+            Assert.IsTrue(verificationResult);
+        }
+
+        [Test]
+        public void TestSaml2LogoutUtil()
+        {
+            RSACryptoServiceProvider key = new RSACryptoServiceProvider();
+
+            Saml2LogoutUtil testedInstance = new Saml2LogoutUtil(key);
+
+            string idpUrl = "http://identity.provider.com";
+            string applicationId = "urn:application:id";
+            string subjectName = "test-subject";
+
+            string result = testedInstance.generateLogoutRequest(subjectName, applicationId, idpUrl);
+            Console.WriteLine("result document: " + result);
+
+            XmlDocument xmlDocument = new XmlDocument();
+            xmlDocument.LoadXml(result);
+
+            SignedXml signedXml = new SignedXml(xmlDocument);
+            XmlNodeList nodeList = xmlDocument.GetElementsByTagName("Signature");
+            signedXml.LoadXml((XmlElement)nodeList[0]);
+
+            bool verificationResult = signedXml.CheckSignature(key);
+            Console.WriteLine("verification result: " + verificationResult);
+            Assert.IsTrue(verificationResult);
+        }
 
         [Test]
         public void TestPaymentResponseDeserialization()
@@ -205,5 +208,5 @@ public void TestPaymentResponseDeserialization()
             XmlSerializer serializer = new XmlSerializer(typeof(PaymentResponseType), xRoot);
             PaymentResponseType paymentResponseType = (PaymentResponseType)serializer.Deserialize(new XmlTextReader(new StringReader(xml)));
         }
-	}
+    }
 }
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/WebServerTest.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/WebServerTest.cs
index 9930ecf..020a9bf 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/WebServerTest.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet-test/src/test/cs/WebServerTest.cs
@@ -118,7 +118,7 @@ public byte[] initiateAuthentication()
         {
             string encodedSamlRequest = this.saml2AuthUtil.generateEncodedAuthnRequest(TestConstants.testApplicationName,
                     null, null, "http://" + TestConstants.localhost + ":8080",
-                    TestConstants.linkidAuthEntry, null, false, null, null, null);
+                    TestConstants.linkidAuthEntry, false, null, null, null);
             byte[] response = generateSamlRequestForm("Authenticate", TestConstants.linkidAuthEntry, encodedSamlRequest);
             Console.WriteLine("initiateAuthentication response: {0}", response);
             return response;
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet.suo b/linkid-sdk-dotnet/linkid-sdk-dotnet.suo
index 027c7fc..3b17cbf 100644
Binary files a/linkid-sdk-dotnet/linkid-sdk-dotnet.suo and b/linkid-sdk-dotnet/linkid-sdk-dotnet.suo differ
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/linkid-sdk-dotnet.csproj b/linkid-sdk-dotnet/linkid-sdk-dotnet/linkid-sdk-dotnet.csproj
index 922606b..def58b0 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/linkid-sdk-dotnet.csproj
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/linkid-sdk-dotnet.csproj
@@ -56,7 +56,6 @@
     <Compile Include="src\main\cs\auth\AuthenticationExceptionInvalidInResponseTo.cs" />
     <Compile Include="src\main\cs\auth\AuthenticationExceptionNoAudiences.cs" />
     <Compile Include="src\main\cs\auth\LoginConfig.cs" />
-    <Compile Include="src\main\cs\auth\LoginMode.cs" />
     <Compile Include="src\main\cs\auth\LoginUtil.cs" />
     <Compile Include="src\main\cs\auth\PaymentResponse.cs" />
     <Compile Include="src\main\cs\auth\PaymentContext.cs" />
@@ -65,7 +64,6 @@
     <Compile Include="src\main\cs\auth\RequestConstants.cs" />
     <Compile Include="src\main\cs\auth\Saml2LogoutUtil.cs" />
     <Compile Include="src\main\cs\auth\Saml2Util.cs" />
-    <Compile Include="src\main\cs\auth\StartPage.cs" />
     <Compile Include="src\main\cs\KeyStoreUtil.cs" />
     <Compile Include="src\main\cs\ws\attrib\AttributeClient.cs" />
     <Compile Include="src\main\cs\ws\attrib\AttributeClientImpl.cs" />
@@ -112,9 +110,6 @@
     <Compile Include="src\main\cs\ws\payment\PaymentClient.cs" />
     <Compile Include="src\main\cs\ws\ping\PingClient.cs" />
     <Compile Include="src\main\cs\ws\ping\PingClientImpl.cs" />
-    <Compile Include="src\main\cs\ws\session\SessionAssertion.cs" />
-    <Compile Include="src\main\cs\ws\session\SessionTrackingClient.cs" />
-    <Compile Include="src\main\cs\ws\session\SessionTrackingClientImpl.cs" />
     <Compile Include="src\main\cs\ws\sts\TrustDomainType.cs" />
     <Compile Include="src\main\cs\ws\sts\STSClient.cs" />
     <Compile Include="src\main\cs\ws\sts\STSClientImpl.cs" />
@@ -152,10 +147,6 @@
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
     </Compile>
-    <Compile Include="target\services\SafeOnlineSessionTrackingWebService.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <Compile Include="target\services\SafeOnlinePaymentWebService.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -176,7 +167,6 @@
     <None Include="src\main\resources\ping-ws\*" />
     <None Include="src\main\resources\idmapping-ws\*" />
     <None Include="src\main\resources\notification-ws\*" />
-    <None Include="src\main\resources\session-ws\*" />
     <None Include="src\main\resources\payment-ws\*" />
     <None Include="src\main\resources\ltqr-ws\*" />
     <None Include="src\main\resources\haws-ws\*" />
@@ -191,7 +181,6 @@
     <Exec Command="svcutil /namespace:*,NotificationConsumerWSNameSpace /directory:target\services src\main\resources\notification-ws\notification-consumer.wsdl src\main\resources\notification-ws\b-2.xsd src\main\resources\notification-ws\bf-2.xsd src\main\resources\ws-addr.xsd src\main\resources\notification-ws\t-1.xsd" />
     <Exec Command="svcutil /namespace:*,NotificationProducerWSNameSpace /directory:target\services src\main\resources\notification-ws\notification-producer.wsdl src\main\resources\notification-ws\b-2.xsd src\main\resources\notification-ws\bf-2.xsd src\main\resources\ws-addr.xsd src\main\resources\notification-ws\t-1.xsd" />
     <Exec Command="svcutil /namespace:*,NotificationSubscriptionManagerWSNameSpace /directory:target\services src\main\resources\notification-ws\notification-subscription-manager.wsdl src\main\resources\notification-ws\b-2.xsd src\main\resources\notification-ws\bf-2.xsd src\main\resources\ws-addr.xsd src\main\resources\notification-ws\t-1.xsd" />
-    <Exec Command="svcutil /namespace:*,SessionWSNameSpace /directory:target\services src\main\resources\session-ws\safe-online-session.wsdl src\main\resources\session-ws\safe-online-session.xsd" />
     <Exec Command="svcutil /namespace:*,PaymentWSNameSpace /directory:target\services src\main\resources\payment-ws\safe-online-payment.wsdl src\main\resources\payment-ws\safe-online-payment.xsd src\main\resources\ws-addr.xsd src\main\resources\xmldsig-core-schema.xsd src\main\resources\xenc-schema.xsd" />
     <Exec Command="svcutil /namespace:*,LTQRWSNameSpace /directory:target\services src\main\resources\ltqr-ws\safe-online-ltqr.wsdl src\main\resources\ltqr-ws\safe-online-ltqr.xsd" />
     <Exec Command="svcutil /namespace:*,HawsWSNameSpace /directory:target\services src\main\resources\haws-ws\safe-online-haws.wsdl src\main\resources\haws-ws\safe-online-haws.xsd" />
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/LoginConfig.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/LoginConfig.cs
index 61b54d1..cc971db 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/LoginConfig.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/LoginConfig.cs
@@ -17,12 +17,9 @@ public class LoginConfig
         private static string SESSION_SAML2_AUTH_UTIL = "linkID.saml2AuthUtil";
         private static string SESSION_LOGIN_CONFIG = "linkID.loginConfig";
 
-        public bool mobile     {get; set;}
         public bool mobileMinimal { get; set; }
         public bool mobileForceRegistration { get; set; }
         public String targetURI { get; set; }
-        public String loginMode { get; set; }
-        public String startPage { get; set; }
         public String linkIDLandingPage { get; set; }
 
         public static Saml2AuthUtil getSaml2AuthUtil(HttpSessionState session)
@@ -42,35 +39,16 @@ public static LoginConfig getLoginConfig(HttpSessionState session)
 
         public LoginConfig(HttpRequest request, HttpSessionState session, String linkIDHost)
         {
-            string LINKID_AUTH_ENTRY = "https://" + linkIDHost + "/linkid-auth/entry";
-            string LINKID_MOBILE_MINIMAL_ENTRY = "https://" + linkIDHost + "/linkid-qr/auth-min";
-            string LINKID_MOBILE_MODAL_ENTRY = "https://" + linkIDHost + "/linkid-qr/auth";
-            string LINKID_MOBILE_REG_MINIMAL_ENTRY = "https://" + linkIDHost + "/linkid-qr/reg-min";
-            string LINKID_MOBILE_REG_MODAL_ENTRY = "https://" + linkIDHost + "/linkid-qr/reg";
+            string LINKID_MOBILE_MINIMAL_ENTRY = "https://" + linkIDHost + "/linkid-mobile/auth-min";
+            string LINKID_MOBILE_REG_MINIMAL_ENTRY = "https://" + linkIDHost + "/linkid-mobile/reg-min";
 
-
-            mobile = null != request[RequestConstants.MOBILE_AUTHN_REQUEST_PARAM];
-            mobileMinimal = null != request[RequestConstants.MOBILE_AUTHN_MINIMAL_REQUEST_PARAM];
             mobileForceRegistration = null != request[RequestConstants.MOBILE_FORCE_REG_REQUEST_PARAM];
             targetURI = request[RequestConstants.TARGET_URI_REQUEST_PARAM];
-            loginMode = request[RequestConstants.LOGIN_MODE_REQUEST_PARAM];
-            startPage = request[RequestConstants.START_PAGE_REQUEST_PARAM];
 
-            linkIDLandingPage = LINKID_AUTH_ENTRY;
-            if (mobile)
-            {
-                if (mobileForceRegistration)
-                    linkIDLandingPage = LINKID_MOBILE_MODAL_ENTRY;
-                else
-                    linkIDLandingPage = LINKID_MOBILE_REG_MODAL_ENTRY;
-            }
-            if (mobileMinimal)
-            {
-                if (mobileForceRegistration)
-                    linkIDLandingPage = LINKID_MOBILE_REG_MINIMAL_ENTRY;
-                else
-                    linkIDLandingPage = LINKID_MOBILE_MINIMAL_ENTRY;
-            }
+            if (mobileForceRegistration)
+                linkIDLandingPage = LINKID_MOBILE_REG_MINIMAL_ENTRY;
+            else
+                linkIDLandingPage = LINKID_MOBILE_MINIMAL_ENTRY;
 
             // store on session
             session[SESSION_LOGIN_CONFIG] = this;
@@ -79,34 +57,17 @@ public LoginConfig(HttpRequest request, HttpSessionState session, String linkIDH
 
         public void finalize(HttpResponse response)
         {
-            if (loginMode == "POPUP" || mobile || mobileMinimal)
-            {
-                response.ContentType = "text/html";
-                response.Write("<html>");
-                response.Write("<head>");
-                response.Write("<script type=\"text/javascript\">");
-                if (mobile || mobileMinimal)
-                {
-                    response.Write("window.top.location.replace(\"" + targetURI + "\");");
-                }
-                else
-                {
-                    response.Write("window.opener.location.href = \"" + targetURI + "\";");
-                    response.Write("window.close();");
-                }
-                response.Write("</script>");
-                response.Write("</head>");
-                response.Write("<body>");
-                response.Write("<noscript><p>You are successfully logged in. Since your browser does not support JavaScript, you must close this popup window and refresh the original window manually.</p></noscript>");
-                response.Write("</body>");
-                response.Write("</html>");
-            }
-            else
-            {
-                response.Redirect(targetURI, true);
-                return;
-            }
-
+            response.ContentType = "text/html";
+            response.Write("<html>");
+            response.Write("<head>");
+            response.Write("<script type=\"text/javascript\">");
+            response.Write("window.top.location.replace(\"" + targetURI + "\");");
+            response.Write("</script>");
+            response.Write("</head>");
+            response.Write("<body>");
+            response.Write("<noscript><p>You are successfully logged in. Since your browser does not support JavaScript, you must close this popup window and refresh the original window manually.</p></noscript>");
+            response.Write("</body>");
+            response.Write("</html>");
         }
 
         public String generateHawsRedirectURL(String sessionId)
@@ -117,7 +78,7 @@ public String generateHawsRedirectURL(String sessionId)
         public static void handleLinkIDWithPOST(HttpRequest request, HttpResponse response, HttpSessionState session,
             String authnContextSessionParam, String linkIDHost, String applicationName, String language,
             String targetURL, String privateKeyPemFile, String appCertPemFile, String linkIDCertPemFile,
-            HtmlForm form, HiddenField SAMLRequestField, HiddenField LoginModeField, HiddenField StartPageField, HiddenField LanguageField)
+            HtmlForm form, HiddenField SAMLRequestField, HiddenField LanguageField)
         {
             // Load applications's keypair and linkID's certificate
             RSACryptoServiceProvider applicationKey = KeyStoreUtil.GetPrivateKeyFromPem(privateKeyPemFile, true);
@@ -127,13 +88,13 @@ public static void handleLinkIDWithPOST(HttpRequest request, HttpResponse respon
 
             handleLinkIDWithPOST(request, response, session, authnContextSessionParam, linkIDHost, applicationName,
                 language, targetURL, applicationCert, linkidCert,
-                form, SAMLRequestField, LoginModeField, StartPageField, LanguageField);
+                form, SAMLRequestField, LanguageField);
         }
 
         public static void handleLinkIDWithPOST(HttpRequest request, HttpResponse response, HttpSessionState session,
             String authnContextSessionParam, String linkIDHost, String applicationName, String language,
             String targetURL, X509Certificate2 applicationCert, X509Certificate2 linkidCert,
-            HtmlForm form, HiddenField SAMLRequestField, HiddenField LoginModeField, HiddenField StartPageField, HiddenField LanguageField)
+            HtmlForm form, HiddenField SAMLRequestField, HiddenField LanguageField)
         {
             string[] responses = request.Form.GetValues(RequestConstants.SAML2_POST_BINDING_RESPONSE_PARAM);
 
@@ -200,19 +161,9 @@ public static void handleLinkIDWithPOST(HttpRequest request, HttpResponse respon
 
                 SAMLRequestField.ID = RequestConstants.SAML2_POST_BINDING_REQUEST_PARAM;
                 SAMLRequestField.Value = saml2AuthUtil.generateEncodedAuthnRequest(applicationName, null, null,
-                    targetURL, loginConfig.linkIDLandingPage, null, false, deviceContextMap, attributeSuggestions, 
+                    targetURL, loginConfig.linkIDLandingPage, false, deviceContextMap, attributeSuggestions,
                     paymentContext);
 
-                if (null != loginConfig.loginMode)
-                {
-                    LoginModeField.ID = RequestConstants.LOGIN_MODE_REQUEST_PARAM;
-                    LoginModeField.Value = loginConfig.loginMode;
-                }
-                if (null != loginConfig.startPage)
-                {
-                    StartPageField.ID = RequestConstants.START_PAGE_REQUEST_PARAM;
-                    StartPageField.Value = loginConfig.startPage;
-                }
                 if (null != language)
                 {
                     LanguageField.ID = RequestConstants.LANGUAGE_REQUEST_PARAM;
@@ -289,12 +240,12 @@ public static void handleLinkIDWithHAWS(HttpRequest request, HttpResponse respon
 
                 // generate authn request
                 AuthnRequestType authnRequest = saml2AuthUtil.generateAuthnRequestObject(applicationName, null, null,
-                    targetURL, loginConfig.linkIDLandingPage, null, false, deviceContextMap,
+                    targetURL, loginConfig.linkIDLandingPage, false, deviceContextMap,
                     attributeSuggestions, paymentContext);
 
                 // push authn request to linkID
                 HawsClient hawsClient = new HawsClientImpl(linkIDHost, username, password);
-                String sessionId = hawsClient.push(authnRequest, language, null, LoginMode.POPUP, StartPage.NONE);
+                String sessionId = hawsClient.push(authnRequest, language);
 
                 // redirect
                 response.Redirect(loginConfig.generateHawsRedirectURL(sessionId));
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/RequestConstants.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/RequestConstants.cs
index 443784d..9133f65 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/RequestConstants.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/RequestConstants.cs
@@ -19,16 +19,10 @@ public sealed class RequestConstants
 		public static readonly String SAML2_POST_BINDING_RESPONSE_PARAM = "SAMLResponse";
 
         // Mobile authentication flows
-        public static readonly String MOBILE_AUTHN_REQUEST_PARAM = "mobileAuthn";
         public static readonly String MOBILE_AUTHN_MINIMAL_REQUEST_PARAM = "mobileAuthnMinimal";
         public static readonly String MOBILE_FORCE_REG_REQUEST_PARAM = "mobileForceReg";
 
-        // Case SP wants to force linkID to go straight to registration or authentication page
-        public static readonly String START_PAGE_REQUEST_PARAM = "start_page";
-
         public static readonly String LANGUAGE_REQUEST_PARAM = "Language";
-		public static readonly String THEME_REQUEST_PARAM = "ThemeName";
-        public static readonly String LOGIN_MODE_REQUEST_PARAM = "login_mode";
         public static readonly String TARGET_URI_REQUEST_PARAM = "return_uri";
         public static readonly String FORCE_AUTH_REQUEST_PARAM = "force";
 
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/Saml2AuthUtil.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/Saml2AuthUtil.cs
index e736ea8..0acc158 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/Saml2AuthUtil.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/auth/Saml2AuthUtil.cs
@@ -62,19 +62,17 @@ public String getAudience()
         /// <param name="applicationFriendlyName">Optional friendly name to be displayed in LinkID authentication pages</param>
         /// <param name="serviceProviderUrl">The URL that will handle the returned SAML response</param>
         /// <param name="identityProviderUrl">The LinkID authentication entry URL</param>
-        /// <param name="devices">Option device restriction list</param>
         /// <param name="ssoEnabled"></param>
         /// <param name="deviceContextMap">Optional device context, e.g. the context title for the QR device</param>
         /// <param name="attributeSuggestions">Optional attribute suggestions for certain attributes. Key is the internal linkID attributeName. The type of the values must be of the correct datatype</param>
         /// <param name="paymentContext">Optional payment context</param>
         /// <returns>Base64 encoded SAML request</returns>
         public string generateEncodedAuthnRequest(string applicationName, List<string> applicationPools, string applicationFriendlyName,
-                                          string serviceProviderUrl, string identityProviderUrl, List<string> devices,
-                                          bool ssoEnabled, Dictionary<string,string> deviceContextMap,
+                                          string serviceProviderUrl, string identityProviderUrl, bool ssoEnabled, Dictionary<string, string> deviceContextMap,
                                           Dictionary<string, List<Object>> attributeSuggestions, PaymentContext paymentContext)
         {
             string samlRequest = generateAuthnRequest(applicationName, applicationPools, applicationFriendlyName, serviceProviderUrl,
-                  identityProviderUrl, devices, ssoEnabled, deviceContextMap, attributeSuggestions, paymentContext);
+                  identityProviderUrl, ssoEnabled, deviceContextMap, attributeSuggestions, paymentContext);
             return Convert.ToBase64String(Encoding.ASCII.GetBytes(samlRequest));
         }
 
@@ -87,15 +85,13 @@ public string generateEncodedAuthnRequest(string applicationName, List<string> a
         /// <param name="applicationFriendlyName">Optional friendly name to be displayed in LinkID authentication pages</param>
         /// <param name="serviceProviderUrl">The URL that will handle the returned SAML response</param>
         /// <param name="identityProviderUrl">The LinkID authentication entry URL</param>
-        /// <param name="devices">Option device restriction list</param>
         /// <param name="ssoEnabled"></param>
         /// <param name="deviceContextMap">Optional device context, e.g. the context title for the QR device</param>
         /// <param name="attributeSuggestions">Optional attribute suggestions for certain attributes. Key is the internal linkID attributeName. The type of the values must be of the correct datatype</param>
         /// <param name="paymentContext">Optional payment context</param>
         /// <returns>SAML request</returns>
         public AuthnRequestType generateAuthnRequestObject(string applicationName, List<string> applicationPools, string applicationFriendlyName,
-                                           string serviceProviderUrl, string identityProviderUrl, List<string> devices,
-                                           bool ssoEnabled, Dictionary<string, string> deviceContextMap,
+                                           string serviceProviderUrl, string identityProviderUrl, bool ssoEnabled, Dictionary<string, string> deviceContextMap,
                                            Dictionary<string, List<Object>> attributeSuggestions, PaymentContext paymentContext)
         {
             this.expectedChallenge = Guid.NewGuid().ToString();
@@ -130,13 +126,6 @@ public AuthnRequestType generateAuthnRequestObject(string applicationName, List<
             nameIdPolicy.AllowCreateSpecified = true;
             authnRequest.NameIDPolicy = nameIdPolicy;
 
-            if (null != devices)
-            {
-                RequestedAuthnContextType requestedAuthnContext = new RequestedAuthnContextType();
-                requestedAuthnContext.Items = devices.ToArray();
-                authnRequest.RequestedAuthnContext = requestedAuthnContext;
-            }
-
             if (null != applicationPools)
             {
                 ConditionsType conditions = new ConditionsType();
@@ -222,19 +211,18 @@ public AuthnRequestType generateAuthnRequestObject(string applicationName, List<
         /// <param name="applicationFriendlyName">Optional friendly name to be displayed in LinkID authentication pages</param>
         /// <param name="serviceProviderUrl">The URL that will handle the returned SAML response</param>
         /// <param name="identityProviderUrl">The LinkID authentication entry URL</param>
-        /// <param name="devices">Option device restriction list</param>
         /// <param name="ssoEnabled"></param>
         /// <param name="deviceContextMap">Optional device context, e.g. the context title for the QR device</param>
         /// <param name="attributeSuggestions">Optional attribute suggestions for certain attributes. Key is the internal linkID attributeName. The type of the values must be of the correct datatype</param>
         /// <param name="paymentContext">Optional payment context</param>
         /// <returns>SAML request</returns>
         public string generateAuthnRequest(string applicationName, List<string> applicationPools, string applicationFriendlyName,
-                                           string serviceProviderUrl, string identityProviderUrl, List<string> devices,
-                                           bool ssoEnabled, Dictionary<string, string> deviceContextMap, 
+                                           string serviceProviderUrl, string identityProviderUrl, 
+                                           bool ssoEnabled, Dictionary<string, string> deviceContextMap,
                                            Dictionary<string, List<Object>> attributeSuggestions, PaymentContext paymentContext)
         {
-            AuthnRequestType authnRequest = generateAuthnRequestObject(applicationName, applicationPools, applicationFriendlyName, 
-                serviceProviderUrl, identityProviderUrl, devices, ssoEnabled, deviceContextMap, attributeSuggestions, paymentContext );
+            AuthnRequestType authnRequest = generateAuthnRequestObject(applicationName, applicationPools, applicationFriendlyName,
+                serviceProviderUrl, identityProviderUrl, ssoEnabled, deviceContextMap, attributeSuggestions, paymentContext);
 
             XmlDocument document = toXmlDocument(authnRequest);
 
@@ -311,7 +299,7 @@ private XmlElement toXmlElement(DeviceContextType deviceContext)
             memoryStream.Seek(0, SeekOrigin.Begin);
             document.Load(memoryStream);
 
-            foreach(XmlNode node in document.ChildNodes)
+            foreach (XmlNode node in document.ChildNodes)
             {
                 if (node is XmlElement)
                     return (XmlElement)node;
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClient.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClient.cs
index 22539be..73dbcb2 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClient.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClient.cs
@@ -17,12 +17,9 @@ public interface HawsClient
         /// </summary>
         /// <param name="authnRequest">SAML v2.0 authentication request</param>
         /// <param name="language">ISO 639 alpha-2 or alpha-3 language code. Optional, default is en</param>
-        /// <param name="theme">optional theme</param>
-        /// <param name="loginMode">optional login mode</param>
-        /// <param name="startPage">optional start page</param>
         /// <returns>the sessionId to be used in the redirect</returns>
         /// <exception cref="HawsPushException">something went wrong, check the error code and extra info in the exception</exception>
-        String push(AuthnRequestType authnRequest, String language, String theme, LoginMode loginMode, StartPage startPage);
+        String push(AuthnRequestType authnRequest, String language);
 
         /// <summary>
         /// Fetch the SAML v2.0 authentication response for specified sessionId.
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClientImpl.cs b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClientImpl.cs
index 4b1789c..52c242d 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClientImpl.cs
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/cs/ws/haws/HawsClientImpl.cs
@@ -55,20 +55,17 @@ public void enableLogging()
             this.client.Endpoint.Behaviors.Add(new LoggingBehavior());
         }
 
-        public string push(AttributeWSNamespace.AuthnRequestType authnRequest, string language, string theme, LoginMode loginMode, StartPage startPage)
+        public string push(AttributeWSNamespace.AuthnRequestType authnRequest, string language)
         {
-            PushRequest request = new PushRequest();
+            PushRequestV2 request = new PushRequestV2();
 
             XmlDocument authnRequestDocument = Saml2AuthUtil.toXmlDocument(authnRequest);
             request.Any = authnRequestDocument.DocumentElement;
 
             request.language = language;
-            request.theme = theme;
-            request.loginMode = loginMode.ToString();
-            request.startPage = startPage.ToString();
 
             // operate
-            PushResponse response = this.client.push(request);
+            PushResponse response = this.client.pushV2(request);
 
             // parse response
             if (null != response.error)
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.wsdl b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.wsdl
index eb6c1b7..63c3131 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.wsdl
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.wsdl
@@ -7,6 +7,12 @@
         </schema>
     </types>
 
+    <!-- =================== Push request v2 ========================= -->
+
+    <message name="pushRequestV2">
+		<part name="request" element="tns:PushRequestV2" />
+	</message>
+
     <!-- =================== Push request ========================= -->
 
     <message name="pushRequest">
@@ -32,6 +38,10 @@
 			<input message="tns:pushRequest" />
 			<output message="tns:pushResponse" />
 		</operation>
+		<operation name="pushV2">
+			<input message="tns:pushRequestV2" />
+			<output message="tns:pushResponse" />
+		</operation>
 		<operation name="pull">
 			<input message="tns:pullRequest" />
 			<output message="tns:pullResponse" />
@@ -51,6 +61,15 @@
                 <soap:body use="literal" />
             </output>
         </operation>
+        <operation name="pushV2">
+            <soap:operation soapAction="urn:net:lin-k:safe-online:haws:pushV2" />
+            <input>
+                <soap:body use="literal" />
+            </input>
+            <output>
+                <soap:body use="literal" />
+            </output>
+        </operation>
         <operation name="pull">
             <soap:operation soapAction="urn:net:lin-k:safe-online:haws:pull" />
             <input>
diff --git a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.xsd b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.xsd
index a39e98d..88eeb11 100644
--- a/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.xsd
+++ b/linkid-sdk-dotnet/linkid-sdk-dotnet/src/main/resources/haws-ws/safe-online-haws.xsd
@@ -48,6 +48,26 @@
         </complexType>
     </element>
 
+    <element name="PushRequestV2">
+        <annotation>
+            <documentation>Submit an authentication request</documentation>
+        </annotation>
+        <complexType>
+            <sequence>
+                <any namespace='##any' processContents='lax' minOccurs='1' maxOccurs='1'>
+                    <annotation>
+                        <documentation>The authentication request, e.g. a SAML2 request</documentation>
+                    </annotation>
+                </any>
+            </sequence>
+            <attribute name="language" type="string" use="optional">
+                <annotation>
+                    <documentation>ISO 639 alpha-2 or alpha-3 language code. Optional, default is en</documentation>
+                </annotation>
+            </attribute>
+        </complexType>
+    </element>
+
     <element name="PushResponse">
         <complexType>
             <sequence>