Add close JDBC methods in tools