diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index 6b2cea5d6c..6d786e46c4 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -692,7 +692,7 @@ public interface Client extends GameEngine
 	 * @return the widget node component table
 	 * @see WidgetNode
 	 */
-	HashTable getComponentTable();
+	HashTable<WidgetNode> getComponentTable();
 
 	/**
 	 * Gets an array of current grand exchange offers.
diff --git a/runelite-api/src/main/java/net/runelite/api/HashTable.java b/runelite-api/src/main/java/net/runelite/api/HashTable.java
index 32a3f7d3e3..a7adda6c32 100644
--- a/runelite-api/src/main/java/net/runelite/api/HashTable.java
+++ b/runelite-api/src/main/java/net/runelite/api/HashTable.java
@@ -30,7 +30,7 @@ import java.util.Collection;
  * A data structure that uses a hash function to compute an index into an
  * array of buckets from which node objects can be quickly obtained.
  */
-public interface HashTable
+public interface HashTable<T extends Node>
 {
 	/**
 	 * Gets a node by its hash value.
@@ -38,12 +38,12 @@ public interface HashTable
 	 * @param value the node value
 	 * @return the associated node
 	 */
-	Node get(long value);
+	T get(long value);
 
 	/**
 	 * Gets a collection of all nodes stored in this table.
 	 *
 	 * @return the nodes stored
 	 */
-	Collection<Node> getNodes();
+	Collection<T> getNodes();
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
index 370bcae612..86615d1c5c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java
@@ -339,10 +339,9 @@ public class ReorderPrayersPlugin extends Plugin
 
 	private PrayerTabState getPrayerTabState()
 	{
-		HashTable componentTable = client.getComponentTable();
-		for (Node node : componentTable.getNodes())
+		HashTable<WidgetNode> componentTable = client.getComponentTable();
+		for (WidgetNode widgetNode : componentTable.getNodes())
 		{
-			WidgetNode widgetNode = (WidgetNode) node;
 			if (widgetNode.getId() == WidgetID.PRAYER_GROUP_ID)
 			{
 				return PrayerTabState.PRAYERS;
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java b/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java
index a2403b7026..e1462ce1dd 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSHashTable.java
@@ -30,6 +30,7 @@ import net.runelite.mapping.Import;
 public interface RSHashTable extends HashTable
 {
 	@Import("get")
+	@Override
 	RSNode get(long value);
 
 	@Import("size")