Adapted to use lucitec/base-java8