Updates for context menu targeting