[MOD] Changed Guava's Optional to Java8's Optional.