Updated builder factory to support multiple menus