Added support for menuitem class