More work on Java8