Getting rid of the guava dependency