Refactor ServiceGroup to reflect recent changes in Guava library