Continued Java 8 conversion