Adding initial context menu support