Update to Java 8 supervision