Refactor with plugs.menus