Improve CMT JDBC Driver management