First initial work to get it working on the JDBC driver.