diff --git a/src/main/java/eu/crushedpixel/replaymod/events/KeyframesModifyEvent.java b/src/main/java/eu/crushedpixel/replaymod/events/KeyframesModifyEvent.java
index 3115f578..6fcc5722 100644
--- a/src/main/java/eu/crushedpixel/replaymod/events/KeyframesModifyEvent.java
+++ b/src/main/java/eu/crushedpixel/replaymod/events/KeyframesModifyEvent.java
@@ -1,7 +1,7 @@
 package eu.crushedpixel.replaymod.events;
 
-import eu.crushedpixel.replaymod.holders.AdvancedPosition;
 import eu.crushedpixel.replaymod.holders.TimestampValue;
+import eu.crushedpixel.replaymod.interpolation.AdvancedPositionKeyframeList;
 import eu.crushedpixel.replaymod.interpolation.KeyframeList;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.Event;
 @EqualsAndHashCode(callSuper=true)
 public class KeyframesModifyEvent extends Event {
 
-    private KeyframeList<AdvancedPosition> positionKeyframes;
+    private AdvancedPositionKeyframeList positionKeyframes;
     private KeyframeList<TimestampValue> timeKeyframes;
 
 }
diff --git a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
index ad642ec3..0f9338e5 100755
--- a/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
+++ b/src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
@@ -10,6 +10,7 @@ import eu.crushedpixel.replaymod.events.KeyframesModifyEvent;
 import eu.crushedpixel.replaymod.events.ReplayExitEvent;
 import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay;
 import eu.crushedpixel.replaymod.holders.*;
+import eu.crushedpixel.replaymod.interpolation.AdvancedPositionKeyframeList;
 import eu.crushedpixel.replaymod.interpolation.KeyframeList;
 import eu.crushedpixel.replaymod.preparation.EntityPositionTracker;
 import eu.crushedpixel.replaymod.registry.LightingHandler;
@@ -54,7 +55,7 @@ public class ReplayHandler {
 
     private static boolean inPath = false;
 
-    private static KeyframeList<AdvancedPosition> positionKeyframes = new KeyframeList<AdvancedPosition>();
+    private static AdvancedPositionKeyframeList positionKeyframes = new AdvancedPositionKeyframeList();
     private static KeyframeList<TimestampValue> timeKeyframes = new KeyframeList<TimestampValue>();
 
     private static boolean inReplay = false;
@@ -268,7 +269,7 @@ public class ReplayHandler {
         fireKeyframesModifyEvent();
     }
 
-    public static KeyframeList<AdvancedPosition> getPositionKeyframes() {
+    public static AdvancedPositionKeyframeList getPositionKeyframes() {
         return positionKeyframes;
     }