diff --git a/Dockerfile.test b/Dockerfile.test
index 13d54056..2a261e67 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -2,7 +2,7 @@ FROM mhart/alpine-node:9.11.1
 
 RUN apk add --no-cache git curl make gcc g++ python linux-headers
 
-RUN npm install -g truffle@4.0.1 typescript@2.4.2
+RUN npm install -g truffle@4.1.7 typescript@2.7.1
 
 ADD package.json package.json
 
diff --git a/contracts/LoopringProtocol.sol b/contracts/LoopringProtocol.sol
index bf065ea3..54db794b 100644
--- a/contracts/LoopringProtocol.sol
+++ b/contracts/LoopringProtocol.sol
@@ -28,12 +28,12 @@ contract LoopringProtocol {
     uint8   public constant OPTION_MASK_CAP_BY_AMOUNTB = 0x01;
 
     struct Fill {
-        bytes32 orderHash;
-        uint    amountS;
-        uint    lrcReward;
-        uint    lrcFee;
-        uint    splitS;
-        uint    splitB;
+        bytes32     orderHash;
+        address     owner;
+        address     tokenS;
+        uint        amountS;
+        int         split;  // Positive number for splitS and negaive for splitB .
+        int         lrcFee;
     }
 
     event RingMined(
diff --git a/contracts/LoopringProtocolImpl.sol b/contracts/LoopringProtocolImpl.sol
index d3749d8e..146c248a 100644
--- a/contracts/LoopringProtocolImpl.sol
+++ b/contracts/LoopringProtocolImpl.sol
@@ -768,11 +768,11 @@ contract LoopringProtocolImpl is LoopringProtocol {
 
             fills[i]  = Fill(
                 order.orderHash,
+                order.owner,
+                order.tokenS,
                 order.fillAmountS,
-                order.lrcReward,
-                order.lrcFeeState,
-                order.splitS,
-                order.splitB
+                order.splitS > 0 ? int(order.splitS) : -int(order.splitB),
+                int(order.lrcFeeState) - int(order.lrcReward)
             );
 
             prevSplitB = order.splitB;