Updated to Java 8