Adapted to new CLI library version