Add context menu support