Refactored: Use Guava ++