Guava enhancements