Moving to Java 8 for 2.0