Updated to new Menu API