- Minor update for context menu