(Menu) Two more enums can go