replaced google-collect by guava