Core/Scripts: Fixed PCH build

24 files changed, 357 insertions, 687 deletions

diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
index 40f1c11d53c..0bb2010a9d6 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
@@ -39,21 +39,10 @@ class instance_ahnkahet : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                ElderNadoxGUID              = 0;
-                PrinceTaldaramGUID          = 0;
-                JedogaShadowseekerGUID      = 0;
-                AmanitarGUID                = 0;
-                HeraldVolazjGUID            = 0;
-
-                PrinceTaldaramPlatformGUID  = 0;
-                JedogaSacrifices            = 0;
-                JedogaTarget                = 0;
                 SwitchTrigger               = 0;
 
                 SpheresState[0]             = 0;
                 SpheresState[1]             = 0;
-
-                InitiandGUIDs.clear();
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -142,7 +131,7 @@ class instance_ahnkahet : public InstanceMapScript
                         SwitchTrigger = data;
                         break;
                     case DATA_JEDOGA_RESET_INITIANDS:
-                        for (uint64 guid : InitiandGUIDs)
+                        for (ObjectGuid guid : InitiandGUIDs)
                         {
                             if (Creature* creature = instance->GetCreature(guid))
                             {
@@ -165,7 +154,7 @@ class instance_ahnkahet : public InstanceMapScript
                     case DATA_SPHERE_2:
                         return SpheresState[type - DATA_SPHERE_1];
                     case DATA_ALL_INITIAND_DEAD:
-                        for (uint64 guid : InitiandGUIDs)
+                        for (ObjectGuid guid : InitiandGUIDs)
                         {
                             Creature* cr = instance->GetCreature(guid);
                             if (!cr || cr->IsAlive())
@@ -213,16 +202,16 @@ class instance_ahnkahet : public InstanceMapScript
                         return PrinceTaldaramPlatformGUID;
                     case DATA_ADD_JEDOGA_INITIAND:
                     {
-                        std::vector<uint64> vInitiands;
-                        vInitiands.clear();
-                        for (uint64 guid : InitiandGUIDs)
+                        GuidVector vInitiands;
+                        vInitiands.reserve(InitiandGUIDs.size());
+                        for (ObjectGuid guid : InitiandGUIDs)
                         {
                             Creature* cr = instance->GetCreature(guid);
                             if (cr && cr->IsAlive())
                                 vInitiands.push_back(guid);
                         }
                         if (vInitiands.empty())
-                            return 0;
+                            return ObjectGuid::Empty;
 
                         return Trinity::Containers::SelectRandomContainerElement(vInitiands);
                     }
@@ -233,7 +222,7 @@ class instance_ahnkahet : public InstanceMapScript
                     default:
                         break;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -246,11 +235,9 @@ class instance_ahnkahet : public InstanceMapScript
                     case DATA_JEDOGA_SHADOWSEEKER:
                         if (state == DONE)
                         {
-                            for (uint64 guid : InitiandGUIDs)
-                            {
+                            for (ObjectGuid guid : InitiandGUIDs)
                                 if (Creature* cr = instance->GetCreature(guid))
                                     cr->DespawnOrUnsummon();
-                            }
                         }
                         break;
                     default:
@@ -271,17 +258,17 @@ class instance_ahnkahet : public InstanceMapScript
             }
 
         protected:
-            uint64 ElderNadoxGUID;
-            uint64 PrinceTaldaramGUID;
-            uint64 JedogaShadowseekerGUID;
-            uint64 AmanitarGUID;
-            uint64 HeraldVolazjGUID;
+            ObjectGuid ElderNadoxGUID;
+            ObjectGuid PrinceTaldaramGUID;
+            ObjectGuid JedogaShadowseekerGUID;
+            ObjectGuid AmanitarGUID;
+            ObjectGuid HeraldVolazjGUID;
 
-            uint64 PrinceTaldaramPlatformGUID;
-            uint64 JedogaSacrifices;
-            uint64 JedogaTarget;
+            ObjectGuid PrinceTaldaramPlatformGUID;
+            ObjectGuid JedogaSacrifices;
+            ObjectGuid JedogaTarget;
 
-            std::set<uint64> InitiandGUIDs;
+            GuidSet InitiandGUIDs;
 
             uint32 SpheresState[2];
             uint8 SwitchTrigger;
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
index 99547f7f36d..0cb34f7b1d2 100644
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -40,13 +40,6 @@ class instance_azjol_nerub : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
-
-                KrikthirGUID        = 0;
-                HadronoxGUID        = 0;
-                AnubarakGUID        = 0;
-                WatcherGashraGUID   = 0;
-                WatcherSilthikGUID  = 0;
-                WatcherNarjilGUID   = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -126,16 +119,16 @@ class instance_azjol_nerub : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         protected:
-            uint64 KrikthirGUID;
-            uint64 HadronoxGUID;
-            uint64 AnubarakGUID;
-            uint64 WatcherGashraGUID;
-            uint64 WatcherSilthikGUID;
-            uint64 WatcherNarjilGUID;
+            ObjectGuid KrikthirGUID;
+            ObjectGuid HadronoxGUID;
+            ObjectGuid AnubarakGUID;
+            ObjectGuid WatcherGashraGUID;
+            ObjectGuid WatcherSilthikGUID;
+            ObjectGuid WatcherNarjilGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
index e4617158141..9f55ca8dc17 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -35,10 +35,6 @@ public:
         void Initialize() override
         {
             SetHeaders(DataHeader);
-            sartharionGUID = 0;
-            tenebronGUID   = 0;
-            shadronGUID    = 0;
-            vesperonGUID   = 0;
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -96,14 +92,14 @@ public:
                 case DATA_VESPERON:
                     return vesperonGUID;
             }
-            return 0;
+            return ObjectGuid::Empty;
         }
 
     protected:
-        uint64 sartharionGUID;
-        uint64 tenebronGUID;
-        uint64 shadronGUID;
-        uint64 vesperonGUID;
+        ObjectGuid sartharionGUID;
+        ObjectGuid tenebronGUID;
+        ObjectGuid shadronGUID;
+        ObjectGuid vesperonGUID;
     };
 
     InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
index f6e79f6e5a5..98aed37a1d2 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
@@ -41,23 +41,7 @@ class instance_ruby_sanctum : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
-                BaltharusTheWarbornGUID  = 0;
-                GeneralZarithrianGUID    = 0;
-                SavianaRagefireGUID      = 0;
-                HalionGUID               = 0;
-                TwilightHalionGUID       = 0;
-                OrbCarrierGUID           = 0;
-                OrbRotationFocusGUID     = 0;
-                HalionControllerGUID     = 0;
-                CrystalChannelTargetGUID = 0;
-                XerestraszaGUID          = 0;
                 BaltharusSharedHealth    = 0;
-                FlameWallsGUID           = 0;
-                FlameRingGUID            = 0;
-                TwilightFlameRingGUID    = 0;
-
-                memset(ZarithrianSpawnStalkerGUID, 0, 2 * sizeof(uint64));
-                memset(BurningTreeGUID, 0, 4 * sizeof(uint64));
             }
 
             void OnPlayerEnter(Player* /*player*/)
@@ -224,7 +208,7 @@ class instance_ruby_sanctum : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -305,21 +289,21 @@ class instance_ruby_sanctum : public InstanceMapScript
             }
 
         protected:
-            uint64 BaltharusTheWarbornGUID;
-            uint64 GeneralZarithrianGUID;
-            uint64 SavianaRagefireGUID;
-            uint64 HalionGUID;
-            uint64 TwilightHalionGUID;
-            uint64 HalionControllerGUID;
-            uint64 OrbCarrierGUID;
-            uint64 OrbRotationFocusGUID;
-            uint64 CrystalChannelTargetGUID;
-            uint64 XerestraszaGUID;
-            uint64 FlameWallsGUID;
-            uint64 ZarithrianSpawnStalkerGUID[2];
-            uint64 BurningTreeGUID[4];
-            uint64 FlameRingGUID;
-            uint64 TwilightFlameRingGUID;
+            ObjectGuid BaltharusTheWarbornGUID;
+            ObjectGuid GeneralZarithrianGUID;
+            ObjectGuid SavianaRagefireGUID;
+            ObjectGuid HalionGUID;
+            ObjectGuid TwilightHalionGUID;
+            ObjectGuid HalionControllerGUID;
+            ObjectGuid OrbCarrierGUID;
+            ObjectGuid OrbRotationFocusGUID;
+            ObjectGuid CrystalChannelTargetGUID;
+            ObjectGuid XerestraszaGUID;
+            ObjectGuid FlameWallsGUID;
+            ObjectGuid ZarithrianSpawnStalkerGUID[2];
+            ObjectGuid BurningTreeGUID[4];
+            ObjectGuid FlameRingGUID;
+            ObjectGuid TwilightFlameRingGUID;
 
             uint32 BaltharusSharedHealth;
         };
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
index a3e21cbb5a9..94bf20bc41f 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -49,18 +49,18 @@ public:
         uint16 uiGrandChampionsDeaths;
         uint8 uiArgentSoldierDeaths;
 
-        uint64 uiAnnouncerGUID;
-        uint64 uiMainGateGUID;
-        uint64 uiGrandChampionVehicle1GUID;
-        uint64 uiGrandChampionVehicle2GUID;
-        uint64 uiGrandChampionVehicle3GUID;
-        uint64 uiGrandChampion1GUID;
-        uint64 uiGrandChampion2GUID;
-        uint64 uiGrandChampion3GUID;
-        uint64 uiChampionLootGUID;
-        uint64 uiArgentChampionGUID;
-
-        std::list<uint64> VehicleList;
+        ObjectGuid uiAnnouncerGUID;
+        ObjectGuid uiMainGateGUID;
+        ObjectGuid uiGrandChampionVehicle1GUID;
+        ObjectGuid uiGrandChampionVehicle2GUID;
+        ObjectGuid uiGrandChampionVehicle3GUID;
+        ObjectGuid uiGrandChampion1GUID;
+        ObjectGuid uiGrandChampion2GUID;
+        ObjectGuid uiGrandChampion3GUID;
+        ObjectGuid uiChampionLootGUID;
+        ObjectGuid uiArgentChampionGUID;
+
+        GuidList VehicleList;
 
         std::string str_data;
 
@@ -73,21 +73,8 @@ public:
             uiGrandChampionsDeaths = 0;
             uiArgentSoldierDeaths = 0;
 
-            uiAnnouncerGUID        = 0;
-            uiMainGateGUID         = 0;
-            uiGrandChampionVehicle1GUID   = 0;
-            uiGrandChampionVehicle2GUID   = 0;
-            uiGrandChampionVehicle3GUID   = 0;
-            uiGrandChampion1GUID          = 0;
-            uiGrandChampion2GUID          = 0;
-            uiGrandChampion3GUID          = 0;
-            uiChampionLootGUID            = 0;
-            uiArgentChampionGUID          = 0;
-
             bDone = false;
 
-            VehicleList.clear();
-
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
         }
 
@@ -183,7 +170,7 @@ public:
                     m_auiEncounter[0] = uiData;
                     if (uiData == IN_PROGRESS)
                     {
-                        for (std::list<uint64>::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr)
+                        for (GuidList::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr)
                             if (Creature* summon = instance->GetCreature(*itr))
                                 summon->RemoveFromWorld();
                     }else if (uiData == DONE)
@@ -264,7 +251,7 @@ public:
                 case DATA_GRAND_CHAMPION_3: return uiGrandChampion3GUID;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         void SetGuidData(uint32 uiType, ObjectGuid uiData) override
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 9d35b3de1f6..9839eb3d952 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -45,29 +45,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 MistressOfPainCount = 0;
                 TributeToImmortalityEligible = true;
                 NeedSave = false;
-
-                TirionFordringGUID = 0;
-                BarrentGUID = 0;
-                TirionGUID = 0;
-                FizzlebangGUID = 0;
-                GarroshGUID = 0;
-                VarianGUID = 0;
-                GormokGUID = 0;
-                AcidmawGUID = 0;
-                DreadscaleGUID = 0;
-                IcehowlGUID = 0;
-                JaraxxusGUID = 0;
-                ChampionsControllerGUID = 0;
-                DarkbaneGUID = 0;
-                LightbaneGUID = 0;
-                AnubarakGUID = 0;
-
-                TributeChestGUID = 0;
-                MainGateDoorGUID = 0;
-                EastPortcullisGUID = 0;
-                WebDoorGUID = 0;
-                CrusadersCacheGUID = 0;
-                FloorGUID = 0;
             }
 
             bool IsEncounterInProgress() const override
@@ -104,7 +81,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 }
             }
 
-            void OpenDoor(uint64 guid)
+            void OpenDoor(ObjectGuid guid)
             {
                 if (!guid)
                     return;
@@ -113,7 +90,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                     go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
             }
 
-            void CloseDoor(uint64 guid)
+            void CloseDoor(ObjectGuid guid)
             {
                 if (!guid)
                     return;
@@ -520,7 +497,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             uint32 GetData(uint32 type) const override
@@ -742,29 +719,29 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 bool   NeedSave;
                 std::string SaveDataBuffer;
 
-                uint64 BarrentGUID;
-                uint64 TirionGUID;
-                uint64 TirionFordringGUID;
-                uint64 FizzlebangGUID;
-                uint64 GarroshGUID;
-                uint64 VarianGUID;
-
-                uint64 GormokGUID;
-                uint64 AcidmawGUID;
-                uint64 DreadscaleGUID;
-                uint64 IcehowlGUID;
-                uint64 JaraxxusGUID;
-                uint64 ChampionsControllerGUID;
-                uint64 DarkbaneGUID;
-                uint64 LightbaneGUID;
-                uint64 AnubarakGUID;
-
-                uint64 CrusadersCacheGUID;
-                uint64 FloorGUID;
-                uint64 TributeChestGUID;
-                uint64 MainGateDoorGUID;
-                uint64 EastPortcullisGUID;
-                uint64 WebDoorGUID;
+                ObjectGuid BarrentGUID;
+                ObjectGuid TirionGUID;
+                ObjectGuid TirionFordringGUID;
+                ObjectGuid FizzlebangGUID;
+                ObjectGuid GarroshGUID;
+                ObjectGuid VarianGUID;
+
+                ObjectGuid GormokGUID;
+                ObjectGuid AcidmawGUID;
+                ObjectGuid DreadscaleGUID;
+                ObjectGuid IcehowlGUID;
+                ObjectGuid JaraxxusGUID;
+                ObjectGuid ChampionsControllerGUID;
+                ObjectGuid DarkbaneGUID;
+                ObjectGuid LightbaneGUID;
+                ObjectGuid AnubarakGUID;
+
+                ObjectGuid CrusadersCacheGUID;
+                ObjectGuid FloorGUID;
+                ObjectGuid TributeChestGUID;
+                ObjectGuid MainGateDoorGUID;
+                ObjectGuid EastPortcullisGUID;
+                ObjectGuid WebDoorGUID;
 
                 // Achievement stuff
                 uint32 NotOneButTwoJormungarsTimer;
diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
index a60bf54e560..4e58d4dac03 100644
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -31,15 +31,6 @@ class instance_drak_tharon_keep : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
-
-                TrollgoreGUID       = 0;
-                NovosGUID           = 0;
-                KingDredGUID        = 0;
-                TharonJaGUID        = 0;
-
-                memset(TrollgoreInvaderSummonerGuids, 0, 3 * sizeof(uint64));
-                memset(NovosCrystalGUIDs, 0, 4 * sizeof(uint64));
-                memset(NovosSummonerGUIDs, 0, 4 * sizeof(uint64));
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -150,7 +141,7 @@ class instance_drak_tharon_keep : public InstanceMapScript
                         return NovosSummonerGUIDs[type - DATA_NOVOS_SUMMONER_1];
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void OnUnitDeath(Unit* unit) override
@@ -161,14 +152,14 @@ class instance_drak_tharon_keep : public InstanceMapScript
             }
 
         protected:
-            uint64 TrollgoreGUID;
-            uint64 NovosGUID;
-            uint64 KingDredGUID;
-            uint64 TharonJaGUID;
-
-            uint64 TrollgoreInvaderSummonerGuids[3];
-            uint64 NovosCrystalGUIDs[4];
-            uint64 NovosSummonerGUIDs[4];
+            ObjectGuid TrollgoreGUID;
+            ObjectGuid NovosGUID;
+            ObjectGuid KingDredGUID;
+            ObjectGuid TharonJaGUID;
+
+            ObjectGuid TrollgoreInvaderSummonerGuids[3];
+            ObjectGuid NovosCrystalGUIDs[4];
+            ObjectGuid NovosSummonerGUIDs[4];
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index 0d9b479f3a1..97c9d407622 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -38,8 +38,6 @@ class instance_forge_of_souls : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(MAX_ENCOUNTER);
-                bronjahm = 0;
-                devourerOfSouls = 0;
 
                 teamInInstance = 0;
             }
@@ -108,12 +106,12 @@ class instance_forge_of_souls : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         private:
-            uint64 bronjahm;
-            uint64 devourerOfSouls;
+            ObjectGuid bronjahm;
+            ObjectGuid devourerOfSouls;
 
             uint32 teamInInstance;
         };
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index b980d921869..9dbc801f76d 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -686,7 +686,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void WriteSaveDataMore(std::ostringstream& data) override
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index 5602629692d..29fbc0be2b3 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -44,15 +44,7 @@ class instance_pit_of_saron : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(Doors);
-                _garfrostGUID = 0;
-                _krickGUID = 0;
-                _ickGUID = 0;
-                _tyrannusGUID = 0;
-                _rimefangGUID = 0;
-                _jainaOrSylvanas1GUID = 0;
-                _jainaOrSylvanas2GUID = 0;
                 _teamInInstance = 0;
-                _tyrannusEventGUID = 0;
             }
 
             void OnPlayerEnter(Player* player) override
@@ -263,19 +255,19 @@ class instance_pit_of_saron : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         private:
-            uint64 _garfrostGUID;
-            uint64 _krickGUID;
-            uint64 _ickGUID;
-            uint64 _tyrannusGUID;
-            uint64 _rimefangGUID;
+            ObjectGuid _garfrostGUID;
+            ObjectGuid _krickGUID;
+            ObjectGuid _ickGUID;
+            ObjectGuid _tyrannusGUID;
+            ObjectGuid _rimefangGUID;
 
-            uint64 _tyrannusEventGUID;
-            uint64 _jainaOrSylvanas1GUID;
-            uint64 _jainaOrSylvanas2GUID;
+            ObjectGuid _tyrannusEventGUID;
+            ObjectGuid _jainaOrSylvanas1GUID;
+            ObjectGuid _jainaOrSylvanas2GUID;
 
             uint32 _teamInInstance;
         };
diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
index 332d4b04f43..0fa26a3dee3 100644
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -56,28 +56,28 @@ public:
 
         uint32 timer;
         uint32 phase;
-        uint64 toActivate;
-
-        uint64 sladRanGUID;
-        uint64 moorabiGUID;
-        uint64 drakkariColossusGUID;
-        uint64 galDarahGUID;
-        uint64 eckTheFerociousGUID;
-
-        uint64 sladRanAltarGUID;
-        uint64 moorabiAltarGUID;
-        uint64 drakkariColossusAltarGUID;
-        uint64 sladRanStatueGUID;
-        uint64 moorabiStatueGUID;
-        uint64 drakkariColossusStatueGUID;
-        uint64 galDarahStatueGUID;
-        uint64 eckTheFerociousDoorGUID;
-        uint64 eckTheFerociousDoorBehindGUID;
-        uint64 galDarahDoor1GUID;
-        uint64 galDarahDoor2GUID;
-        uint64 galDarahDoor3GUID;
-        uint64 bridgeGUID;
-        uint64 collisionGUID;
+        ObjectGuid toActivate;
+
+        ObjectGuid sladRanGUID;
+        ObjectGuid moorabiGUID;
+        ObjectGuid drakkariColossusGUID;
+        ObjectGuid galDarahGUID;
+        ObjectGuid eckTheFerociousGUID;
+
+        ObjectGuid sladRanAltarGUID;
+        ObjectGuid moorabiAltarGUID;
+        ObjectGuid drakkariColossusAltarGUID;
+        ObjectGuid sladRanStatueGUID;
+        ObjectGuid moorabiStatueGUID;
+        ObjectGuid drakkariColossusStatueGUID;
+        ObjectGuid galDarahStatueGUID;
+        ObjectGuid eckTheFerociousDoorGUID;
+        ObjectGuid eckTheFerociousDoorBehindGUID;
+        ObjectGuid galDarahDoor1GUID;
+        ObjectGuid galDarahDoor2GUID;
+        ObjectGuid galDarahDoor3GUID;
+        ObjectGuid bridgeGUID;
+        ObjectGuid collisionGUID;
 
         uint32 m_auiEncounter[MAX_ENCOUNTER];
 
@@ -88,7 +88,7 @@ public:
         GOState bridgeState;
         GOState collisionState;
 
-        std::set<uint64> DwellerGUIDs;
+        GuidSet DwellerGUIDs;
 
         std::string str_data;
 
@@ -98,31 +98,6 @@ public:
 
             timer = 0;
             phase = 0;
-            toActivate = 0;
-
-            sladRanGUID = 0;
-            moorabiGUID = 0;
-            drakkariColossusGUID = 0;
-            galDarahGUID = 0;
-            eckTheFerociousGUID = 0;
-
-            sladRanAltarGUID = 0;
-            moorabiAltarGUID = 0;
-            drakkariColossusAltarGUID = 0;
-
-            sladRanStatueGUID = 0;
-            moorabiStatueGUID = 0;
-            drakkariColossusStatueGUID = 0;
-            galDarahStatueGUID = 0;
-
-            eckTheFerociousDoorGUID = 0;
-            eckTheFerociousDoorBehindGUID = 0;
-            galDarahDoor1GUID = 0;
-            galDarahDoor2GUID = 0;
-            galDarahDoor3GUID = 0;
-
-            bridgeGUID = 0;
-            collisionGUID = 0;
 
             sladRanStatueState = GO_STATE_ACTIVE;
             moorabiStatueState = GO_STATE_ACTIVE;
@@ -131,8 +106,6 @@ public:
             bridgeState = GO_STATE_ACTIVE;
             collisionState = GO_STATE_READY;
 
-            DwellerGUIDs.clear();
-
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
         }
 
@@ -391,7 +364,7 @@ public:
                     return toActivate;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         std::string GetSaveData() override
@@ -476,7 +449,7 @@ public:
                      GameObject* drakkariColossusStatue = instance->GetGameObject(drakkariColossusStatueGUID);
                      GameObject* galDarahStatue = instance->GetGameObject(galDarahStatueGUID);
 
-                     toActivate = 0;
+                     toActivate.Clear();
 
                      if (bridge && collision && sladRanStatue && moorabiStatue && drakkariColossusStatue && galDarahStatue)
                      {
@@ -525,7 +498,7 @@ public:
                      if (GameObject* statueGO = instance->GetGameObject(toActivate))
                          statueGO->SetGoState(GO_STATE_READY);
 
-                     toActivate = 0;
+                     toActivate.Clear();
 
                      if (phase == 3)
                          SetGuidData(DATA_STATUE_ACTIVATE, bridgeGUID);
@@ -537,7 +510,7 @@ public:
                 timer -= diff;
         }
 
-         GOState GetObjState(uint64 guid)
+         GOState GetObjState(ObjectGuid guid)
          {
              if (GameObject* go = instance->GetGameObject(guid))
                  return go->GetGoState();
@@ -555,7 +528,7 @@ public:
     bool OnGossipHello(Player* /*player*/, GameObject* go) override
     {
         InstanceScript* instance = go->GetInstanceScript();
-        uint64 statueGUID = 0;
+        ObjectGuid statueGUID;
 
         go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
         go->SetGoState(GO_STATE_ACTIVE);
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index 78ebfe57fe4..f1a1aae030f 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -120,52 +120,6 @@ class instance_icecrown_citadel : public InstanceMapScript
                 LoadDoorData(doorData);
                 TeamInInstance = 0;
                 HeroicAttempts = MaxHeroicAttempts;
-                LadyDeathwisperElevatorGUID = 0;
-                GunshipGUID = 0;
-                EnemyGunshipGUID = 0;
-                GunshipArmoryGUID = 0;
-                DeathbringerSaurfangGUID = 0;
-                DeathbringerSaurfangDoorGUID = 0;
-                DeathbringerSaurfangEventGUID = 0;
-                DeathbringersCacheGUID = 0;
-                TeleporterLichKingGUID = 0;
-                TeleporterUpperSpireGUID = 0;
-                TeleporterLightsHammerGUID = 0;
-                TeleporterRampartsGUID = 0;
-                TeleporterDeathBringerGUID = 0;
-                TeleporterOratoryGUID = 0;
-                TeleporterSindragosaGUID = 0;
-                PlagueSigilGUID = 0;
-                BloodwingSigilGUID = 0;
-                FrostwingSigilGUID = 0;
-                memset(PutricidePipeGUIDs, 0, 2 * sizeof(uint64));
-                memset(PutricideGateGUIDs, 0, 2 * sizeof(uint64));
-                PutricideCollisionGUID = 0;
-                FestergutGUID = 0;
-                RotfaceGUID = 0;
-                ProfessorPutricideGUID = 0;
-                PutricideTableGUID = 0;
-                memset(BloodCouncilGUIDs, 0, 3 * sizeof(uint64));
-                BloodCouncilControllerGUID = 0;
-                BloodQueenLanaThelGUID = 0;
-                CrokScourgebaneGUID = 0;
-                memset(CrokCaptainGUIDs, 0, 4 * sizeof(uint64));
-                SisterSvalnaGUID = 0;
-                ValithriaDreamwalkerGUID = 0;
-                ValithriaLichKingGUID = 0;
-                ValithriaTriggerGUID = 0;
-                SindragosaGUID = 0;
-                SpinestalkerGUID = 0;
-                RimefangGUID = 0;
-                TheLichKingTeleportGUID = 0;
-                TheLichKingGUID = 0;
-                HighlordTirionFordringGUID = 0;
-                TerenasMenethilGUID = 0;
-                ArthasPlatformGUID = 0;
-                ArthasPrecipiceGUID = 0;
-                FrozenThroneEdgeGUID = 0;
-                FrozenThroneWindGUID = 0;
-                FrozenThroneWarningGUID = 0;
                 IsBonedEligible = true;
                 IsOozeDanceEligible = true;
                 IsNauseaEligible = true;
@@ -174,9 +128,6 @@ class instance_icecrown_citadel : public InstanceMapScript
                 UpperSpireTeleporterActiveState = NOT_STARTED;
                 BloodQuickeningState = NOT_STARTED;
                 BloodQuickeningMinutes = 0;
-                FrozenBolvarGUID = 0;
-                PillarsChainedGUID = 0;
-                PillarsUnchainedGUID = 0;
             }
 
             // A function to help reduce the number of lines for teleporter management.
@@ -362,7 +313,7 @@ class instance_icecrown_citadel : public InstanceMapScript
             void OnCreatureRemove(Creature* creature) override
             {
                 if (creature->GetEntry() == NPC_SINDRAGOSA)
-                    SindragosaGUID = 0;
+                    SindragosaGUID.Clear();
             }
 
             // Weekly quest spawn prevention
@@ -725,7 +676,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                         break;
                     case GO_THE_SKYBREAKER_A:
                     case GO_ORGRIMS_HAMMER_H:
-                        GunshipGUID = 0;
+                        GunshipGUID.Clear();
                         break;
                     default:
                         break;
@@ -824,7 +775,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -1476,55 +1427,55 @@ class instance_icecrown_citadel : public InstanceMapScript
 
         protected:
             EventMap Events;
-            uint64 LadyDeathwisperElevatorGUID;
-            uint64 GunshipGUID;
-            uint64 EnemyGunshipGUID;
-            uint64 GunshipArmoryGUID;
-            uint64 DeathbringerSaurfangGUID;
-            uint64 DeathbringerSaurfangDoorGUID;
-            uint64 DeathbringerSaurfangEventGUID;   // Muradin Bronzebeard or High Overlord Saurfang
-            uint64 DeathbringersCacheGUID;
-            uint64 TeleporterLichKingGUID;
-            uint64 TeleporterUpperSpireGUID;
-            uint64 TeleporterLightsHammerGUID;
-            uint64 TeleporterRampartsGUID;
-            uint64 TeleporterDeathBringerGUID;
-            uint64 TeleporterOratoryGUID;
-            uint64 TeleporterSindragosaGUID;
-            uint64 PlagueSigilGUID;
-            uint64 BloodwingSigilGUID;
-            uint64 FrostwingSigilGUID;
-            uint64 PutricidePipeGUIDs[2];
-            uint64 PutricideGateGUIDs[2];
-            uint64 PutricideCollisionGUID;
-            uint64 FestergutGUID;
-            uint64 RotfaceGUID;
-            uint64 ProfessorPutricideGUID;
-            uint64 PutricideTableGUID;
-            uint64 BloodCouncilGUIDs[3];
-            uint64 BloodCouncilControllerGUID;
-            uint64 BloodQueenLanaThelGUID;
-            uint64 CrokScourgebaneGUID;
-            uint64 CrokCaptainGUIDs[4];
-            uint64 SisterSvalnaGUID;
-            uint64 ValithriaDreamwalkerGUID;
-            uint64 ValithriaLichKingGUID;
-            uint64 ValithriaTriggerGUID;
-            uint64 SindragosaGUID;
-            uint64 SpinestalkerGUID;
-            uint64 RimefangGUID;
-            uint64 TheLichKingTeleportGUID;
-            uint64 TheLichKingGUID;
-            uint64 HighlordTirionFordringGUID;
-            uint64 TerenasMenethilGUID;
-            uint64 ArthasPlatformGUID;
-            uint64 ArthasPrecipiceGUID;
-            uint64 FrozenThroneEdgeGUID;
-            uint64 FrozenThroneWindGUID;
-            uint64 FrozenThroneWarningGUID;
-            uint64 FrozenBolvarGUID;
-            uint64 PillarsChainedGUID;
-            uint64 PillarsUnchainedGUID;
+            ObjectGuid LadyDeathwisperElevatorGUID;
+            ObjectGuid GunshipGUID;
+            ObjectGuid EnemyGunshipGUID;
+            ObjectGuid GunshipArmoryGUID;
+            ObjectGuid DeathbringerSaurfangGUID;
+            ObjectGuid DeathbringerSaurfangDoorGUID;
+            ObjectGuid DeathbringerSaurfangEventGUID;   // Muradin Bronzebeard or High Overlord Saurfang
+            ObjectGuid DeathbringersCacheGUID;
+            ObjectGuid TeleporterLichKingGUID;
+            ObjectGuid TeleporterUpperSpireGUID;
+            ObjectGuid TeleporterLightsHammerGUID;
+            ObjectGuid TeleporterRampartsGUID;
+            ObjectGuid TeleporterDeathBringerGUID;
+            ObjectGuid TeleporterOratoryGUID;
+            ObjectGuid TeleporterSindragosaGUID;
+            ObjectGuid PlagueSigilGUID;
+            ObjectGuid BloodwingSigilGUID;
+            ObjectGuid FrostwingSigilGUID;
+            ObjectGuid PutricidePipeGUIDs[2];
+            ObjectGuid PutricideGateGUIDs[2];
+            ObjectGuid PutricideCollisionGUID;
+            ObjectGuid FestergutGUID;
+            ObjectGuid RotfaceGUID;
+            ObjectGuid ProfessorPutricideGUID;
+            ObjectGuid PutricideTableGUID;
+            ObjectGuid BloodCouncilGUIDs[3];
+            ObjectGuid BloodCouncilControllerGUID;
+            ObjectGuid BloodQueenLanaThelGUID;
+            ObjectGuid CrokScourgebaneGUID;
+            ObjectGuid CrokCaptainGUIDs[4];
+            ObjectGuid SisterSvalnaGUID;
+            ObjectGuid ValithriaDreamwalkerGUID;
+            ObjectGuid ValithriaLichKingGUID;
+            ObjectGuid ValithriaTriggerGUID;
+            ObjectGuid SindragosaGUID;
+            ObjectGuid SpinestalkerGUID;
+            ObjectGuid RimefangGUID;
+            ObjectGuid TheLichKingTeleportGUID;
+            ObjectGuid TheLichKingGUID;
+            ObjectGuid HighlordTirionFordringGUID;
+            ObjectGuid TerenasMenethilGUID;
+            ObjectGuid ArthasPlatformGUID;
+            ObjectGuid ArthasPrecipiceGUID;
+            ObjectGuid FrozenThroneEdgeGUID;
+            ObjectGuid FrozenThroneWindGUID;
+            ObjectGuid FrozenThroneWarningGUID;
+            ObjectGuid FrozenBolvarGUID;
+            ObjectGuid PillarsChainedGUID;
+            ObjectGuid PillarsUnchainedGUID;
             uint32 TeamInInstance;
             uint32 ColdflameJetsState;
             uint32 UpperSpireTeleporterActiveState;
diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
index 338cd10a7fc..6dcdd05048a 100644
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -112,24 +112,7 @@ class instance_naxxramas : public InstanceMapScript
                 LoadDoorData(doorData);
                 LoadMinionData(minionData);
 
-                GothikGateGUID          = 0;
-                HorsemenChestGUID       = 0;
-                FaerlinaGUID            = 0;
-                ThaneGUID               = 0;
-                LadyGUID                = 0;
-                BaronGUID               = 0;
-                SirGUID                 = 0;
-                ThaddiusGUID            = 0;
-                HeiganGUID              = 0;
-                FeugenGUID              = 0;
-                StalaggGUID             = 0;
-                SapphironGUID           = 0;
-                KelthuzadGUID           = 0;
-                KelthuzadTriggerGUID    = 0;
-
                 playerDied              = 0;
-
-                memset(PortalsGUID, 0, sizeof(PortalsGUID));
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -342,7 +325,7 @@ class instance_naxxramas : public InstanceMapScript
                         return KelthuzadTriggerGUID;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 id, EncounterState state) override
@@ -369,7 +352,7 @@ class instance_naxxramas : public InstanceMapScript
                     if (i == section)
                         continue;
 
-                    for (uint64 guid : HeiganEruptionGUID[i])
+                    for (ObjectGuid guid : HeiganEruptionGUID[i])
                     {
                         if (GameObject* heiganEruption = instance->GetGameObject(guid))
                         {
@@ -431,39 +414,39 @@ class instance_naxxramas : public InstanceMapScript
         protected:
             /* The Arachnid Quarter */
             // Grand Widow Faerlina
-            uint64 FaerlinaGUID;
+            ObjectGuid FaerlinaGUID;
 
             /* The Plague Quarter */
             // Heigan the Unclean
-            std::set<uint64> HeiganEruptionGUID[4];
-            uint64 HeiganGUID;
+            GuidSet HeiganEruptionGUID[4];
+            ObjectGuid HeiganGUID;
 
             /* The Military Quarter */
             // Gothik the Harvester
-            uint64 GothikGateGUID;
+            ObjectGuid GothikGateGUID;
             // The Four Horsemen
-            uint64 ThaneGUID;
-            uint64 LadyGUID;
-            uint64 BaronGUID;
-            uint64 SirGUID;
-            uint64 HorsemenChestGUID;
-            uint64 HorsemenTeleporterGUID;
+            ObjectGuid ThaneGUID;
+            ObjectGuid LadyGUID;
+            ObjectGuid BaronGUID;
+            ObjectGuid SirGUID;
+            ObjectGuid HorsemenChestGUID;
+            ObjectGuid HorsemenTeleporterGUID;
             time_t minHorsemenDiedTime;
             time_t maxHorsemenDiedTime;
 
             /* The Construct Quarter */
             // Thaddius
-            uint64 ThaddiusGUID;
-            uint64 FeugenGUID;
-            uint64 StalaggGUID;
+            ObjectGuid ThaddiusGUID;
+            ObjectGuid FeugenGUID;
+            ObjectGuid StalaggGUID;
 
             /* Frostwyrm Lair */
             // Sapphiron
-            uint64 SapphironGUID;
+            ObjectGuid SapphironGUID;
             // Kel'Thuzad
-            uint64 KelthuzadGUID;
-            uint64 KelthuzadTriggerGUID;
-            uint64 PortalsGUID[4];
+            ObjectGuid KelthuzadGUID;
+            ObjectGuid KelthuzadTriggerGUID;
+            ObjectGuid PortalsGUID[4];
             uint8 AbominationCount;
 
             /* The Immortal / The Undying */
diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
index 8f90486bd73..834297aa123 100644
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -37,17 +37,7 @@ public:
         {
             SetHeaders(DataHeader);
             SetBossNumber(MAX_ENCOUNTER);
-
-            vortexTriggers.clear();
-            portalTriggers.clear();
-
-            malygosGUID = 0;
-            irisGUID = 0;
-            lastPortalGUID = 0;
-            platformGUID = 0;
-            exitPortalGUID = 0;
-            alexstraszaBunnyGUID = 0;
-        };
+        }
 
         bool SetBossState(uint32 type, EncounterState state) override
         {
@@ -58,7 +48,7 @@ public:
             {
                 if (state == FAIL)
                 {
-                    for (std::list<uint64>::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
+                    for (GuidList::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
                     {
                         if (Creature* trigger = instance->GetCreature(*itr_trigger))
                         {
@@ -189,7 +179,7 @@ public:
             if (Creature* malygos = instance->GetCreature(malygosGUID))
             {
                 std::list<HostileReference*> m_threatlist = malygos->getThreatManager().getThreatList();
-                for (std::list<uint64>::const_iterator itr_vortex = vortexTriggers.begin(); itr_vortex != vortexTriggers.end(); ++itr_vortex)
+                for (GuidList::const_iterator itr_vortex = vortexTriggers.begin(); itr_vortex != vortexTriggers.end(); ++itr_vortex)
                 {
                     if (m_threatlist.empty())
                         return;
@@ -223,7 +213,7 @@ public:
         {
             bool next = (lastPortalGUID == portalTriggers.back() || !lastPortalGUID ? true : false);
 
-            for (std::list<uint64>::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
+            for (GuidList::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
             {
                 if (next)
                 {
@@ -276,20 +266,20 @@ public:
                     return giftBoxBunnyGUID;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
     private:
-        std::list<uint64> vortexTriggers;
-        std::list<uint64> portalTriggers;
-        uint64 malygosGUID;
-        uint64 irisGUID;
-        uint64 lastPortalGUID;
-        uint64 platformGUID;
-        uint64 exitPortalGUID;
-        uint64 heartOfMagicGUID;
-        uint64 alexstraszaBunnyGUID;
-        uint64 giftBoxBunnyGUID;
+        GuidList vortexTriggers;
+        GuidList portalTriggers;
+        ObjectGuid malygosGUID;
+        ObjectGuid irisGUID;
+        ObjectGuid lastPortalGUID;
+        ObjectGuid platformGUID;
+        ObjectGuid exitPortalGUID;
+        ObjectGuid heartOfMagicGUID;
+        ObjectGuid alexstraszaBunnyGUID;
+        ObjectGuid giftBoxBunnyGUID;
         Position focusingIrisPosition;
         Position exitPortalPosition;
     };
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index 25f78415645..91a40d43f12 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -44,12 +44,12 @@ public:
 
         uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS];
 
-        uint64 Anomalus;
-        uint64 Keristrasza;
+        ObjectGuid Anomalus;
+        ObjectGuid Keristrasza;
 
-        uint64 AnomalusContainmentSphere;
-        uint64 OrmoroksContainmentSphere;
-        uint64 TelestrasContainmentSphere;
+        ObjectGuid AnomalusContainmentSphere;
+        ObjectGuid OrmoroksContainmentSphere;
+        ObjectGuid TelestrasContainmentSphere;
 
         std::string strInstData;
 
@@ -57,12 +57,6 @@ public:
         {
             SetHeaders(DataHeader);
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
-            Anomalus = 0;
-            Keristrasza = 0;
-            AnomalusContainmentSphere = 0;
-            OrmoroksContainmentSphere = 0;
-            TelestrasContainmentSphere = 0;
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -232,7 +226,7 @@ public:
                 case ORMOROKS_CONTAINMET_SPHERE:    return OrmoroksContainmentSphere;
                 case TELESTRAS_CONTAINMET_SPHERE:   return TelestrasContainmentSphere;
             }
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         std::string GetSaveData() override
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index bd461cfa294..1c5aadc3581 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -44,20 +44,7 @@ class instance_oculus : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                DrakosGUID          = 0;
-                VarosGUID           = 0;
-                UromGUID            = 0;
-                EregosGUID          = 0;
-
                 CentrifugueConstructCounter = 0;
-
-                EregosCacheGUID     = 0;
-
-                GreaterWhelpList.clear();
-
-                BelgaristraszGUID   = 0;
-                EternosGUID         = 0;
-                VerdisaGUID         = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -256,7 +243,7 @@ class instance_oculus : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void FreeDragons()
@@ -282,26 +269,26 @@ class instance_oculus : public InstanceMapScript
 
             void GreaterWhelps()
             {
-                for (uint64 guid : GreaterWhelpList)
+                for (ObjectGuid guid : GreaterWhelpList)
                     if (Creature* gwhelp = instance->GetCreature(guid))
                         gwhelp->SetPhaseMask(1, true);
             }
 
         protected:
-            uint64 DrakosGUID;
-            uint64 VarosGUID;
-            uint64 UromGUID;
-            uint64 EregosGUID;
+            ObjectGuid DrakosGUID;
+            ObjectGuid VarosGUID;
+            ObjectGuid UromGUID;
+            ObjectGuid EregosGUID;
 
-            uint64 BelgaristraszGUID;
-            uint64 EternosGUID;
-            uint64 VerdisaGUID;
+            ObjectGuid BelgaristraszGUID;
+            ObjectGuid EternosGUID;
+            ObjectGuid VerdisaGUID;
 
             uint8 CentrifugueConstructCounter;
 
-            uint64 EregosCacheGUID;
+            ObjectGuid EregosCacheGUID;
 
-            std::list<uint64> GreaterWhelpList;
+            GuidList GreaterWhelpList;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
index bcd6ee7fff7..0d39a8921e8 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -39,13 +39,6 @@ class instance_halls_of_lightning : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
-
-                GeneralBjarngrimGUID = 0;
-                VolkhanGUID          = 0;
-                IonarGUID            = 0;
-                LokenGUID            = 0;
-
-                LokenGlobeGUID       = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -134,16 +127,16 @@ class instance_halls_of_lightning : public InstanceMapScript
                     default:
                         break;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         protected:
-            uint64 GeneralBjarngrimGUID;
-            uint64 VolkhanGUID;
-            uint64 IonarGUID;
-            uint64 LokenGUID;
+            ObjectGuid GeneralBjarngrimGUID;
+            ObjectGuid VolkhanGUID;
+            ObjectGuid IonarGUID;
+            ObjectGuid LokenGUID;
 
-            uint64 LokenGlobeGUID;
+            ObjectGuid LokenGlobeGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
index 4bac4661558..d5849d43e37 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -39,22 +39,6 @@ class instance_halls_of_stone : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
-
-                KrystallusGUID          = 0;
-                MaidenOfGriefGUID       = 0;
-                SjonnirGUID             = 0;
-
-                KaddrakGUID             = 0;
-                AbedneumGUID            = 0;
-                MarnakGUID              = 0;
-                BrannGUID               = 0;
-
-                TribunalConsoleGUID     = 0;
-                TribunalChestGUID       = 0;
-                TribunalSkyFloorGUID    = 0;
-                KaddrakGoGUID           = 0;
-                AbedneumGoGUID          = 0;
-                MarnakGoGUID            = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -162,7 +146,7 @@ class instance_halls_of_stone : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -205,21 +189,21 @@ class instance_halls_of_stone : public InstanceMapScript
             }
 
         protected:
-            uint64 KrystallusGUID;
-            uint64 MaidenOfGriefGUID;
-            uint64 SjonnirGUID;
-
-            uint64 KaddrakGUID;
-            uint64 AbedneumGUID;
-            uint64 MarnakGUID;
-            uint64 BrannGUID;
-
-            uint64 TribunalConsoleGUID;
-            uint64 TribunalChestGUID;
-            uint64 TribunalSkyFloorGUID;
-            uint64 KaddrakGoGUID;
-            uint64 AbedneumGoGUID;
-            uint64 MarnakGoGUID;
+            ObjectGuid KrystallusGUID;
+            ObjectGuid MaidenOfGriefGUID;
+            ObjectGuid SjonnirGUID;
+
+            ObjectGuid KaddrakGUID;
+            ObjectGuid AbedneumGUID;
+            ObjectGuid MarnakGUID;
+            ObjectGuid BrannGUID;
+
+            ObjectGuid TribunalConsoleGUID;
+            ObjectGuid TribunalChestGUID;
+            ObjectGuid TribunalSkyFloorGUID;
+            ObjectGuid KaddrakGoGUID;
+            ObjectGuid AbedneumGoGUID;
+            ObjectGuid MarnakGoGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index dcf95fea0c3..d00208b0d6f 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -63,50 +63,50 @@ class instance_ulduar : public InstanceMapScript
             instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { }
 
             // Creatures
-            uint64 LeviathanGUID;
-            uint64 IgnisGUID;
-            uint64 RazorscaleGUID;
-            uint64 RazorscaleController;
-            uint64 ExpeditionCommanderGUID;
-            uint64 XT002GUID;
-            uint64 XTToyPileGUIDs[4];
-            uint64 AssemblyGUIDs[3];
-            uint64 KologarnGUID;
-            uint64 AuriayaGUID;
-            uint64 HodirGUID;
-            uint64 ThorimGUID;
-            uint64 FreyaGUID;
-            uint64 ElderGUIDs[3];
-            uint64 MimironGUID;
-            uint64 MimironVehicleGUIDs[3];
-            uint64 MimironComputerGUID;
-            uint64 MimironWorldTriggerGUID;
-            uint64 VezaxGUID;
-            uint64 YoggSaronGUID;
-            uint64 VoiceOfYoggSaronGUID;
-            uint64 SaraGUID;
-            uint64 BrainOfYoggSaronGUID;
-            uint64 KeeperGUIDs[4];
-            uint64 AlgalonGUID;
-            uint64 BrannBronzebeardAlgGUID;
+            ObjectGuid LeviathanGUID;
+            ObjectGuid IgnisGUID;
+            ObjectGuid RazorscaleGUID;
+            ObjectGuid RazorscaleController;
+            ObjectGuid ExpeditionCommanderGUID;
+            ObjectGuid XT002GUID;
+            ObjectGuid XTToyPileGUIDs[4];
+            ObjectGuid AssemblyGUIDs[3];
+            ObjectGuid KologarnGUID;
+            ObjectGuid AuriayaGUID;
+            ObjectGuid HodirGUID;
+            ObjectGuid ThorimGUID;
+            ObjectGuid FreyaGUID;
+            ObjectGuid ElderGUIDs[3];
+            ObjectGuid MimironGUID;
+            ObjectGuid MimironVehicleGUIDs[3];
+            ObjectGuid MimironComputerGUID;
+            ObjectGuid MimironWorldTriggerGUID;
+            ObjectGuid VezaxGUID;
+            ObjectGuid YoggSaronGUID;
+            ObjectGuid VoiceOfYoggSaronGUID;
+            ObjectGuid SaraGUID;
+            ObjectGuid BrainOfYoggSaronGUID;
+            ObjectGuid KeeperGUIDs[4];
+            ObjectGuid AlgalonGUID;
+            ObjectGuid BrannBronzebeardAlgGUID;
 
             // GameObjects
-            uint64 LeviathanGateGUID;
-            uint64 RazorHarpoonGUIDs[4];
-            uint64 KologarnChestGUID;
-            uint64 KologarnBridgeGUID;
-            uint64 ThorimChestGUID;
-            uint64 HodirRareCacheGUID;
-            uint64 HodirChestGUID;
-            uint64 MimironTramGUID;
-            uint64 MimironElevatorGUID;
-            uint64 MimironButtonGUID;
-            uint64 BrainRoomDoorGUIDs[3];
-            uint64 AlgalonSigilDoorGUID[3];
-            uint64 AlgalonFloorGUID[2];
-            uint64 AlgalonUniverseGUID;
-            uint64 AlgalonTrapdoorGUID;
-            uint64 GiftOfTheObserverGUID;
+            ObjectGuid LeviathanGateGUID;
+            ObjectGuid RazorHarpoonGUIDs[4];
+            ObjectGuid KologarnChestGUID;
+            ObjectGuid KologarnBridgeGUID;
+            ObjectGuid ThorimChestGUID;
+            ObjectGuid HodirRareCacheGUID;
+            ObjectGuid HodirChestGUID;
+            ObjectGuid MimironTramGUID;
+            ObjectGuid MimironElevatorGUID;
+            ObjectGuid MimironButtonGUID;
+            ObjectGuid BrainRoomDoorGUIDs[3];
+            ObjectGuid AlgalonSigilDoorGUID[3];
+            ObjectGuid AlgalonFloorGUID[2];
+            ObjectGuid AlgalonUniverseGUID;
+            ObjectGuid AlgalonTrapdoorGUID;
+            ObjectGuid GiftOfTheObserverGUID;
 
             // Miscellaneous
             uint32 TeamInInstance;
@@ -119,47 +119,12 @@ class instance_ulduar : public InstanceMapScript
             bool Unbroken;
             bool IsDriveMeCrazyEligible;
 
-            std::set<uint64> mRubbleSpawns;
-
             void Initialize() override
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(MAX_ENCOUNTER);
                 LoadDoorData(doorData);
                 LoadMinionData(minionData);
-                LeviathanGUID                    = 0;
-                IgnisGUID                        = 0;
-                RazorscaleGUID                   = 0;
-                RazorscaleController             = 0;
-                ExpeditionCommanderGUID          = 0;
-                XT002GUID                        = 0;
-                KologarnGUID                     = 0;
-                AuriayaGUID                      = 0;
-                MimironGUID                      = 0;
-                MimironComputerGUID              = 0;
-                MimironWorldTriggerGUID          = 0;
-                HodirGUID                        = 0;
-                ThorimGUID                       = 0;
-                FreyaGUID                        = 0;
-                VezaxGUID                        = 0;
-                YoggSaronGUID                    = 0;
-                VoiceOfYoggSaronGUID             = 0;
-                SaraGUID                         = 0;
-                BrainOfYoggSaronGUID             = 0;
-                AlgalonGUID                      = 0;
-                KologarnChestGUID                = 0;
-                KologarnBridgeGUID               = 0;
-                ThorimChestGUID                  = 0;
-                HodirRareCacheGUID               = 0;
-                HodirChestGUID                   = 0;
-                MimironTramGUID                  = 0;
-                MimironElevatorGUID              = 0;
-                MimironButtonGUID                = 0;
-                LeviathanGateGUID                = 0;
-                AlgalonUniverseGUID              = 0;
-                AlgalonTrapdoorGUID              = 0;
-                BrannBronzebeardAlgGUID          = 0;
-                GiftOfTheObserverGUID            = 0;
                 _algalonTimer                    = 61;
                 _maxArmorItemLevel               = 0;
                 _maxWeaponItemLevel              = 0;
@@ -175,15 +140,6 @@ class instance_ulduar : public InstanceMapScript
                 _algalonSummoned                 = false;
                 _summonAlgalon                   = false;
 
-                memset(AlgalonSigilDoorGUID, 0, sizeof(AlgalonSigilDoorGUID));
-                memset(AlgalonFloorGUID, 0, sizeof(AlgalonFloorGUID));
-                memset(XTToyPileGUIDs, 0, sizeof(XTToyPileGUIDs));
-                memset(AssemblyGUIDs, 0, sizeof(AssemblyGUIDs));
-                memset(RazorHarpoonGUIDs, 0, sizeof(RazorHarpoonGUIDs));
-                memset(ElderGUIDs, 0, sizeof(ElderGUIDs));
-                memset(MimironVehicleGUIDs, 0, sizeof(MimironVehicleGUIDs));
-                memset(BrainRoomDoorGUIDs, 0, sizeof(BrainRoomDoorGUIDs));
-                memset(KeeperGUIDs, 0, sizeof(KeeperGUIDs));
                 memset(_summonObservationRingKeeper, false, sizeof(_summonObservationRingKeeper));
                 memset(_summonYSKeeper, false, sizeof(_summonYSKeeper));
             }
@@ -460,7 +416,7 @@ class instance_ulduar : public InstanceMapScript
                         for (uint8 i = 0; i < 4; ++i)
                             if (XTToyPileGUIDs[i] == creature->GetGUID())
                             {
-                                XTToyPileGUIDs[i] = 0;
+                                XTToyPileGUIDs[i].Clear();
                                 break;
                             }
                         break;
@@ -471,7 +427,7 @@ class instance_ulduar : public InstanceMapScript
                         break;
                     case NPC_BRANN_BRONZBEARD_ALG:
                         if (BrannBronzebeardAlgGUID == creature->GetGUID())
-                            BrannBronzebeardAlgGUID = 0;
+                            BrannBronzebeardAlgGUID.Clear();
                         break;
                     default:
                         break;
@@ -975,7 +931,7 @@ class instance_ulduar : public InstanceMapScript
                         return BrannBronzebeardAlgGUID;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             uint32 GetData(uint32 type) const override
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
index af545cb39f0..360befc02af 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -45,11 +45,6 @@ class instance_utgarde_keep : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
                 LoadMinionData(minionData);
-
-                PrinceKelesethGUID  = 0;
-                SkarvaldGUID        = 0;
-                DalronnGUID         = 0;
-                IngvarGUID          = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -166,7 +161,7 @@ class instance_utgarde_keep : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void SetData(uint32 type, uint32 data) override
@@ -207,10 +202,10 @@ class instance_utgarde_keep : public InstanceMapScript
         protected:
             ForgeInfo Forges[3];
 
-            uint64 PrinceKelesethGUID;
-            uint64 SkarvaldGUID;
-            uint64 DalronnGUID;
-            uint64 IngvarGUID;
+            ObjectGuid PrinceKelesethGUID;
+            ObjectGuid SkarvaldGUID;
+            ObjectGuid DalronnGUID;
+            ObjectGuid IngvarGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
index 751239755cf..5b52072b07f 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
@@ -76,11 +76,11 @@ enum GameObjectIds
 
 struct ForgeInfo
 {
-    ForgeInfo() : AnvilGUID(0), BellowGUID(0), FireGUID(0), Event(NOT_STARTED) { };
+    ForgeInfo() : Event(NOT_STARTED) { };
 
-    uint64 AnvilGUID;
-    uint64 BellowGUID;
-    uint64 FireGUID;
+    ObjectGuid AnvilGUID;
+    ObjectGuid BellowGUID;
+    ObjectGuid FireGUID;
 
     uint32 Event;
 };
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
index 6177bab90cd..519cc3b7202 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
@@ -38,23 +38,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
-
-                SvalaSorrowgraveGUID        = 0;
-                GortokPalehoofGUID          = 0;
-                SkadiTheRuthlessGUID        = 0;
-                KingYmironGUID              = 0;
-
-                UtgardeMirrorGUID           = 0;
-                GortokPalehoofSphereGUID    = 0;
-
-                FrenziedWorgenGUID          = 0;
-                RavenousFurbolgGUID         = 0;
-                FerociousRhinoGUID          = 0;
-                MassiveJormungarGUID        = 0;
-                PalehoofOrbGUID             = 0;
-
-                SvalaGUID                   = 0;
-                SacrificedPlayerGUID        = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -179,27 +162,27 @@ class instance_utgarde_pinnacle : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         protected:
-            uint64 SvalaSorrowgraveGUID;
-            uint64 GortokPalehoofGUID;
-            uint64 SkadiTheRuthlessGUID;
-            uint64 KingYmironGUID;
+            ObjectGuid SvalaSorrowgraveGUID;
+            ObjectGuid GortokPalehoofGUID;
+            ObjectGuid SkadiTheRuthlessGUID;
+            ObjectGuid KingYmironGUID;
 
-            uint64 UtgardeMirrorGUID;
-            uint64 GortokPalehoofSphereGUID;
+            ObjectGuid UtgardeMirrorGUID;
+            ObjectGuid GortokPalehoofSphereGUID;
 
-            uint64 FrenziedWorgenGUID;
-            uint64 RavenousFurbolgGUID;
-            uint64 FerociousRhinoGUID;
-            uint64 MassiveJormungarGUID;
+            ObjectGuid FrenziedWorgenGUID;
+            ObjectGuid RavenousFurbolgGUID;
+            ObjectGuid FerociousRhinoGUID;
+            ObjectGuid MassiveJormungarGUID;
 
-            uint64 PalehoofOrbGUID;
+            ObjectGuid PalehoofOrbGUID;
 
-            uint64 SvalaGUID;
-            uint64 SacrificedPlayerGUID;
+            ObjectGuid SvalaGUID;
+            ObjectGuid SacrificedPlayerGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
index 55146cfecfd..846ecc1226a 100644
--- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
@@ -38,8 +38,6 @@ class instance_vault_of_archavon : public InstanceMapScript
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
 
-                EmalonGUID      = 0;
-                ToravonGUID     = 0;
                 ArchavonDeath   = 0;
                 EmalonDeath     = 0;
                 KoralonDeath    = 0;
@@ -72,7 +70,7 @@ class instance_vault_of_archavon : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -127,8 +125,8 @@ class instance_vault_of_archavon : public InstanceMapScript
             }
 
         private:
-            uint64 EmalonGUID;
-            uint64 ToravonGUID;
+            ObjectGuid EmalonGUID;
+            ObjectGuid ToravonGUID;
             time_t ArchavonDeath;
             time_t EmalonDeath;
             time_t KoralonDeath;
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 84ee3786983..cddf6ce3c25 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -114,35 +114,35 @@ public:
     {
         instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
-        uint64 uiMoragg;
-        uint64 uiErekem;
-        uint64 uiErekemGuard[2];
-        uint64 uiIchoron;
-        uint64 uiLavanthor;
-        uint64 uiXevozz;
-        uint64 uiZuramat;
-        uint64 uiCyanigosa;
-        uint64 uiSinclari;
-
-        uint64 uiMoraggCell;
-        uint64 uiErekemCell;
-        uint64 uiErekemLeftGuardCell;
-        uint64 uiErekemRightGuardCell;
-        uint64 uiIchoronCell;
-        uint64 uiLavanthorCell;
-        uint64 uiXevozzCell;
-        uint64 uiZuramatCell;
-        uint64 uiMainDoor;
-        uint64 uiTeleportationPortal;
-        uint64 uiSaboteurPortal;
-
-        uint64 uiActivationCrystal[4];
+        ObjectGuid uiMoragg;
+        ObjectGuid uiErekem;
+        ObjectGuid uiErekemGuard[2];
+        ObjectGuid uiIchoron;
+        ObjectGuid uiLavanthor;
+        ObjectGuid uiXevozz;
+        ObjectGuid uiZuramat;
+        ObjectGuid uiCyanigosa;
+        ObjectGuid uiSinclari;
+
+        ObjectGuid uiMoraggCell;
+        ObjectGuid uiErekemCell;
+        ObjectGuid uiErekemLeftGuardCell;
+        ObjectGuid uiErekemRightGuardCell;
+        ObjectGuid uiIchoronCell;
+        ObjectGuid uiLavanthorCell;
+        ObjectGuid uiXevozzCell;
+        ObjectGuid uiZuramatCell;
+        ObjectGuid uiMainDoor;
+        ObjectGuid uiTeleportationPortal;
+        ObjectGuid uiSaboteurPortal;
+
+        ObjectGuid uiActivationCrystal[4];
 
         uint32 uiActivationTimer;
         uint32 uiCyanigosaEventTimer;
         uint32 uiDoorSpellTimer;
 
-        std::set<uint64> trashMobs; // to kill with crystal
+        GuidSet trashMobs; // to kill with crystal
 
         uint8 uiWaveCount;
         uint8 uiLocation;
@@ -171,28 +171,6 @@ public:
         void Initialize() override
         {
             SetHeaders(DataHeader);
-            uiMoragg = 0;
-            uiErekem = 0;
-            uiIchoron = 0;
-            uiLavanthor = 0;
-            uiXevozz = 0;
-            uiZuramat = 0;
-            uiCyanigosa = 0;
-            uiSinclari = 0;
-
-            uiMoraggCell = 0;
-            uiErekemCell = 0;
-            uiErekemGuard[0] = 0;
-            uiErekemGuard[1] = 0;
-            uiIchoronCell = 0;
-            uiLavanthorCell = 0;
-            uiXevozzCell = 0;
-            uiZuramatCell = 0;
-            uiMainDoor = 0;
-            uiTeleportationPortal = 0;
-            uiSaboteurPortal = 0;
-
-            trashMobs.clear();
 
             uiRemoveNpc = 0;
 
@@ -471,7 +449,7 @@ public:
                 case DATA_SABOTEUR_PORTAL:          return uiSaboteurPortal;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         void SpawnPortal()
@@ -817,7 +795,7 @@ public:
             trigger->CastSpell(trigger, spellInfoLightning, true, 0, 0, trigger->GetGUID());
 
             // Kill all mobs registered with SetGuidData(ADD_TRASH_MOB)
-            for (std::set<uint64>::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
+            for (GuidSet::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
             {
                 Creature* creature = instance->GetCreature(*itr);
                 if (creature && creature->IsAlive())