diff --git a/FrameworkTest/FrameworkTest.xcodeproj/project.pbxproj b/FrameworkTest/FrameworkTest.xcodeproj/project.pbxproj
index 2ec9097..9f7902a 100644
--- a/FrameworkTest/FrameworkTest.xcodeproj/project.pbxproj
+++ b/FrameworkTest/FrameworkTest.xcodeproj/project.pbxproj
@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		564C3B8B25BAE97600196325 /* Test-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3B8A25BAE97600196325 /* Test-Configs.plist */; };
-		564C3B9125BB290800196325 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564C3B9025BB290700196325 /* String+Extension.swift */; };
 		564C3BEB25BEEF8500196325 /* Dev-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3BEA25BEEF8500196325 /* Dev-Configs.plist */; };
 		564C3BEE25BEEF8E00196325 /* Pilot-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3BED25BEEF8E00196325 /* Pilot-Configs.plist */; };
 		564C3BF025BEEF9300196325 /* Prod-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3BEF25BEEF9300196325 /* Prod-Configs.plist */; };
@@ -54,7 +53,6 @@
 		563DC67E2506323F00E77893 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Main.strings; sourceTree = "<group>"; };
 		563DC67F2506323F00E77893 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
 		564C3B8A25BAE97600196325 /* Test-Configs.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Test-Configs.plist"; sourceTree = "<group>"; };
-		564C3B9025BB290700196325 /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		564C3BEA25BEEF8500196325 /* Dev-Configs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Dev-Configs.plist"; sourceTree = "<group>"; };
 		564C3BED25BEEF8E00196325 /* Pilot-Configs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Pilot-Configs.plist"; sourceTree = "<group>"; };
 		564C3BEF25BEEF9300196325 /* Prod-Configs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Prod-Configs.plist"; sourceTree = "<group>"; };
@@ -148,7 +146,6 @@
 				564C3B8A25BAE97600196325 /* Test-Configs.plist */,
 				564C3BED25BEEF8E00196325 /* Pilot-Configs.plist */,
 				564C3BEF25BEEF9300196325 /* Prod-Configs.plist */,
-				564C3B9025BB290700196325 /* String+Extension.swift */,
 				5665CD3225F0FD5100491280 /* PlistManager.swift */,
 			);
 			path = FrameworkTest;
@@ -359,7 +356,6 @@
 			files = (
 				5665CD0B25F0CA6500491280 /* SelectEnvironmentViewController.swift in Sources */,
 				5690662B2500CDCC00BB5604 /* ViewController.swift in Sources */,
-				564C3B9125BB290800196325 /* String+Extension.swift in Sources */,
 				5665CD3325F0FD5100491280 /* PlistManager.swift in Sources */,
 				564C3C0525C0054700196325 /* ConfigViewController.swift in Sources */,
 				564C3C1A25C0390100196325 /* ConfigCommonViewController.swift in Sources */,
diff --git a/FrameworkTest/FrameworkTest/Base.lproj/Main.storyboard b/FrameworkTest/FrameworkTest/Base.lproj/Main.storyboard
index 37a3d13..aa705ba 100644
--- a/FrameworkTest/FrameworkTest/Base.lproj/Main.storyboard
+++ b/FrameworkTest/FrameworkTest/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="E8w-ky-6VJ">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="E8w-ky-6VJ">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -120,7 +120,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillProportionally" alignment="center" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="0ao-Zt-Lud" userLabel="AuthToken">
                                         <rect key="frame" x="0.0" y="0.0" width="281" height="31"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="800" text="No Network Test Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAe-3M-BQ8">
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="800" text="Offline Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAe-3M-BQ8">
                                                 <rect key="frame" x="0.0" y="0.0" width="212" height="31"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
@@ -189,11 +189,11 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Q8G-mM-S6F" userLabel="ParamStack">
                                 <rect key="frame" x="81" y="106" width="213" height="251"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jcC-XB-jB1">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ReQ-4w-XWB">
                                         <rect key="frame" x="0.0" y="0.0" width="213" height="55.5"/>
-                                        <state key="normal" title="Reset"/>
+                                        <state key="normal" title="Configure common parameters"/>
                                         <connections>
-                                            <action selector="resetClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bEJ-fH-gIt"/>
+                                            <action selector="configureCommonParamsClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="pSQ-c0-XcH"/>
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rfV-2s-PKw">
@@ -210,11 +210,11 @@
                                             <action selector="configureReversalParamClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="map-cJ-Bcb"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ReQ-4w-XWB">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jcC-XB-jB1">
                                         <rect key="frame" x="0.0" y="196" width="213" height="55"/>
-                                        <state key="normal" title="Configure common parameters"/>
+                                        <state key="normal" title="Reset"/>
                                         <connections>
-                                            <action selector="configureCommonParamsClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="pSQ-c0-XcH"/>
+                                            <action selector="resetClicked:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bEJ-fH-gIt"/>
                                         </connections>
                                     </button>
                                 </subviews>
@@ -387,10 +387,10 @@
                         <outlet property="kartNameLbl" destination="nWr-5Q-HTe" id="Maw-ud-4D2"/>
                         <outlet property="kartNumber" destination="CY8-bk-h5H" id="vQP-34-pH2"/>
                         <outlet property="kartSilBtn" destination="Pep-vY-C5C" id="FOB-Dq-oRj"/>
+                        <outlet property="offlineModeSwitch" destination="3kh-rd-Gbd" id="XIr-KF-s4r"/>
                         <outlet property="ödemeYapBtn" destination="J9W-OD-4bP" id="7vG-na-1yI"/>
                         <outlet property="reversalSegmentedControl" destination="moM-Gv-wGy" id="RtZ-0D-RCi"/>
                         <outlet property="reversalStackView" destination="WNx-6i-a88" id="ySp-hP-ABh"/>
-                        <outlet property="testModeSwitch" destination="3kh-rd-Gbd" id="XIr-KF-s4r"/>
                         <outlet property="walletTokenSwitch" destination="TFC-he-IcU" id="HfP-u8-pbd"/>
                     </connections>
                 </viewController>
@@ -418,14 +418,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="hIZ-o3-Wbq">
                                         <rect key="frame" x="0.0" y="40" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PaymentAppToken" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ct3-8H-uWl">
-                                                <rect key="frame" x="0.0" y="0.0" width="141.5" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payment App Token" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ct3-8H-uWl">
+                                                <rect key="frame" x="0.0" y="0.0" width="151.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NqK-fe-DYq">
-                                                <rect key="frame" x="146.5" y="0.0" width="134.5" height="34"/>
+                                                <rect key="frame" x="156.5" y="0.0" width="124.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -434,14 +434,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="kgF-aR-OZM" userLabel="RequestIdStack">
                                         <rect key="frame" x="0.0" y="94" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RequestId" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hap-D4-TLz">
-                                                <rect key="frame" x="0.0" y="0.0" width="77" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Request Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hap-D4-TLz">
+                                                <rect key="frame" x="0.0" y="0.0" width="81.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Ov9-P1-Sz2">
-                                                <rect key="frame" x="82" y="0.0" width="199" height="34"/>
+                                                <rect key="frame" x="86.5" y="0.0" width="194.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -450,14 +450,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="wFg-Xq-PTe">
                                         <rect key="frame" x="0.0" y="147.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MerchantRefNum" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="myV-Xj-cem">
-                                                <rect key="frame" x="0.0" y="0.0" width="134" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Merchant Ref. Num." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="myV-Xj-cem">
+                                                <rect key="frame" x="0.0" y="0.0" width="151" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="a9Z-fx-RVL">
-                                                <rect key="frame" x="139" y="0.0" width="142" height="34"/>
+                                                <rect key="frame" x="156" y="0.0" width="125" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -466,14 +466,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Q8d-DO-EH1">
                                         <rect key="frame" x="0.0" y="201.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TerminalRefNum" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebv-sA-WHR">
-                                                <rect key="frame" x="0.0" y="0.0" width="126.5" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Terminal Ref. Num." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebv-sA-WHR">
+                                                <rect key="frame" x="0.0" y="0.0" width="143.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iP3-FK-Ufd">
-                                                <rect key="frame" x="131.5" y="0.0" width="149.5" height="34"/>
+                                                <rect key="frame" x="148.5" y="0.0" width="132.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -482,14 +482,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="VOc-VY-dLX">
                                         <rect key="frame" x="0.0" y="255" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TransferRefNum" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sMi-Kl-7dp">
-                                                <rect key="frame" x="0.0" y="0.0" width="124.5" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Ref. Num." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sMi-Kl-7dp">
+                                                <rect key="frame" x="0.0" y="0.0" width="141.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="50r-8V-V3M">
-                                                <rect key="frame" x="129.5" y="0.0" width="151.5" height="34"/>
+                                                <rect key="frame" x="146.5" y="0.0" width="134.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -514,30 +514,30 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="vy7-Kz-LNp">
                                         <rect key="frame" x="0.0" y="362.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ProductId" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vpy-QX-jZX">
-                                                <rect key="frame" x="0.0" y="0.0" width="74.5" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Id" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vpy-QX-jZX">
+                                                <rect key="frame" x="0.0" y="0.0" width="79" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e22-8u-6Dw">
-                                                <rect key="frame" x="79.5" y="0.0" width="201.5" height="34"/>
+                                                <rect key="frame" x="84" y="0.0" width="197" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
                                         </subviews>
                                     </stackView>
-                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="7Fu-88-GPq">
+                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="tFd-ls-GFH">
                                         <rect key="frame" x="0.0" y="416.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SaltKey" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sy7-T1-rD1">
-                                                <rect key="frame" x="0.0" y="0.0" width="57" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mjk-5g-zhl">
+                                                <rect key="frame" x="0.0" y="0.0" width="34" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vt6-aE-t7J">
-                                                <rect key="frame" x="62" y="0.0" width="219" height="34"/>
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="2gl-aQ-WWl">
+                                                <rect key="frame" x="39" y="0.0" width="242" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -575,17 +575,17 @@
                     <connections>
                         <outlet property="amountTxtField" destination="4Bb-dX-NlO" id="gmf-lG-0R0"/>
                         <outlet property="merchantRefNumTxtField" destination="a9Z-fx-RVL" id="Bdc-ib-2P2"/>
-                        <outlet property="paymentAppTokenTxtField" destination="NqK-fe-DYq" id="hxd-gH-tUb"/>
+                        <outlet property="paymentwalletAppTokenTxtField" destination="NqK-fe-DYq" id="hxd-gH-tUb"/>
                         <outlet property="productIdTxtField" destination="e22-8u-6Dw" id="HCR-ab-hfm"/>
                         <outlet property="requestIdTxtField" destination="Ov9-P1-Sz2" id="rC2-OI-GHd"/>
-                        <outlet property="saltKeyTxtField" destination="vt6-aE-t7J" id="WUa-wT-2xh"/>
+                        <outlet property="signTxtField" destination="2gl-aQ-WWl" id="Hmv-TJ-Esg"/>
                         <outlet property="terminalRefNumTxtField" destination="iP3-FK-Ufd" id="35D-i2-BC5"/>
                         <outlet property="transferRefNumTxtField" destination="50r-8V-V3M" id="Fqn-zm-U8i"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="P9I-Dj-nfx" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1742" y="370"/>
+            <point key="canvasLocation" x="2110" y="279"/>
         </scene>
         <!--Config Common View Controller-->
         <scene sceneID="ozD-ld-trD">
@@ -604,8 +604,24 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="gWc-dl-wKv">
+                                        <rect key="frame" x="0.0" y="107.5" width="281" height="34"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Obfuscation Key" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5AA-pC-nNG">
+                                                <rect key="frame" x="0.0" y="0.0" width="125.5" height="34"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <nil key="textColor"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yAD-3f-Avs">
+                                                <rect key="frame" x="130.5" y="0.0" width="150.5" height="34"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                <textInputTraits key="textInputTraits"/>
+                                            </textField>
+                                        </subviews>
+                                    </stackView>
                                     <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="7qc-EX-BIP">
-                                        <rect key="frame" x="0.0" y="20.5" width="281" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="141.5" width="281" height="0.0"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AuthenticationToken" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ggF-0T-h9j">
                                                 <rect key="frame" x="0.0" y="0.0" width="155" height="0.0"/>
@@ -621,7 +637,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView hidden="YES" opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="fWy-yB-8i0">
-                                        <rect key="frame" x="0.0" y="20.5" width="281" height="0.0"/>
+                                        <rect key="frame" x="0.0" y="141.5" width="281" height="0.0"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="WalletToken" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bvf-VY-r4A">
                                                 <rect key="frame" x="0.0" y="0.0" width="92" height="0.0"/>
@@ -637,32 +653,32 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="UhH-p6-QKf">
-                                        <rect key="frame" x="0.0" y="147.5" width="281" height="34"/>
+                                        <rect key="frame" x="0.0" y="228.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ReferenceNumber" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tNB-hJ-75f">
-                                                <rect key="frame" x="0.0" y="0.0" width="139" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reference Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tNB-hJ-75f">
+                                                <rect key="frame" x="0.0" y="0.0" width="143" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hFk-Ag-ZXE">
-                                                <rect key="frame" x="149" y="0.0" width="132" height="34"/>
+                                                <rect key="frame" x="153" y="0.0" width="128" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="MKs-yj-Joh">
-                                        <rect key="frame" x="0.0" y="309" width="281" height="34"/>
+                                        <rect key="frame" x="0.0" y="349" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AppToken" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PvD-M7-U3R">
-                                                <rect key="frame" x="0.0" y="0.0" width="75" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wallet App Token" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PvD-M7-U3R">
+                                                <rect key="frame" x="0.0" y="0.0" width="132" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FFT-ZQ-Ao4">
-                                                <rect key="frame" x="85" y="0.0" width="196" height="34"/>
+                                                <rect key="frame" x="142" y="0.0" width="139" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -698,15 +714,16 @@
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="appTokenTxtField" destination="FFT-ZQ-Ao4" id="5iP-Uv-JJP"/>
                         <outlet property="authTokenTxtField" destination="A6X-pZ-xXg" id="07j-aH-V5D"/>
+                        <outlet property="obfuscationKeyTxtField" destination="yAD-3f-Avs" id="5HU-jM-4Xb"/>
                         <outlet property="referenceNumberTxtField" destination="hFk-Ag-ZXE" id="AnZ-hN-dwu"/>
+                        <outlet property="walletAppTokenTxtField" destination="FFT-ZQ-Ao4" id="5iP-Uv-JJP"/>
                         <outlet property="walletTokenTxtField" destination="K83-E6-gx1" id="iES-TU-OVa"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="eKx-wn-6We" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2377" y="81"/>
+            <point key="canvasLocation" x="1378" y="279"/>
         </scene>
         <!--Reversal Config View Controller-->
         <scene sceneID="B5p-3l-8JD">
@@ -728,14 +745,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="x1s-IG-7WJ">
                                         <rect key="frame" x="0.0" y="67" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PaymentAppToken" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FCV-8I-9jH">
-                                                <rect key="frame" x="0.0" y="0.0" width="141.5" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Payment App Token" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FCV-8I-9jH">
+                                                <rect key="frame" x="0.0" y="0.0" width="151.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gsX-tb-zVY">
-                                                <rect key="frame" x="146.5" y="0.0" width="134.5" height="34"/>
+                                                <rect key="frame" x="156.5" y="0.0" width="124.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -744,14 +761,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="km5-P3-ucp" userLabel="RequestIdStack">
                                         <rect key="frame" x="0.0" y="147.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RequestId" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wwn-Qe-itQ">
-                                                <rect key="frame" x="0.0" y="0.0" width="77" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Request Id" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wwn-Qe-itQ">
+                                                <rect key="frame" x="0.0" y="0.0" width="81.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ltq-6z-nO6">
-                                                <rect key="frame" x="82" y="0.0" width="199" height="34"/>
+                                                <rect key="frame" x="86.5" y="0.0" width="194.5" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -760,14 +777,14 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="907-ic-6vc">
                                         <rect key="frame" x="0.0" y="228.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MerchantRefNum" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gi0-3p-8Mi">
-                                                <rect key="frame" x="0.0" y="0.0" width="134" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Merchant Ref. Num." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gi0-3p-8Mi">
+                                                <rect key="frame" x="0.0" y="0.0" width="151" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ANj-lb-MVM">
-                                                <rect key="frame" x="139" y="0.0" width="142" height="34"/>
+                                                <rect key="frame" x="156" y="0.0" width="125" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -776,30 +793,30 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="hA0-8q-H1x">
                                         <rect key="frame" x="0.0" y="309" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TerminalRefNum" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xb5-HY-aop">
-                                                <rect key="frame" x="0.0" y="0.0" width="126.5" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Terminal Ref. Number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xb5-HY-aop">
+                                                <rect key="frame" x="0.0" y="0.0" width="164" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="sJN-Ye-ZGu">
-                                                <rect key="frame" x="131.5" y="0.0" width="149.5" height="34"/>
+                                                <rect key="frame" x="169" y="0.0" width="112" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
                                         </subviews>
                                     </stackView>
-                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="RsT-ef-n6T">
+                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="lSV-Zb-alj">
                                         <rect key="frame" x="0.0" y="389.5" width="281" height="34"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="SaltKey" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bmF-Dj-dpd">
-                                                <rect key="frame" x="0.0" y="0.0" width="57" height="34"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sign" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cKg-s8-J1x">
+                                                <rect key="frame" x="0.0" y="0.0" width="34" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dCH-dI-d6R">
-                                                <rect key="frame" x="62" y="0.0" width="219" height="34"/>
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xMW-61-EvQ">
+                                                <rect key="frame" x="39" y="0.0" width="242" height="34"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
@@ -836,15 +853,15 @@
                     </view>
                     <connections>
                         <outlet property="merchantRefNumTxtField" destination="ANj-lb-MVM" id="lOI-B7-9I9"/>
-                        <outlet property="paymentAppTokenTxtField" destination="gsX-tb-zVY" id="Rmt-9K-M2C"/>
+                        <outlet property="paymentwalletAppTokenTxtField" destination="gsX-tb-zVY" id="Rmt-9K-M2C"/>
                         <outlet property="requestIdTxtField" destination="ltq-6z-nO6" id="IYS-Hh-d9h"/>
-                        <outlet property="saltKeyTxtField" destination="dCH-dI-d6R" id="H9i-Xh-teP"/>
+                        <outlet property="signTxtField" destination="xMW-61-EvQ" id="tSE-PH-bht"/>
                         <outlet property="terminalRefNumTxtField" destination="sJN-Ye-ZGu" id="JuN-ET-ZpT"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="eMH-Bd-wQP" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1468" y="72"/>
+            <point key="canvasLocation" x="2844" y="278"/>
         </scene>
     </scenes>
     <resources>
diff --git a/FrameworkTest/FrameworkTest/ConfigCommonViewController.swift b/FrameworkTest/FrameworkTest/ConfigCommonViewController.swift
index 1e8e905..f541222 100644
--- a/FrameworkTest/FrameworkTest/ConfigCommonViewController.swift
+++ b/FrameworkTest/FrameworkTest/ConfigCommonViewController.swift
@@ -14,12 +14,13 @@ class ConfigCommonViewController: UIViewController {
     @IBOutlet weak var authTokenTxtField: UITextField!
     @IBOutlet weak var walletTokenTxtField: UITextField!
     @IBOutlet weak var referenceNumberTxtField: UITextField!
-    @IBOutlet weak var appTokenTxtField: UITextField!
-    
-    var lastSelectedApiType:APIType?{
+    @IBOutlet weak var walletAppTokenTxtField: UITextField!
+    @IBOutlet weak var obfuscationKeyTxtField: UITextField!
+
+    var lastSelectedApiType:Environment?{
         get{
-            let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
-            return APIType(rawValue: apiType ?? 3)
+            let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
+            return Environment(rawValue: environment ?? 3)
         }
         set{
             userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
@@ -29,7 +30,7 @@ class ConfigCommonViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        let tempDict = getConfirmPaymentDict(apiType: self.lastSelectedApiType!)
+        let tempDict = getConfirmPaymentDict(environment: self.lastSelectedApiType!)
         
         if let dict = tempDict{
             
@@ -39,7 +40,9 @@ class ConfigCommonViewController: UIViewController {
             
             self.referenceNumberTxtField.text = dict["referenceNumber"] as? String
             
-            self.appTokenTxtField.text = dict["appToken"] as? String
+            self.walletAppTokenTxtField.text = dict["walletAppToken"] as? String
+            
+            self.obfuscationKeyTxtField.text = dict["obfuscationKey"] as? String
             
         }
     }
@@ -59,9 +62,9 @@ class ConfigCommonViewController: UIViewController {
 
 extension ConfigCommonViewController{
     
-    func getConfirmPaymentDict(apiType:APIType) -> [String:AnyObject]?{
+    func getConfirmPaymentDict(environment:Environment) -> [String:AnyObject]?{
         
-        if let plistDict = getPlist(apiType: apiType){
+        if let plistDict = getPlist(environment: environment){
             
             let paymentConfirmDict = plistDict
             
@@ -89,8 +92,10 @@ extension ConfigCommonViewController{
             
             tempDict["referenceNumber"] = referenceNumberTxtField.text
             
-            tempDict["appToken"] = appTokenTxtField.text
-            
+            tempDict["walletAppToken"] = walletAppTokenTxtField.text
+
+            tempDict["obfuscationKey"] = obfuscationKeyTxtField.text
+
             tempDict.write(toFile: returnValues.url.path, atomically: true)
             
         }
diff --git a/FrameworkTest/FrameworkTest/ConfigViewController.swift b/FrameworkTest/FrameworkTest/ConfigViewController.swift
index 415f81d..11b61cc 100644
--- a/FrameworkTest/FrameworkTest/ConfigViewController.swift
+++ b/FrameworkTest/FrameworkTest/ConfigViewController.swift
@@ -12,18 +12,18 @@ import Multipay
 class ConfigViewController: UIViewController {
     
     @IBOutlet weak var requestIdTxtField: UITextField!
-    @IBOutlet weak var saltKeyTxtField: UITextField!
     @IBOutlet weak var productIdTxtField: UITextField!
     @IBOutlet weak var amountTxtField: UITextField!
     @IBOutlet weak var transferRefNumTxtField: UITextField!
     @IBOutlet weak var terminalRefNumTxtField: UITextField!
     @IBOutlet weak var merchantRefNumTxtField: UITextField!
-    @IBOutlet weak var paymentAppTokenTxtField: UITextField!
-    
-    var lastSelectedApiType:APIType?{
+    @IBOutlet weak var paymentwalletAppTokenTxtField: UITextField!
+    @IBOutlet weak var signTxtField: UITextField!
+
+    var lastSelectedApiType:Environment?{
         get{
-            let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
-            return APIType(rawValue: apiType ?? 3)
+            let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
+            return Environment(rawValue: environment ?? 3)
         }
         set{
             userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
@@ -33,13 +33,11 @@ class ConfigViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        let confirmPayDict = getConfirmPaymentDict(apiType: self.lastSelectedApiType!)
+        let confirmPayDict = getConfirmPaymentDict(environment: self.lastSelectedApiType!)
         
         if let dict = confirmPayDict{
-            
-            self.saltKeyTxtField.text = dict["saltKeyTest"] as? String
-            
-            self.paymentAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String
+                        
+            self.paymentwalletAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String
             
             self.merchantRefNumTxtField.text = dict["merchantReferenceNumberTest"] as? String
             
@@ -52,6 +50,8 @@ class ConfigViewController: UIViewController {
             self.amountTxtField.text = dict["amount"] as? String ?? "100TRY"
             
             self.requestIdTxtField.text = dict["requestId"] as? String
+            
+            self.signTxtField.text = dict["sign"] as? String
         }
         
         // Do any additional setup after loading the view.
@@ -77,9 +77,9 @@ class ConfigViewController: UIViewController {
 
 extension ConfigViewController{
     
-    func getConfirmPaymentDict(apiType:APIType) -> [String:AnyObject]?{
+    func getConfirmPaymentDict(environment:Environment) -> [String:AnyObject]?{
         
-        if let plistDict = getPlist(apiType: apiType){
+        if let plistDict = getPlist(environment: environment){
             
             let paymentConfirmDict = plistDict["ConfirmPayment"]
             
@@ -100,24 +100,24 @@ extension ConfigViewController{
         let plistDict = tempDict?["ConfirmPayment"] as? NSMutableDictionary
             
         if let plistDict = plistDict{
-                
-                plistDict["saltKeyTest"] = saltKeyTxtField.text
-                
-                plistDict["productIdTest"] = productIdTxtField.text
-                
-                plistDict["transferReferenceNumberTest"] = transferRefNumTxtField.text
-                
-                plistDict["terminalReferenceNumberTest"] = terminalRefNumTxtField.text
-                
-                plistDict["merchantReferenceNumberTest"] = merchantRefNumTxtField.text
-                
-                plistDict["paymentAppTokenTest"] = paymentAppTokenTxtField.text
-                
-                plistDict["amount"] = amountTxtField.text
-                
-                plistDict["requestId"] = self.requestIdTxtField.text
-                
-                tempDict?["ConfirmPayment"] = plistDict
+            
+            plistDict["productIdTest"] = productIdTxtField.text
+            
+            plistDict["transferReferenceNumberTest"] = transferRefNumTxtField.text
+            
+            plistDict["terminalReferenceNumberTest"] = terminalRefNumTxtField.text
+            
+            plistDict["merchantReferenceNumberTest"] = merchantRefNumTxtField.text
+            
+            plistDict["paymentAppTokenTest"] = paymentwalletAppTokenTxtField.text
+            
+            plistDict["amount"] = amountTxtField.text
+            
+            plistDict["requestId"] = self.requestIdTxtField.text
+            
+            plistDict["sign"] = self.signTxtField.text
+            
+            tempDict?["ConfirmPayment"] = plistDict
         }
             
         tempDict?.write(toFile: returnValues.url.path, atomically: true)
diff --git a/FrameworkTest/FrameworkTest/PlistManager.swift b/FrameworkTest/FrameworkTest/PlistManager.swift
index e1e158a..b256a31 100644
--- a/FrameworkTest/FrameworkTest/PlistManager.swift
+++ b/FrameworkTest/FrameworkTest/PlistManager.swift
@@ -9,12 +9,12 @@
 import Foundation
 import Multipay
 
-func getPlist(apiType:APIType) -> [String:AnyObject]?
+func getPlist(environment:Environment) -> [String:AnyObject]?
 {
     
     var apiFileNameStart = ""
     
-    switch apiType {
+    switch environment {
     case .dev:
         apiFileNameStart = "Dev"
         break
@@ -24,7 +24,7 @@ func getPlist(apiType:APIType) -> [String:AnyObject]?
     case .pilot:
         apiFileNameStart = "Pilot"
         break
-    case .prod:
+    case .production:
         apiFileNameStart = "Prod"
         break
     }
@@ -53,14 +53,14 @@ func getPlist(apiType:APIType) -> [String:AnyObject]?
     return nil
 }
 
-func getMutableDictionaryFromPlist(lastSelectedApiType:APIType) -> (mutDict: NSMutableDictionary?, url: URL)
+func getMutableDictionaryFromPlist(lastSelectedApiType:Environment) -> (mutDict: NSMutableDictionary?, url: URL)
 {
     
-    let apiType:APIType = lastSelectedApiType
+    let environment:Environment = lastSelectedApiType
     
     var apiFileNameStart = ""
     
-    switch apiType {
+    switch environment {
     case .dev:
         apiFileNameStart = "Dev"
         break
@@ -70,7 +70,7 @@ func getMutableDictionaryFromPlist(lastSelectedApiType:APIType) -> (mutDict: NSM
     case .pilot:
         apiFileNameStart = "Pilot"
         break
-    case .prod:
+    case .production:
         apiFileNameStart = "Prod"
         break
     }
diff --git a/FrameworkTest/FrameworkTest/ReversalViewController.swift b/FrameworkTest/FrameworkTest/ReversalViewController.swift
index 8f6a43e..ed77d1e 100644
--- a/FrameworkTest/FrameworkTest/ReversalViewController.swift
+++ b/FrameworkTest/FrameworkTest/ReversalViewController.swift
@@ -12,19 +12,19 @@ import Multipay
 class ReversalConfigViewController: UIViewController {
     
     @IBOutlet weak var requestIdTxtField: UITextField!
-    
-    @IBOutlet weak var saltKeyTxtField: UITextField!
-    
+        
     @IBOutlet weak var terminalRefNumTxtField: UITextField!
     
     @IBOutlet weak var merchantRefNumTxtField: UITextField!
     
-    @IBOutlet weak var paymentAppTokenTxtField: UITextField!
+    @IBOutlet weak var paymentwalletAppTokenTxtField: UITextField!
     
-    var lastSelectedApiType:APIType?{
+    @IBOutlet weak var signTxtField: UITextField!
+
+    var lastSelectedApiType:Environment?{
         get{
-            let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
-            return APIType(rawValue: apiType ?? 3)
+            let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
+            return Environment(rawValue: environment ?? 3)
         }
         set{
             userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
@@ -34,20 +34,19 @@ class ReversalConfigViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        let confirmPayDict = getRollbackPaymentDict(apiType: self.lastSelectedApiType!)
+        let confirmPayDict = getRollbackPaymentDict(environment: self.lastSelectedApiType!)
         
         if let dict = confirmPayDict{
             
-            self.paymentAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String
+            self.paymentwalletAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String
             
             self.requestIdTxtField.text = dict["requestId"] as? String
-            
-            self.saltKeyTxtField.text = dict["saltKeyTest"] as? String
-            
+                        
             self.merchantRefNumTxtField.text = dict["merchantReferenceNumberTest"] as? String
             
             self.terminalRefNumTxtField.text = dict["terminalReferenceNumberTest"] as? String
             
+            self.signTxtField.text = dict["sign"] as? String
         }
         // Do any additional setup after loading the view.
     }
@@ -67,9 +66,9 @@ class ReversalConfigViewController: UIViewController {
 
 extension ReversalConfigViewController{
     
-    func getRollbackPaymentDict(apiType:APIType) -> [String:AnyObject]?{
+    func getRollbackPaymentDict(environment:Environment) -> [String:AnyObject]?{
         
-        if let plistDict = getPlist(apiType: apiType){
+        if let plistDict = getPlist(environment: environment){
             
             let paymentConfirmDict = plistDict["RollbackPayment"]
             
@@ -90,17 +89,17 @@ extension ReversalConfigViewController{
         let plistDict = tempDict?["RollbackPayment"] as? NSMutableDictionary
         
         if let plistDict = plistDict{
-            
-            plistDict["saltKeyTest"] = saltKeyTxtField.text
-            
+                        
             plistDict["terminalReferenceNumberTest"] = terminalRefNumTxtField.text
             
             plistDict["merchantReferenceNumberTest"] = merchantRefNumTxtField.text
             
-            plistDict["paymentAppTokenTest"] = paymentAppTokenTxtField.text
+            plistDict["paymentAppTokenTest"] = paymentwalletAppTokenTxtField.text
             
             plistDict["requestId"] = self.requestIdTxtField.text
             
+            plistDict["sign"] = self.signTxtField.text
+
             tempDict?["RollbackPayment"] = plistDict
         }
         
diff --git a/FrameworkTest/FrameworkTest/SelectEnvironment/SelectEnvironmentViewController.swift b/FrameworkTest/FrameworkTest/SelectEnvironment/SelectEnvironmentViewController.swift
index 525fffe..1074367 100644
--- a/FrameworkTest/FrameworkTest/SelectEnvironment/SelectEnvironmentViewController.swift
+++ b/FrameworkTest/FrameworkTest/SelectEnvironment/SelectEnvironmentViewController.swift
@@ -17,28 +17,28 @@ class SelectEnvironmentViewController: UIViewController {
         // Do any additional setup after loading the view.
     }
     
-    func openOtherScreen(apiType:APIType){
+    func openOtherScreen(environment:Environment){
         
         let storyboard = UIStoryboard(name: "Main", bundle: nil)
         
         let vc = storyboard.instantiateViewController(withIdentifier: "MainTestViewController") as! ViewController
         
-        vc.lastSelectedApiType = apiType
+        vc.lastSelectedApiType = environment
         
         self.navigationController?.pushViewController(vc, animated: true)
     }
     
     @IBAction func useDevEnvironmentClicked(_ sender: Any) {
-        openOtherScreen(apiType: .dev)
+        openOtherScreen(environment: .dev)
     }
     @IBAction func useTestEnvironmentClicked(_ sender: Any) {
-        openOtherScreen(apiType: .test)
+        openOtherScreen(environment: .test)
     }
     @IBAction func usePilotEnvClicked(_ sender: Any) {
-        openOtherScreen(apiType: .pilot)
+        openOtherScreen(environment: .pilot)
     }
     @IBAction func useProdEnvClicked(_ sender: Any) {
-        openOtherScreen(apiType: .prod)
+        openOtherScreen(environment: .production)
     }
 
 }
diff --git a/FrameworkTest/FrameworkTest/String+Extension.swift b/FrameworkTest/FrameworkTest/String+Extension.swift
deleted file mode 100644
index 3cfb29a..0000000
--- a/FrameworkTest/FrameworkTest/String+Extension.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-//  String+Extension.swift
-//  FrameworkTest
-//
-//  Created by ilker sevim on 22.01.2021.
-//  Copyright © 2021 multinet. All rights reserved.
-//
-
-import Foundation
-import CommonCrypto.CommonHMAC
-
-extension String {
-    var sha256PaymentConfirmation:String? {
-        guard let stringData = self.data(using: String.Encoding.utf8) else { return nil }
-        return digest(input: stringData as NSData).base64EncodedString(options: [])
-    }
-
-    private func digest(input : NSData) -> NSData {
-        let digestLength = Int(CC_SHA256_DIGEST_LENGTH)
-        var hash = [UInt8](repeating: 0, count: digestLength)
-        CC_SHA256(input.bytes, UInt32(input.length), &hash)
-        return NSData(bytes: hash, length: digestLength)
-    }
-}
diff --git a/FrameworkTest/FrameworkTest/ViewController.swift b/FrameworkTest/FrameworkTest/ViewController.swift
index 34d9528..a0cfcc5 100644
--- a/FrameworkTest/FrameworkTest/ViewController.swift
+++ b/FrameworkTest/FrameworkTest/ViewController.swift
@@ -13,7 +13,7 @@ public let userDefaults = UserDefaults.standard
 
 class ViewController: UIViewController {
     
-    @IBOutlet weak var testModeSwitch: UISwitch!
+    @IBOutlet weak var offlineModeSwitch: UISwitch!
     
     @IBOutlet weak var authenticationTokenSwitch: UISwitch!
     
@@ -34,13 +34,12 @@ class ViewController: UIViewController {
     @IBOutlet weak var kartSilBtn: UIButton!
     
     @IBOutlet weak var reversalStackView: UIStackView!
-    @IBOutlet weak var transferServerRefNoValue: UILabel!
     @IBOutlet weak var reversalSegmentedControl: UISegmentedControl!
     
     var selectedWalletToken: String?
     {
         get{
-            //return getWalletToken(apiType: lastSelectedApiType ?? .test) ?? userDefaults.object(forKey: "selectedWalletToken") as? String
+            //return getWalletToken(environment: lastSelectedApiType ?? .test) ?? userDefaults.object(forKey: "selectedWalletToken") as? String
             return userDefaults.object(forKey: "selectedWalletToken") as? String
         }
         set{
@@ -52,7 +51,7 @@ class ViewController: UIViewController {
     var selectedAuthToken: String?
     {
         get{
-            //return getAuthToken(apiType: lastSelectedApiType ?? .test) ?? userDefaults.object(forKey: "selectedAuthToken") as? String
+            //return getAuthToken(environment: lastSelectedApiType ?? .test) ?? userDefaults.object(forKey: "selectedAuthToken") as? String
             return userDefaults.object(forKey: "selectedAuthToken") as? String
         }
         set{
@@ -111,11 +110,11 @@ class ViewController: UIViewController {
         }
     }
     
-    var lastSelectedApiType:APIType?{
+    var lastSelectedApiType:Environment?{
         
         get{
-            let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
-            return APIType(rawValue: apiType ?? 3)
+            let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
+            return Environment(rawValue: environment ?? 3)
         }
         set{
             userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
@@ -127,76 +126,75 @@ class ViewController: UIViewController {
 
 extension ViewController{
     
-    func openMultipay(apiType:APIType){
+    func openMultipay(environment: Environment){
         
-        lastSelectedApiType = apiType
+        lastSelectedApiType = environment
         
         //let userPreset = UserPreset(name: "TestName", surname: "TestSurname", email: "testEmail", gsm: "5321234567")
         
         let userPreset = UserPreset()
         
-        Multipay.start(vcToPresent: self.navigationController!.topViewController ?? self, walletAppToken: getAppToken(apiType: apiType), referenceNumber: getReferenceNumber(apiType: apiType), delegate: self, languageCode: "tr", apiType: apiType, testMode: testModeSwitch.isOn, walletToken: walletTokenSwitch.isOn ? (selectedWalletToken != nil) ? selectedWalletToken : getWalletToken(apiType: apiType) : nil, obfuscationSalt: getObfuscationSalt(apiType: apiType) ?? "", userPreset: userPreset)
+        Multipay.start(vcToPresent: self.navigationController!.topViewController ?? self, walletAppToken: getWalletAppToken(environment: environment), referenceNumber: getReferenceNumber(environment: environment), delegate: self, language: .tr, environment: environment, offlineMode: offlineModeSwitch.isOn, walletToken: walletTokenSwitch.isOn ? (selectedWalletToken != nil) ? selectedWalletToken : getWalletToken(environment: environment) : nil, obfuscationKey: getObfuscationKey(environment: environment) ?? "", userPreset: userPreset)
     }
 }
 
 extension ViewController{
     
-    func getObfuscationSalt(apiType:APIType) -> String?{
-        var obfuscationSalt:String?
+    func getObfuscationKey(environment: Environment) -> String? {
+        var obfuscationKey: String?
         
-        if let plistDict = getPlist(apiType: apiType){
-            let tempAppToken = plistDict["obfuscationSalt"]
-            obfuscationSalt = tempAppToken as? String
+        if let plistDict = getPlist(environment: environment){
+            let tempObfuscationKey = plistDict["obfuscationKey"]
+            obfuscationKey = tempObfuscationKey as? String
         }
-        return obfuscationSalt
+        return obfuscationKey
     }
     
-    func getWalletToken(apiType:APIType) -> String?{
+    func getWalletToken(environment: Environment) -> String? {
+        var walletToken:String?
         
-        var appToken:String?
-        
-        if let plistDict = getPlist(apiType: apiType){
-            let tempAppToken = plistDict["walletToken"]
-            appToken = tempAppToken as? String
+        if let plistDict = getPlist(environment: environment){
+            let tempWalletToken = plistDict["walletToken"]
+            walletToken = tempWalletToken as? String
         }
         
-        return appToken
+        return walletToken
     }
     
-    func getAuthToken(apiType:APIType) -> String?{
+    func getAuthToken(environment: Environment) -> String? {
         
-        var appToken:String?
+        var authToken:String?
         
-        if let plistDict = getPlist(apiType: apiType){
-            let tempAppToken = plistDict["authenticationToken"]
-            appToken = tempAppToken as? String
+        if let plistDict = getPlist(environment: environment){
+            let tempAuthToken = plistDict["authenticationToken"]
+            authToken = tempAuthToken as? String
         }
         
-        return appToken
+        return authToken
     }
     
-    func getAppToken(apiType:APIType) -> String{
+    func getWalletAppToken(environment: Environment) -> String{
         
-        var appToken = ""
+        var walletAppToken = ""
         
-        if let plistDict = getPlist(apiType: apiType){
-            let tempAppToken = plistDict["appToken"]
-            appToken = tempAppToken as! String
+        if let plistDict = getPlist(environment: environment){
+            let tempWalletAppToken = plistDict["walletAppToken"]
+            walletAppToken = tempWalletAppToken as! String
         }
         
-        return appToken
+        return walletAppToken
     }
     
-    func getReferenceNumber(apiType:APIType) -> String{
+    func getReferenceNumber(environment:Environment) -> String{
         
-        var appToken = ""
+        var referenceNumber = ""
         
-        if let plistDict = getPlist(apiType: apiType){
-            let tempAppToken = plistDict["referenceNumber"]
-            appToken = tempAppToken as! String
+        if let plistDict = getPlist(environment: environment){
+            let tempReferenceNumber = plistDict["referenceNumber"]
+            referenceNumber = tempReferenceNumber as! String
         }
         
-        return appToken
+        return referenceNumber
     }
     
 }
@@ -209,7 +207,7 @@ extension ViewController{
         self.cardStack.layer.borderWidth = 1
         self.cardStack.layer.borderColor = UIColor.black.cgColor
         
-        testModeSwitch.isOn = false
+        offlineModeSwitch.isOn = false
         
         if selectedWalletToken != nil, selectedWalletToken!.count > 0{
             walletTokenSwitch.isOn = true
@@ -219,7 +217,7 @@ extension ViewController{
         }
         
         if let selectedWalletToken = selectedWalletToken, selectedWalletToken.count > 0 {
-            Multipay.callSingleWallet(delegate: self, appToken: getAppToken(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, languageCode: "tr", referenceNumber: getReferenceNumber(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType!) ?? "", testMode: testModeSwitch.isOn)
+            Multipay.getWallet(delegate: self, walletAppToken: getWalletAppToken(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, language: .tr, referenceNumber: getReferenceNumber(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationKey: getObfuscationKey(environment: lastSelectedApiType!) ?? "", offlineMode: offlineModeSwitch.isOn)
         }
     }
     
@@ -269,7 +267,7 @@ extension ViewController: MultipayDelegate {
             self.present(alert, animated: true, completion: nil)
             
             if let selectedWalletToken = selectedWalletToken, selectedWalletToken.count > 0 {
-                Multipay.callSingleWallet(delegate: self, appToken: getAppToken(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, languageCode: "tr", referenceNumber: getReferenceNumber(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType ?? .test) ?? "", testMode: testModeSwitch.isOn)
+                Multipay.getWallet(delegate: self, walletAppToken: getWalletAppToken(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, language: .tr, referenceNumber: getReferenceNumber(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationKey: getObfuscationKey(environment: lastSelectedApiType ?? .test) ?? "", offlineMode: offlineModeSwitch.isOn)
             }
             
             self.reversalStackView.isHidden = true
@@ -306,7 +304,7 @@ extension ViewController: MultipayDelegate {
             }
             
             if let selectedWalletToken = selectedWalletToken, selectedWalletToken.count > 0 {
-                Multipay.callSingleWallet(delegate: self, appToken: getAppToken(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, languageCode: "tr", referenceNumber: getReferenceNumber(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType ?? .test) ?? "", testMode: testModeSwitch.isOn)
+                Multipay.getWallet(delegate: self, walletAppToken: getWalletAppToken(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, language: .tr, referenceNumber: getReferenceNumber(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationKey: getObfuscationKey(environment: lastSelectedApiType ?? .test) ?? "", offlineMode: offlineModeSwitch.isOn)
             }
             
             self.reversalStackView.isHidden = false
@@ -328,7 +326,7 @@ extension ViewController: MultipayDelegate {
     func multipayPaymentDidFail(error: Error?) {
         
         if let selectedWalletToken = selectedWalletToken, selectedWalletToken.count > 0 {
-            Multipay.callSingleWallet(delegate: self, appToken: getAppToken(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, languageCode: "tr", referenceNumber: getReferenceNumber(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType ?? .test) ?? "", testMode: testModeSwitch.isOn)
+            Multipay.getWallet(delegate: self, walletAppToken: getWalletAppToken(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: selectedWalletToken, language: .tr, referenceNumber: getReferenceNumber(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationKey: getObfuscationKey(environment: lastSelectedApiType ?? .test) ?? "", offlineMode: offlineModeSwitch.isOn)
         }
         
         self.reversalStackView.isHidden = false
@@ -442,41 +440,11 @@ extension UIImageView {
     }
 }
 
-extension ViewController{
-    
-    func getPlist(apiType:APIType) -> [String:AnyObject]?
-    {
-        
-        var apiFileNameStart = ""
-        
-        switch apiType {
-        case .dev:
-            apiFileNameStart = "Dev"
-            break
-        case .test:
-            apiFileNameStart = "Test"
-            break
-        case .pilot:
-            apiFileNameStart = "Pilot"
-            break
-        case .prod:
-            apiFileNameStart = "Prod"
-            break
-        }
-        
-        if  let path = Bundle.main.path(forResource: apiFileNameStart + "-Configs", ofType: "plist"),
-            let xml = FileManager.default.contents(atPath: path)
-        {
-            print("xml: \(xml)")
-            return (try? PropertyListSerialization.propertyList(from: xml, options: .mutableContainersAndLeaves, format: nil)) as? [String:AnyObject]
-        }
-        
-        return nil
-    }
+extension ViewController {
     
-    func getConfirmPaymentDict(apiType:APIType) -> [String:AnyObject]?{
+    func getConfirmPaymentDict(environment:Environment) -> [String:AnyObject]?{
         
-        if let plistDict = getPlist(apiType: apiType){
+        if let plistDict = getPlist(environment: environment){
             
             let paymentConfirmDict = plistDict["ConfirmPayment"]
             
@@ -487,9 +455,9 @@ extension ViewController{
         }
     }
     
-    func getReversalPaymentDict(apiType:APIType) -> [String:AnyObject]?{
+    func getReversalPaymentDict(environment:Environment) -> [String:AnyObject]?{
         
-        if let plistDict = getPlist(apiType: apiType){
+        if let plistDict = getPlist(environment: environment){
             
             let paymentConfirmDict = plistDict["RollbackPayment"]
             
@@ -502,11 +470,11 @@ extension ViewController{
     
     func saveToPropertyList() {
         
-        let apiType:APIType = self.lastSelectedApiType!
+        let environment:Environment = self.lastSelectedApiType!
         
         var apiFileNameStart = ""
         
-        switch apiType {
+        switch environment {
         case .dev:
             apiFileNameStart = "Dev"
             break
@@ -516,7 +484,7 @@ extension ViewController{
         case .pilot:
             apiFileNameStart = "Pilot"
             break
-        case .prod:
+        case .production:
             apiFileNameStart = "Prod"
             break
         }
@@ -551,7 +519,7 @@ extension ViewController{
         
         self.silClicked(self)
         
-        self.testModeSwitch.isOn = false
+        self.offlineModeSwitch.isOn = false
         self.authenticationTokenSwitch.isOn = false
         self.walletTokenSwitch.isOn = false
         
@@ -602,59 +570,47 @@ extension ViewController{
             
             activityInd.startAnimating()
             
-            Multipay.callUnSelectWallet(delegate: self, appToken: getAppToken(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: walletToken, referenceNumber: getReferenceNumber(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType ?? .test) ?? "", testMode: testModeSwitch.isOn)
+            Multipay.callUnSelectWallet(delegate: self, walletAppToken: getWalletAppToken(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), walletToken: walletToken, referenceNumber: getReferenceNumber(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test), obfuscationKey: getObfuscationKey(environment: lastSelectedApiType ?? .test) ?? "", offlineMode: offlineModeSwitch.isOn)
         }
     }
     
     @IBAction func confirmPaymentClicked(_ sender: Any) {
         
-        let confirmPayment = getConfirmPaymentDict(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test)
+        let confirmPayment = getConfirmPaymentDict(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test)
         
         if let confirmPaymentDict = confirmPayment, let walletToken = selectedWalletToken {
             
             activityInd.startAnimating()
             
-            let paymentAppToken = confirmPaymentDict["paymentAppTokenTest"] as! String
-            let merchantReferenceNumber = confirmPaymentDict["merchantReferenceNumberTest"] as! String
-            let terminalReferenceNumber = confirmPaymentDict["terminalReferenceNumberTest"] as! String
-            //let transferReferenceNumber = confirmPaymentDict["transferReferenceNumberTest"] as! String
-            
-            let transferReferenceNumber = UUID().uuidString.lowercased()
+            let paymentAppToken = confirmPaymentDict["paymentAppTokenTest"] as? String ?? ""
+            let merchantReferenceNumber = confirmPaymentDict["merchantReferenceNumberTest"] as? String ?? ""
+            let terminalReferenceNumber = confirmPaymentDict["terminalReferenceNumberTest"] as? String ?? ""
+            let transferReferenceNumber = confirmPaymentDict["transferReferenceNumberTest"] as? String ?? ""
+            let sign = confirmPaymentDict["sign"] as? String ?? ""
             
             self.lastTransferReferenceNumber = transferReferenceNumber
             
-            let productId = confirmPaymentDict["productIdTest"] as! String
-            
-            var configRequestId = confirmPaymentDict["requestId"] as? String ?? ""
-            if configRequestId.count < 1 {
-                configRequestId = UUID().uuidString.lowercased()
-            }
-            
-            let requestId = configRequestId
+            let productId = confirmPaymentDict["productIdTest"] as? String ?? ""
             
+            let requestId = confirmPaymentDict["requestId"] as? String ?? ""
+                        
             let referenceNumber = UUID().uuidString.lowercased()
             
             let amount = confirmPaymentDict["amount"] as? String ?? "100TRY"
             let transactionDetailModel: TransactionDetailModel = TransactionDetailModel(amount: amount, productId: productId , referenceNumber: referenceNumber)
             
             let transactionDetailModelArray:[TransactionDetailModel] = [transactionDetailModel]
-            
-            let saltKey = confirmPaymentDict["saltKeyTest"] as! String
-            
+                        
             var transactionDetailSaltValue = ""
             
             for transDetailModel in transactionDetailModelArray{
                 transactionDetailSaltValue += transDetailModel.amount + transDetailModel.productId
             }
             
-            var sign = saltKey + merchantReferenceNumber + transferReferenceNumber + transactionDetailSaltValue + terminalReferenceNumber + requestId
-            sign = sign.sha256PaymentConfirmation ?? sign
-            
             self.lastConfirmPaymentRequestId = requestId
             
-            Multipay.callConfirmPayment(delegate: self, paymentAppToken: paymentAppToken, languageCode: "tr", requestId: requestId, walletToken: walletToken, merchantReferenceNumber: merchantReferenceNumber, terminalReferenceNumber: terminalReferenceNumber, transferReferenceNumber: transferReferenceNumber, transactionDetails: transactionDetailModelArray, sign: sign, obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType ?? .test) ?? "", testMode: testModeSwitch.isOn)
+            Multipay.callConfirmPayment(delegate: self, paymentAppToken: paymentAppToken, language: .tr, requestId: requestId, walletToken: walletToken, merchantReferenceNumber: merchantReferenceNumber, terminalReferenceNumber: terminalReferenceNumber, transferReferenceNumber: transferReferenceNumber, transactionDetails: transactionDetailModelArray, sign: sign, obfuscationKey: getObfuscationKey(environment: lastSelectedApiType ?? .test) ?? "", offlineMode: offlineModeSwitch.isOn)
         }
-        
     }
     
 }
@@ -665,34 +621,25 @@ extension ViewController{
     
     func callPaymentReversal(reason:ReferenceToRollbackModel.ReasonRollback){
         
-        let confirmPayment = getReversalPaymentDict(apiType: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test)
+        let confirmPayment = getReversalPaymentDict(environment: (lastSelectedApiType != nil) ? lastSelectedApiType! : .test)
         
         if let confirmPaymentDict = confirmPayment{
             
             activityInd2.startAnimating()
             
-            let paymentAppToken = confirmPaymentDict["paymentAppTokenTest"] as! String
-            let merchantReferenceNumber = confirmPaymentDict["merchantReferenceNumberTest"] as! String
-            let terminalReferenceNumber = confirmPaymentDict["terminalReferenceNumberTest"] as! String
-            
+            let paymentAppToken = confirmPaymentDict["paymentAppTokenTest"] as? String ?? ""
+            let merchantReferenceNumber = confirmPaymentDict["merchantReferenceNumberTest"] as? String ?? ""
+            let terminalReferenceNumber = confirmPaymentDict["terminalReferenceNumberTest"] as? String ?? ""
+            let sign = confirmPaymentDict["sign"] as? String ?? ""
+
             let rollbackReferenceNumber = UUID().uuidString.lowercased()
             
             self.lastRollbackReferenceNumber = rollbackReferenceNumber
             
-            var configRequestId = confirmPaymentDict["requestId"] as? String ?? ""
-            if configRequestId.count < 1 {
-                configRequestId = UUID().uuidString.lowercased()
-            }
-            
-            let requestId = configRequestId
-            
+            let requestId = confirmPaymentDict["requestId"] as? String ?? ""
+                        
             self.lastReversalPaymentRequestId = requestId
-            
-            let saltKey = confirmPaymentDict["saltKeyTest"] as! String
-            
-            var sign = saltKey + merchantReferenceNumber + self.lastRollbackReferenceNumber! + String(reason.rawValue) + terminalReferenceNumber + requestId
-            sign = sign.sha256PaymentConfirmation ?? sign
-            
+                        
             let selectedSegmentIndex = self.reversalSegmentedControl.selectedSegmentIndex
             
             let referenceNumberType = ReferenceToRollbackModel.ReferenceNumberType(rawValue: selectedSegmentIndex)!
@@ -711,7 +658,7 @@ extension ViewController{
                 referenceNumber = lastTransferReferenceNumber
             }
             
-            Multipay.callPaymentReversal(delegate: self, paymentAppToken: paymentAppToken, languageCode: "tr", requestId: requestId, sign: sign, merchantRefNo: merchantReferenceNumber, terminalRefNo: terminalReferenceNumber, rollbackReferenceNumber: rollbackReferenceNumber, reason: reason, referenceNumberType: referenceNumberType, referenceNumber: referenceNumber, obfuscationSalt: getObfuscationSalt(apiType: lastSelectedApiType ?? .test) ?? "", testMode: testModeSwitch.isOn)
+            Multipay.rollbackPayment(delegate: self, paymentAppToken: paymentAppToken, language: .tr, requestId: requestId, sign: sign, merchantReferenceNumber: merchantReferenceNumber, terminalReferenceNumber: terminalReferenceNumber, rollbackReferenceNumber: rollbackReferenceNumber, reason: reason, referenceNumberType: referenceNumberType, referenceNumber: referenceNumber, obfuscationKey: getObfuscationKey(environment: lastSelectedApiType ?? .test) ?? "", offlineMode: offlineModeSwitch.isOn)
             
         }
     }
@@ -735,7 +682,7 @@ extension ViewController{
     }
     
     @IBAction func kartDegistirClicked(_ sender: Any) {
-        self.openMultipay(apiType: lastSelectedApiType ?? .test)
+        self.openMultipay(environment: lastSelectedApiType ?? .test)
     }
 }
 
diff --git a/FrameworkTest/Podfile b/FrameworkTest/Podfile
index 9816baa..4669246 100644
--- a/FrameworkTest/Podfile
+++ b/FrameworkTest/Podfile
@@ -12,13 +12,13 @@ target 'FrameworkTest' do
 	# pod 'Multipay'
 
 	# To use specific version
-	 pod 'Multipay', '~> 1.0.24'	
+  # pod 'Multipay', '~> 1.0.24'
 
 	# To use directly from repo
 	# pod 'Multipay', :git => 'https://github.com/multinetinventiv/MultiPay-iOS-Sdk.git'
 
 	# To use in development mode
-	#pod 'Multipay', :path => '../'
+	pod 'Multipay', :path => '../'
 
 	pod 'IQKeyboardManagerSwift'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ca89295..8b92acc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,20 +17,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.571.0)
-    aws-sdk-core (3.130.0)
+    aws-partitions (1.611.0)
+    aws-sdk-core (3.131.4)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.55.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.58.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.113.0)
+    aws-sdk-s3 (1.114.0)
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -81,12 +81,12 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.92.1)
+    excon (0.92.4)
     faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -106,8 +106,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -116,7 +116,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.204.3)
+    fastlane (2.208.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -161,9 +161,9 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.17.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-androidpublisher_v3 (0.25.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -172,19 +172,19 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.11.0)
-      google-apis-core (>= 0.4, < 2.a)
+    google-apis-iamcredentials_v1 (0.13.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-playcustomapp_v1 (0.10.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-storage_v1 (0.18.0)
+      google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.1)
+    google-cloud-storage (1.37.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -192,7 +192,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.2)
+    googleauth (1.2.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -200,14 +200,14 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
-    json (2.6.1)
-    jwt (2.3.0)
+    json (2.6.2)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
@@ -222,9 +222,9 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -235,9 +235,9 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.1)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -258,11 +258,11 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -276,6 +276,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  ruby
   universal-darwin-20
 
 DEPENDENCIES
diff --git a/Multipay/Managers/CoreManager.swift b/Multipay/Managers/CoreManager.swift
index f640ea3..af5c46b 100644
--- a/Multipay/Managers/CoreManager.swift
+++ b/Multipay/Managers/CoreManager.swift
@@ -85,27 +85,24 @@ internal class CoreManager {
         return "Test"
     }
     
-    internal class func start(vcToPresent: UIViewController, appToken: String?, referenceNumber: String?, languageCode: String? = nil, apiType: APIType = .prod, walletToken: String? = nil, obfuscationSalt: String, userPreset: UserPreset? = nil)
+    internal class func start(vcToPresent: UIViewController, appToken: String?, referenceNumber: String?, languageCode: String, environment: Environment = .production, walletToken: String? = nil, obfuscationKey: String, userPreset: UserPreset? = nil)
     {
         
         CoreManager.shared.vcToPresent = vcToPresent
         
-        Auth.obfuscationSalt = obfuscationSalt
+        Auth.obfuscationKey = obfuscationKey
         
         if let token = appToken{
-            Auth.appToken = token
+            Auth.walletAppToken = token
         }
         Auth.referenceNumber = referenceNumber
         
         Auth.walletToken = walletToken
         
         Auth.userPreset = userPreset
+        CoreManager.shared.language = languageCode
         
-        if let language = languageCode, language.count > 0{
-            CoreManager.shared.language = language
-        }
-        
-        ServiceUrl.setApiType(kApiType: apiType)
+        ServiceUrl.setApiType(kApiType: environment)
         
         FontHelper.registerFonts()
         CoreManager.shared.setConfiguration()
@@ -115,46 +112,12 @@ internal class CoreManager {
         CoreManager.shared.vcToPresent.show(navigationCont, sender: nil)
     }
     
-    class func getLocaleIdentifier() -> String {
-        
-        
-        /*Bu Method LocaleIdentifier gerektirebileck durumlar için
-         ref : https://developer.apple.com/library/ios/documentation/MacOSX/Conceptual/BPInternational/LanguageandLocaleIDs/LanguageandLocaleIDs.html
-         
-         check with avaliableCurrentLocaleIdentifier()
-         
-         */
-        
-        //log.debug(NSLocaleCountryCode)
-        let langCode = shared.language
-        
-        
-        if (langCode.contains("en")) {
-            return "en_US"
-        }else if(langCode.contains("tr")) {
-            return "tr_TR"
-            
-        }else{
-            return "en_US"
-        }
-    }
-    
-    func getLanguageRegion() -> String {
-        
-        //log.debug(NSLocaleCountryCode)
-        let langCode = self.language
-        
-        if (langCode.contains("en")) {
-            return "en-US"
-        }else if(langCode.contains("tr")) {
-            return "tr-TR"
-        }else{
-            return "en-US"
+    class func getLocaleIdentifier(language: Language? = nil) -> String {
+        if let language = language {
+            return language.rawValue
         }
         
-        //        else if (langCode.contains("fr")){
-        //            return "fr-FR"
-        //        }
+        return shared.language
     }
     
     class func dateFromatter(formatStr:String) -> DateFormatter {
@@ -191,8 +154,8 @@ internal class CoreManager {
     public func getUser() {
         let url = ServiceUrl.getURL(ServiceConstants.ServiceName.GetUser)
         
-        let serviceParameter:[String:Any] = [languageCodeKey : self.getLanguageRegion(),
-                                             appTokenKey    : ServiceUrl.getToken() ]
+        let serviceParameter:[String:Any] = [languageCodeKey : CoreManager.getLocaleIdentifier(),
+                                             walletAppTokenKey : ServiceUrl.getToken() ]
         
         let httpHeaders = HTTPHeaders(Auth.shared.getHeader())
         
diff --git a/Multipay/Managers/Multipay.swift b/Multipay/Managers/Multipay.swift
index 81f071f..be2cfe4 100644
--- a/Multipay/Managers/Multipay.swift
+++ b/Multipay/Managers/Multipay.swift
@@ -53,33 +53,30 @@ public class Multipay {
     
     weak static var delegate: MultipayDelegate?
     
-    static var testModeActive = false
+    static var offlineModeActive = false
     
-    public class func start(vcToPresent: UIViewController, walletAppToken: String, referenceNumber: String?, delegate:MultipayDelegate? = nil, languageCode: String? = nil, apiType: APIType = .prod, testMode: Bool = false, walletToken: String? = nil, obfuscationSalt: String, userPreset: UserPreset? = nil)
-    {
-        Multipay.testModeActive = testMode
+    public class func start(vcToPresent: UIViewController, walletAppToken: String, referenceNumber: String?, delegate: MultipayDelegate? = nil, language: Language? = nil, environment: Environment = .production, offlineMode: Bool = false, walletToken: String? = nil, obfuscationKey: String, userPreset: UserPreset? = nil) {
+        Multipay.offlineModeActive = offlineMode
         Multipay.delegate = delegate
         
-        CoreManager.start(vcToPresent: vcToPresent, appToken: walletAppToken, referenceNumber: referenceNumber, languageCode: languageCode, apiType:apiType, walletToken: walletToken, obfuscationSalt: obfuscationSalt, userPreset: userPreset)
+        CoreManager.start(vcToPresent: vcToPresent, appToken: walletAppToken, referenceNumber: referenceNumber, languageCode: language?.rawValue ?? NSLocale.preferredLanguages[0], environment: environment, walletToken: walletToken, obfuscationKey: obfuscationKey, userPreset: userPreset)
     }
     
     //MARK: SDK FUNCTIONS
     
-    public class func callUnSelectWallet(delegate:MultipayDelegate, appToken: String, walletToken: String, languageCode: String = NSLocale.preferredLanguages[0], referenceNumber: String?, obfuscationSalt: String, testMode: Bool = false)
-    {
+    public class func callUnSelectWallet(delegate: MultipayDelegate, walletAppToken: String, walletToken: String, language: Language? = nil, referenceNumber: String?, obfuscationKey: String, offlineMode: Bool = false) {
         
         log.debug("callUnSelectWallet is called")
         
-        Auth.obfuscationSalt = obfuscationSalt
+        Auth.obfuscationKey = obfuscationKey
         
-        if testMode{
+        if offlineMode{
             delegate.multipayUnselectCardSuccess()
             return
         }
         
-        var parameters = [appTokenKey : appToken.count > 0 ? appToken : Auth.appToken]
-        parameters[newAppTokenKey] = appToken.count > 0 ? appToken : Auth.appToken
-        parameters[languageCodeKey] = languageCode.count > 0 ? languageCode : "tr"
+        var parameters = [walletAppTokenKey : walletAppToken.count > 0 ? walletAppToken : Auth.walletAppToken]
+        parameters[languageCodeKey] = CoreManager.getLocaleIdentifier(language: language)
         parameters[walletTokenKey] = walletToken.count > 0 ? walletToken : Auth.walletToken
         if let referenceNmbr = referenceNumber{
             parameters[referenceNumberKey] = referenceNmbr
@@ -121,29 +118,26 @@ public class Multipay {
             log.error("error: \(responseFail)")
             
             DispatchQueue.main.async(execute: {
-                
                 delegate.multipayUnselectCardFailed(resultCode: responseFail.code, resultMessage: responseFail.description)
-                
             })
         }
     }
     
-    public class func callSingleWallet(delegate:MultipayDelegate, appToken: String, walletToken: String, languageCode: String = NSLocale.preferredLanguages[0], referenceNumber: String?, obfuscationSalt: String, testMode: Bool = false)
-    {
+    public class func getWallet(delegate:MultipayDelegate, walletAppToken: String, walletToken: String, language: Language? = nil, referenceNumber: String?, obfuscationKey: String, offlineMode: Bool = false) {
         
         log.debug("callSingleWallet is called")
         
-        Auth.obfuscationSalt = obfuscationSalt
+        Auth.obfuscationKey = obfuscationKey
         
-        if testMode{
+        if offlineMode{
             let walletModelTest = WalletModelTest()
             delegate.multipaySingleWalletSuccess(cardBalance: walletModelTest.cardBalance, cardImageUrl: walletModelTest.cardImageUrl, cardName: walletModelTest.cardName, walletToken: walletModelTest.token, cardMaskedNumber: walletModelTest.cardNumber)
             return
         }
         
-        var parameters = [appTokenKey : appToken.count > 0 ? appToken : Auth.appToken]
-        parameters[newAppTokenKey] = appToken.count > 0 ? appToken : Auth.appToken
-        parameters[languageCodeKey] = languageCode.count > 0 ? languageCode : "tr"
+        var parameters = [walletAppTokenKey : walletAppToken.count > 0 ? walletAppToken : Auth.walletAppToken]
+        parameters[languageCodeKey] = CoreManager.getLocaleIdentifier(language: language)
+        
         parameters[walletTokenKey] = walletToken.count > 0 ? walletToken : Auth.walletToken
         if let referenceNmbr = referenceNumber{
             parameters[referenceNumberKey] = referenceNmbr
@@ -207,14 +201,14 @@ public class Multipay {
     
     //MARK: CONFIRM PAYMENT
     
-    public class func callConfirmPayment(delegate:MultipayDelegate, paymentAppToken: String, languageCode: String = NSLocale.preferredLanguages[0], requestId: String, walletToken: String, merchantReferenceNumber: String, terminalReferenceNumber:String, transferReferenceNumber:String, transactionDetails: [TransactionDetailModel], sign:String, obfuscationSalt: String, testMode: Bool = false)
+    public class func callConfirmPayment(delegate: MultipayDelegate, paymentAppToken: String, language: Language? = nil, requestId: String, walletToken: String, merchantReferenceNumber: String, terminalReferenceNumber: String, transferReferenceNumber: String, transactionDetails: [TransactionDetailModel], sign: String, obfuscationKey: String, offlineMode: Bool = false)
     {
         
         log.debug("callConfirmPayment is called")
         
-        Auth.obfuscationSalt = obfuscationSalt
+        Auth.obfuscationKey = obfuscationKey
         
-        if testMode{
+        if offlineMode{
             delegate.multipayPaymentDidSucceed(sign: nil, transferServerRefNo: nil)
             return
         }
@@ -222,7 +216,7 @@ public class Multipay {
         var parameters:[String:AnyObject] = [:]
         
         parameters[paymentAppTokenKey] = paymentAppToken as AnyObject
-        parameters[languageCodeKey] = (languageCode.count > 0 ? languageCode : "tr") as AnyObject
+        parameters[languageCodeKey] = CoreManager.getLocaleIdentifier(language: language) as AnyObject
         parameters[requestIdKey] = requestId as AnyObject
         parameters[walletTokenKey] = (walletToken.count > 0 ? walletToken : Auth.walletToken) as AnyObject
         parameters[merchantReferenceNumberKey] = merchantReferenceNumber as AnyObject
@@ -311,14 +305,13 @@ public class Multipay {
     
     //MARK: PAYMENT Reversal
     
-    public class func callPaymentReversal(delegate:MultipayDelegate, paymentAppToken: String, languageCode: String = NSLocale.preferredLanguages[0], requestId: String, sign:String, merchantRefNo:String, terminalRefNo:String, rollbackReferenceNumber:String, reason:ReferenceToRollbackModel.ReasonRollback, referenceNumberType: ReferenceToRollbackModel.ReferenceNumberType, referenceNumber: String, obfuscationSalt: String, testMode: Bool = false)
-    {
+    public class func rollbackPayment(delegate: MultipayDelegate, paymentAppToken: String, language: Language? = nil, requestId: String, sign: String, merchantReferenceNumber: String, terminalReferenceNumber: String, rollbackReferenceNumber: String, reason: ReferenceToRollbackModel.ReasonRollback, referenceNumberType: ReferenceToRollbackModel.ReferenceNumberType, referenceNumber: String, obfuscationKey: String, offlineMode: Bool = false) {
         
         log.debug("callPaymentReversal is called")
         
-        Auth.obfuscationSalt = obfuscationSalt
+        Auth.obfuscationKey = obfuscationKey
         
-        if testMode{
+        if offlineMode{
             delegate.multipayRollbackWithSignDidSucceed(sign: nil, rollbackServerReferenceNumber: nil)
             return
         }
@@ -327,15 +320,15 @@ public class Multipay {
         
         parameters[paymentAppTokenKey] = paymentAppToken as AnyObject
         
-        parameters[languageCodeKey] = (languageCode.count > 0 ? languageCode : "tr") as AnyObject
+        parameters[languageCodeKey] = CoreManager.getLocaleIdentifier(language: language) as AnyObject
         
         parameters[requestIdKey] = requestId as AnyObject
         
         parameters[signKey] = sign as AnyObject
 
-        parameters[merchantReferenceNumberKey] = merchantRefNo as AnyObject
+        parameters[merchantReferenceNumberKey] = merchantReferenceNumber as AnyObject
         
-        parameters[terminalReferenceNumberKey] = terminalRefNo as AnyObject
+        parameters[terminalReferenceNumberKey] = terminalReferenceNumber as AnyObject
         
         parameters[rollbackReferenceNumberKey] = rollbackReferenceNumber as AnyObject
         
diff --git a/Multipay/Models/BaseModel.swift b/Multipay/Models/BaseModel.swift
index 682b0cf..d274ea8 100644
--- a/Multipay/Models/BaseModel.swift
+++ b/Multipay/Models/BaseModel.swift
@@ -31,8 +31,8 @@ class BaseModel: SessionDelegate {
         
         let url = ServiceUrl.getURL(serviceName)
         
-        var serviceParameter:[String:Any] = [languageCodeKey :  CoreManager.Instance().getLanguageRegion(),
-                                             appTokenKey     : ServiceUrl.getToken()  ]
+        var serviceParameter:[String:Any] = [languageCodeKey :  CoreManager.getLocaleIdentifier(),
+                                             walletAppTokenKey : ServiceUrl.getToken()  ]
         
         
         if let paramdictionary  = parameters {
diff --git a/Multipay/Networking/Auth.swift b/Multipay/Networking/Auth.swift
index 0df23fc..9e64658 100755
--- a/Multipay/Networking/Auth.swift
+++ b/Multipay/Networking/Auth.swift
@@ -23,8 +23,8 @@ class Auth {
     static var authToken: String?
     static var referenceNumber: String?
     static var walletToken: String?
-    internal static var appToken: String?
-    internal static var obfuscationSalt: String?
+    internal static var walletAppToken: String?
+    internal static var obfuscationKey: String?
     static let isOnlyWalletTokenEnoughForAuthentication = true
     static var userPreset: UserPreset?
     
diff --git a/Multipay/Networking/ConfigParameters.swift b/Multipay/Networking/ConfigParameters.swift
index 20e45e3..83a6818 100644
--- a/Multipay/Networking/ConfigParameters.swift
+++ b/Multipay/Networking/ConfigParameters.swift
@@ -9,5 +9,5 @@
 import Foundation
 
 public let API_TYPE = 1
-public let MP_IS_DEBUG=Multipay.testModeActive
+public let MP_IS_DEBUG=Multipay.offlineModeActive
 public let IS_ENVIRONMENT_FORCED = false
diff --git a/Multipay/Networking/ServiceInvokerHandler.swift b/Multipay/Networking/ServiceInvokerHandler.swift
index 017a600..aa50295 100644
--- a/Multipay/Networking/ServiceInvokerHandler.swift
+++ b/Multipay/Networking/ServiceInvokerHandler.swift
@@ -11,8 +11,7 @@ import Foundation
 public let authTokenKey = "authToken"
 public let walletTokenKey = "walletToken"
 public let languageCodeKey = "languageCode"
-public let appTokenKey = "appToken"
-public let newAppTokenKey = "walletAppToken"
+public let walletAppTokenKey = "walletAppToken"
 public let requestIdKey = "requestId"
 public let referenceNumberKey = "referenceNumber"
 public let paymentAppTokenKey = "paymentAppToken"
@@ -59,15 +58,14 @@ open class ServiceInvokerHandler {
         
         var serviceParameters = parameters
         
-        let languageRegion = CoreManager.shared.getLanguageRegion()
+        let languageRegion = CoreManager.getLocaleIdentifier()
         
         serviceParameters[languageCodeKey] = languageRegion as AnyObject
         
         let token = ServiceUrl.getToken()
         
         if sendAppTokenToRequests, token.count > 0{
-            serviceParameters[appTokenKey] = token as AnyObject
-            serviceParameters[newAppTokenKey] = token as AnyObject
+            serviceParameters[walletAppTokenKey] = token as AnyObject
         }
         
         if sendRequestIdToRequests, sendRequestIdToRequestsParam{
diff --git a/Multipay/Resources/Common.storyboard b/Multipay/Resources/Common.storyboard
index cbc1cbb..c7750a0 100644
--- a/Multipay/Resources/Common.storyboard
+++ b/Multipay/Resources/Common.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -249,7 +249,7 @@
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         <prototypes>
                                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="addressCell" id="fge-tK-vnN">
-                                                <rect key="frame" x="0.0" y="24.5" width="273" height="44"/>
+                                                <rect key="frame" x="0.0" y="44.5" width="273" height="44"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fge-tK-vnN" id="vNd-Tw-10p">
                                                     <rect key="frame" x="0.0" y="0.0" width="273" height="44"/>
diff --git a/Multipay/Shared/Constants/Constants.swift b/Multipay/Shared/Constants/Constants.swift
index 6e8489f..7de19d5 100644
--- a/Multipay/Shared/Constants/Constants.swift
+++ b/Multipay/Shared/Constants/Constants.swift
@@ -31,7 +31,7 @@ struct Constants {
     
     static let STATUS_BAR_STYLE_ANIMATION_DURATION = 0.3
     
-    static let maxRetryCount = Multipay.testModeActive ? 0 : 2
+    static let maxRetryCount = Multipay.offlineModeActive ? 0 : 2
 
     //MARK:
     struct FormatTemplate {
diff --git a/Multipay/Shared/Constants/ServiceConstants.swift b/Multipay/Shared/Constants/ServiceConstants.swift
index 57129cc..cba1fc4 100644
--- a/Multipay/Shared/Constants/ServiceConstants.swift
+++ b/Multipay/Shared/Constants/ServiceConstants.swift
@@ -1,15 +1,20 @@
 import Foundation
 
-public enum APIType : Int, CaseIterable {
-    case prod = 1
+public enum Environment : Int, CaseIterable {
+    case production = 1
     case pilot = 2
     case test = 3
     case dev = 4
 }
 
+public enum Language: String {
+    case tr = "tr-TR"
+    case en = "en-US"
+}
+
 struct Config {
-    static let basePathTpype: APIType = {
-        return (APIType(rawValue: API_TYPE) ?? APIType.prod)
+    static let basePathTpype: Environment = {
+        return (Environment(rawValue: API_TYPE) ?? Environment.production)
     }()
     static let forcePathType: Bool      = IS_ENVIRONMENT_FORCED  // true oldugunda uygulama icerisinden ortam degisikligi yapilamaz
     static let isDebug                  = true // Debug loglarını açar ve kullanıcı bilgilerini ilgili alanlara dolu getirir.
@@ -267,19 +272,19 @@ struct ServiceConstants {
 // MARK: - ServiceUrl
 public struct ServiceUrl {
     
-    static func setApiType(kApiType: APIType) {
+    static func setApiType(kApiType: Environment) {
         
         let userDefaults = UserDefaults.standard
-        userDefaults.set(kApiType.rawValue, forKey: "apiType")
+        userDefaults.set(kApiType.rawValue, forKey: "environment")
         userDefaults.synchronize()
         
     }
     
-    static func readApiType() -> APIType {
-        if let kApiType = UserDefaults.standard.object(forKey: "apiType") as? Int {
+    static func readApiType() -> Environment {
+        if let kApiType = UserDefaults.standard.object(forKey: "environment") as? Int {
             switch kApiType {
             case 1:
-                return .prod
+                return .production
             case 2:
                 return .pilot
             case 3:
@@ -287,14 +292,14 @@ public struct ServiceUrl {
             case 4:
                 return .dev
             default:
-                return .prod
+                return .production
             }
         }
-        return .prod
+        return .production
     }
     
     static func isPROD() -> Bool {
-        return ServiceUrl.readApiType() == .prod ? true : false
+        return ServiceUrl.readApiType() == .production ? true : false
     }
     
     static func isPILOT() -> Bool {
@@ -313,7 +318,7 @@ public struct ServiceUrl {
                 return TestSdkConfig.API_BASE_PATH
         case .pilot:
                 return PilotSdkConfig.API_BASE_PATH
-        case .prod:
+        case .production:
                 return ProdSdkConfig.API_BASE_PATH
         }
     }
@@ -327,7 +332,7 @@ public struct ServiceUrl {
                 return TestSdkConfig.API_BASE_DOMAIN_URL
         case .pilot:
                 return PilotSdkConfig.API_BASE_DOMAIN_URL
-        case .prod:
+        case .production:
                 return ProdSdkConfig.API_BASE_DOMAIN_URL
         }
     }
@@ -339,7 +344,7 @@ public struct ServiceUrl {
     
     static func getToken() -> String {
         
-        if let token = Auth.appToken{
+        if let token = Auth.walletAppToken{
             return token
         }
         else{
diff --git a/Multipay/Utilities/Obfsctr.swift b/Multipay/Utilities/Obfsctr.swift
index cca8c6e..fe9e05d 100644
--- a/Multipay/Utilities/Obfsctr.swift
+++ b/Multipay/Utilities/Obfsctr.swift
@@ -18,10 +18,10 @@ class Obfuscator {
     
     init() {
         
-        let apiTypeInt = UserDefaults.standard.object(forKey: "lastSelectedApiType") as? Int
-        let apiType = APIType(rawValue: apiTypeInt ?? 3) ?? APIType.test
+        let environmentInt = UserDefaults.standard.object(forKey: "lastSelectedApiType") as? Int
+        let environment = Environment(rawValue: environmentInt ?? 3) ?? Environment.test
         
-        let obfsSalt = getObfuscationSalt(apiType: apiType)
+        let obfsSalt = getObfuscationKey(environment: environment)
         
         if let tempSalt = obfsSalt{
             salt = tempSalt
@@ -90,27 +90,27 @@ class Obfuscator {
 
 extension Obfuscator{
     
-    func getObfuscationSalt(apiType:APIType) -> String?{
-        var obfuscationSalt:String?
+    func getObfuscationKey(environment:Environment) -> String?{
+        var obfuscationKey:String?
         
-        if let plistDict = getPlist(apiType: apiType){
-            let tempAppToken = plistDict["obfuscationSalt"]
-            obfuscationSalt = tempAppToken as? String
+        if let plistDict = getPlist(environment: environment){
+            let tempAppToken = plistDict["obfuscationKey"]
+            obfuscationKey = tempAppToken as? String
         }
         
-        if obfuscationSalt == nil || obfuscationSalt?.count ?? 0 < 1{
-            obfuscationSalt = Auth.obfuscationSalt
+        if obfuscationKey == nil || obfuscationKey?.count ?? 0 < 1{
+            obfuscationKey = Auth.obfuscationKey
         }
             
-        return obfuscationSalt
+        return obfuscationKey
     }
     
     
-    func getPlist(apiType:APIType) -> [String:AnyObject]?
+    func getPlist(environment:Environment) -> [String:AnyObject]?
     {
         var apiFileNameStart = ""
         
-        switch apiType {
+        switch environment {
         case .dev:
             apiFileNameStart = "Dev"
             break
@@ -120,7 +120,7 @@ extension Obfuscator{
         case .pilot:
             apiFileNameStart = "Pilot"
             break
-        case .prod:
+        case .production:
             apiFileNameStart = "Prod"
             break
         }
diff --git a/Multipay/ViewControllers/Base/BaseVC.swift b/Multipay/ViewControllers/Base/BaseVC.swift
index 96e74e9..4194418 100644
--- a/Multipay/ViewControllers/Base/BaseVC.swift
+++ b/Multipay/ViewControllers/Base/BaseVC.swift
@@ -174,7 +174,7 @@ extension BaseVC {
         if(hasKeyboard){
             registerKeyboardNotificarion(false)
         }
-        if Multipay.testModeActive{
+        if Multipay.offlineModeActive{
             log.debug("Controller Disappear : \(self.className)")
         }
     }
diff --git a/Multipay/ViewControllers/Login/LoginVC.swift b/Multipay/ViewControllers/Login/LoginVC.swift
index a4406db..3e56032 100644
--- a/Multipay/ViewControllers/Login/LoginVC.swift
+++ b/Multipay/ViewControllers/Login/LoginVC.swift
@@ -219,7 +219,7 @@ class LoginVC: BaseVC {
     
     @IBAction func loginClicked(_ sender: AnyObject) {
         
-        if Multipay.testModeActive{
+        if Multipay.offlineModeActive{
             self.loginResponseModel = LoginResponseModel(result: LoginResponseModel.Result(gsm: emailPhoneView.textValue(), remainingTime: 30, verificationCode: "asd"), resultCode: 200, resultMessage: nil)
             performSegue(withIdentifier: "verifySegue", sender: self)
             return
diff --git a/Multipay/ViewControllers/Login/OTPVC.swift b/Multipay/ViewControllers/Login/OTPVC.swift
index fe4f59e..b4c2aaa 100644
--- a/Multipay/ViewControllers/Login/OTPVC.swift
+++ b/Multipay/ViewControllers/Login/OTPVC.swift
@@ -194,7 +194,7 @@ class OTPVC: BaseVC {
     
     fileprivate func initializeTimer(){
         
-        let constantTime: Int = Multipay.testModeActive ? 10 : 180
+        let constantTime: Int = Multipay.offlineModeActive ? 10 : 180
         
         if let data = loginResponseModel?.result ,  let remainTime  = data.remainingTime{
             self.timeCount = (remainTime < 1) ? constantTime : remainTime
@@ -223,7 +223,7 @@ class OTPVC: BaseVC {
             return
         }
         
-        if Multipay.testModeActive{
+        if Multipay.offlineModeActive{
             self.otpEndProcess(nil, otpResponseModel:nil)
             return
         }
@@ -250,8 +250,8 @@ class OTPVC: BaseVC {
                 }
                 
                 if let responseData  = data {
-                    if  strongSelf.checkResultCodeAndShowError(responseData,showMessage: Multipay.testModeActive ? false : true) == ServiceResultCodeType.exit {
-                        if Multipay.testModeActive{
+                    if  strongSelf.checkResultCodeAndShowError(responseData,showMessage: Multipay.offlineModeActive ? false : true) == ServiceResultCodeType.exit {
+                        if Multipay.offlineModeActive{
                             strongSelf.otpEndProcess(nil, otpResponseModel:nil)
                         }
                         return
@@ -267,7 +267,7 @@ class OTPVC: BaseVC {
                 return
             }
             
-            if Multipay.testModeActive{
+            if Multipay.offlineModeActive{
                 self.otpEndProcess(nil, otpResponseModel:nil)
             }
             
@@ -362,7 +362,7 @@ extension OTPVC {
             [weak self] (data, rawData) in
             log.error("error : \(data.description)")
             if let strongSelf = self{
-                if Multipay.testModeActive{
+                if Multipay.offlineModeActive{
                     strongSelf.processResendService(postDict: postDict, data: nil, rawData: nil)
                 }
                 else{
diff --git a/Multipay/ViewControllers/Login/RegisterVC.swift b/Multipay/ViewControllers/Login/RegisterVC.swift
index ea221fb..98bc075 100644
--- a/Multipay/ViewControllers/Login/RegisterVC.swift
+++ b/Multipay/ViewControllers/Login/RegisterVC.swift
@@ -227,7 +227,7 @@ class RegisterVC: BaseVC {
     
     @IBAction func registerButtonClicked(_ sender: AnyObject) {
         
-        if Multipay.testModeActive{
+        if Multipay.offlineModeActive{
             self.loginResponseModel = LoginResponseModel(result: LoginResponseModel.Result(gsm: "5321765109", remainingTime: 30, verificationCode: "asd"), resultCode: 200, resultMessage: nil)
             performSegue(withIdentifier: "otpSegue", sender: self)
             return
@@ -356,7 +356,7 @@ class RegisterVC: BaseVC {
 //MARK: - RegisterButton Active State
 extension RegisterVC {
     func decideRegisterButtonState(){
-        let isValid = Multipay.testModeActive ? true : isValid(shouldShowMessage: false)
+        let isValid = Multipay.offlineModeActive ? true : isValid(shouldShowMessage: false)
         
         if isValid {
             buttonRegister.setTitleColor(ColorPalette.login.girisYapActiveText, for: .normal)
diff --git a/Multipay/ViewControllers/Wallet/WalletViewController.swift b/Multipay/ViewControllers/Wallet/WalletViewController.swift
index 4376fbe..04e963e 100644
--- a/Multipay/ViewControllers/Wallet/WalletViewController.swift
+++ b/Multipay/ViewControllers/Wallet/WalletViewController.swift
@@ -51,7 +51,7 @@ class WalletViewController: BaseVC {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         
-        if Multipay.testModeActive
+        if Multipay.offlineModeActive
         {
             addTestModel()
             walletModelList.forEach { (model) in
@@ -171,7 +171,7 @@ extension WalletViewController: UITableViewDataSource, UITableViewDelegate {
             return WalletTableViewCell()
         }
         
-        if Multipay.testModeActive, let model = walletModelList[safeIndex:indexPath.row]{
+        if Multipay.offlineModeActive, let model = walletModelList[safeIndex:indexPath.row]{
             cell.initTestView(model: model)
         }
         else if let wallets = self.getWalletsResponseModel?.result?.wallets, let model = wallets[safeIndex:indexPath.row]{
@@ -183,7 +183,7 @@ extension WalletViewController: UITableViewDataSource, UITableViewDelegate {
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if Multipay.testModeActive{
+        if Multipay.offlineModeActive{
             return walletModelList.count
         }
         else{
@@ -207,7 +207,7 @@ extension WalletViewController: UITableViewDataSource, UITableViewDelegate {
             self.lastSelectedCard = realModel
         }
         
-        if Multipay.testModeActive{
+        if Multipay.offlineModeActive{
             walletModelList.forEach { (model) in
                 model.isChecked = false
             }
@@ -243,7 +243,7 @@ extension WalletViewController{
         
         log.debug("eslestir btn clicked")
         
-        guard let selected = self.lastSelectedCardTest, Multipay.testModeActive else {
+        guard let selected = self.lastSelectedCardTest, Multipay.offlineModeActive else {
             guard let selected = self.lastSelectedCard else{
                 return
             }
@@ -277,7 +277,7 @@ extension WalletViewController{
         log.debug("callGetWallets is called")
         
         var parameters : [String:String] = [:]
-        if let walletToken = Auth.walletToken {
+        if let walletToken = Auth.walletToken, walletToken.count > 0 {
             parameters[walletTokenKey] = walletToken
         }
         else{
@@ -313,7 +313,7 @@ extension WalletViewController{
                 }
                 
                 if let responseData  = data {
-                    if  strongSelf.checkResultCodeAndShowError(responseData,showMessage: Multipay.testModeActive ? false : true) == ServiceResultCodeType.exit {
+                    if  strongSelf.checkResultCodeAndShowError(responseData,showMessage: Multipay.offlineModeActive ? false : true) == ServiceResultCodeType.exit {
                         //strongSelf.navigationController?.popToRootViewController(animated: true)
                         return
                     }
@@ -384,7 +384,7 @@ extension WalletViewController{
                 lastSelectedCard.isSelected = true
                 
                 if let responseData  = data {
-                    if  self.checkResultCodeAndShowError(responseData,showMessage: Multipay.testModeActive ? false : true) == ServiceResultCodeType.exit {
+                    if  self.checkResultCodeAndShowError(responseData,showMessage: Multipay.offlineModeActive ? false : true) == ServiceResultCodeType.exit {
                         //self.navigationController?.popToRootViewController(animated: true)
                         return
                     }