Updated (or corrected) everything for JDBC