Update to mappings for <menuitem>