vietj Adapt to CompositeFuture changes