Updated to new guava version