Replace Lists with guava