diff --git a/MarketBoardPlugin/GUI/MarketBoardConfigWindow.cs b/MarketBoardPlugin/GUI/MarketBoardConfigWindow.cs
index f07a5d4..9c974a4 100644
--- a/MarketBoardPlugin/GUI/MarketBoardConfigWindow.cs
+++ b/MarketBoardPlugin/GUI/MarketBoardConfigWindow.cs
@@ -40,7 +40,7 @@ public override void Draw()
       this.Checkbox("No Gil Sales Tax", "Toggles whether the Gil Sales Tax is included", this.Plugin.Config.NoGilSalesTax, (v) =>
       {
         this.Plugin.Config.NoGilSalesTax = v;
-        MBPlugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
+        this.Plugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
         this.Plugin.ResetMarketData();
       });
 
@@ -56,7 +56,7 @@ public override void Draw()
       if (this.Plugin.Config.MarketBufferSize != marketBufferSize)
       {
         this.Plugin.Config.MarketBufferSize = marketBufferSize;
-        MBPlugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
+        this.Plugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
       }
 
       var itemRefreshTimeout = this.Plugin.Config.ItemRefreshTimeout;
@@ -65,7 +65,7 @@ public override void Draw()
       if (this.Plugin.Config.ItemRefreshTimeout != itemRefreshTimeout)
       {
         this.Plugin.Config.ItemRefreshTimeout = itemRefreshTimeout;
-        MBPlugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
+        this.Plugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
       }
     }
 
@@ -73,7 +73,7 @@ private void Checkbox(string label, string description, bool oldValue, Action<bo
     {
       if (ImGuiUtil.Checkbox(label, description, oldValue, setter))
       {
-        MBPlugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
+        this.Plugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
       }
     }
   }
diff --git a/MarketBoardPlugin/GUI/MarketBoardShoppingListWindow.cs b/MarketBoardPlugin/GUI/MarketBoardShoppingListWindow.cs
index 4735d1e..0e33de7 100644
--- a/MarketBoardPlugin/GUI/MarketBoardShoppingListWindow.cs
+++ b/MarketBoardPlugin/GUI/MarketBoardShoppingListWindow.cs
@@ -101,7 +101,7 @@ private void Checkbox(string label, string description, bool oldValue, Action<bo
     {
       if (ImGuiUtil.Checkbox(label, description, oldValue, setter))
       {
-        MBPlugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
+        this.Plugin.PluginInterface.SavePluginConfig(this.Plugin.Config);
       }
     }
   }
diff --git a/MarketBoardPlugin/GUI/MarketBoardWindow.cs b/MarketBoardPlugin/GUI/MarketBoardWindow.cs
index 2cd1329..fa27d80 100644
--- a/MarketBoardPlugin/GUI/MarketBoardWindow.cs
+++ b/MarketBoardPlugin/GUI/MarketBoardWindow.cs
@@ -15,10 +15,9 @@ namespace MarketBoardPlugin.GUI
   using System.Threading.Tasks;
   using Dalamud.Game.Text;
   using Dalamud.Interface;
-  using Dalamud.Interface.Components;
-  using Dalamud.Interface.Internal;
   using Dalamud.Interface.ManagedFontAtlas;
-  using Dalamud.Interface.Utility.Raii;
+  using Dalamud.Interface.Textures;
+  using Dalamud.Interface.Textures.TextureWraps;
   using Dalamud.Interface.Windowing;
   using Dalamud.Plugin.Services;
   using ImGuiNET;
@@ -83,8 +82,6 @@ public class MarketBoardWindow : Window, IDisposable
 
     private ClassJob selectedClassJob;
 
-    private IDalamudTextureWrap selectedItemIcon;
-
     private bool hQOnly;
 
     private ulong playerId;
@@ -116,6 +113,7 @@ public class MarketBoardWindow : Window, IDisposable
     public MarketBoardWindow(MBPlugin plugin)
       : base("Market Board")
     {
+      this.plugin = plugin ?? throw new ArgumentNullException(nameof(plugin));
       this.Flags = ImGuiWindowFlags.NoScrollbar;
       this.Size = new Vector2(800, 600);
       this.SizeCondition = ImGuiCond.FirstUseEver;
@@ -126,8 +124,8 @@ public MarketBoardWindow(MBPlugin plugin)
       };
 
       this.marketBuffer = new List<MarketDataResponse>();
-      this.items = MBPlugin.Data.GetExcelSheet<Item>();
-      this.classJobs = MBPlugin.Data.GetExcelSheet<ClassJob>()?
+      this.items = plugin.DataManager.GetExcelSheet<Item>();
+      this.classJobs = plugin.DataManager.GetExcelSheet<ClassJob>()?
         .Where(cj => cj.RowId != 0)
         .OrderBy(cj =>
         {
@@ -141,13 +139,12 @@ public MarketBoardWindow(MBPlugin plugin)
             _ => 4,
           };
         }).ToList();
-      this.plugin = plugin ?? throw new ArgumentNullException(nameof(plugin));
       this.sortedCategoriesAndItems = this.SortCategoriesAndItems();
 
-      MBPlugin.Framework.Update += this.HandleFrameworkUpdateEvent;
-      MBPlugin.GameGui.HoveredItemChanged += this.HandleHoveredItemChange;
+      this.plugin.Framework.Update += this.HandleFrameworkUpdateEvent;
+      this.plugin.GameGui.HoveredItemChanged += this.HandleHoveredItemChange;
 
-      this.defaultFontHandle = MBPlugin.PluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
+      this.defaultFontHandle = this.plugin.PluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
         e.OnPreBuild(toolkit =>
           toolkit.AddFontFromStream(
             this.GetType().Assembly.GetManifestResourceStream("MarketBoardPlugin.Resources.NotoSans-Medium-NNBSP.otf"),
@@ -160,11 +157,9 @@ public MarketBoardWindow(MBPlugin plugin)
             false,
             "NNBSP")));
 
-      this.titleFontHandle = MBPlugin.PluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
+      this.titleFontHandle = this.plugin.PluginInterface.UiBuilder.FontAtlas.NewDelegateFontHandle(e =>
         e.OnPreBuild(toolkit =>
-          toolkit.AddDalamudDefaultFont(MBPlugin.PluginInterface.UiBuilder.DefaultFontSpec.SizePx * 1.5f)));
-
-      MBPlugin.PluginInterface.UiBuilder.RebuildFonts();
+          toolkit.AddDalamudDefaultFont(this.plugin.PluginInterface.UiBuilder.DefaultFontSpec.SizePx * 1.5f)));
 
       var imPlotStylePtr = ImPlot.GetStyle();
 
@@ -347,7 +342,7 @@ void SelectClassJob(ClassJob classJob)
       {
         ImGui.Text("History");
         ImGui.Separator();
-        var sheet = MBPlugin.Data.Excel.GetSheet<Item>();
+        var sheet = this.plugin.DataManager.Excel.GetSheet<Item>();
         foreach (var id in this.plugin.Config.History.ToArray())
         {
           var item = sheet.GetRow(id);
@@ -366,7 +361,7 @@ void SelectClassJob(ClassJob classJob)
       {
         ImGui.Text("Favorites");
         ImGui.Separator();
-        var sheet = MBPlugin.Data.Excel.GetSheet<Item>();
+        var sheet = this.plugin.DataManager.Excel.GetSheet<Item>();
         foreach (var id in this.plugin.Config.Favorites.ToArray())
         {
           var item = sheet.GetRow(id);
@@ -477,7 +472,7 @@ void SelectClassJob(ClassJob classJob)
         else
         {
           this.progressPosition = 0;
-          var itemId = MBPlugin.GameGui.HoveredItem;
+          var itemId = this.plugin.GameGui.HoveredItem;
           this.ChangeSelectedItem(Convert.ToUInt32(itemId % 500000));
           this.itemBeingHovered = 0;
         }
@@ -505,18 +500,26 @@ void SelectClassJob(ClassJob classJob)
 
       if (this.selectedItem?.RowId > 0)
       {
-        if (this.selectedItemIcon != null)
+        var couldGetIcon = this.plugin.TextureProvider.GetFromGameIcon(new GameIconLookup
         {
-          if (ImGui.ImageButton(this.selectedItemIcon.ImGuiHandle, new Vector2(40, 40)))
+          IconId = this.selectedItem.Icon,
+        }).TryGetWrap(out var selectedItemIcon, out _);
+
+        using (selectedItemIcon)
+        {
+          if (couldGetIcon)
           {
-            ImGui.LogToClipboard();
-            ImGui.LogText(this.selectedItem.Name);
-            ImGui.LogFinish();
+            if (ImGui.ImageButton(selectedItemIcon.ImGuiHandle, new Vector2(40, 40)))
+            {
+              ImGui.LogToClipboard();
+              ImGui.LogText(this.selectedItem.Name);
+              ImGui.LogFinish();
+            }
+          }
+          else
+          {
+            ImGui.SetCursorPos(new Vector2(40, 40));
           }
-        }
-        else
-        {
-          ImGui.SetCursorPos(new Vector2(40, 40));
         }
 
         this.titleFontHandle.Push();
@@ -848,8 +851,7 @@ internal void ChangeSelectedItem(uint itemId, bool noHistory = false)
       this.selectedItem = this.items.Single(i => i.RowId == itemId);
 
       var iconId = this.selectedItem.Icon;
-      this.selectedItemIcon?.Dispose();
-      this.selectedItemIcon = MBPlugin.TextureProvider.GetIcon(iconId);
+      this.plugin.Log.Verbose("Selected item: {0} ({1}), icon: {2}", this.selectedItem.Name, this.selectedItem.RowId, iconId);
 
       this.RefreshMarketData();
       if (!noHistory)
@@ -861,7 +863,7 @@ internal void ChangeSelectedItem(uint itemId, bool noHistory = false)
           this.plugin.Config.History.RemoveRange(100, this.plugin.Config.History.Count - 100);
         }
 
-        MBPlugin.PluginInterface.SavePluginConfig(this.plugin.Config);
+        this.plugin.PluginInterface.SavePluginConfig(this.plugin.Config);
       }
     }
 
@@ -878,9 +880,8 @@ protected virtual void Dispose(bool disposing)
 
       if (disposing)
       {
-        MBPlugin.Framework.Update -= this.HandleFrameworkUpdateEvent;
-        MBPlugin.GameGui.HoveredItemChanged -= this.HandleHoveredItemChange;
-        this.selectedItemIcon?.Dispose();
+        this.plugin.Framework.Update -= this.HandleFrameworkUpdateEvent;
+        this.plugin.GameGui.HoveredItemChanged -= this.HandleHoveredItemChange;
         this.defaultFontHandle?.Dispose();
         this.titleFontHandle?.Dispose();
       }
@@ -919,13 +920,13 @@ private static string ConvertItemNameToSortableFormat(string itemName)
     ///  Function used for debug purposes : Log every attributes of an Item.
     /// </summary>
     /// <param name="itm"> Item class to show in logs.</param>
-    private static void LogItemInfo(Item itm)
+    private void LogItemInfo(Item itm)
     {
       foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(itm))
       {
         string name = descriptor.Name;
         object value = descriptor.GetValue(itm);
-        MBPlugin.Log.Information("{0}={1}", name, value);
+        this.plugin.Log.Information("{0}={1}", name, value);
       }
     }
 
@@ -972,7 +973,7 @@ private Dictionary<ItemSearchCategory, List<Item>> SortCategoriesAndItems()
     {
       try
       {
-        var itemSearchCategories = MBPlugin.Data.GetExcelSheet<ItemSearchCategory>();
+        var itemSearchCategories = this.plugin.DataManager.GetExcelSheet<ItemSearchCategory>();
 
         var sortedCategories = itemSearchCategories.Where(c => c.Category > 0).OrderBy(c => c.Category).ThenBy(c => c.Order);
 
@@ -992,23 +993,23 @@ private Dictionary<ItemSearchCategory, List<Item>> SortCategoriesAndItems()
       }
       catch (Exception ex)
       {
-        MBPlugin.Log.Error(ex, $"Error loading category list.");
+        this.plugin.Log.Error(ex, $"Error loading category list.");
         return null;
       }
     }
 
     private void HandleFrameworkUpdateEvent(IFramework framework)
     {
-      if (MBPlugin.ClientState.LocalContentId != 0 && this.playerId != MBPlugin.ClientState.LocalContentId)
+      if (this.plugin.ClientState.LocalContentId != 0 && this.playerId != this.plugin.ClientState.LocalContentId)
       {
-        var localPlayer = MBPlugin.ClientState.LocalPlayer;
+        var localPlayer = this.plugin.ClientState.LocalPlayer;
         if (localPlayer == null)
         {
           return;
         }
 
         var currentDc = localPlayer.CurrentWorld.GameData.DataCenter;
-        var dcWorlds = MBPlugin.Data.GetExcelSheet<World>()
+        var dcWorlds = this.plugin.DataManager.GetExcelSheet<World>()
           .Where(w => w.DataCenter.Row == currentDc.Row && w.IsPublic)
           .OrderBy(w => w.Name.ToString())
           .Select(w =>
@@ -1052,11 +1053,11 @@ private void HandleFrameworkUpdateEvent(IFramework framework)
 
         if (this.worldList.Count > 1)
         {
-          this.playerId = MBPlugin.ClientState.LocalContentId;
+          this.playerId = this.plugin.ClientState.LocalContentId;
         }
       }
 
-      if (MBPlugin.ClientState.LocalContentId == 0)
+      if (this.plugin.ClientState.LocalContentId == 0)
       {
         this.playerId = 0;
       }
@@ -1077,7 +1078,7 @@ private void HandleHoveredItemChange(object sender, ulong itemId)
         return;
       }
 
-      var item = MBPlugin.Data.Excel.GetSheet<Item>().GetRow((uint)itemId % 500000);
+      var item = this.plugin.DataManager.Excel.GetSheet<Item>().GetRow((uint)itemId % 500000);
 
       if (item != null && this.enumerableCategoriesAndItems != null && this.sortedCategoriesAndItems.Any(i => i.Value != null && i.Value.Any(k => k.ToString() == item.ToString())))
       {
@@ -1119,7 +1120,7 @@ private void RefreshMarketData()
 
           try
           {
-            this.marketData = await UniversalisClient
+            this.marketData = await this.plugin.UniversalisClient
               .GetMarketData(
                 this.selectedItem.RowId,
                 this.worldList[this.selectedWorld].Item1,
@@ -1129,7 +1130,7 @@ private void RefreshMarketData()
           }
           catch (Exception)
           {
-            MBPlugin.Log.Warning($"Failed to fetch market data for item {this.selectedItem.RowId} from Universalis.");
+            this.plugin.Log.Warning($"Failed to fetch market data for item {this.selectedItem.RowId} from Universalis.");
             this.marketData = null;
           }
 
diff --git a/MarketBoardPlugin/Helpers/UniversalisClient.cs b/MarketBoardPlugin/Helpers/UniversalisClient.cs
index df92077..8e92330 100644
--- a/MarketBoardPlugin/Helpers/UniversalisClient.cs
+++ b/MarketBoardPlugin/Helpers/UniversalisClient.cs
@@ -16,17 +16,23 @@ namespace MarketBoardPlugin.Helpers
   /// <summary>
   /// Universalis API Client.
   /// </summary>
-  public static class UniversalisClient
+  /// <remarks>
+  /// Initializes a new instance of the <see cref="UniversalisClient"/> class.
+  /// </remarks>
+  /// <param name="plugin">The plugin instance.</param>
+  public class UniversalisClient(MBPlugin plugin)
   {
+    private readonly MBPlugin plugin = plugin ?? throw new ArgumentNullException(nameof(plugin));
+
     /// <summary>
-    /// Gets market data of an item for a specific world.
+    /// Retrieves market data for a specific item from the Universalis API.
     /// </summary>
-    /// <param name="itemId">The item ID.</param>
-    /// <param name="worldName">The world's name.</param>
-    /// <param name="historyCount">Number of entries to fetch from the history.</param>
-    /// <param name="cancellationToken">A <see cref="CancellationToken"/>.</param>
-    /// <returns>The market data.</returns>
-    public static async Task<MarketDataResponse> GetMarketData(uint itemId, string worldName, int historyCount, CancellationToken cancellationToken)
+    /// <param name="itemId">The ID of the item to retrieve market data for.</param>
+    /// <param name="worldName">The name of the world to retrieve market data from.</param>
+    /// <param name="historyCount">The number of historical entries to retrieve.</param>
+    /// <param name="cancellationToken">A cancellation token to cancel the operation.</param>
+    /// <returns>A <see cref="MarketDataResponse"/> object containing the retrieved market data, or null if the operation fails.</returns>
+    public async Task<MarketDataResponse> GetMarketData(uint itemId, string worldName, int historyCount, CancellationToken cancellationToken)
     {
       var uriBuilder = new UriBuilder($"https://universalis.app/api/{worldName}/{itemId}?entries={historyCount}");
 
@@ -44,7 +50,7 @@ public static async Task<MarketDataResponse> GetMarketData(uint itemId, string w
       }
       catch (HttpRequestException)
       {
-        MBPlugin.Log.Warning($"Failed to fetch market data for item {itemId} on world {worldName}.");
+        this.plugin.Log.Warning($"Fai    /// to fetch market data for item {itemId} on world {worldName}.");
         return null;
       }
 
@@ -60,7 +66,7 @@ public static async Task<MarketDataResponse> GetMarketData(uint itemId, string w
       }
       catch (JsonException)
       {
-        MBPlugin.Log.Warning($"Failed to parse market data for item {itemId} on world {worldName}.");
+        this.plugin.Log.Warning($"Failed to parse market data for item {itemId} on world {worldName}.");
         return null;
       }
 
diff --git a/MarketBoardPlugin/MBPlugin.cs b/MarketBoardPlugin/MBPlugin.cs
index 8589ac5..416ef77 100644
--- a/MarketBoardPlugin/MBPlugin.cs
+++ b/MarketBoardPlugin/MBPlugin.cs
@@ -8,18 +8,16 @@ namespace MarketBoardPlugin
   using System.Collections.Generic;
   using System.Diagnostics.CodeAnalysis;
   using System.Globalization;
-  using Dalamud.ContextMenu;
   using Dalamud.Game.Command;
+  using Dalamud.Game.Gui.ContextMenu;
   using Dalamud.Game.Text;
-  using Dalamud.Game.Text.SeStringHandling;
-  using Dalamud.Game.Text.SeStringHandling.Payloads;
   using Dalamud.Interface.Windowing;
-  using Dalamud.IoC;
   using Dalamud.Plugin;
   using Dalamud.Plugin.Services;
   using Lumina.Excel.GeneratedSheets;
 
   using MarketBoardPlugin.GUI;
+  using MarketBoardPlugin.Helpers;
   using MarketBoardPlugin.Models.ShoppingList;
 
   /// <summary>
@@ -28,16 +26,14 @@ namespace MarketBoardPlugin
   [SuppressMessage("ReSharper", "UnusedMember.Global", Justification = "Plugin entry point")]
   public class MBPlugin : IDalamudPlugin
   {
-    private readonly DalamudContextMenu contextMenuBase;
-
-    private readonly InventoryContextMenuItem inventoryContextMenuItem;
-
     private readonly MarketBoardWindow marketBoardWindow;
 
     private readonly MarketBoardConfigWindow marketBoardConfigWindow;
 
     private readonly MarketBoardShoppingListWindow marketBoardShoppingListWindow;
 
+    private readonly MenuItem inventoryContextMenuItem;
+
     /// <summary>
     /// Gets the window system.
     /// </summary>
@@ -49,9 +45,39 @@ public class MBPlugin : IDalamudPlugin
     /// Initializes a new instance of the <see cref="MBPlugin"/> class.
     /// This is the plugin's entry point.
     /// </summary>
-    public MBPlugin()
+    /// <param name="pluginInterface">The Dalamud plugin interface.</param>
+    /// <param name="dataManager">The data manager.</param>
+    /// <param name="commandManager">The command manager.</param>
+    /// <param name="framework">The framework.</param>
+    /// <param name="clientState">The client state.</param>
+    /// <param name="gameGui">The game GUI.</param>
+    /// <param name="textureProvider">The texture provider.</param>
+    /// <param name="log">The plugin log.</param>
+    /// <param name="contextMenu">The context menu.</param>
+    public MBPlugin(
+      IDalamudPluginInterface pluginInterface,
+      IDataManager dataManager,
+      ICommandManager commandManager,
+      IFramework framework,
+      IClientState clientState,
+      IGameGui gameGui,
+      ITextureProvider textureProvider,
+      IPluginLog log,
+      IContextMenu contextMenu)
     {
-      this.Config = PluginInterface.GetPluginConfig() as MBPluginConfig ?? new MBPluginConfig();
+      this.PluginInterface = pluginInterface;
+      this.DataManager = dataManager;
+      this.CommandManager = commandManager;
+      this.Framework = framework;
+      this.ClientState = clientState;
+      this.GameGui = gameGui;
+      this.TextureProvider = textureProvider;
+      this.Log = log;
+      this.ContextMenu = contextMenu;
+
+      this.UniversalisClient = new UniversalisClient(this);
+
+      this.Config = this.PluginInterface.GetPluginConfig() as MBPluginConfig ?? new MBPluginConfig();
 
       this.marketBoardWindow = new MarketBoardWindow(this);
       this.marketBoardConfigWindow = new MarketBoardConfigWindow(this);
@@ -62,20 +88,24 @@ public MBPlugin()
       this.windowSystem.AddWindow(this.marketBoardShoppingListWindow);
 
       // Set up command handlers
-      CommandManager.AddHandler("/pmb", new CommandInfo(this.OnOpenMarketBoardCommand)
+      this.CommandManager.AddHandler("/pmb", new CommandInfo(this.OnOpenMarketBoardCommand)
       {
         HelpMessage = "Open the market board window.",
       });
 
-      PluginInterface.UiBuilder.Draw += this.DrawUi;
-      PluginInterface.UiBuilder.OpenConfigUi += this.OpenConfigUi;
-      PluginInterface.UiBuilder.OpenMainUi += this.OpenMainUi;
+      this.PluginInterface.UiBuilder.Draw += this.DrawUi;
+      this.PluginInterface.UiBuilder.OpenConfigUi += this.OpenConfigUi;
+      this.PluginInterface.UiBuilder.OpenMainUi += this.OpenMainUi;
 
       // Set up context menu
-      this.contextMenuBase = new DalamudContextMenu(PluginInterface);
-      this.inventoryContextMenuItem = new InventoryContextMenuItem(
-        new SeString(new TextPayload("Search with Market Board Plugin")), this.OnSelectContextMenuItem, true);
-      this.contextMenuBase.OnOpenInventoryContextMenu += this.OnContextMenuOpened;
+      this.inventoryContextMenuItem = new MenuItem
+      {
+        Name = "Search with Market Board Plugin",
+        OnClicked = this.OnSelectContextMenuItem,
+        Prefix = SeIconChar.Gil,
+        PrefixColor = 48,
+      };
+      this.ContextMenu.OnMenuOpened += this.OnContextMenuOpened;
 
       // Set up number format
       this.NumberFormatInfo.CurrencySymbol = SeIconChar.Gil.ToIconString();
@@ -106,29 +136,52 @@ public MBPlugin()
     /// </summary>
     public NumberFormatInfo NumberFormatInfo { get; init; } = CultureInfo.CurrentCulture.NumberFormat.Clone() as NumberFormatInfo;
 
-    [PluginService]
-    internal static DalamudPluginInterface PluginInterface { get; private set; } = null!;
+    /// <summary>
+    /// Gets the Dalamud plugin interface.
+    /// </summary>
+    public IDalamudPluginInterface PluginInterface { get; init; }
 
-    [PluginService]
-    internal static IDataManager Data { get; private set; } = null!;
+    /// <summary>
+    /// Gets the data manager.
+    /// </summary>
+    public IDataManager DataManager { get; init; }
 
-    [PluginService]
-    internal static ICommandManager CommandManager { get; private set; } = null!;
+    /// <summary>
+    /// Gets the command manager.
+    /// </summary>
+    public ICommandManager CommandManager { get; init; }
 
-    [PluginService]
-    internal static IFramework Framework { get; private set; } = null!;
+    /// <summary>
+    /// Gets the framework.
+    /// </summary>
+    public IFramework Framework { get; init; }
 
-    [PluginService]
-    internal static IClientState ClientState { get; private set; } = null!;
+    /// <summary>
+    /// Gets the client state.
+    /// </summary>
+    public IClientState ClientState { get; init; }
 
-    [PluginService]
-    internal static IGameGui GameGui { get; private set; } = null!;
+    /// <summary>
+    /// Gets the game GUI.
+    /// </summary>
+    public IGameGui GameGui { get; init; }
 
-    [PluginService]
-    internal static ITextureProvider TextureProvider { get; private set; } = null!;
+    /// <summary>
+    /// Gets the texture provider.
+    /// </summary>
+    public ITextureProvider TextureProvider { get; init; }
 
-    [PluginService]
-    internal static IPluginLog Log { get; private set; } = null!;
+    /// <summary>
+    /// Gets the plugin log.
+    /// </summary>
+    public IPluginLog Log { get; init; }
+
+    /// <summary>
+    /// Gets the context menu.
+    /// </summary>
+    public IContextMenu ContextMenu { get; init; }
+
+    public UniversalisClient UniversalisClient { get; init; }
 
     /// <inheritdoc/>
     public void Dispose()
@@ -138,7 +191,7 @@ public void Dispose()
     }
 
     /// <summary>
-    /// Reset the market data.
+    /// Resets the market data.
     /// </summary>
     public void ResetMarketData()
     {
@@ -146,7 +199,7 @@ public void ResetMarketData()
     }
 
     /// <summary>
-    /// Open the main UI.
+    /// Opens the main UI.
     /// </summary>
     public void OpenMainUi()
     {
@@ -154,7 +207,7 @@ public void OpenMainUi()
     }
 
     /// <summary>
-    /// Open the config UI.
+    /// Opens the config UI.
     /// </summary>
     public void OpenConfigUi()
     {
@@ -175,61 +228,75 @@ protected virtual void Dispose(bool disposing)
       if (disposing)
       {
         // Save config
-        PluginInterface.SavePluginConfig(this.Config);
+        this.PluginInterface.SavePluginConfig(this.Config);
 
         // Remove windows
         this.windowSystem.RemoveAllWindows();
         this.marketBoardWindow.Dispose();
 
         // Remove command handlers
-        CommandManager.RemoveHandler("/pmb");
+        this.CommandManager.RemoveHandler("/pmb");
 
         // Remove context menu handler
-        this.contextMenuBase.OnOpenInventoryContextMenu -= this.OnContextMenuOpened;
-        this.contextMenuBase.Dispose();
+        this.ContextMenu.OnMenuOpened -= this.OnContextMenuOpened;
       }
 
       this.isDisposed = true;
     }
 
-    private void OnContextMenuOpened(InventoryContextMenuOpenArgs args)
+    private void OnContextMenuOpened(IMenuOpenedArgs args)
     {
+      if (args.MenuType != ContextMenuType.Inventory)
+      {
+        return;
+      }
+
       if (!this.Config.ContextMenuIntegration)
       {
         return;
       }
 
-      var i = (uint)(GameGui.HoveredItem % 500000);
+      this.inventoryContextMenuItem.IsEnabled = true;
+
+      var target = args.Target as MenuTargetInventory;
 
-      var item = Data.Excel.GetSheet<Item>()?.GetRow(i);
-      if (item == null)
+      if (!target.TargetItem.HasValue || target.TargetItem.Value.ItemId == 0)
       {
-        return;
+        this.inventoryContextMenuItem.IsEnabled = false;
       }
 
+      var item = this.DataManager.Excel.GetSheet<Item>().GetRow(target.TargetItem.Value.ItemId);
+
       if (item.IsUntradable)
       {
-        return;
+        this.inventoryContextMenuItem.IsEnabled = false;
       }
 
-      if (args.ItemId == 0)
+      args.AddMenuItem(this.inventoryContextMenuItem);
+    }
+
+    private void OnSelectContextMenuItem(IMenuItemClickedArgs args)
+    {
+      if (args.MenuType != ContextMenuType.Inventory)
       {
         return;
       }
 
-      args.AddCustomItem(this.inventoryContextMenuItem);
-    }
+      var target = args.Target as MenuTargetInventory;
+
+      if (!target.TargetItem.HasValue || target.TargetItem.Value.ItemId == 0)
+      {
+        return;
+      }
 
-    private void OnSelectContextMenuItem(InventoryContextMenuItemSelectedArgs args)
-    {
       try
       {
         this.marketBoardWindow.IsOpen = true;
-        this.marketBoardWindow.ChangeSelectedItem(args.ItemId);
+        this.marketBoardWindow.ChangeSelectedItem(target.TargetItem.Value.ItemId);
       }
       catch (Exception ex)
       {
-        Log.Error(ex, "Failed on context menu for itemId" + args.ItemId);
+        this.Log.Error(ex, "Failed on context menu for itemId" + target.TargetItem.Value.ItemId);
       }
     }
 
diff --git a/MarketBoardPlugin/MarketBoardPlugin.csproj b/MarketBoardPlugin/MarketBoardPlugin.csproj
index 154d480..4fc0db3 100644
--- a/MarketBoardPlugin/MarketBoardPlugin.csproj
+++ b/MarketBoardPlugin/MarketBoardPlugin.csproj
@@ -11,9 +11,9 @@
     <DebugType>PdbOnly</DebugType>
     <GenerateFullPaths>true</GenerateFullPaths>
     <MSBuildGitHashCommand>git rev-parse --short HEAD</MSBuildGitHashCommand>
-    <AssemblyVersion>1.5.0</AssemblyVersion>
-    <FileVersion>1.5.0</FileVersion>
-    <Version>1.5.0</Version>
+    <AssemblyVersion>1.6.0</AssemblyVersion>
+    <FileVersion>1.6.0</FileVersion>
+    <Version>1.6.0</Version>
     <Company>Florian Maunier</Company>
     <Description>Market board plugin for Dalamud.</Description>
     <Copyright>Copyright (c) Florian Maunier. All rights reserved.</Copyright>
@@ -51,9 +51,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dalamud.ContextMenu" Version="1.3.1" />
-    <PackageReference Include="Dalamud.DrunkenToad" Version="1.8.15" />
-    <PackageReference Include="DalamudPackager" Version="2.1.12" />
+    <PackageReference Include="Dalamud.DrunkenToad" Version="1.9.2" />
+    <PackageReference Include="DalamudPackager" Version="2.1.13" />
     <PackageReference Include="MSBuildGitHash" Version="2.0.2"
       Condition="'$(Configuration)'!='Release'">
       <PrivateAssets>all</PrivateAssets>
diff --git a/MarketBoardPlugin/packages.lock.json b/MarketBoardPlugin/packages.lock.json
index 8093649..11f396d 100644
--- a/MarketBoardPlugin/packages.lock.json
+++ b/MarketBoardPlugin/packages.lock.json
@@ -2,17 +2,11 @@
   "version": 1,
   "dependencies": {
     "net8.0-windows7.0": {
-      "Dalamud.ContextMenu": {
-        "type": "Direct",
-        "requested": "[1.3.1, )",
-        "resolved": "1.3.1",
-        "contentHash": "ptAxut5PiLnzZ4G/KQdHJVcyklC/BF3otHJ7zYVUPiKBjsOCoF0n/6h2jK7e+8ev2Y1yAY3Wtx2GuXLFQgt9Uw=="
-      },
       "Dalamud.DrunkenToad": {
         "type": "Direct",
-        "requested": "[1.8.15, )",
-        "resolved": "1.8.15",
-        "contentHash": "biuHkQR0qmIMWEsa14CcWtUH4f6G7sOTQMDZZKws2MhzTYl/3sw2lDS3z6bBOPd17I1UPtmkFBBn0QbQEpO4PA==",
+        "requested": "[1.9.2, )",
+        "resolved": "1.9.2",
+        "contentHash": "fT7ntQ1swV+U9H9I1TI6hJVXVSKxifzXex9D5EOdxqk3ZoHDwTLaKjKxWBrGOI+NI12UjgYWC7DPW39oJfqIfg==",
         "dependencies": {
           "Dalamud.Loc": "1.1.2",
           "Microsoft.Extensions.DependencyInjection": "7.0.0"
@@ -20,9 +14,9 @@
       },
       "DalamudPackager": {
         "type": "Direct",
-        "requested": "[2.1.12, )",
-        "resolved": "2.1.12",
-        "contentHash": "Sc0PVxvgg4NQjcI8n10/VfUQBAS4O+Fw2pZrAqBdRMbthYGeogzu5+xmIGCGmsEZ/ukMOBuAqiNiB5qA3MRalg=="
+        "requested": "[2.1.13, )",
+        "resolved": "2.1.13",
+        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
       },
       "StyleCop.Analyzers": {
         "type": "Direct",
diff --git a/OtterGui b/OtterGui
index 1d93651..c5f3ef9 160000
--- a/OtterGui
+++ b/OtterGui
@@ -1 +1 @@
-Subproject commit 1d9365164655a7cb38172e1311e15e19b1def6db
+Subproject commit c5f3ef9343d2943dfaefa7a7eefe1bc09d4b8f01