diff --git a/build.gradle b/build.gradle
index 73dade74c8031bc8a68fbb3d8072b19d7b3bd761..78832236939b32124502cb5dd2c27a64600aa4b7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ def vSwagger = '2.4.0'
 def vHibernate = '4.3.11.Final'
 def vEhcache = '2.6.11'
 def vJackson = '2.6.5'
-def vPostgreSQL = '9.4.1207'
+def vPostgreSQL = '9.4.1209.jre7'
 def vServletApi = '3.1.0'
 def vTomcat = '7.0.68'
 def vCargo = '1.4.18'
diff --git a/src/main/java/org/nrg/xnat/initialization/tasks/EncryptXnatPasswords.java b/src/main/java/org/nrg/xnat/initialization/tasks/EncryptXnatPasswords.java
index fbc9f06307285389fe59adca04a19ef67beb7b47..da4903621481ce2efee196b11f80c4999093201c 100644
--- a/src/main/java/org/nrg/xnat/initialization/tasks/EncryptXnatPasswords.java
+++ b/src/main/java/org/nrg/xnat/initialization/tasks/EncryptXnatPasswords.java
@@ -83,10 +83,11 @@ public class EncryptXnatPasswords extends AbstractInitializingTask {
             }
             return passwords;
         }
+
         final ShaPasswordEncoder encoder = new ShaPasswordEncoder(256);
     }
 
-    private static Logger logger = LoggerFactory.getLogger(EncryptXnatPasswords.class);
+    private static final Logger logger = LoggerFactory.getLogger(EncryptXnatPasswords.class);
 
     private final JdbcTemplate _template;
 }
diff --git a/src/main/java/org/nrg/xnat/initialization/tasks/MigrateDatabaseTables.java b/src/main/java/org/nrg/xnat/initialization/tasks/MigrateDatabaseTables.java
new file mode 100644
index 0000000000000000000000000000000000000000..eb8d400c58293aea11f9e60d79259e3d3a27d71d
--- /dev/null
+++ b/src/main/java/org/nrg/xnat/initialization/tasks/MigrateDatabaseTables.java
@@ -0,0 +1,71 @@
+/*
+ * org.nrg.xnat.initialization.tasks.XnatPasswordEncrypter
+ * XNAT http://www.xnat.org
+ * Copyright (c) 2016, Washington University School of Medicine
+ * All Rights Reserved
+ *
+ * Released under the Simplified BSD.
+ */
+package org.nrg.xnat.initialization.tasks;
+
+import org.nrg.framework.utilities.BasicXnatResourceLocator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PropertiesLoaderUtils;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.BadSqlGrammarException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.ResultSetExtractor;
+import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+@Component
+public class MigrateDatabaseTables extends AbstractInitializingTask {
+    @Autowired
+    public MigrateDatabaseTables(final JdbcTemplate template) {
+        super();
+        _template = template;
+    }
+
+    @Override
+    public String getTaskName() {
+        return "Migrate XNAT database tables";
+    }
+
+    @Override
+    public void run() {
+        try {
+            for (final Resource resource : BasicXnatResourceLocator.getResources("classpath*:META-INF/xnat/migration/**/*-tables.properties")) {
+                final Properties properties = PropertiesLoaderUtils.loadProperties(resource);
+
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        BasicXnatResourceLocator.getResources()
+    }
+
+    private boolean tableExists(final String name) throws SQLException {
+        try (final Connection connection = _template.getDataSource().getConnection();
+             final ResultSet results = connection.getMetaData().getTables("catalog", null, name, new String[]{"TABLE"})) {
+            if (results.next()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static final Logger logger = LoggerFactory.getLogger(MigrateDatabaseTables.class);
+
+    private final JdbcTemplate _template;
+}