Updated context menu creation mechanism