Include support for Java 8