Use new command infrastructure