More Java 8 support