Upgrade to fit JDBC in Java1.7