Change to new command format