Changes for Java 8 enhancements.