diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt
index 66e5caaba0..a95fc87c59 100644
--- a/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt
+++ b/node/src/main/kotlin/net/corda/node/services/transactions/MySQLUniquenessProvider.kt
@@ -18,6 +18,7 @@ import com.zaxxer.hikari.HikariDataSource
 import net.corda.core.contracts.StateRef
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.sha256
+import net.corda.core.flows.NotarisationRequestSignature
 import net.corda.core.flows.NotaryError
 import net.corda.core.flows.NotaryInternalException
 import net.corda.core.flows.StateConsumptionDetails
@@ -42,6 +43,7 @@ class MySQLUniquenessProvider(
         metrics: MetricRegistry,
         configuration: MySQLConfiguration
 ) : UniquenessProvider, SingletonSerializeAsToken() {
+
     companion object {
         private val log = loggerFor<MySQLUniquenessProvider>()
 
@@ -108,7 +110,7 @@ class MySQLUniquenessProvider(
         dataSource.close()
     }
 
-    override fun commit(states: List<StateRef>, txId: SecureHash, callerIdentity: Party) {
+    override fun commit(states: List<StateRef>, txId: SecureHash, callerIdentity: Party, requestSignature: NotarisationRequestSignature) {
         val s = Stopwatch.createStarted()
         try {
             retryTransaction(CommitAll(states, txId, callerIdentity))
diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt b/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt
index d0e04d7937..223e171bf4 100644
--- a/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt
+++ b/node/src/main/kotlin/net/corda/node/services/transactions/PersistentUniquenessProvider.kt
@@ -57,7 +57,6 @@ class PersistentUniquenessProvider(val clock: Clock) : UniquenessProvider, Singl
             @Column(name = "consuming_transaction_id")
             val consumingTxHash: String,
 
-            @Embedded
             @Column(name = "requesting_party_name")
             var partyName: String,
 
diff --git a/node/src/main/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLog.kt b/node/src/main/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLog.kt
index 414992e165..8a95adb9b4 100644
--- a/node/src/main/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLog.kt
+++ b/node/src/main/kotlin/net/corda/node/services/transactions/RaftTransactionCommitLog.kt
@@ -1,3 +1,13 @@
+/*
+ * R3 Proprietary and Confidential
+ *
+ * Copyright (c) 2018 R3 Limited.  All rights reserved.
+ *
+ * The intellectual and technical concepts contained herein are proprietary to R3 and its suppliers and are protected by trade secret law.
+ *
+ * Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited.
+ */
+
 package net.corda.node.services.transactions
 
 import io.atomix.catalyst.buffer.BufferInput
diff --git a/node/src/main/resources/migration/node-notary.changelog-init.xml b/node/src/main/resources/migration/node-notary.changelog-init.xml
index 48f75924b6..e8345d268b 100644
--- a/node/src/main/resources/migration/node-notary.changelog-init.xml
+++ b/node/src/main/resources/migration/node-notary.changelog-init.xml
@@ -23,45 +23,65 @@
             <column name="transaction_id" type="NVARCHAR(64)">
                 <constraints nullable="false"/>
             </column>
-            <column name="consuming_input_index" type="INT"/>
-            <column name="consuming_transaction_id" type="NVARCHAR(255)"/>
-            <column name="requesting_party_name" type="NVARCHAR(255)"/>
-            <column name="requesting_party_key" type="varbinary(255)"/>
+            <column name="consuming_transaction_id" type="NVARCHAR(64)"/>
         </createTable>
     </changeSet>
     <changeSet author="R3.Corda" id="1511451595465-16">
-        <createTable tableName="node_notary_commit_log">
+        <createTable tableName="node_notary_committed_states">
             <column name="output_index" type="INT">
                 <constraints nullable="false"/>
             </column>
             <column name="transaction_id" type="NVARCHAR(64)">
                 <constraints nullable="false"/>
             </column>
-            <column name="consuming_input_index" type="INT"/>
-            <column name="consuming_transaction_id" type="NVARCHAR(255)"/>
-            <column name="requesting_party_name" type="NVARCHAR(255)"/>
-            <column name="requesting_party_key" type="varbinary(255)"/>
+            <column name="consuming_transaction_id" type="NVARCHAR(64)"/>
         </createTable>
     </changeSet>
     <changeSet author="R3.Corda" id="1511451595465-18">
         <createTable tableName="node_raft_committed_states">
-            <column name="id" type="NVARCHAR(255)">
+            <column name="transaction_id" type="NVARCHAR(64)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="output_index" type="INT(10)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="raft_log_index" type="BIGINT(19)"/>
+            <column name="consuming_transaction_id" type="NVARCHAR(64)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="R3.Corda" id="1521131680317-17">
+        <createTable tableName="node_notary_request_log">
+            <column autoIncrement="true" name="id" type="INT(10)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="consuming_transaction_id" type="NVARCHAR(64)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="requesting_party_name" type="NVARCHAR(255)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="request_timestamp" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="request_signature" type="BLOB">
                 <constraints nullable="false"/>
             </column>
-            <column name="state_index" type="BIGINT"/>
-            <column name="state_value" type="blob"/>
         </createTable>
     </changeSet>
     <changeSet author="R3.Corda" id="1511451595465-31">
-        <addPrimaryKey columnNames="output_index, transaction_id" constraintName="node_bft_committed_states_pkey"
+        <addPrimaryKey columnNames="output_index, transaction_id" constraintName="node_bft_states_pkey"
                        tableName="node_bft_committed_states"/>
     </changeSet>
     <changeSet author="R3.Corda" id="1511451595465-41">
-        <addPrimaryKey columnNames="output_index, transaction_id" constraintName="node_notary_commit_log_pkey"
-                       tableName="node_notary_commit_log"/>
+        <addPrimaryKey columnNames="output_index, transaction_id" constraintName="node_notary_states_pkey"
+                       tableName="node_notary_committed_states"/>
     </changeSet>
     <changeSet author="R3.Corda" id="1511451595465-43">
-        <addPrimaryKey columnNames="id" constraintName="node_raft_comm_states_pkey"
+        <addPrimaryKey columnNames="output_index, transaction_id" constraintName="node_raft_state_pkey"
                        tableName="node_raft_committed_states"/>
     </changeSet>
+    <changeSet author="R3.Corda" id="1521131680317-48">
+        <addPrimaryKey columnNames="id" constraintName="node_notary_request_log_pkey"
+                       tableName="node_notary_request_log"/>
+    </changeSet>
 </databaseChangeLog>