Add util methods, update deprecated Guava calls