Update for Java8