Updated for latest Java 8 Lambda JDK APIs