Looks good. But it's not clear from this diagram what will happen if switch in unmapped. Could you add this?