diff --git a/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java b/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java
index ae30d323a3166a7527c6f77d4bf424a3aeb7aba4..668baffa4e3a1aa58727cd2513401cc172303f33 100644
--- a/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java
+++ b/src/main/java/neatlogic/framework/sqlrunner/SqlInfo.java
@@ -60,6 +60,8 @@ public class SqlInfo {
      */
     private Integer pageSize = 20;
 
+    private String tableContent;
+
     public String getId() {
         return id;
     }
@@ -147,4 +149,12 @@ public class SqlInfo {
     public void setPageSize(Integer pageSize) {
         this.pageSize = pageSize;
     }
+
+    public String getTableContent() {
+        return tableContent;
+    }
+
+    public void setTableContent(String tableContent) {
+        this.tableContent = tableContent;
+    }
 }
diff --git a/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java b/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java
index 51253ae493de3e357a33983c9072c487681e98db..647e8ce7fb045875d7f5729578dcea5e7d146e2e 100644
--- a/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java
+++ b/src/main/java/neatlogic/framework/sqlrunner/SqlRunner.java
@@ -30,10 +30,7 @@ import javax.sql.DataSource;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
@@ -59,16 +56,16 @@ public class SqlRunner {
         this(mapperXml, namespace, null);
     }
 
-    public SqlRunner(String mapperXml, DataSource dataSource) {
-        this(mapperXml, null, dataSource);
+    public SqlRunner(String mapperXml, DataSource _dataSource) {
+        this(mapperXml, null, _dataSource);
     }
 
-    public SqlRunner(String mapperXml, String namespace, DataSource dataSource) {
+    public SqlRunner(String mapperXml, String namespace, DataSource _dataSource) {
         if (StringUtils.isNotBlank(namespace)) {
             this.namespace = namespace;
         }
-        if (dataSource != null) {
-            this.dataSource = dataSource;
+        if (_dataSource != null) {
+            dataSource = _dataSource;
         }
 
         Configuration configuration = new Configuration();
@@ -76,9 +73,10 @@ public class SqlRunner {
         configuration.addInterceptor(new SqlCostInterceptor());
         configuration.addInterceptor(new LimitInterceptor());
         configuration.addInterceptor(new PageInterceptor());
-        Environment environment = new Environment("", new SpringManagedTransactionFactory(), this.dataSource);
+        Environment environment = new Environment("", new SpringManagedTransactionFactory(), dataSource);
         configuration.setEnvironment(environment);
         configuration.setDefaultStatementTimeout(Config.SQLRUNNER_QUERY_TIMEOUT());
+        configuration.setCallSettersOnNulls(true);
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(DOCTYPE);
         stringBuilder.append("<mapper namespace=\"").append(this.namespace).append("\">");