Updated to JDK8