diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7e3b578..d7031dc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,14 @@
   <component name="ChangeListManager">
     <list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/msp/org1/User-org1.context" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/msp/org1/User2-org1.context" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/msp/org1/admin.context" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -19,38 +24,112 @@
     <session id="-1607393105">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="2" />
-          <entry key="project.open.time.5" value="1" />
-          <entry key="project.open.time.6" value="2" />
-          <entry key="project.opened" value="3" />
+          <entry key="project.closed" value="13" />
+          <entry key="project.open.time.5" value="3" />
+          <entry key="project.open.time.6" value="9" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.opened" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="class" value="1" />
-          <entry key="java" value="7" />
+          <entry key="class" value="3" />
+          <entry key="java" value="26" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="CLASS" value="1" />
-          <entry key="JAVA" value="7" />
+          <entry key="CLASS" value="3" />
+          <entry key="JAVA" value="26" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="45" />
+          <entry key="java" value="168" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="45" />
+          <entry key="JAVA" value="168" />
         </counts>
       </usages-collector>
     </session>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="201">
+              <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="272">
+              <caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="357">
+              <caret line="27" column="61" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="748">
+              <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="442">
+              <caret line="38" column="65" selection-start-line="38" selection-start-column="65" selection-end-line="38" selection-end-column="65" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="28" column="42" lean-forward="true" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="748">
+              <caret line="59" column="108" selection-start-line="59" selection-start-column="108" selection-end-line="59" selection-end-column="108" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
@@ -62,6 +141,7 @@
   <component name="FindInProjectRecents">
     <findStrings>
       <find>uSecret</find>
+      <find>uSec</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -86,10 +166,8 @@
         <option value="$PROJECT_DIR$/src/main/java/blockchain/utility/Util.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/utility/UtilTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java" />
-        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java" />
-        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java" />
         <option value="$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java" />
@@ -97,9 +175,12 @@
         <option value="$PROJECT_DIR$/src/main/java/restService/StringResponse.java" />
         <option value="$PROJECT_DIR$/src/main/java/restImplementation/BlockchainQueryImplementation.java" />
         <option value="$PROJECT_DIR$/src/main/java/restService/BlockchainQueryResource.java" />
-        <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
-        <option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java" />
+        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" />
+        <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
+        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
       </list>
     </option>
   </component>
@@ -158,6 +239,14 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="application" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -184,6 +273,15 @@
               <item name="blockchain" type="462c0819:PsiDirectoryNode" />
               <item name="configuration" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
+              <item name="query" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -210,6 +308,15 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="database" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="database" type="462c0819:PsiDirectoryNode" />
+              <item name="transaction" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -265,6 +372,33 @@
               <item name="blockchain" type="462c0819:PsiDirectoryNode" />
               <item name="client" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
+              <item name="query" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
+              <item name="queryWrapper" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
+              <item name="java-api" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
+              <item name="user" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -283,7 +417,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1543747284804" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551295777732" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -309,7 +443,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.ReadUserTest">
+  <component name="RunManager" selected="JUnit.QueryTest">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
@@ -422,11 +556,11 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.ReadUserTest" />
-        <item itemvalue="JUnit.TestRegisterEnrollUser" />
-        <item itemvalue="JUnit.QueryChannelTest" />
         <item itemvalue="JUnit.QueryTest" />
+        <item itemvalue="JUnit.QueryChannelTest" />
         <item itemvalue="JUnit.TestEnrollAdmin" />
+        <item itemvalue="JUnit.TestRegisterEnrollUser" />
+        <item itemvalue="JUnit.ReadUserTest" />
       </list>
     </recent_temporary>
   </component>
@@ -456,49 +590,59 @@
       <workItem from="1543224100704" duration="2118000" />
       <workItem from="1543744990946" duration="2101000" />
       <workItem from="1543747427112" duration="38000" />
-      <workItem from="1543749977543" duration="299000" />
+      <workItem from="1543749977543" duration="413000" />
+      <workItem from="1550503489998" duration="508000" />
+      <workItem from="1550517144269" duration="438000" />
+      <workItem from="1550853013374" duration="370000" />
+      <workItem from="1550859445553" duration="1438000" />
+      <workItem from="1550938093318" duration="1075000" />
+      <workItem from="1550947009408" duration="1293000" />
+      <workItem from="1551119277467" duration="1152000" />
+      <workItem from="1551124909913" duration="739000" />
+      <workItem from="1551206164180" duration="2072000" />
+      <workItem from="1551295665994" duration="704000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="QueryTest - 2018.11.16 at 19h 41m 17s.xml">
+    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 52m 21s.xml">
+      <configuration name="QueryChannelTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.02.26 at 19h 52m 32s.xml">
       <configuration name="QueryTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="TestEnrollAdmin - 2018.11.16 at 19h 43m 42s.xml">
+    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 52m 57s.xml">
+      <configuration name="QueryChannelTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.02.26 at 19h 53m 12s.xml">
+      <configuration name="QueryTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 53m 28s.xml">
+      <configuration name="QueryChannelTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.02.26 at 19h 53m 38s.xml">
+      <configuration name="QueryTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 54m 09s.xml">
+      <configuration name="QueryChannelTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestEnrollAdmin - 2019.02.27 at 20h 28m 27s.xml">
       <configuration name="TestEnrollAdmin" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="QueryTest - 2018.11.16 at 19h 44m 27s.xml">
-      <configuration name="QueryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryChannelTest - 2018.11.16 at 19h 46m 25s.xml">
+    <history-entry file="QueryChannelTest - 2019.02.27 at 20h 28m 38s.xml">
       <configuration name="QueryChannelTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="QueryTest - 2018.11.16 at 19h 48m 08s.xml">
+    <history-entry file="QueryTest - 2019.02.27 at 20h 28m 57s.xml">
       <configuration name="QueryTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="QueryTest - 2018.11.16 at 19h 49m 05s.xml">
-      <configuration name="QueryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryTest - 2018.11.16 at 19h 50m 50s.xml">
-      <configuration name="QueryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryChannelTest - 2018.11.16 at 19h 51m 50s.xml">
-      <configuration name="QueryChannelTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestRegisterEnrollUser - 2018.12.02 at 11h 12m 14s.xml">
-      <configuration name="TestRegisterEnrollUser" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="ReadUserTest - 2018.12.02 at 11h 31m 41s.xml">
-      <configuration name="ReadUserTest" configurationId="JUnit" />
-    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33083000" />
+    <option name="totallyTimeSpent" value="42986000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25596184" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27623212" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -509,7 +653,7 @@
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8434022" weight="0.40405616" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8398251" weight="0.45787832" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -518,7 +662,7 @@
       <window_info anchor="bottom" id="Messages" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="10" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.15659778" side_tool="true" visible="true" weight="0.31123245" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16017488" side_tool="true" visible="true" weight="0.45787832" />
       <window_info anchor="bottom" id="Spring" order="12" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -597,20 +741,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
-          <caret line="44" selection-start-line="44" selection-end-line="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hyperledger/fabric-sdk-java/fabric-sdk-java/1.2.1/fabric-sdk-java-1.2.1.jar!/org/hyperledger/fabric/sdk/HFClient.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="49" selection-start-line="49" selection-end-line="49" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/user/UserContextTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="68">
@@ -633,48 +763,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="32" column="49" selection-start-line="32" selection-start-column="49" selection-end-line="32" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="714">
-          <caret line="50" selection-start-line="50" selection-end-line="50" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="23" column="65" lean-forward="true" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="408">
-          <caret line="32" selection-start-line="32" selection-end-line="32" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="33" selection-start-line="33" selection-end-line="33" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/restImplementation/UserLoggerTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -728,23 +816,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1014">
           <caret line="68" column="13" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="68">
-          <caret line="4" column="49" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="49" />
         </state>
       </provider>
     </entry>
@@ -776,9 +847,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="170">
           <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="16" selection-end-column="27" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -796,6 +864,90 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/queryWrapper/QueryWrapperTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="578">
+          <caret line="50" selection-start-line="50" selection-end-line="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/hyperledger/fabric-sdk-java/fabric-sdk-java/1.2.1/fabric-sdk-java-1.2.1.jar!/org/hyperledger/fabric/sdk/HFClient.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="234" column="23" selection-start-line="234" selection-start-column="23" selection-end-line="234" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="357">
+          <caret line="27" column="61" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="748">
+          <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="442">
+          <caret line="38" column="65" selection-start-line="38" selection-start-column="65" selection-end-line="38" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="748">
+          <caret line="59" column="108" selection-start-line="59" selection-start-column="108" selection-end-line="59" selection-end-column="108" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="28" column="42" lean-forward="true" selection-start-line="28" selection-start-column="42" selection-end-line="28" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="201">
+          <caret line="36" column="31" selection-start-line="36" selection-start-column="31" selection-end-line="36" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/msp/org1/User-org1.context b/msp/org1/User-org1.context
deleted file mode 100644
index 0dbf1f5..0000000
Binary files a/msp/org1/User-org1.context and /dev/null differ
diff --git a/msp/org1/User2-org1.context b/msp/org1/User2-org1.context
deleted file mode 100644
index 651edfc..0000000
Binary files a/msp/org1/User2-org1.context and /dev/null differ
diff --git a/msp/org1/admin.context b/msp/org1/admin.context
index 7511448..9cd1a0c 100644
Binary files a/msp/org1/admin.context and b/msp/org1/admin.context differ
diff --git a/src/main/java/blockchain/client/ChannelClientWrapper.java b/src/main/java/blockchain/client/ChannelClientWrapper.java
index 4e84469..6f67847 100644
--- a/src/main/java/blockchain/client/ChannelClientWrapper.java
+++ b/src/main/java/blockchain/client/ChannelClientWrapper.java
@@ -56,7 +56,8 @@ public class ChannelClientWrapper {
 
         channel = channelClientWrapper.getChannel();
         Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
-        EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
+        //EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
+        EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:7053");
         Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
         channel.addPeer(peer);
         channel.addEventHub(eventHub);
diff --git a/src/main/java/blockchain/configuration/Config.java b/src/main/java/blockchain/configuration/Config.java
index a56f753..161b839 100644
--- a/src/main/java/blockchain/configuration/Config.java
+++ b/src/main/java/blockchain/configuration/Config.java
@@ -7,7 +7,7 @@ public class Config {
     //ORGANIZATION
     public static final String ORG1_MSP = "Org1MSP";
 
-    public static final String ORG1 = "org1";
+    public static final String ORG1 = "Org1";
 
     //ADMIN
     public static final String ADMIN = "admin";
@@ -15,25 +15,33 @@ public class Config {
     public static final String ADMIN_PASSWORD = "adminpw";
 
     //USER
-    public static final String UserPWD = "ZIidLJHQbLcC";
+    //public static final String UserPWD = "ZIidLJHQbLcC";
+    public static final String UserPWD = "OelXVCdHnYPe";
+
+
 
     //CA
-    public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054";
+    //public static final String CA_ORG1_URL = "http://vps577432.ovh.net:7054";
+    public static final String CA_ORG1_URL = "http://93.30.148.59:7054";
 
     //ORDERER
-    public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050";
+    //public static final String ORDERER_URL = "grpc://vps577432.ovh.net:7050";
+    public static final String ORDERER_URL = "grpc://93.30.148.59:7050";
 
     public static final String ORDERER_NAME = "orderer.example.com";
 
     //CHANNEL - CHAINCODE
     public static final String CHANNEL_NAME = "mychannel";
 
-    public static final String CHAINCODE_NAME = "mycc";
+    //public static final String CHAINCODE_NAME = "mycc";
+    public static final String CHAINCODE_NAME = "monnethic";
 
     //PEER 0
     public static final String ORG1_PEER_0 = "peer0.org1.example.com";
 
-    public static final String ORG1_PEER_0_URL = "grpc://vps577432.ovh.net:8051";
+    //public static final String ORG1_PEER_0_URL = "grpc://vps577432.ovh.net:8051";
+    public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:7051";
+    //public static final String ORG1_PEER_0_URL = "grpc://93.30.148.59:8051";
 
     //PEER 1
     public static final String ORG_PEER = "peer1.org1.example.com";
diff --git a/src/test/java/blockchain/client/TestRegisterEnrollUser.java b/src/test/java/blockchain/client/TestRegisterEnrollUser.java
index 3957856..d1ffb21 100644
--- a/src/test/java/blockchain/client/TestRegisterEnrollUser.java
+++ b/src/test/java/blockchain/client/TestRegisterEnrollUser.java
@@ -21,7 +21,7 @@ public class TestRegisterEnrollUser {
             caClientWrapper.setAdminContext(admin);
             UserContext userContext = new UserContext();
 
-            userContext.setName("User2-org1");
+            userContext.setName("User-org1");
             userContext.setAffiliation(Config.ORG1);
             userContext.setMspId(Config.ORG1_MSP);
             String userSecret = caClientWrapper.registerUser(userContext.getName(),userContext.getAffiliation());
diff --git a/src/test/java/blockchain/query/QueryChannelTest.java b/src/test/java/blockchain/query/QueryChannelTest.java
index b118aa4..5b9fe34 100644
--- a/src/test/java/blockchain/query/QueryChannelTest.java
+++ b/src/test/java/blockchain/query/QueryChannelTest.java
@@ -20,7 +20,7 @@ public class QueryChannelTest {
     @Test
     public void testQ(){
         BasicConfigurator.configure();
-        UserContext userContext = Util.readUserContext(Config.ORG1,"User-org1");
+        UserContext userContext = Util.readUserContext(Config.ORG1,"admin");
 
         try{
             FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(userContext);
diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java
index 39613f3..9ef3b63 100644
--- a/src/test/java/blockchain/query/QueryTest.java
+++ b/src/test/java/blockchain/query/QueryTest.java
@@ -23,7 +23,7 @@ public class QueryTest {
         BasicConfigurator.configure();
 
         //UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
-        UserContext user = Util.readUserContext(Config.ORG1,"User-org1");
+        UserContext user = Util.readUserContext(Config.ORG1,"admin");
 
         try{
             String chaincode = Config.CHAINCODE_NAME;