Changed Apache usage to Guava