Rework the command mapping.