Upgraded to user guava 1.6