Removed dependency to Guava by using java 8 features