ContextMenu API Enhancement