added Guava support