adapt JDBC as well