Adding support for menus