Catching up with JDK8