Updated to newer version of guava