diff --git a/pk3DS/Structs.cs b/pk3DS/Structs.cs
index 86be05f..36c4f77 100644
--- a/pk3DS/Structs.cs
+++ b/pk3DS/Structs.cs
@@ -1068,10 +1068,12 @@ public byte[] Write()
             public class EntityNPC
             {
                 // 0x30 Bytes Long
+                public ushort ID;
                 public byte[] Raw;
                 public EntityNPC(byte[] data)
                 {
                     Raw = data;
+                    ID = BitConverter.ToUInt16(data, 0x4);
                 }
                 public byte[] Write()
                 {
@@ -1082,9 +1084,14 @@ public class EntityWarp
             {
                 // 0x18 Bytes Long
                 public byte[] Raw;
+                public ushort DestinationMap;
+                public ushort DestinationTileIndex;
                 public EntityWarp(byte[] data)
                 {
                     Raw = data;
+
+                    DestinationMap = BitConverter.ToUInt16(data, 0x4);
+                    DestinationTileIndex = BitConverter.ToUInt16(data, 0x6);
                 }
                 public byte[] Write()
                 {