IMenuService refactoring