Refactored JdbcConnect