Switched to JDK8