Upgrade to guava version