End of refactoring, now testing on Guava