Index: Creature.cpp
===================================================================
--- Creature.cpp	(revision 67)
+++ Creature.cpp	(working copy)
@@ -232,7 +232,8 @@
 		<< m_uint32Values[UNIT_FIELD_FLAGS] << ","
 		<< m_uint32Values[UNIT_FIELD_BYTES_0] << ","
 		<< m_uint32Values[UNIT_FIELD_BYTES_2] << ","
-		<< m_uint32Values[UNIT_NPC_EMOTESTATE] << ")";
+		<< m_uint32Values[UNIT_NPC_EMOTESTATE] << ","
+		<< m_uint32Values[UNIT_NPC_LINK] << ")";
 
 	sDatabase.Execute(ss.str().c_str());
 }
Index: Map.cpp
===================================================================
--- Map.cpp	(revision 67)
+++ Map.cpp	(working copy)
@@ -282,7 +282,7 @@
 			cspawn->bytes = fields[11].GetUInt32();
 			cspawn->bytes2 = fields[12].GetUInt32();
 			cspawn->emote_state = fields[13].GetUInt32();
-			cspawn->respawnNpcLink = fields[14].GetUInt32();
+			cspawn->Link = fields[14].GetUInt32();
 			spawns[cellx][celly]->CreatureSpawns.insert(cspawn);
 			++CreatureSpawnCount;
 		}while(result->NextRow());
Index: Map.h
===================================================================
--- Map.h	(revision 67)
+++ Map.h	(working copy)
@@ -43,7 +43,7 @@
 	uint32 bytes;
 	uint32 bytes2;
 	uint32 emote_state;
-	uint32 respawnNpcLink;
+	uint32 Link;
 }CreatureSpawn;
 
 typedef struct
Index: MapCell.cpp
===================================================================
--- MapCell.cpp	(revision 67)
+++ MapCell.cpp	(working copy)
@@ -127,7 +127,7 @@
 	{
 		for(CreatureSpawnList::iterator i=sp->CreatureSpawns.begin();i!=sp->CreatureSpawns.end();i++)
 		{
-			if(pInstance && pInstance->FindObject((*i)->id) || pInstance && pInstance->FindObject((*i)->respawnNpcLink))
+			if(pInstance && pInstance->FindObject((*i)->id) || pInstance && pInstance->FindObject((*i)->Link))
 			{
 				continue;
 			}
Index: UpdateFields.h
===================================================================
--- UpdateFields.h	(revision 67)
+++ UpdateFields.h	(working copy)
@@ -384,6 +384,7 @@
 #define UNIT_FIELD_POWER_COST_MULTIPLIER_06						OBJECT_END + 0x0DA
 #define UNIT_FIELD_PADDING										 OBJECT_END + 0x0DB
 #define UNIT_END												OBJECT_END + 0x0DC
+#define UNIT_NPC_LINK												OBJECT_END + 0x0DD
 
 // Player Fields
 #define PLAYER_DUEL_ARBITER										UNIT_END + 0x000