Update for mock and menus