Added context menu for Key-Value commands