Add submenu support