Replaced new HashSet<T> inst's with Guava Collections