todo
Get rid of guava dependency