Better adjusted to Java 8