ContextMenu Class Revised