Adding support for context menus