Upgrading to java-driver 2.0