Use new command framework