Adapted to new captain-core version