Use new commands API