Supporting Java 8 features