diff --git a/BUILD b/BUILD
index 441fa83..7939099 100644
--- a/BUILD
+++ b/BUILD
@@ -28,7 +28,6 @@
 
 junit_tests(
     name = "verify-status_tests",
-    size = "small",
     srcs = ["src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java"],
     tags = ["verify-status"],
     deps = [
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceProvider.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceProvider.java
index 828d2e3..00bc3c5 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceProvider.java
@@ -69,7 +69,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
     this.metrics = metrics;
     this.ctx = ctx;
     this.dst = dst;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceTypeGuesser.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceTypeGuesser.java
index 00bf457..07cd81c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceTypeGuesser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/CiDataSourceTypeGuesser.java
@@ -39,7 +39,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
   }
 
   public String guessDataSourceType() {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Derby.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Derby.java
index 2e8b173..108dcc2 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Derby.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Derby.java
@@ -40,7 +40,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
   }
 
   @Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/H2.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/H2.java
index 8685f21..948a7e7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/H2.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/H2.java
@@ -40,7 +40,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
   }
 
   @Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/MySql.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/MySql.java
index 6906a1f..03abf67 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/MySql.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/MySql.java
@@ -38,7 +38,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
   }
 
   @Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Oracle.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Oracle.java
index 20b348a..006a1a3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Oracle.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/Oracle.java
@@ -38,7 +38,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
   }
 
   @Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/PostgreSQL.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/PostgreSQL.java
index 8038b46..3a42370 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/PostgreSQL.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/server/schema/PostgreSQL.java
@@ -38,7 +38,7 @@
     } catch (IOException | ConfigInvalidException e) {
       throw new ProvisionException(e.getMessage(), e);
     }
-    this.config = new PluginConfig(pluginName, cfg);
+    this.config = PluginConfig.create(pluginName, cfg, null);
   }
 
   @Override