Added JDBC driver handling
Added a few comments