Adding support to Java 8