Dominic: use Java 8