Updated to Java8