Added support for dynamic menus