Changed tables to use JDBC for future.