Change to use guava more