Use new on_command event handler.