Updated to use guava over outdated google-collections