Adding support for submenus