Guava upgrade