Add guava:15.0 as dependency
refactor API methods