Guava support added