Add support for Java 8