Updated dependencies, tweaked code to match modified driver api.