CLI expansion