Added Java 8 code