Update for latest version of datatypes, Guava